Various random noodlings: - Visual changes to circ, detail, request, and member pages...

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

diff --git a/C4/Members.pm b/C4/Members.pm
index e7a39be..c27d73f 100644 (file)
--- a/C4/Members.pm
+++ b/C4/Members.pm
@@ -597,11 +597,11 @@ sub ModMember {
         $sth->execute;
     }
     else {
-
+ ( $data{'password'} = md5_base64( $data{'password'} ) )
+          if ( $data{'password'} ne '' );
         foreach (keys %data)
         {push @parameters,"$_ = ".$dbh->quote($data{$_}) if ($_ ne "borrowernumber" and $hashborrowerfields{$_} and $data{$_})} ;
-        ( $data{'password'} = md5_base64( $data{'password'} ) )
-          if ( $data{'password'} ne '' );
+       
         $query = "UPDATE borrowers SET ".join (",",@parameters)." WHERE borrowernumber=$data{'borrowernumber'}";
 #         warn "$query";
         $sth = $dbh->prepare($query);

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 67514be..c1474ea 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -210,12 +210,12 @@ span.problem {
 
 fieldset {
        border : 2px solid #EEEEEE;
-       margin : 1em;
+       margin : 1em 1em 1em 0;
        padding : 1em;
 }
 
 legend {
-       font-size : 138.5%;
+       font-size : 123.1%;
        font-weight : bold;
        margin : 0 0 0 -1em;
        padding : 0;
@@ -264,47 +264,9 @@ div#circ_search,div#catalog_search,div#patron_search,div#subscription_search,div
        padding : 0 0 .2em 0;
 }
 
-/* Panel-Switch Tabs */
-ul.link-tabs {
-       list-style-type: none;
-       margin: 1px 0 9px 5px;
-       padding: 0;
-}
-
-ul.link-tabs li {
-       display: inline;
-       padding: 0px;
-}
-
-ul.link-tabs li a {
-       border-bottom: 1px solid #333333;
-       border-left : 1px solid #DDDDDD;
-       border-right : 1px solid #666666;
-       padding: .2em 1.2em .2em 1.2em;
-       text-decoration: none;
-}
-
-ul.link-tabs li.off a {
-       background-color: #FFFFFF;
-       border : 0;
-       margin-right : 1px;
-       text-decoration: underline;
-}
-
-ul.link-tabs li.off a:hover {
-       background-color: #FFFFEC;
-       border : 0;
-       margin-right : 0;
-       padding: .2em 1.2em .2em 1.2em;
-}
-
-ul.link-tabs li.on a {
-       background-color: #FFFFCC;
-       border-top: 1px solid #FFFFCC;
-       border-right: 1px solid #FF9900;
-       border-bottom: 1px solid #FF9900;
-       border-left: 1px solid #FFCC66;
-       font-weight : bold;
+div#reserves,div#checkouts {
+       border : 1px solid #E8E8E8;
+       padding : 1em;
 }
 
 div#header_search .tip {
@@ -481,29 +443,43 @@ div.message {
 }
 
 div.patroninfo {
-       margin-bottom : .5em;
        margin-top : -.5em;
 }
 
 div.patroninfo h5 {
-       background-color : #F5F0CC;
-       border-top :  1px solid #CCCC99;
-       border-left :  1px solid #CCCC99;
+       background-color : #FCFAF3;
+       /*border-top :  1px solid #CCCC99;
+       border-left :  1px solid #CCCC99;*/
        border-right :  1px solid #CCCC99;
        margin-bottom : 0;
+       padding-left : .5em;
+       padding-top : .3em;
        padding-bottom : .5em;
 }
 
 div.patroninfo ul {
-       border : 1px solid #CCCC99;
+       /*border : 1px solid #CCCC99;*/
+       border-right : 1px solid #CCCC99;
+       border-bottom : 0;
        border-top : 0;
-       background-color : #F5F0CC;
+       background-color : #FCFAF3;
+       padding-bottom : .5em;
 }
 
-div.patroninfo ul li {
+div.patroninfo ul li, div.patronviews ul li {
        list-style-type : none;
 }
 
+div.patronviews {
+       background-color : #FDFCF7;
+       /*border-left : 1px solid #CCCC99;
+       border-bottom : 1px solid #CCCC99;*/
+       border-right :  1px solid #CCCC99;
+       border-top : 1px solid #CCCC99;
+       margin-bottom : .5em;
+       padding : .5em 0 .5em 0;
+}
+
 a.member-edit {
        float : right;
        background-color : #DBECC8;
@@ -511,4 +487,192 @@ a.member-edit {
        padding : .3em;
        text-align : right;
        text-decoration : none;
-}
\ No newline at end of file
+}
+
+fieldset.brief {
+       border : 1px solid #E8E8E8;
+}
+
+fieldset.brief label {
+       display : block;
+       font-weight : bold;
+       padding : .3em 0;
+}
+
+fieldset.brief div.hint {
+       color : #999999;
+       font-size : 80%;
+       margin-bottom : .4em;
+}
+
+fieldset.rows {  
+border-width : 1px;
+border-bottom : 1px solid black;
+float : left;
+font-size : 90%;
+clear : left;
+margin: .9em 0 0 0;  
+padding: 0;
+width: 100%; 
+}
+
+fieldset.rows legend {  
+       margin-left: 1em;
+       font-weight: bold;
+       font-size : 110%;
+}
+
+fieldset.rows label, fieldset.rows span.label {  
+       float: left;  
+       font-weight : bold;
+       width: 12em;  
+       margin-right: 1em;  
+       text-align: right;
+}
+
+fieldset.rows.left label, fieldset.rows.left span.label {
+       width : 8em;
+       text-align : left;      
+}
+
+fieldset.rows ol {  
+padding: 1em 1em 0 1em;  
+list-style-type: none;
+}
+
+fieldset.rows li {  
+float : left;
+clear : left;
+padding-bottom: 1em;
+list-style-type: none;
+width: 100%; 
+}
+
+fieldset.rows.left li {
+       padding-bottom : .4em;
+}
+
+fieldset.rows ol.radio label {
+       width : auto;
+       float : none;
+       margin-right : 0;
+}
+
+fieldset.rows ol.radio label.radio {
+       float : left;
+       width : 12em;
+       margin-right : 1em;
+}
+
+fieldset.rows table {
+       clear : both;
+       margin-left : 1em;
+}
+
+fieldset.rows td label {
+       float : none;
+       font-weight : normal;
+       width : auto;
+}
+
+fieldset.action {
+       clear : both;
+       float : none;
+       border : none;
+       margin : 0;
+       padding : 1em 0 .3em 0;
+       width : auto;
+}
+
+fieldset.rows fieldset.action {
+       padding : 0 0 1em 1em;
+}
+
+.tabs-nav li {
+       list-style : none;
+}
+
+.tabs-nav a, .tabs-nav a span {
+   background : none;
+       padding: .2em .5em .25em .5em;
+}
+
+.tabs-nav a {
+    z-index : auto;
+}
+
+.tabs-nav .tabs-selected a {
+       background-color : #FFFFCC;
+       border-top: 1px solid #FFFFCC;
+       border-right: 1px solid #FF9900;
+       border-bottom: 1px solid #FF9900;
+       border-left: 1px solid #FFCC66;
+       font-weight : bold;
+       text-align : center;
+       text-decoration : none;
+       top : -1px;
+}
+
+.tabs-nav .tabs-selected a, .tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active {
+    background-position : inherit;
+    outline: 0; /* prevent dotted border in Firefox */
+}
+.tabs-nav a, .tabs-nav .tabs-disabled a:hover, .tabs-nav .tabs-disabled a:focus, .tabs-nav .tabs-disabled a:active {
+    background-position: inherit;
+}
+
+.tabs-nav .tabs-selected a:hover {
+       color : #0000CC;
+}
+
+.tabs-nav li.tabs-selected {
+       background-color : #FFFFCC;
+}
+
+.tabs-nav .tabs-selected a, .tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active {
+        background : none;
+    outline: 0; /* prevent dotted border in Firefox */
+}
+
+.tabs-container {
+    border-top: 0;
+    padding : inherit;
+    background: #fff; /* declare background color for container to avoid distorted fonts in IE while fading */
+}
+.tabs-loading em {
+    padding: inherit;
+    background: none;
+}
+
+#patronlists .tabs-nav a {
+    top: 0;
+ }
+
+#patronlists .tabs-nav li {
+       margin-right : .5em;
+}
+
+#patronlists .tabs-nav li a {
+       background-color : #F3F3F3;
+       border-top : 1px solid #E8E8E8;
+       border-left : 1px solid #E8E8E8;
+       border-right : 1px solid #E8E8E8;
+       border-bottom : 0;
+       text-align : center;
+       text-decoration : none;
+}
+
+#patronlists .tabs-nav li.tabs-selected  {
+       background-color : #FFF;
+}
+
+#patronlists .tabs-nav li.tabs-selected a {
+       background-color : #FFF;
+       border-top : 1px solid #E8E8E8;
+       border-left : 1px solid #E8E8E8;
+       border-right : 1px solid #E8E8E8;
+       border-bottom : 1px solid #FFF;
+       margin-bottom : -5px;
+       text-align : center;
+}
+

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-menu.inc
index 73bb1c1..9419ea2 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-menu.inc
@@ -1,3 +1,10 @@
+<!-- TMPL_IF NAME="biblionumber" -->
+       <div class="biblioinfo">
+       <h5><!-- TMPL_VAR NAME="title" --></h5> 
+       <!-- TMPL_IF NAME="author" --><!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF -->
+       </div>
+<!-- /TMPL_IF -->
+
 <ul>
        <li><a href="/cgi-bin/koha/catalogue/search.pl">Advanced Search</a></li>
        <li><a href="/cgi-bin/koha/virtualshelves/shelves.pl">Virtual Shelves</a></li>

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 fa4d368..e33e8a8 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
@@ -24,11 +24,13 @@
     <!-- /TMPL_IF -->
     <li>Category: <!-- TMPL_VAR name="categorycode" --></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>
