More efforts with toolbars, nothing solved. Also corrections, and modifications to...

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

diff --git a/circ/circulation.pl b/circ/circulation.pl
index 326ea42..d6deedb 100755 (executable)
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -595,6 +595,7 @@ if ($borrowerslist) {
     }
     $CGIselectborrower = CGI::scrolling_list(
         -name     => 'borrowernumber',
+               -id          => 'borrowernumber',
         -values   => \@values,
         -labels   => \%labels,
         -size     => 7,

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 933e104..585e735 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -312,6 +312,11 @@ div#header_search .tip {
        color : Gray;
 }
 
+.ex {
+       font-family : "Courier New", Courier, fixed-width;
+       font-weight : bold;
+}
+
 /* ClickMenu Overrides */
 
 div.cmDiv
@@ -453,10 +458,6 @@ ul.toolbar li a {
 
 ul.toolbar li a:hover {
        background-color : #FFFFCC;
-       border-top : 1px solid #FFFFFF;
-       border-left : 1px solid #FFFFFF;
-       border-bottom : 1px solid #BCBCBC;
-       border-right : 1px solid #BCBCBC;
 }
 
 ul.toolbar li:last-child a:hover {

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-menu.inc
new file mode 100644 (file)
index 0000000..73bb1c1
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-menu.inc
@@ -0,0 +1,4 @@
+<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>
+</ul>
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
index cc56896..08aac7d 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
@@ -3,7 +3,7 @@
        <div id="circ_search">
        <p class="tip">Enter patron card number or partial name:</p>
        <form action="/cgi-bin/koha/circ/circulation.pl" method="post">
-    <input id="findborrower" name="findborrower" size="40" class="focusonshow" type="text" />
+    <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
        <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
     <input name="printer" value="" type="hidden" />
        <input value="Submit" type="submit" />
@@ -12,14 +12,14 @@
        <div id="checkin_search">
        <p class="tip">Scan a barcode to check in:</p>
        <form method="post" action="/cgi-bin/koha/circ/returns.pl">
-               <input name="barcode" id="ret_barcode" size="40" class="focusonshow" maxlength="14" />
+               <input name="barcode" id="ret_barcode" size="40" maxlength="14" />
            <input value="Submit" type="submit" />
     </form>
        </div>
        <div id="catalog_search">
        <p class="tip">Enter search keywords:</p>
                <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
-                        <input type="text" name="q" id="search-form" size="40" class="focusonshow" />
+                        <input type="text" name="q" id="search-form" size="40" />
                                <input type="submit" name="op" id="opac-submit" value="Submit"  class="form-submit" />
                </form>
        </div>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc
index f1f464c..866ba73 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc
@@ -3,10 +3,10 @@
        <li><a href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->&amp;modify=edit&amp;destination=circ&amp;categorycode=<!-- TMPL_VAR name="categorycode" -->">Edit</a></li>
        <li><a href="Someone please write this">Add Note</a></li>
        <li><a href="/cgi-bin/koha/members/member-password.pl?member=1">Change Password</a></li>
-       <li><a href="">Print</a><ul><li><a href="">Page</a></li><li><a href="">Slip</a></li></ul></li>
-       <li><a href="more">More</a><ul><li><a href="javascript:confirm_reregistration();">Renew Account</a></li>
-       <li><a href="/cgi-bin/koha/members/member-flags.pl?member=1">Set Permissions</a></li>
-       <li><a href="javascript:confirm_deletion();">Delete</a></li></ul></li>
+       <li><a href="">Print</a><ul><li><a href="">Page</a></li><li><a href="">Slip</a></li></ul></li><li><a href="javascript:confirm_reregistration();">Renew Account</a></li><li><a href="/cgi-bin/koha/members/member-flags.pl?member=1">Set Permissions</a></li><li><a href="javascript:confirm_deletion();">Delete</a></li>
+       <!-- <li><a href="more">More</a><ul>
+       
+       </ul></li> -->
        
 </ul>
 <br clear="all" /></div>
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js b/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js
index 46323b2..9b6e169 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js
+++ b/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js
@@ -4,10 +4,10 @@
        $(".focus").focus();
        $('#toplevelmenu').clickMenu(); 
        $('#header_search').tabs({
-    onShow: function() {
-        alert($('#header_search').children("div:visible").children("input:eq(0)").focus());
-    }
-});
+               onShow: function() {
+               $('#header_search').find('div:visible').find('input').eq(0).focus();
+           }   
+       });
  });
  
 

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 8f8dc35..aaddbcb 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
@@ -52,6 +52,9 @@
             }
         }
     }
