More work to toolbars and menus. Adding experimental YUI-based toolbar to detail...

Signed-off-by: Chris Cormack <crc@liblime.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index 2153966..a89ba5d 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -106,6 +106,10 @@ li {
        list-style-type : disc;
 }
 
+li li {
+       list-style-type : circle;
+}
+
 #header {
        background-color : #F3F3F3;
        border-bottom : 1px solid #E8E8E8;
@@ -180,7 +184,7 @@ table {
 td, th {
        border-bottom : 1px solid #BCBCBC;
        border-left : 1px solid #BCBCBC;
-       padding : .5em;
+       padding : .2em .3em;
 }
 
 td {
@@ -240,7 +244,7 @@ div#header_search {
        background-repeat : no-repeat;
        float: left;
        padding-left : 14.2em;
-       margin: 1em 0 1.5em 0;
+       margin: .3em 0 .5em 0;
 }
 
 div#header_search input {
@@ -679,4 +683,8 @@ fieldset.rows fieldset.action {
 .checkedout {
        color : #999999;
        font-style : italic;
+}
+
+.subfield_not_filled {
+       background-color : #FFFF99;
 }
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/action-catalogue.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/action-catalogue.inc
deleted file mode 100644 (file)
index 3f8c62a..0000000
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/action-catalogue.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-<div id="toolbar"><ul class="toolbar">
-       <li>                <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;frameworkcode=<!--TMPL_VAR Name="current_framework" -->&amp;op=">Edit biblio</a></li>
-       <li>                <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;frameworkcode=<!--TMPL_VAR Name="current_framework" -->&amp;op=duplicate">Duplicate</a></li>
-       <li>                <a href="/cgi-bin/koha/cataloguing/additem.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Edit item</a></li>
-       <li>                <a href="javascript:confirm_deletion(<!-- TMPL_VAR NAME="count" -->)">Delete</a></li>
-
-       <li>                <a href="#" onclick="window.open('/cgi-bin/koha/virtualshelves/addbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->','Add_to_virtualshelf','width=500,height=400,toolbar=false,scrollbars=yes'); return false;">Add to shelf</a></li>
-       <li>                <a href="/cgi-bin/koha/catalogue/detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Print</a></li>
-                       
-                       <!-- TMPL_IF NAME="norequests" --><!-- TMPL_ELSE --><li><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Request</a></li><!-- /TMPL_IF -->
-       
-</ul>
-    <br clear="all" /></div>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc
index 5e81651..0ff4b9e 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc
@@ -1,7 +1,9 @@
 <ul>
-<li>                <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Complete</a></li>
+<li>                <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">MARC</a></li>
        <li>                <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Normal</a></li>
-       <li>                <a href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">ISBD</a></li><!-- TMPL_IF name="subscriptionsnumber" --><li><a href="/cgi-bin/koha/serials/serials-home.pl?searched=1&amp;title_filter=<!-- TMPL_VAR NAME="subscriptiontitle" -->">Subscription(s)</a></li><!-- /TMPL_IF -->
+       <li>                <a href="/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">ISBD</a></li>
+       <li><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Holds</a></li>
+<!-- TMPL_IF name="subscriptionsnumber" --><li><a href="/cgi-bin/koha/serials/serials-home.pl?searched=1&amp;title_filter=<!-- TMPL_VAR NAME="subscriptiontitle" -->">Subscription(s)</a></li><!-- /TMPL_IF -->
 </ul>
 <ul>
 <li>                <a href="/cgi-bin/koha/catalogue/issuehistory.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;title=<!-- TMPL_VAR NAME="title"-->&amp;author=<!-- TMPL_VAR NAME="author"-->" >Circulation history</a></li>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
new file mode 100644 (file)
index 0000000..e8d4566
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
@@ -0,0 +1,17 @@
+<div id="toolbar">
+                               <a id="addbiblio" href="/cgi-bin/koha/cataloguing/addbiblio.pl">New</a>
+                       <input type="submit" id="editbutton" name="editbutton_button" value="Edit">
+            <select id="editbuttonselect" name="editbuttonselect">
+                <option value="0">Bibliographic Record</option>
+                <option value="1">Items</option>
+                <option value="2">As New Record (Duplicate)</option>                
+            </select>
+                       <a id="deletebiblio" href="javascript:confirm_deletion(<!-- TMPL_VAR NAME="count" -->)">Delete</a>
+
+                       <a id="addtoshelf" href="#" onclick="window.open('/cgi-bin/koha/virtualshelves/addbybiblionumber.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->','Add_to_virtualshelf','width=500,height=400,toolbar=false,scrollbars=yes'); return false;">Add to shelf</a>
+                       <a id="printbiblio" href="/cgi-bin/koha/catalogue/detailprint.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Print</a>
+                       
+                       <!-- TMPL_IF NAME="norequests" --><!-- TMPL_ELSE --><a id="placehold" href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Place Hold</a><!-- /TMPL_IF -->
+       
+
+    <br clear="all" /></div>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
index e33e8a8..e014453 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
@@ -29,8 +29,8 @@
        <li><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Fines</a></li>
        <!-- TMPL_IF NAME="intranetreadinghistory" --><li><a href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Reading Record</a></li><!-- /TMPL_IF -->
        <!-- TMPL_IF NAME="CAN_user_parameters"--><li><a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&amp;module=MEMBERS&amp;action=MODIFY&amp;object=<!-- TMPL_VAR NAME="borrowernumber" -->">Modification Log</a></li><!-- /TMPL_IF --></ul>
-<!-- /TMPL_IF -->
 </div>
+<!-- /TMPL_IF -->
 
 <ul>
        <li><a href="/cgi-bin/koha/circ/returns.pl">Check In</a></li>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/hold-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/hold-menu.inc
new file mode 100644 (file)
index 0000000..da7cbdb
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/hold-menu.inc
@@ -0,0 +1,39 @@
+<!-- TMPL_IF NAME="borrowernumber" -->
+<div class="patroninfo"><h5><!-- TMPL_VAR name="borrowerfirstname" --> <!-- TMPL_VAR name="borrowersurname" --></h5>
+<ul>
+               <li><!-- TMPL_IF NAME="borrowerstreetaddress"-->
+            <!-- TMPL_VAR NAME="borrowerstreetaddress" -->,
+        <!-- TMPL_ELSE -->
+            <span class="problem">No address stored for patron.</span>
+        <!-- /TMPL_IF --></li>
+       <li> <!-- TMPL_IF NAME="borrowercity" -->
+            <!-- TMPL_VAR NAME="borrowercity" -->
+        <!-- TMPL_ELSE -->
+            No city stored.
+        <!-- /TMPL_IF --></li>
+   <li> <!--TMPL_IF NAME="borrowerphone" -->
+        <!-- TMPL_VAR NAME="borrowerphone" -->
+    <!-- TMPL_ELSE -->
+        <span class="problem">No phone stored.</span>    
+    <!-- /TMPL_IF --></li>
+           <!-- TMPL_IF NAME="borroweremail" -->
+   <li> <a href="mailto:<!-- TMPL_VAR NAME="email" -->"><!-- TMPL_VAR NAME="borroweremail" --></a></li>
+    <!-- /TMPL_IF -->
+                   <!-- TMPL_IF NAME="borroweremailpro" -->
+   <li> <a href="mailto:<!-- TMPL_VAR NAME="emailpro" -->"><!-- TMPL_VAR NAME="borroweremailpro" --></a></li>
+    <!-- /TMPL_IF -->
+    <li>Category: <!-- TMPL_VAR name="borrowercategorycode" --></li>
+</ul></div>
+<div class="patronviews">
+<ul><li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Details</a></li>
+       <li><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Fines</a></li>
+       <!-- TMPL_IF NAME="intranetreadinghistory" --><li><a href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Reading Record</a></li><!-- /TMPL_IF -->
+       <!-- TMPL_IF NAME="CAN_user_parameters"--><li><a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&amp;module=MEMBERS&amp;action=MODIFY&amp;object=<!-- TMPL_VAR NAME="borrowernumber" -->">Modification Log</a></li><!-- /TMPL_IF --></ul>
+</div>
+<!-- /TMPL_IF -->
+
+<ul>
+       <li><a href="/cgi-bin/koha/circ/returns.pl">Check In</a></li>
+       <li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfer</a></li>
+       <li>    <a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a></li>
+</ul>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tmpl
index 50ae6da..ef7e7ff 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/ISBDdetail.tmpl
@@ -41,6 +41,7 @@ function confirm_deletion(count) {
    <div id="bd">
        <div id="yui-main">
        <div class="yui-b">
+<!-- TMPL_INCLUDE NAME="cat-toolbar.inc" -->
 
 <h1>MARC biblio : <!-- TMPL_VAR NAME="biblionumber" --></h1>
 
@@ -54,6 +55,7 @@ function confirm_deletion(count) {
 </div>
 </div>
 <div class="yui-b">
+<!-- TMPL_INCLUDE NAME="biblio-view-menu.inc" -->
 <!-- TMPL_INCLUDE NAME="cat-menu.inc" -->
 </div>
 </div>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
index d69a39d..66e100e 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
@@ -67,7 +67,7 @@ function Addbiblio(op) {
    <div id="bd">
        <div id="yui-main">
        <div class="yui-b">
-<!-- TMPL_INCLUDE NAME="action-catalogue.inc" -->
+<!-- TMPL_INCLUDE NAME="cat-toolbar.inc" -->
 
 <!-- TMPL_UNLESS name="popup" -->
     <h1>MARC biblio : <!-- TMPL_VAR NAME="biblionumber" --></h1>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
index b8564bb..b76b757 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
@@ -1,6 +1,21 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Catalogue &rsaquo; Details for <!-- TMPL_VAR NAME="title" --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- Core + Skin CSS -->
+<link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.3.1/build/button/assets/skins/sam/button.css">
+<!-- OPTIONAL: Menu Stylesheet (required for creating buttons of type "menu" and "split") -->
+<link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.3.1/build/menu/assets/skins/sam/menu.css">
+
+<!-- Dependencies -->
+<script type="text/javascript" src="http://yui.yahooapis.com/2.3.1/build/yahoo-dom-event/yahoo-dom-event.js"></script>
+<script type="text/javascript" src="http://yui.yahooapis.com/2.3.1/build/element/element-beta-min.js"></script>
+
+<!-- OPTIONAL: Menu and Container Core (required for creating buttons of type "menu" and "split") -->
+<script type="text/javascript" src="http://yui.yahooapis.com/2.3.1/build/container/container_core-min.js"></script>
+<script type="text/javascript" src="http://yui.yahooapis.com/2.3.1/build/menu/menu-min.js"></script>
+
+<!-- Source file -->
+<script type="text/javascript" src="http://yui.yahooapis.com/2.3.1/build/button/button-beta-min.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 function Dopop(link) {
@@ -26,10 +41,61 @@ function confirm_deletion(count) {
                
     }
 }
+      // "contentready" event handler for the "toolbar" <div>
+        YAHOO.example.init = function () {
+      YAHOO.util.Event.onContentReady("toolbar", function () {
+                       var oAddbiblio = new YAHOO.widget.Button("addbiblio");
+            var oDeletebiblio = new YAHOO.widget.Button("deletebiblio");
+                       var oAddtoshelf = new YAHOO.widget.Button("addtoshelf");
+                       var oPrintbiblio = new YAHOO.widget.Button("printbiblio");
+                       var oPlacehold = new YAHOO.widget.Button("placehold");
+                       var oEditButton = new YAHOO.widget.Button("editbutton", { type: "menu", menu: "editbuttonselect" });
+                        });
+    } ();
+       
 //]]>
 </script>
+<style type="text/css">
+#toolbar {
+}
+
+#addbiblio a {
+       padding-left : 2.1em;
+       background-image: url("/intranet-tmpl/prog/img/opac-buttons.gif");
+       background-position : 0 -155px;
+       background-repeat : no-repeat;
+}
+
+#deletebiblio a {
+       padding-left : 2.1em;
+       background-image: url("/intranet-tmpl/prog/img/opac-buttons.gif");
+       background-position : 0 -188px;
+       background-repeat : no-repeat;
+}
+
+#printbiblio a {
+       padding-left : 2.1em;
+       background-image: url("/intranet-tmpl/prog/img/opac-buttons.gif");
+       background-position : 0 -243px;
+       background-repeat : no-repeat;
+}
+
+#addtoshelf a {
+       padding-left : 2.2em;
+       background-image: url("/intranet-tmpl/prog/img/opac-buttons.gif");
+       background-position : 0 -124px;
+       background-repeat : no-repeat;
+}
+
+#placehold a {
+       padding-left : 2.2em;
+       background-image: url("/intranet-tmpl/prog/img/opac-buttons.gif");
+       background-position : 0 -215px;
+       background-repeat : no-repeat;
+}
+</style>
 </head>