-       <li><a href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Reading Record</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>
 
 <ul>
        <li><a href="/cgi-bin/koha/circ/returns.pl">Check In</a></li>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.checkboxes.pack.js b/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.checkboxes.pack.js
new file mode 100644 (file)
index 0000000..3801b44
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.checkboxes.pack.js
@@ -0,0 +1,13 @@
+/*
+ *
+ * Copyright (c) 2006/2007 Sam Collett (http://www.texotela.co.uk)
+ * Licensed under the MIT License:
+ * http://www.opensource.org/licenses/mit-license.php
+ * 
+ * Version 2.0.1
+ * Demo: http://www.texotela.co.uk/code/jquery/checkboxes/
+ *
+ * $LastChangedDate$
+ * $Rev$
+ */
+eval(function(p,a,c,k,e,r){e=function(c){return c.toString(a)};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('2.g.q=1(b,c){b=b||"*";c=c||7;4 d=2([]);0.5(1(){4 a=2("9[@8=f]",0).6(b).5(1(){0.3=!0.3}).6(":3");d=a});e(!c){d=0}i d};2.g.p=1(b,c){b=b||"*";c=c||7;4 d=2([]);0.5(1(){4 a=2("9[@8=f]",0).6(b).5(1(){0.3=o}).6(":3");d=a});e(!c){d=0}i d};2.g.n=1(b,c){b=b||"*";c=c||7;4 d=2([]);0.5(1(){4 a=2("9[@8=f]",0).6(b).5(1(){0.3=7}).6(":j(:3)");d=a});e(!c){d=0}i d};2.m=1(a,b){b=b||"*";4 c="9[@8=f]";e(a){c+="[@l="+a+"]"}4 h=2(c).6(b);h.k(1(){h.j(0).5(1(){0.3=7}).r()})};',28,28,'this|function|jQuery|checked|var|each|filter|false|type|input|||||if|checkbox|fn|x|return|not|click|name|radioCheckboxGroup|unCheckCheckboxes|true|checkCheckboxes|toggleCheckboxes|end'.split('|'),0,{}))
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl
index dc4662a..3c87987 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl
@@ -62,7 +62,7 @@
           </select>
           <input id="value_anywhere" type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->" />
     </p>
-suivi.paulpoulain.com):koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tmpl
+
     <div id="action">
           <p><label>Order by :</label><select name="orderby">
          <option value="">None</option>

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 02a8d6b..a88c09c 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,7 +1,8 @@
 <!-- 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" -->