+        $(document).ready(function() {
+               $('#patronlists').tabs();
+        });
 //]]>
 </script>
 
@@ -264,7 +267,7 @@
 
 <!-- TMPL_IF NAME="message" -->
 <p>
-No patron matched <!-- TMPL_VAR name="message" -->
+No patron matched <span class="ex"><!-- TMPL_VAR name="message" --></span>
 <a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=A" />Add adult</a>
 <a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=C" />Add child</a>  
 </p>
@@ -290,7 +293,7 @@ No patron matched <!-- TMPL_VAR name="message" -->
     Patron not found?
     <a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=A" />Add adult</a>
     <a href="/cgi-bin/koha/members/memberentry.pl?op=add&category_type=C" />Add child</a>
-    or <a href="JavaScript:back();">try another search</a>
+    or <a href="/cgi-bin/koha/circ/circulation.pl">try another search</a>
     </p>
 </fieldset>
 </form>
@@ -692,83 +695,25 @@ No patron matched <!-- TMPL_VAR name="message" -->
 
 <!-- /TMPL_IF -->
 
-<div id="tabs">
+<div id="patronlists">
     <h2><!-- TMPL_VAR NAME="firstname"--> <!-- TMPL_VAR NAME="surname"--> (<!-- TMPL_VAR NAME="cardnumber"-->) has</h2>
-    <!-- TMPL_IF NAME="countreserv"-->
-        <a href="javascript:active(0)" class="tab_inactive" id="link0">
-            <!--TMPL_VAR NAME="countreserv"--> reserve(s)
-        </a>
+
+<ul>   
+<li>    <!--TMPL_IF NAME="issuecount"-->
+            <a href="/cgi-bin/koha/circ/circulation.pl#checkouts"><!-- TMPL_VAR NAME="issuecount"--> issue(s)</a>
     <!-- TMPL_ELSE -->
-        <a href="#" class="tab_inactive">
-            0 reserves
-        </a>
-    <!-- /TMPL_IF -->
-    
-    <!--TMPL_IF NAME="issuecount"-->
-        <a href="javascript:active(1)" class="tab_inactive" id="link1">
-            <!-- TMPL_VAR NAME="issuecount"--> issue(s)
-        </a>
+            <a href="/cgi-bin/koha/circ/circulation.pl#checkouts">0 issues</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>
     <!-- TMPL_ELSE -->