-<body>
+<body class="yui-skin-sam">
 
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="cat-search.inc" -->
@@ -42,12 +108,11 @@ function confirm_deletion(count) {
        <div id="yui-main">
        <div class="yui-b">
 
-    <h1></h1>
-    
-<!-- TMPL_INCLUDE NAME="action-catalogue.inc" -->
-    
-    <div id="catalogue_detail_biblio">
-        <h2><!-- TMPL_VAR NAME="title" --></h2>
+<!-- TMPL_INCLUDE NAME="cat-toolbar.inc" -->
+    <div class="yui-gb">
+    <h2><!-- TMPL_VAR NAME="title" --></h2>    
+       <div id="catalogue_detail_biblio" class="yui-u first">
+
         <p>
             [
             <!-- TMPL_IF name="description" -->
@@ -61,90 +126,108 @@ function confirm_deletion(count) {
             <!-- TMPL_IF name="unititle" -->, <!-- TMPL_VAR name="unititle" --><!-- /TMPL_IF -->
             / <!-- TMPL_VAR NAME="author" --> <!-- TMPL_VAR NAME="class" -->
         </p>
-
+               
+               
+               
+               <ul>
         <!-- TMPL_IF name="MARCAUTHORS" -->
-            <p><label><b>Authors:</b></label>
+            <li><strong>Authors:</strong><ul>
                 <!-- TMPL_LOOP NAME="MARCAUTHORS" -->
-                <p><a href="/cgi-bin/koha/catalogue/search.pl?q=Koha-Auth-Number:<!-- TMPL_VAR NAME="link" -->">
+                <li><a href="/cgi-bin/koha/catalogue/search.pl?q=Koha-Auth-Number:<!-- TMPL_VAR NAME="link" -->">
                     <!-- TMPL_VAR NAME="value" -->
-                </a>&nbsp;</p>
+                </a>&nbsp;</li>
                 <!-- /TMPL_LOOP -->
-            </p>
+                               </ul>
+            </li>
         <!-- /TMPL_IF -->
         <!-- TMPL_IF name="illus" -->
-            <p><label><b>Illus:</b></label><!-- TMPL_VAR name="illus" -->&nbsp;</p>
+            <li><strong>Illustrator:</strong> <!-- TMPL_VAR name="illus" -->&nbsp;</li>
         <!-- /TMPL_IF -->
         <!-- TMPL_IF name="publishercode" -->
-            <p><label><b>Published by :</b></label>
+            <li><strong>Publisher:</strong>
                 <a href="/cgi-bin/koha/catalogue/search.pl?q=pb:<!-- TMPL_VAR NAME="publishercode" -->">
                     <!-- TMPL_VAR NAME="publishercode" -->
                 </a>&nbsp;
-            </p>
+            </li>
         <!-- /TMPL_IF -->
         <!-- TMPL_IF name="publicationyear" -->
-            <p><label><b>in:</b></label><!-- TMPL_VAR NAME="publicationyear" -->&nbsp;</p>
+            <li>in:<!-- TMPL_VAR NAME="publicationyear" -->&nbsp;</li>
         <!-- /TMPL_IF -->
-        <p>
-            <label><b>Description:</b></label>
+        <li><strong>Description:</strong>
                 <!-- TMPL_IF name="pages" --> <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" -->
-                <!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" -->&nbsp;
-        </p>
+                <!-- TMPL_IF name="size" -->, <!-- /TMPL_IF --><!-- TMPL_VAR name="size" -->
+        </li>
+               </ul>
+               </div>
+               
+               <div class="yui-u">
+<!-- TMPL_IF NAME="AmazonContent" --><a href="http://www.amazon.com/gp/reader/<!-- TMPL_VAR NAME="isbn" -->/ref=sib_dp_pt/002-7879865-0184864#reader-link"><img border="0" src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="isbn" -->.01._PIdp-schmooS,TopRight,7,-26_SCMZZZZZZZ_.jpg" alt="Book Cover Image" /></a><!-- /TMPL_IF -->
+</div>
+               
+               <div class="yui-u">
+               <ul>
         <!-- TMPL_IF name="isbn" -->
-            <p><label><b>ISBN: </b></label><!-- TMPL_VAR NAME="isbn" -->&nbsp;</p>
+            <li><strong>ISBN:</strong> <!-- TMPL_VAR NAME="isbn" -->&nbsp;</li>
         <!-- /TMPL_IF -->
         <!-- TMPL_IF name="issn" -->
-            <p><label><b>ISSN:</b></label><!-- TMPL_VAR NAME="issn" -->&nbsp;</p>
+            <li><strong>ISSN:</strong><!-- TMPL_VAR NAME="issn" -->&nbsp;</li>
         <!-- /TMPL_IF -->
         <!-- TMPL_IF name="collectiontitle" -->
-            <p><label><b>Collection: </b></label>
-                <!-- TMPL_VAR NAME="collectiontitle" --> <!-- TMPL_IF name="collectionvolume" -->, <!-- TMPL_VAR NAME="collectionvolume" --><!-- /TMPL_IF --><!-- TMPL_IF name="collectionissn" -->(ISSN : <!-- TMPL_VAR NAME="collectionissn" -->)<!-- /TMPL_IF -->
-            </p>
+            <li><strong>Collection: </strong>
+                <!-- TMPL_VAR NAME="collectiontitle" --> <!-- TMPL_IF name="collectionvolume" -->, <!-- TMPL_VAR NAME="collectionvolume" --><!-- /TMPL_IF --><!-- TMPL_IF name="collectionissn" -->(<strong>ISSN:</strong> <!-- TMPL_VAR NAME="collectionissn" -->)<!-- /TMPL_IF -->
+            </li>
         <!-- /TMPL_IF -->
         <!-- TMPL_IF name="MARCSUBJCTS" -->
-            <p><label><b>Subjects: </b></label></p>
-            <p>
+            <li><strong>Subjects:</strong> 
+            <ul>
                 <!-- TMPL_LOOP NAME="MARCSUBJCTS" -->
-                    <p><a href="/cgi-bin/koha/catalogue/search.pl?q=<!-- TMPL_VAR NAME="link" ESCAPE="URL"-->"><!-- TMPL_VAR NAME="label" --></a>
-                    &nbsp;</p>
+                    <li><a href="/cgi-bin/koha/catalogue/search.pl?q=<!-- TMPL_VAR NAME="link" ESCAPE="URL"-->"><!-- TMPL_VAR NAME="label" --></a>
+                    &nbsp;</li>
                 <!-- /TMPL_LOOP -->
-            </p>
+                               </ul>
+            </li>
         <!-- /TMPL_IF -->
         <!-- TMPL_IF name="copyrightdate" -->
-            <p><label><b>Year : </b></label><!-- TMPL_VAR NAME="copyrightdate" --></p>
+            <li><strong>Copyright:</strong> <!-- TMPL_VAR NAME="copyrightdate" --></li>
         <!-- /TMPL_IF -->
         <!-- TMPL_IF name="MARCNOTES" -->
-            <p><label><b>Notes: </b></label></p>
-            <p>
+            <li><strong>Notes:</strong>
+            <ul>
                 <!-- TMPL_LOOP NAME="MARCNOTES" -->
-                    <p>- <!-- TMPL_VAR NAME="marcnote" --></p>
+                    <li>- <!-- TMPL_VAR NAME="marcnote" --></li>
                 <!-- /TMPL_LOOP -->
-            </p>
+            </ul>
+                       </li>
         <!-- TMPL_ELSE -->
             <!-- TMPL_IF name="notes" -->
-                <p><label><b>Notes: </b></label><!-- TMPL_VAR NAME="notes" --></p>
+                <li><strong>Notes:</strong> <!-- TMPL_VAR NAME="notes" --></li>
             <!-- /TMPL_IF -->
         <!-- /TMPL_IF -->
         <!-- TMPL_IF name="unititle" -->
-            <p><label><b>Alt title: </b></label><!-- TMPL_VAR NAME="unititle" --></p>
+            <li><strong>Alternate title:</strong> <!-- TMPL_VAR NAME="unititle" --></li>
         <!-- /TMPL_IF -->
         <!-- TMPL_IF name="classification" -->
-            <p><label><b>classification:</b></label><!-- TMPL_VAR name="subclass" --><!-- TMPL_VAR name="classification" --></p>
+            <li><strong>Classification:</strong> <!-- TMPL_VAR name="subclass" --><!-- TMPL_VAR name="classification" --></li>
         <!-- /TMPL_IF -->
         <!-- TMPL_IF name="dewey" -->
-            <p><label><b>Dewey:</b></label><!-- TMPL_VAR name="dewey" --></p>
+            <li><strong>Dewey:</strong> <!-- TMPL_VAR name="dewey" --></li>
         <!-- /TMPL_IF -->
         <!-- TMPL_IF name="URLS" -->
-            <p><label><b>URL: </b></label>
+            <li><strong>URL:</strong> 
                 <!-- TMPL_LOOP name="URLS" -->
                     <a href="<!-- TMPL_VAR name="url" -->"><!-- TMPL_VAR NAME="url" --></a>&nbsp;
                 <!-- /TMPL_LOOP -->
-            </p>
+            </li>
         <!-- /TMPL_IF -->
-    </div>
+               </ul>
+</div>
+
+</div>
 
+<div class="yui-g">
 <!-- TMPL_IF name="count" -->
     <div id="catalogue_detail_items">
-        <h2><!-- TMPL_VAR NAME="count" --> items</h2>
+        <caption><!-- TMPL_VAR NAME="count" --> item(s)</caption>
         <table>
             <tr>
                 <th>Item type</th>
@@ -187,7 +270,10 @@ function confirm_deletion(count) {
 <!-- TMPL_ELSE -->
     <p>No physical items for this record</p>
 <!-- /TMPL_IF -->
+</div>
+
 <!-- TMPL_IF name="subscriptionsnumber" -->
+<div class="yui-g">
 <div id="catalogue_detail_subscriptions">
     <h2>This is a serial subscription</h2>
     <p> (We have <!-- TMPL_VAR name="subscriptionsnumber" --> subscriptions associated with this title).</p> 
@@ -227,6 +313,7 @@ function confirm_deletion(count) {
             <!-- /TMPL_IF -->
     <!-- /TMPL_LOOP -->
 </div>
+</div>
 <!-- /TMPL_IF -->
 
 </div>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl
index 9c70749..2b10f53 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl
@@ -14,6 +14,7 @@
    <div id="bd">
        <div id="yui-main">
        <div class="yui-b">
+<!-- TMPL_INCLUDE NAME="cat-toolbar.inc" -->
 
 <div id="catalogue_detail_biblio">
        <!-- TMPL_LOOP NAME="BIBITEM_DATA" -->
@@ -81,6 +82,7 @@ NAME="biblionumber"-->&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->">Modif
 </div>
 </div>
 <div class="yui-b">
+<!-- TMPL_INCLUDE NAME="biblio-view-menu.inc" -->
 <!-- TMPL_INCLUDE NAME="cat-menu.inc" -->
 </div>
 </div>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
index 2656fd5..d0bc2c5 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
@@ -105,17 +105,18 @@ if (alreadyreserved > "0"){
     <!-- /TMPL_IF -->
     <form action="request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" method="post" onsubmit="request.pl" name="getborrower">
         <!-- TMPL_UNLESS name="CGIselectborrower" -->
+                       <fieldset class="brief">
                        <label for="patron">Patron: </label>
                                <div class="hint">(type card number or part of a name)</div>
                 <input type="text" size="20" id="patron" name="findborrower" /> 
                 <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber"-->" />
                 <input type="submit" value="Search" />
+                       </fieldset>
         <!-- TMPL_ELSE -->
             <!-- TMPL_VAR NAME="CGIselectborrower" -->
                 <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber"-->" />
                 <input type="submit" value="Select" />
         <!-- /TMPL_UNLESS -->
-               </fieldset>
     </form>
 <!-- TMPL_ELSE -->
   <!-- TMPL_IF NAME="maxreserves" -->
@@ -291,9 +292,15 @@ if (alreadyreserved > "0"){
     <!-- TMPL_IF Name="wait" -->
             <option value="W" selected="selected">Waiting</option>
        <!-- TMPL_ELSE -->
-            <option value="<!-- TMPL_VAR NAME="priority" -->" <!-- TMPL_IF Name="selected" --> selected <!-- /TMPL_IF -->>
+               <!-- TMPL_IF Name="selected" -->
+            <option value="<!-- TMPL_VAR NAME="priority" -->" selected="selected">
               <!-- TMPL_VAR NAME="priority" -->
             </option>
+       <!-- TMPL_ELSE -->
+                       <option value="<!-- TMPL_VAR NAME="priority" -->">
+              <!-- TMPL_VAR NAME="priority" -->
+            </option>
+        <!-- /TMPL_IF -->
         <!-- /TMPL_IF -->
             <option value="del">del</option>
           </select>
@@ -307,12 +314,12 @@ if (alreadyreserved > "0"){
     <!-- TMPL_IF Name="wait" -->
        <!-- TMPL_IF NAME="atdestination" -->
                 <!-- TMPL_IF name="found" -->
-                Item waiting at <b> <!-- TMPL_VAR NAME="wbrname" --></b> <input type="hidden" name="pickup" value=<!-- TMPL_VAR NAME="wbrcd" --> />
+                Item waiting at <b> <!-- TMPL_VAR NAME="wbrname" --></b> <input type="hidden" name="pickup" value="<!-- TMPL_VAR NAME="wbrcd" -->" />
             <!-- TMPL_ELSE -->
                 Waiting to be pulled
             <!-- /TMPL_IF -->
           <!-- TMPL_ELSE -->
-            Item being transfered to <b> <!-- TMPL_VAR NAME="wbrname" --></b> <input type="hidden" name="pickup" value=<!-- TMPL_VAR NAME="wbrcd" --> />
+            Item being transfered to <b> <!-- TMPL_VAR NAME="wbrname" --></b> <input type="hidden" name="pickup" value="<!-- TMPL_VAR NAME="wbrcd" -->" />
          <!-- /TMPL_IF -->
     <!-- TMPL_ELSE -->
           <select name="pickup">
@@ -351,7 +358,7 @@ if (alreadyreserved > "0"){
       </tr>
   <!-- /TMPL_LOOP --> <!-- existing reserveloop -->
      </table>
-<fieldset class="action"><input type="submit" name="submit" value="Cancel hold(s)" border="0" /></fieldset>
+<fieldset class="action"><input type="submit" name="submit" value="Cancel hold(s)" /></fieldset>
 </fieldset>
 </form>
 <!-- /TMPL_IF -->
@@ -360,7 +367,7 @@ if (alreadyreserved > "0"){
 </div>
 </div>
 <div class="yui-b">
-<!-- TMPL_INCLUDE NAME="circ-menu.inc" -->
+<!-- TMPL_INCLUDE NAME="hold-menu.inc" -->
 </div>
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tmpl
index fc0ca61..cd07499 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tmpl
@@ -8,50 +8,50 @@
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Tools</div>
 
-<div id="doc3" class="yui-t2">
-   
-   <div id="bd">
-       <div id="yui-main">
-       <div class="yui-b">
-
-<h1>Koha tools</h1>
+<div id="doc3">
+<div id="bd">
+       <div class="yui-gb">
 
+<div class="yui-u first">
 <dl>
+    <dt><a href="/cgi-bin/koha/tools/koha-news.pl">News</a></dt>
+    <dd>Write news for the OPAC and staff interfaces.</dd>
+       
     <dt><a href="/cgi-bin/koha/labels/label-home.pl">Label creator</a></dt>
     <dd>Create printable labels and barcodes from catalog data.</dd>
 
     <dt><a href="/cgi-bin/koha/tools/holidays.pl">Holidays</a></dt>
     <dd>Define holidays (days where the library is closed)</dd>
-
+       </dl>
+</div>
+<div class="yui-u">
+       <dl>
     <dt><a href="/cgi-bin/koha/tools/export.pl">Export</a></dt>
     <dd>Export data</dd>
 
+    <dt><a href="/cgi-bin/koha/tools/inventory.pl">Inventory/stocktaking</a></dt>
+    <dd>Perform inventory (stocktaking) of your catalogue</dd>
+
     <dt><a href="/cgi-bin/koha/tools/import.pl">Reservoir Import</a></dt>
     <dd>Import data into the reservoir.</dd>
-
-    <dt><a href="/cgi-bin/koha/tools/koha-news.pl">News</a></dt>
-    <dd>Write news for the OPAC and staff interfaces.</dd>
-
+       </dl>
+</div>
+<div class="yui-u">
+<dl>
     <dt><a href="/cgi-bin/koha/tools/letter.pl">Notices</a></dt>
     <dd>Define notices (print and email notification messages for overdues, etc.)</dd>
 
     <dt><a href="/cgi-bin/koha/tools/overduerules.pl">Overdue rules</a></dt>
     <dd>Rules for overdue books</dd>
 
-    <dt><a href="/cgi-bin/koha/tools/inventory.pl">Inventory/stocktaking</a></dt>
-    <dd>Perform inventory (stocktaking) of your catalogue</dd>
-
     <dt><a href="/cgi-bin/koha/tools/cleanborrowers.pl">Clean borrowers</a></dt>
     <dd>Delete old borrowers and anonymize circulation history (deletes borrower reading history)</dd>
 
     <dt><a href="/cgi-bin/koha/tools/viewlog.pl">Log viewer</a></dt>
     <dd>Browse the system logs</dd>
 </dl>
-
 </div>
-</div>
-<div class="yui-b">
-<!-- TMPL_INCLUDE NAME="tools-menu.inc" -->
+
 </div>
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

diff --git a/koha-tmpl/intranet-tmpl/prog/img/opac-buttons.gif b/koha-tmpl/intranet-tmpl/prog/img/opac-buttons.gif
new file mode 100644 (file)
index 0000000..6aa552d
Binary files /dev/null and b/koha-tmpl/intranet-tmpl/prog/img/opac-buttons.gif differ

diff --git a/reserve/request.pl b/reserve/request.pl
index fd40aae..90ca398 100755 (executable)
--- a/reserve/request.pl
+++ b/reserve/request.pl
@@ -119,6 +119,12 @@ if ($cardnumber) {
                borrowernumber => $borrowerinfo->{'borrowernumber'},
         borrowersurname   => $borrowerinfo->{'surname'},
         borrowerfirstname => $borrowerinfo->{'firstname'},
+               borrowerstreetaddress => $borrowerinfo->{'address'},
+               borrowercity => $borrowerinfo->{'city'},
+               borrowerphone => $borrowerinfo->{'phone'},
+               borroweremail => $borrowerinfo->{'email'},
+               borroweremailpro => $borrowerinfo->{'emailpro'},
+               borrowercategory => $borrowerinfo->{'category'},
         borrowerreservs   => $count_reserv,
         maxreserves       => $maxreserves,
         expiry            => $expiry,