-<script language="javascript" type="text/javascript">
+<script type="text/javascript">
+//<![CDATA[
 function Dopop(link) {
     newin=window.open(link,'popup','width=500,height=400,toolbar=false,scrollbars=yes');
 }
@@ -25,6 +26,7 @@ function confirm_deletion(count) {
                
     }
 }
+//]]>
 </script>
 </head>
 <body>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
index bb25287..20fb676 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
@@ -49,7 +49,7 @@
         <div class="warning">
                <h3>Warning</h3>
                <ul>
-                       <!--TMPL_IF Name="warndeparture"--><li> Patron card expires on <!-- TMPL_VAR name="warndeparture" -->.</li><!--/TMPL_IF-->
+                       <!--TMPL_IF Name="warndeparture"--><li> Patron card has expired or will expire soon.</li><!--/TMPL_IF-->
             <!-- TMPL_IF NAME="gna" --><li>Address: Patron's address in doubt</li><!-- /TMPL_IF -->
             <!-- TMPL_IF NAME="lost" --><li>Lost: Patron's card is lost</li><!-- /TMPL_IF -->
             <!-- TMPL_IF NAME="dbarred" --><li>
@@ -238,7 +238,7 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
     <legend>Check Out to <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --></legend>
 
     <p>
-    <label for="barcode">Enter item barcode: </label><input type="text" name="barcode" class="focus" size="14" />
+    <label for="barcode">Enter item barcode: </label><input type="text" name="barcode" class="focus" size="14" /></p>
     
         <!-- RESULT OF ISSUING REQUEST -->
         <!-- TMPL_IF NAME="IMPOSSIBLE" -->
@@ -278,7 +278,7 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
             <li><span class="problem">Patron's card is expired</span></li>
         <!-- /TMPL_IF -->
         </ul>
-</p>
+
     <!-- TMPL_IF NAME="memberofinstution" -->
     <p><!-- TMPL_VAR NAME="CGIorganisations" --></p>
     <!-- /TMPL_IF -->
@@ -600,9 +600,9 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
     <input type="hidden" name="oldamount" value="<!-- TMPL_VAR NAME="amountold" -->" />
     <!-- /TMPL_IF -->
 
-    <div id="action">
+    <fieldset class="action">
     <input type="submit" value="Issue" />
-    </div>
+    </fieldset>
 
 </fieldset>
 </form>
@@ -611,33 +611,32 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
 
 <ul>   
 <li>    <!--TMPL_IF NAME="issuecount"-->
-            <a href="/cgi-bin/koha/circ/circulation.pl#checkouts"><!-- TMPL_VAR NAME="issuecount"--> issue(s)</a>
+            <a href="/cgi-bin/koha/circ/circulation.pl#checkouts"><!-- TMPL_VAR NAME="issuecount"--> Checkout(s)</a>
     <!-- TMPL_ELSE -->
-            <a href="/cgi-bin/koha/circ/circulation.pl#checkouts">0 issues</a>
+            <a href="/cgi-bin/koha/circ/circulation.pl#checkouts">0 Checkouts</a>
     <!-- /TMPL_IF --></li>
 <li><!-- TMPL_IF NAME="countreserv"-->
-            <a href="/cgi-bin/koha/circ/circulation.pl#reserves"><!--TMPL_VAR NAME="countreserv"--> reserve(s)</a>
+            <a href="/cgi-bin/koha/circ/circulation.pl#reserves"><!--TMPL_VAR NAME="countreserv"--> Holds(s)</a>
     <!-- TMPL_ELSE -->
-            <a href="/cgi-bin/koha/circ/circulation.pl#reserves">0 reserves</a>
+            <a href="/cgi-bin/koha/circ/circulation.pl#reserves">0 Holds</a>
     <!-- /TMPL_IF --></li>
  
 </ul>
 
 <!-- SUMMARY : TODAY & PREVIOUS ISSUES -->
 <div id="checkouts">
+<!--TMPL_IF NAME="issuecount"-->
     <form action="/cgi-bin/koha/reserve/renewscript.pl" method="post">
-    <p>
+<!--     <p>
     <a href="#" onclick="window.open('/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;print=page'); return false;">Print Page</a>
     / <a href="#" onclick="window.open('/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;print=slip'); return false;">Print Slip</a>
-    </p>
+    </p> -->
     
     <input type="hidden" value="circ" name="destination" />
     <input type="hidden" name="cardnumber" value="<!-- TMPL_VAR NAME="cardnumber" -->" />
     <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
     <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->" />      
-    
-<!-- TMPL_IF NAME="todayissues" -->
-    <table>
+        <table>
     <tr>
         <th>Title</th>
         <th>Due date</th>
@@ -646,10 +645,8 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
         <th>Barcode</th>
         <th>Renew?</th>
     </tr>
-    
-    <tr>
-        <th colspan="6"><a name="today" id="today">Today checkouts</a></th>
-    </tr>
+<!-- TMPL_IF NAME="todayissues" -->
+
     <!-- TMPL_LOOP NAME="todayissues" -->
     <!-- TMPL_IF NAME="togglecolor" -->
     <tr>
@@ -658,8 +655,8 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
     <!-- /TMPL_IF -->
         <td>
         <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;type=intra"><!-- TMPL_VAR NAME="title" --></a>
-        <br /><!-- TMPL_VAR NAME="author" -->
-        - <!-- TMPL_VAR name="itemnotes" -->
+       <!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF -->
+        <!-- TMPL_IF NAME="itemnotes" -->- <!-- TMPL_VAR name="itemnotes" --><!-- /TMPL_IF -->
         </td>
         <td><!-- TMPL_VAR NAME="dd" --></td>
         <td>
@@ -682,15 +679,6 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
     <!-- /TMPL_LOOP --> <!-- todayissues -->
     <!-- /TMPL_IF --> <!-- todayissues -->
 <!-- TMPL_IF NAME="previssues" -->