-        <a href="#" class="tab_inactive">
-            0 issue(s)
-        </a>
-    <!-- /TMPL_IF -->
-</div>
-
-<!-- TMPL_IF NAME="reservloop" -->
-<div id="0XX" class="content_hidden">
-    <table>
-        <tr>
-            <th>Reserve date</th>
-            <th>Barcode</th>
-            <th>Title</th>
-            <th>Author</th>
-            <th>Localisation</th>
-        </tr>
-        <!-- TMPL_LOOP NAME="reservloop" -->
-        <tr class="<!-- TMPL_VAR NAME="color" -->">
-                    <td>
-                        <!-- TMPL_VAR NAME="reservedate" -->
-                    </td>
-                    <td>
-                        <!-- TMPL_IF name="barcodereserv" -->
-                        <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;type=intra" onclick="openWindow(this, 'Item', 480, 640); return false;"><!-- TMPL_VAR NAME="barcodereserv" --></a>
-                        <!-- /TMPL_IF -->
-                        <!-- TMPL_IF NAME="waitingposition" -->
-                        Hold priority :
-                        <b> <!-- TMPL_VAR NAME="waitingposition" --> </b>
-                        <!-- /TMPL_IF -->
-                    </td>
-                    <td>
-                        <!-- TMPL_VAR NAME="title" --> (<b> <!-- TMPL_VAR NAME="itemtype" --> </b>) 
-
-                        <!-- TMPL_IF name="waiting" -->
-                        <br />
-                        <i>This hold is available</i>
-                        <!-- /TMPL_IF -->
-                        <!-- TMPL_IF name="transfered" -->
-                        <br />
-                        <i>This hold has been transfered from library : 
-                        <!-- TMPL_VAR NAME="frombranch" --> the : <!-- TMPL_VAR NAME="datesent" --> </i>
-                        <!-- /TMPL_IF -->
-
-                        <!-- TMPL_IF name="nottransfered" -->
-                        <br />
-                        <i>This hold hasn't been transfered yet from library : <!-- TMPL_VAR NAME="nottransferedby" --></i>
-                        <!-- /TMPL_IF -->
-                    </td>
-                    <td><!-- TMPL_VAR NAME="author" --></td>
-                    <td><!-- TMPL_VAR NAME="itemcallnumber" --></td>
-            </tr>
-        <!-- /TMPL_LOOP -->
-    </table>
-</div>
-<!-- /TMPL_IF --> <!-- reservesloop -->
-<!-- /TMPL_IF --> <!-- borrowernumber -->
+            <a href="/cgi-bin/koha/circ/circulation.pl#reserves">0 reserves</a>
+    <!-- /TMPL_IF --></li>
+ 
+</ul>
 
 <!-- SUMMARY : TODAY & PREVIOUS ISSUES -->
-<!-- TMPL_IF NAME="borrowernumber" -->
-<div id="1XX">
+<div id="checkouts">
     <form action="/cgi-bin/koha/reserve/renewscript.pl" method="post">
     <p>
     <span class="click" onclick="window.open('/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&amp;print=page')">Print Page</span>
@@ -878,7 +823,59 @@ No patron matched <!-- TMPL_VAR name="message" -->
     </div>
 </form>
 </div>
+
+<!-- TMPL_IF NAME="reservloop" -->
+<div id="reserves">
+    <table>
+        <tr>
+            <th>Reserve date</th>
+            <th>Barcode</th>
+            <th>Title</th>
+            <th>Author</th>
+            <th>Localisation</th>
+        </tr>
+        <!-- TMPL_LOOP NAME="reservloop" -->
+        <tr class="<!-- TMPL_VAR NAME="color" -->">
+                    <td>
+                        <!-- TMPL_VAR NAME="reservedate" -->
+                    </td>
+                    <td>
+                        <!-- TMPL_IF name="barcodereserv" -->
+                        <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;type=intra" onclick="openWindow(this, 'Item', 480, 640); return false;"><!-- TMPL_VAR NAME="barcodereserv" --></a>
+                        <!-- /TMPL_IF -->
+                        <!-- TMPL_IF NAME="waitingposition" -->
+                        Hold priority :
+                        <b> <!-- TMPL_VAR NAME="waitingposition" --> </b>
+                        <!-- /TMPL_IF -->
+                    </td>
+                    <td>
+                        <!-- TMPL_VAR NAME="title" --> (<b> <!-- TMPL_VAR NAME="itemtype" --> </b>) 
+
+                        <!-- TMPL_IF name="waiting" -->
+                        <br />
+                        <i>This hold is available</i>
+                        <!-- /TMPL_IF -->
+                        <!-- TMPL_IF name="transfered" -->
+                        <br />
+                        <i>This hold has been transfered from library : 
+                        <!-- TMPL_VAR NAME="frombranch" --> the : <!-- TMPL_VAR NAME="datesent" --> </i>
+                        <!-- /TMPL_IF -->
+
+                        <!-- TMPL_IF name="nottransfered" -->
+                        <br />
+                        <i>This hold hasn't been transfered yet from library : <!-- TMPL_VAR NAME="nottransferedby" --></i>
+                        <!-- /TMPL_IF -->
+                    </td>
+                    <td><!-- TMPL_VAR NAME="author" --></td>
+                    <td><!-- TMPL_VAR NAME="itemcallnumber" --></td>
+            </tr>
+        <!-- /TMPL_LOOP -->
+    </table>
+</div>
+<!-- /TMPL_IF --> <!-- reservesloop -->
+
 <!-- /TMPL_IF --> <!-- borrowernumber -->