-    <table>
-    <tr>
-        <th>Title</th>
-        <th>Due date</th>
-        <th>Itemtype</th>
-        <th>Call no</th>
-        <th>Barcode</th>
-        <th>Renew?</th>
-    </tr>
     <tr>
         <th colspan="6"><a name="previous" id="previous">Previous checkouts</a></th>
     </tr>
@@ -727,19 +715,24 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
     <!-- /TMPL_LOOP --> <!-- previssues -->
 <!-- /TMPL_IF --> <!-- previssues -->
     </table>
-
+       <!--TMPL_IF NAME="issuecount"-->
     <div id="action">
     <input type="submit" name="renew_checked" value="Renew Checked Items" />
     <input type="submit" name="renew_all" value="Renew All" />
     </div>
+       <!-- /TMPL_IF -->
 </form>
+<!-- TMPL_ELSE -->
+<p>Patron has nothing checked out.</p>
+<!-- /TMPL_IF -->
 </div>
 
-<!-- TMPL_IF NAME="reservloop" -->
+
 <div id="reserves">
+<!-- TMPL_IF NAME="reservloop" -->
     <table>
         <tr>
-            <th>Reserve date</th>
+            <th>Hold date</th>
             <th>Barcode</th>
             <th>Title</th>
             <th>Author</th>
@@ -782,8 +775,10 @@ No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
             </tr>
         <!-- /TMPL_LOOP -->
     </table>
-</div>
-<!-- /TMPL_IF --> <!-- reservesloop -->
+       <!-- TMPL_ELSE -->
+       <p>Patron has no pending holds.</p>
+<!-- /TMPL_IF -->
+</div> <!-- reservesloop -->
 
 <!-- /TMPL_IF --> <!-- borrowernumber -->
 </div>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tmpl
index 0e0841d..2bcd2b1 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tmpl
@@ -6,13 +6,14 @@
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="members-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; <!-- TMPL_IF NAME="newpassword" -->Password Updated<!-- TMPL_ELSE -->Change Username and/or Password<!-- /TMPL_IF --></div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></a> &rsaquo; <!-- TMPL_IF NAME="newpassword" -->Password Updated<!-- TMPL_ELSE -->Change Username and/or Password<!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
        <div id="yui-main">
        <div class="yui-b">
+<!-- TMPL_INCLUDE NAME="circ-toolbar.inc" -->
 
 <!-- TMPL_IF NAME="newpassword" -->
 <h1>Password Updated</h1>
@@ -20,22 +21,22 @@
 <!-- TMPL_ELSE -->
 
 <form method="post" action="/cgi-bin/koha/members/member-password.pl">
-<h1>Change Username and/or Password for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h1>
        
        <!-- TMPL_IF NAME="warn" -->
-               <p>You have entered a User ID that already exists.  Please choose another one.</p>
+               <p class="warning">You have entered a User ID that already exists.  Please choose another one.</p>
        <!-- /TMPL_IF -->
 
-<p>
-       <label>New UserID:</label>
-       <input type="hidden" name="member" value="<!-- TMPL_VAR NAME="member" -->" />
-       <input name="newuserid" size="20" value="<!-- TMPL_VAR NAME="userid" -->" />
-</p>
-<p>
-       <label>New Password:</label>
-       <input name="newpassword" type="text" size="20" value="<!-- TMPL_VAR NAME="defaultnewpassword" -->" />
-</p>
-<p><input type="submit" value="Confirm Password" /></p>
+
+       <fieldset class="brief"><legend>Change Username and/or Password for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></legend>
+       <ol>
+       <li><label for="newuserid">New Username:</label>
+       <input type="hidden" name="member" value="<!-- TMPL_VAR NAME="member" -->" /><input id="newuserid" name="newuserid" size="20" value="<!-- TMPL_VAR NAME="userid" -->" /></li>
+       <li><label for="newpassword">New Password:</label>
+       <div class="hint">Koha cannot display existing passwords. Below is a randomly generated suggestion</div>
+       <input name="newpassword"  id="newpassword" type="text" size="20" value="<!-- TMPL_VAR NAME="defaultnewpassword" -->" /></li>
+       </ol>
+       <fieldset class="action"><input type="submit" value="Save" /></fieldset>
+</fieldset>
 </form><!-- /TMPL_IF -->
 
 </div>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
index ad8fb75..0da8fd3 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tmpl
@@ -6,70 +6,6 @@ patron <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" --><!-- /
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <script type="text/javascript" src="<!-- TMPL_VAR NAME='themelang' -->/js/members.js"></script>
 <!-- TMPL_INCLUDE NAME="calendar.inc" -->
-
-<style type="text/css">
-
-fieldset {  
-border-width : 1px;
-border-bottom : 1px solid black;
-float : left;
-font-size : 90%;
-clear : left;
-margin: .9em 0 0 0;  
-padding: 0;
-width: 100%; 
-}
-
-legend {  
-margin-left: 1em;
-font-weight: bold;
-font-size : 110%;
-}
-
-label {  
-float: left;  
-font-weight : bold;
-width: 12em;  
-margin-right: 1em;  
-text-align: right;
-}
-
-fieldset ol {  
-padding: 1em 1em 0 1em;  
-list-style-type: none;
-}
-
-fieldset li {  
-float : left;
-clear : left;
-padding-bottom: 1em;
-list-style-type: none;
-width: 100%; 
-}
-
-fieldset.submit {  
-border-style: none;
-}
-
-ol.radio label {
-       width : auto;
-       float : none;
-       margin-right : 0;
-}
-
-ol.radio label.radio {
-       float : left;
-       width : 12em;
-       margin-right : 1em;
-}
-
-fieldset.action {
-       float : none;
-       border : none;
-       margin : 0;
-       padding : 1em 0 .3em 0;
-}      
-</style>
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
@@ -89,13 +25,13 @@ patron <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" --><!-- /
 
        <!-- TMPL_IF NAME="opadd" -->
        <h1>
-               Add<!--TMPL_IF Name="I"--> Organisation <!--/TMPL_IF --><!--TMPL_IF Name="A"--> Adult <!--/TMPL_IF --><!--TMPL_IF Name="C"--> Child <!--/TMPL_IF --><!--TMPL_IF Name="P"--> Professional <!--/TMPL_IF -->
-patron <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" -->
+               Add<!--TMPL_IF Name="I"--> organisation <!--/TMPL_IF --><!--TMPL_IF Name="A"--> adult <!--/TMPL_IF --><!--TMPL_IF Name="C"--> child <!--/TMPL_IF --><!--TMPL_IF Name="P"--> professional <!--/TMPL_IF -->
+patron <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR NAME="surname" --> 
        </h1>
        <!-- TMPL_ELSE -->
        <h1 >
-               Modify<!--TMPL_IF Name="I"--> Organisation <!--/TMPL_IF --><!--TMPL_IF Name="A"--> Adult <!--/TMPL_IF --><!--TMPL_IF Name="C"--> Child <!--/TMPL_IF --><!--TMPL_IF Name="P"--> Professional <!--/TMPL_IF -->
-patron <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" -->
+               Modify<!--TMPL_IF Name="I"--> organisation <!--/TMPL_IF --><!--TMPL_IF Name="A"--> adult <!--/TMPL_IF --><!--TMPL_IF Name="C"--> child <!--/TMPL_IF --><!--TMPL_IF Name="P"--> professional <!--/TMPL_IF -->
+patron <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR NAME="surname" --> 
        </h1>
        <!-- /TMPL_IF -->
        <!-- TMPL_IF NAME="check_member" -->
@@ -154,7 +90,7 @@ patron <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" -->
   <div id="step1" class="content_visible">
   <!--TMPL_IF Name="I"-->
   <input type="hidden" name="FormFieldList" value="surname|contactname|contactfirstname" /> <!--TMPL_ELSE--> <input type="hidden" name="FormFieldList" value="title|surname|firstname|dateofbirth|initials|othernames" />  <!--/TMPL_IF-->
-       <fieldset id="memberentry_identity">
+       <fieldset class="rows" id="memberentry_identity">
                <legend><!--TMPL_IF Name="I"-->Organisation <!--TMPL_ELSE-->Patron <!--/TMPL_IF-->identity</legend>
                <ol>
                <li>
@@ -246,7 +182,7 @@ patron <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" -->
   </p>       
 <!--/TMPL_IF-->       
        </fieldset>
-<fieldset>
+<fieldset class="rows">
     <legend>Main address</legend><ol>
     <li>
       <!-- TMPL_IF NAME="mandatorystreetnumber" -->
@@ -317,7 +253,7 @@ patron <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" -->
     </li>
        </ol>
     </fieldset>
-  <fieldset id="memberentry_contact">
+  <fieldset class="rows" id="memberentry_contact">
     <legend>Contact</legend><ol>       
 <!--TMPL_IF Name="C"-->
       <h2>Borrower</h2>
@@ -405,7 +341,7 @@ patron <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" -->
 <div id="step2" class="content_visible">
 <!--/TMPL_IF-->       
 
-               <fieldset id="memberentry_address">
+               <fieldset class="rows" id="memberentry_address">
                <legend>Alternate address</legend><ol>
                        <li>
                                <!-- TMPL_IF NAME="mandatoryB_address" -->
@@ -438,7 +374,7 @@ patron <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" -->
                </fieldset>
   <!-- TMPL_IF NAME="I" -->
        <!-- TMPL_IF NAME="memberofinstution" -->
-       <fieldset id="memberentry_organisation">
+       <fieldset class="rows" id="memberentry_organisation">
                <legend>Organisations</legend><ol>
                <li>
                        <!-- TMPL_IF NAME="mandatoryphone" --> 
@@ -463,7 +399,7 @@ patron <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" -->
 <div id="step3" class="content_visible">
 <!--/TMPL_IF-->       
 
-  <fieldset id="memberentry_library_management">
+  <fieldset class="rows" id="memberentry_library_management">
     <legend>Library Management</legend><ol>
    <li> <!-- TMPL_IF NAME="mandatorycardnumber" -->
       <label for="cardnumber" class="required">
@@ -518,7 +454,7 @@ patron <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" -->
     </li>
        </ol>
   </fieldset>
-       <fieldset id="memberentry_subscription">
+       <fieldset class="rows" id="memberentry_subscription">
        <legend>Library set-up</legend><ol>
                <li>
                        <!-- TMPL_IF NAME="mandatorydateenrolled" -->
@@ -578,7 +514,7 @@ patron <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" -->
                </li>
                </ol>
        </fieldset>
-       <fieldset id="memberentry_userid">
+       <fieldset class="rows" id="memberentry_userid">
                <legend>OPAC login</legend><ol>
                <li>
                        <!-- TMPL_IF NAME="mandatoryuserid" -->
@@ -609,7 +545,7 @@ patron <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" -->
                </fieldset>
                <!--this zones are not necessary in modif mode -->
                <!-- TMPL_UNLESS NAME="opadd" -->
-               <fieldset>
+               <fieldset class="rows">
                        <legend>Patron Account Flags</legend>
                        <ol class="radio">
                        <!-- TMPL_LOOP NAME="flagloop" -->
@@ -638,9 +574,9 @@ patron <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" -->
 <!-- /TMPL_IF -->
     <fieldset class="action">
       <!-- TMPL_IF NAME="opadd" -->
-        <input type="button" name="step4" onclick="return check_form_borrowers(); unique();" value="Add member" />
+        <input type="button" name="step4" onclick="return check_form_borrowers(); unique();" value="Add Patron" />
       <!-- TMPL_ELSE -->
-        <input type="button" name="step4" onclick="return check_form_borrowers();" value="Modify member" />
+        <input type="button" name="step4" onclick="return check_form_borrowers();" value="Save Changes" />
       <!--/TMPL_IF -->
     </fieldset>
 </form>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