+</div>
 <!--/TMPL_IF -->
 
 

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 2f01a72..c90fcfc 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
@@ -2,6 +2,7 @@
 <title>Koha &rsaquo; Patrons &rsaquo; Patron Details for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <script type="text/javascript">
+//<![CDATA[
 function confirm_deletion() {
     var is_confirmed = window.confirm('Click OK to confirm deletion');
     var borrowernumbervalue=document.form.borrowernumber.value; 
@@ -15,9 +16,10 @@ function confirm_reregistration() {
     var is_confirmed = window.confirm('Click OK to confirm renewal');
     var borrowernumbervalue1=document.form.borrowernumber.value;
     if (is_confirmed) {
-    window.location='/cgi-bin/koha/members/moremember.pl?reregistration=y&amp;borrowernumber='+borrowernumbervalue1+'';
+    window.location='/cgi-bin/koha/members/moremember.pl?reregistration=y&borrowernumber='+borrowernumbervalue1+'';
     }
 }
+//]]>
 </script>
 </head>
 <body>
@@ -40,6 +42,9 @@ function confirm_reregistration() {
 <input type="hidden" name="reregistration" value="<!-- TMPL_VAR NAME="reregistration"-->" /> 
 <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
 </form>
+
+<!-- TMPL_INCLUDE NAME="circ-toolbar.inc" -->
+
 <div id="action">
     
        <div class="edit">
@@ -68,7 +73,7 @@ function confirm_reregistration() {
     <div class="view">
 <ul>
        <li>        <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Pay fines</a> </li>
-       <li>        <a href="javascript:confirm_reregistration();" onclick="document.form.value='y'" class="gest_borro_op">Renew</a></li>
+       <li>        <a href="#" onclick="confirm_reregistration(); document.form.value='y';">Renew</a></li>
 </ul>
     </div>
 </div>

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 7400365..0677751 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,8 +1,9 @@
 <!-- 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">
-       function confirmDelete(s){
+//<![CDATA[    function confirmDelete(s){
                if (window.confirm(s))
                        return true;
                return false;
@@ -37,7 +38,7 @@
                }
                return true;
        }
-       
+       //]]>
 </script>
 </head>
 <body>
@@ -63,10 +64,10 @@
 <h3>Contents of <i><!-- TMPL_VAR NAME="shelfname" --></i></h3>
 
 <form class="inline" action="/cgi-bin/koha/virtualshelves/shelves.pl" method="post" name="mainform">
-    <!-- TMPL_IF NAME="itemsloop" -->
-    <table>
         <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();">
@@ -114,19 +115,13 @@
     <!-- TMPL_UNLESS NAME="itemsloop" -->
         <input type="hidden" name="DEL-<!-- TMPL_VAR NAME="shelfnumber" -->" />
         <input type="hidden" name="shelves" value="1" />
-        <input type="submit" class="icon delete"
-               value="Delete this shelf"
-               onclick="return confirmDelete('Are you sure you want to delete this shelf?')" />
+        <input type="submit" value="Delete this shelf" onclick="return confirmDelete('Are you sure you want to delete this shelf?')" />
         <!-- /TMPL_UNLESS -->
         <!-- /TMPL_IF -->
     <!-- TMPL_IF name="manageshelf" -->
         <!-- TMPL_IF NAME="itemsloop" -->
             <b>With selected items :</b>
-            <input type="submit" "Remove"
-                   class="icon delete"
-                   onclick="return confirmDelete('Are you sure you want to remove these items from the shelf?')"
-                   style="display:inline;"
-                   />
+            <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 -->
 </form>