index 790f6d1..ced75f8 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
@@ -158,16 +158,16 @@ function confirm_reregistration() {
     
     <li><strong>Registration branch: </strong><!-- TMPL_VAR NAME="branchname" --></li>
 
-    <li><strong>Sort field 1: </strong><!-- TMPL_VAR NAME="sort1" --></li>
-    <li><strong>Sort field 2:</strong><!-- TMPL_VAR NAME="sort2" --></li>
+    <!-- TMPL_IF NAME="sort1" --><li><strong>Sort field 1: </strong><!-- TMPL_VAR NAME="sort1" --></li><!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="sort2" --><li><strong>Sort field 2:</strong><!-- TMPL_VAR NAME="sort2" --></li><!-- /TMPL_IF -->
     <li><strong>OPAC login: </strong><!-- TMPL_VAR name="userid" --></li>
     <!-- TMPL_IF NAME="password" -->
   <li><strong>OPAC password: </strong>*******</li>
    <!--TMPL_ELSE -->
   <li><strong>OPAC password: </strong><span class="problem"><a href="/cgi-bin/koha/members/member-password.pl?member=<!-- TMPL_VAR NAME="borrowernumber" -->">Undefined</a></span></li> 
    <!--/TMPL_IF --> 
-  <li><strong>Circulation notes: </strong><!-- TMPL_VAR name="borrowernotes" --></li>
-    <li><strong>Message to Patron:</strong><!-- TMPL_VAR NAME="opacnote" --></li>
+  <!-- TMPL_IF NAME="borrowernotes" --><li><strong>Circulation notes: </strong><!-- TMPL_VAR name="borrowernotes" --></li><!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="opacnote" --><li><strong>Message to Patron:</strong><!-- TMPL_VAR NAME="opacnote" --></li><!-- /TMPL_IF -->
        </ul>
             <a class="member-edit" href="memberentry.pl?op=modify&amp;borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;step=3">Edit</a>
  </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 79bf39f..7abd82a 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
@@ -1,7 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Circulation</title>
+<title>Koha &rsaquo; Circulation &rsaquo; Holds &rsaquo; Place a hold on <!-- TMPL_VAR NAME="title" --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<script type="text/css">
+<script type="text/javascript">
 // <![CDATA[ 
 function check() {
        var msg = "";
@@ -48,6 +48,7 @@ if (alreadyreserved > "0"){
                return(false);
        }
 }
+
 // ]]>
 </script>
 </head>
@@ -55,7 +56,7 @@ if (alreadyreserved > "0"){
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="circ-search.inc" -->
 
-
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/catalogue/search.pl">Catalogue</a> &rsaquo; <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a> &rsaquo; Place a hold on <!-- TMPL_VAR NAME="title" --></div>
 
 <div id="doc3" class="yui-t2">
    
@@ -73,20 +74,16 @@ if (alreadyreserved > "0"){
                        </form>
                </div>
        <!-- /TMPL_IF -->
-<h1>Holds</h1>
-
-  <h2>Biblio informations</h2>
-    <p><label>Title: </label><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a></p>
-    <p><label>Author: </label><!-- TMPL_VAR NAME="author" --></p>
+<h1>Place a hold on <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a></h1>
 
-<h2>Add reserve</h2>
 <!-- TMPL_UNLESS NAME="cardnumber"-->
-    <form action="request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" method="post" onsubmit="request.pl" name="getborrower">
+    <form action="request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->" method="post" name="getborrower">
+       <fieldset class="brief">
+       <legend>Select Patron</legend>
         <!-- TMPL_UNLESS name="CGIselectborrower" -->
-                <p>
-                <label>Patron</label>
-                <input type="text" size="20" name="findborrower" /> (type card number or part of a name)
-                </p>
+                       <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" />
         <!-- TMPL_ELSE -->
@@ -94,11 +91,12 @@ if (alreadyreserved > "0"){
                 <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" -->
     <p class="problem">
-      <label><u>Too many holds</u></label>
+      <strong>Too many holds</strong>
       Currently, this patron has too many holds.
     </p>
     <!-- /TMPL_IF -->
@@ -106,29 +104,30 @@ if (alreadyreserved > "0"){
     <!-- TMPL_IF NAME="expiry" -->
     <br />
     <p class="problem">
-      <label>Expired account</label>
+      <strong>Expired account</strong>
       This patron's account has expired
     </p>
     <!-- /TMPL_IF -->
 
     <!-- TMPL_IF NAME="diffbranch" -->                 
     <p class="problem">
-      <label>Localisation</label>
-      The borrower isn't in is own library
+      <strong>Branch Mismatch</strong>
+      The patron isn't in his own library
     </p>
     <!-- /TMPL_IF -->
 
     <!-- TMPL_IF NAME="alreadyreserved" -->                    
     <p class="problem">
-      <label>Operation can be make</label>
+      <strong>Operation Failed</strong>
       This patron already has a hold on this item
     </p>
     <!-- /TMPL_IF -->
 
   <!-- TMPL_IF NAME="messageborrower" -->
-    <div class="problem">No patron with this name, Please, try an other </div>
+    <p class="problem"><strong>Patron not found:</strong> Name or barcode not found. Please try an other </p>
   <!-- /TMPL_IF -->
-    <h3>Reserve properties</h3>
+  <fieldset class="rows left">
+    <legend>Hold details</legend>
         <form action="placerequest.pl" method="post" onsubmit="return check();" name="form">
     
         <input type="hidden" size="10" name="member" value="<!--  TMPL_VAR NAME="cardnumber" -->" />
@@ -136,29 +135,29 @@ if (alreadyreserved > "0"){
         <input type="hidden" name="type" value="str8" />
         <input type="hidden" name="title" value="<!-- TMPL_VAR NAME="title" -->" />
         <input type="hidden" name="rank-request" value="<!-- TMPL_VAR NAME="fixedRank" -->" />
-        <p><label>Patron</label>
+       <ol> <li><span class="label">Patron:</span>
             <!-- TMPL_IF NAME="cardnumber"-->
-                <!-- TMPL_VAR NAME="borrowersurname" --> <!-- TMPL_VAR NAME="borrowerfirstname" -->
-                (card number: <!--  TMPL_VAR NAME="cardnumber" -->)
+                <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="borrowerfirstname" --> <!-- TMPL_VAR NAME="borrowersurname" --> (<!--  TMPL_VAR NAME="cardnumber" -->)</a>
             <!-- TMPL_ELSE -->
                 Not defined yet
             <!-- /TMPL_IF -->
-        </p>
-        <p>
-        <label for="priority">Priority</label>
-            <b> <!-- TMPL_VAR Name="fixedRank" --> </b>
-        </p>
-        <p>
-            <label>Notes</label>
-            <textarea name="notes" cols="20" rows="2"></textarea>
-        </p>
-        <p>
-            <label>Pickup at</label>
+        </li>
+        <li>
+        <span class="label">Priority:</span>
+            <strong><!-- TMPL_VAR Name="fixedRank" --></strong>
+        </li>
+        <li>
+            <label for="holdnotes">Notes:</label>
+            <textarea id="holdnotes" name="notes" cols="30" rows="1"></textarea>
+        </li>
+        <li>
+            <label for="pickup">Pickup at:</label>
             <!-- TMPL_VAR NAME="CGIbranch" -->
-        </p>
+        </li>
         <!-- TMPL_LOOP name="bibitemloop" -->    
-        <p><label>Item type:</label> <!-- TMPL_VAR NAME="description" --></p>
-        <p><label>Publication year:</label> <!-- TMPL_VAR NAME="publicationyear" --></p>
+        <li><span class="label">Item type:</span> <!-- TMPL_VAR NAME="description" --></li>
+        <!-- TMPL_IF NAME="publicationyear" --><li><span class="label">Publication year:</span> <!-- TMPL_VAR NAME="publicationyear" --></li><!-- /TMPL_IF -->
+</ol>
     
         <table>
         <tr>
@@ -189,14 +188,14 @@ if (alreadyreserved > "0"){
         <!-- /TMPL_IF -->
     
         <!-- TMPL_IF NAME="available" -->
-            <label>
+            <label>Hold this item 
                 <input type="checkbox" name="checkitem" value="<!-- TMPL_VAR NAME="itemnumber" -->" />
-                reserve this item
-            </label>
+           </label>     
+           
         <!-- /TMPL_IF -->
             
         <!-- TMPL_IF name="reservedate" -->
-            Item reserved on <!-- TMPL_VAR NAME="reservedate" -->
+            Item on hold since <!-- TMPL_VAR NAME="reservedate" -->
         <!-- /TMPL_IF -->
     
         <!-- TMPL_IF Name="message" -->
@@ -215,20 +214,20 @@ if (alreadyreserved > "0"){
             <td>
             <!-- TMPL_IF NAME="reservedate"-->
                     <!-- TMPL_IF NAME="nocancel" -->
-                            Can't be cancelled, when item on transfert
+                            Can't be cancelled, when item on transfer
                             <!-- TMPL_ELSE -->
                             <a class="info" href="modrequest.pl?CancelBiblioNumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;CancelBorrowerNumber=<!-- TMPL_VAR NAME="ReservedForBorrowernumber" -->&amp;CancelItemnumber=<!--  TMPL_VAR NAME="itemnumber"-->"  onclick="if (window.confirm('You will delete a reserve, are you sure ?'))    
                                     {return true;}
-                    else {return false;}">Cancel A reserve
+                    else {return false;}">Cancel A reserve  </a>
                     <span> Item reserved for :
                             <!-- TMPL_VAR NAME="ReservedForSurname" -->  <!-- TMPL_VAR NAME="ReservedForFirstname" -->
                     <br />
                     expected at :      <!-- TMPL_VAR NAME="ExpectedAtLibrary" -->
                     </span>
-                    </a>
+                  
                     <!-- /TMPL_IF -->
             <!-- TMPL_ELSE -->
-                    No reserves
+                    No holds
             <!-- /TMPL_IF -->
             </td>
         </tr>
@@ -236,24 +235,26 @@ if (alreadyreserved > "0"){
         </table>
     <!-- /TMPL_LOOP --> <!-- bibitemloop -->
     
-        <p> <label>&nbsp;</label>
-            If no item is available, reserve next returning item
-            <input type="checkbox" name="request" value="Any" />
+        <p> <label for="requestany" style="float: none; width: auto; padding-left : 1em;"> If no item is available, hold next returning item</label>
+               <input type="checkbox" id="requestany" name="request" checked="checked" value="Any" />
         </p>
         
         <input type="hidden" name="biblioitem" value="<!-- TMPL_VAR NAME="biblioitemnumber" -->" />
         <input type="hidden" name="alreadyreserved" value="<!-- TMPL_VAR NAME="alreadyreserved" -->" />
     
-    <div id="actions">
+    <fieldset class="action">
     <!-- TMPL_IF NAME="cardnumber"-->
-        <input type="submit" value="Reserve" />
+        <input type="submit" value="Place Hold" />
     <!-- /TMPL_IF -->
-    </div>
+    </fieldset>
+       </fieldset>
     </form>
+
 <!-- /TMPL_UNLESS -->
 <!-- TMPL_IF name="reserveloop" -->
-<h2>Existing reserves</h2>
 <form name="T<!-- TMPL_VAR NAME="time" -->" action="modrequest.pl" method="post">
+<fieldset class="rows left">
+<legend>Existing holds</legend>
     <table>
       <tr>
         <th>Priority</th>
@@ -261,7 +262,7 @@ if (alreadyreserved > "0"){
         <th>Notes</th>
         <th>Date</th>
         <th>Pick up location</th>
-        <th>Informations</th>
+        <th>Details</th>
       </tr>
   <!-- TMPL_LOOP Name="reserveloop" -->
       <tr>
@@ -280,7 +281,7 @@ if (alreadyreserved > "0"){
           </select>
         </td>
         <td>
-          <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->" ><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></a>
+          <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->" ><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></a>
         </td>
         <td><!-- TMPL_VAR NAME="notes" --></td>
         <td><!-- TMPL_VAR NAME="date" --></td>
@@ -331,12 +332,9 @@ if (alreadyreserved > "0"){
         </td>
       </tr>
   <!-- /TMPL_LOOP --> <!-- existing reserveloop -->
-      <tr>
-        <td colspan="6">
-          <input type="submit" name="submit" value="Cancel reserve(s)" border="0" />
-        </td>
-      </tr>
-    </table>
+     </table>
+<fieldset class="action"><input type="submit" name="submit" value="Cancel hold(s)" border="0" /></fieldset>
+</fieldset>
 </form>
 <!-- /TMPL_IF -->
 

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
index 0677751..5b35a13 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
@@ -1,9 +1,27 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; <!-- TMPL_IF NAME="viewshelf" -->Virtual Shelves &rsaquo; Contents of <!-- TMPL_VAR NAME="shelfname" --><!-- TMPL_ELSE -->Virtual Shelves<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.checkboxes.pack.js"></script>
 <script type="text/javascript">
-//<![CDATA[    function confirmDelete(s){
+//<![CDATA[    
+
+$(document).ready(function(){
+       $("th.checkall").html("<a href=\"/cgi-bin/koha/shelves.pl\" id=\"CheckAll\"><img src=\"<!-- TMPL_VAR NAME="themelang" -->/../img/checkall.gif\" height=\"18\" width=\"18\" alt=\"Check All\" title=\"Check All\" border=\"0\" /></a>");
+       $("#CheckAll").click(function(){
+               $(".checkboxed").checkCheckboxes();
+               $("#CheckAll img").attr("src","<!-- TMPL_VAR NAME="themelang" -->/../img/checknone.gif").attr("title","Check None").attr("alt","Check None");
+               $("#CheckAll").attr("id","CheckNone");
+               return false;
+       });
+       $("#CheckNone").click(function(){
+               $(".checkboxed").unCheckCheckboxes();
+               $("#CheckNone img").attr("src","<!-- TMPL_VAR NAME="themelang" -->/../img/checkall.gif").attr("title","Check All").attr("alt","Check All");
+               $("#CheckNone").attr("id","CheckAll");
+               return false;
+       });
+});
+
+function confirmDelete(s){
                if (window.confirm(s))
                        return true;
                return false;
@@ -55,29 +73,28 @@
 
 <!-- TMPL_IF NAME="viewshelf" -->
 <div id="action">
-<ul>    <li><a href="/cgi-bin/koha/virtualshelves/shelves.pl">Back to virtual Shelves</a></li>
-    <!-- TMPL_IF name="manageshelf" -->
+<!-- TMPL_IF name="manageshelf" --><ul>
     <li><a  href="/cgi-bin/koha/virtualshelves/shelves.pl?op=modif&amp;shelf=<!-- TMPL_VAR NAME="shelfnumber" -->">Edit this shelf</a></li>
-    <!-- /TMPL_IF --></ul>
+    </ul><!-- /TMPL_IF -->
 </div>
 
-<h3>Contents of <i><!-- TMPL_VAR NAME="shelfname" --></i></h3>
+<fieldset>
+<legend>Contents of <i><!-- TMPL_VAR NAME="shelfname" --></i></legend>
 
-<form class="inline" action="/cgi-bin/koha/virtualshelves/shelves.pl" method="post" name="mainform">
+<form action="/cgi-bin/koha/virtualshelves/shelves.pl" method="post" class="checkboxed">
         <input type="hidden" name="viewshelf" value="<!-- TMPL_VAR NAME="shelfnumber" -->" />
         <input type="hidden" name="modifyshelfcontents" value="1" />
     <!-- TMPL_IF NAME="itemsloop" -->
     <table>
             <tr>
-                <th>
-                    <a href="javascript:CheckAll();">
-                        <small>(Un)Check All</small>
-                    </a>
+                <th class="checkall">
+                   &nbsp;
                 </th>
                 <th>&nbsp;</th>
                 <th>Title</th>
                 <th>Author</th>
                 <th>Call No.</th>
+                               <th>&nbsp;</th>
             </tr>
         <!-- TMPL_LOOP NAME="itemsloop" -->
             <tr<!-- TMPL_IF name="color" --> class="highlight"<!-- /TMPL_IF -->>
@@ -106,6 +123,7 @@
                     </td>
                     <td><!-- TMPL_VAR NAME="author" --></td>
                     <td><!-- TMPL_VAR NAME="classification" --></td>
+                                       <td><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">Holds</a></td>
         </tr>
         <!-- /TMPL_LOOP -->
     </table>
@@ -124,24 +142,24 @@
             <input type="submit" value="Remove" onclick="return confirmDelete('Are you sure you want to remove these items from the shelf?')" style="display:inline;" />
         <!-- /TMPL_IF -->
         <!-- /TMPL_IF -->
+               </fieldset>
 </form>
     <!-- TMPL_IF name="manageshelf" -->
     
 <form action="/cgi-bin/koha/virtualshelves/shelves.pl" method="post">
-    <table>
-        <tr><th colspan="2">Add an item to this shelf by barcode</th></tr>
-        <tr>
-            <td>
+<fieldset>
+    <legend>Add an item to this shelf by barcode</legend>
+        <ol>
+            <li>
                 <label for="addbarcode">Barcode:</label>
-            </td>
-            <td>
+            
                 <input name="addbarcode" type="text" id="addbarcode" size="14" maxlength="14" />
                 <input type="hidden" name="viewshelf" value="<!-- TMPL_VAR NAME="shelfnumber" -->" />
                 <input type="hidden" name="modifyshelfcontents" value="1" />
-                <input type="submit" value="Save" />
-            </td>
-        </tr>
-    </table>
+                <input type="submit" value="Add" />
+            </li>
+               </ol>
+       </fieldset>
 </form>
 <!-- /TMPL_IF -->
 <!-- TMPL_ELSE -->
@@ -233,7 +251,7 @@
                                 <li> A <b>free</b> virtual shelf can be seen and managed by everybody.</li>
             </ul>
             <p><input type="submit" value="Save changes"></p>
-
+                       
         </form>
 <!-- /TMPL_IF -->
 <!-- /TMPL_IF -->

diff --git a/reserve/request.pl b/reserve/request.pl
index 803956c..fd40aae 100755 (executable)
--- a/reserve/request.pl
+++ b/reserve/request.pl
@@ -116,6 +116,7 @@ if ($cardnumber) {
     }
 
     $template->param(
+               borrowernumber => $borrowerinfo->{'borrowernumber'},
         borrowersurname   => $borrowerinfo->{'surname'},
         borrowerfirstname => $borrowerinfo->{'firstname'},
         borrowerreservs   => $count_reserv,
@@ -399,6 +400,7 @@ foreach my $branchcode ( keys %{$branches} ) {
 }
 my $CGIbranch = CGI::scrolling_list(
     -name     => 'pickup',
+       -id          => 'pickup',
     -values   => \@values,
     -default  => $default,
     -labels   => \%label_of,