Corrections, and first test of Circ toolbar

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 47c9a2b..933e104 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -258,7 +258,7 @@ div#header_search ul.link-tabs li.off a {
        padding : 0.1em .5em .2em .5em;
 }
 
-div#circ_search,div#catalog_search,div#patron_search,div#subscription_search,div#addbooks_search,div#notices_search,div#printer_search,div#checkin_search,div#suggestions_search {
+div#circ_search,div#catalog_search,div#patron_search,div#subscription_search,div#addbooks_search,div#notices_search,div#printer_search,div#checkin_search,div#suggestions_search,div#roadtype_search {
        border : 0;
        border-bottom : 1px solid #FF9900;
        padding : 0 0 .2em 0;
@@ -427,4 +427,41 @@ dt {
 dd {
        padding : .2em;
        text-indent : 1.5em;
+}
+
+div#toolbar {
+       background-color : #F3F3F3;
+}
+
+ul.toolbar {
+}
+
+ul.toolbar li {
+       display : inline;
+       float : left;
+       list-style : none;
+}
+
+ul.toolbar li a {
+       background-color : #F3F3F3;
+       border : 1px solid #F3F3F3;
+       display : block;
+       margin : 3px;
+       padding : 3px;
+       text-decoration : none;
+}
+
+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 {
+}
+
+ul.toolbar ul {
+       display : none;
 }
\ 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 c4da0b0..cc56896 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,8 +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">
-                       <label for="findborrower"> </label>
-    <input id="findborrower" name="findborrower" size="40" class="focus" type="text" />
+    <input id="findborrower" name="findborrower" size="40" class="focusonshow" type="text" />
        <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
     <input name="printer" value="" type="hidden" />
        <input value="Submit" type="submit" />
@@ -13,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" maxlength="14" />
+               <input name="barcode" id="ret_barcode" size="40" class="focusonshow" 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" value="" title="Enter the terms you wish to search for." class="form-text" />
+                        <input type="text" name="q" id="search-form" size="40" class="focusonshow" />
                                <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
new file mode 100644 (file)
index 0000000..f1f464c
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-toolbar.inc
@@ -0,0 +1,12 @@
+<div id="toolbar"><ul class="toolbar">
+       <li><a href="/cgi-bin/koha/members/memberentry.pl?op=add&guarantorid=<!-- TMPL_VAR NAME="borrowernumber" -->&category_type=C">New</a></li>
+       <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>
+       
+</ul>
+<br clear="all" /></div>
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
index 42e4441..4d748e3 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
@@ -1,11 +1,11 @@
 <div id="header">
        
 <div id="toplevelnav">
-<ul id="toplevelmenu">
-       <li><a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a></li>
-       <li><a href="/cgi-bin/koha/members/members-home.pl">Patrons</a></li>
-       <li><a href="/cgi-bin/koha/catalogue/search.pl">Catalogue</a></li>
-       <li class="more"><a href="/cgi-bin/koha/mainpage.pl">More</a><ul>
+<ul class="clickMenu" id="toplevelmenu">
+       <li class="main"><a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a></li>
+       <li class="main"><a href="/cgi-bin/koha/members/members-home.pl">Patrons</a></li>
+       <li class="main"><a href="/cgi-bin/koha/catalogue/search.pl">Catalogue</a></li>
+       <li class="more main"><a href="/cgi-bin/koha/mainpage.pl">More</a><ul class="innerBox">
        <li><a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloguing</a></li>
        <li><a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a></li>
        <li><a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a></li>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc
index 7579d61..21b43f8 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-menu.inc
@@ -1,27 +1,26 @@
-<strong>Statistics wizards</strong>
+<h5>Statistics wizards</h5>
        <ul>
                <li><a href="/cgi-bin/koha/reports/acquisitions_stats.pl">Acquisitions</a></li>
                <li><a href="/cgi-bin/koha/reports/borrowers_stats.pl">Patrons</a></li>
-
                <li><a href="/cgi-bin/koha/reports/catalogue_stats.pl">Catalogue</a></li>
                <li><a href="/cgi-bin/koha/reports/issues_stats.pl">Circulation</a></li>
        </ul>
 
 
-       <strong>Top Lists</strong>
+       <h5>Top Lists</h5>
        <ul>
                <li><a href="/cgi-bin/koha/reports/bor_issues_top.pl">Patrons checking out the most</a></li>
-
                <li><a href="/cgi-bin/koha/reports/cat_issues_top.pl">Items checked out the most</a></li>
        </ul>
-       Inactive
+       
+       <h5>Inactive</h5>
        <ul>
                <li><a href="/cgi-bin/koha/reports/borrowers_out.pl">Patrons who haven't checked out</a></li>
                <li><a href="/cgi-bin/koha/reports/catalogue_out.pl">Items not checked out</a></li>
        </ul>
 
 
-       <strong>Other</strong>
+       <h5>Other</h5>
        <ul>
                <li><a href="/cgi-bin/koha/reports/itemslost.pl">Items lost</a></li>
                <li><a href="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">Catalogue by itemtype</a></li>

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 397d7b3..46323b2 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js
+++ b/koha-tmpl/intranet-tmpl/prog/en/js/staff-global.js
@@ -3,9 +3,11 @@
  $(document).ready(function() {
        $(".focus").focus();
        $('#toplevelmenu').clickMenu(); 
-       $('#header_search').tabs();
-       
-       
+       $('#header_search').tabs({
+    onShow: function() {
+        alert($('#header_search').children("div:visible").children("input:eq(0)").focus());
+    }
+});
  });
  
 

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl
index ae81a0a..27eecc7 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tmpl
@@ -6,7 +6,7 @@
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="cat-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; </div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; Search Existing Records</div>
 
 <div id="doc3" class="yui-t2">
    

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 85bebe5..8f8dc35 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
@@ -84,8 +84,8 @@
         <fieldset>
             <legend><!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" -->
             </legend>
-            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->">details</a>
-                / <a href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->&amp;modify=edit&amp;destination=circ&categorycode=<!-- TMPL_VAR name="categorycode" -->">edit</a>
+<!--             <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->">details</a>
+                / <a href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->&amp;modify=edit&amp;destination=circ&categorycode=<!-- TMPL_VAR name="categorycode" -->">edit</a> -->
         <p>
         <!--TMPL_IF Name="warndeparture"--><p class="problem"> Patron card expires on <!-- TMPL_VAR name="warndeparture" -->.</p><!--/TMPL_IF-->
         <!-- TMPL_IF NAME="streetaddress"-->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tmpl
index d981e24..4ce71e3 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tmpl
@@ -30,6 +30,7 @@
                <li><a href="/cgi-bin/koha/reports/bor_issues_top.pl">Patrons checking out the most</a></li>
                <li><a href="/cgi-bin/koha/reports/cat_issues_top.pl">Items checked out the most</a></li>
        </ul>
+       
        <h2>Inactive</h2>
        <ul>
                <li><a href="/cgi-bin/koha/reports/borrowers_out.pl">Patrons who haven't checked out</a></li>
@@ -39,8 +40,7 @@
 
        <h2>Other</h2>
        <ul>
-               <dt><a href="/cgi-bin/koha/reports/itemslost.pl">Items lost</a></dt>
-       <dd>Show lost items</dd>
+               <li><a href="/cgi-bin/koha/reports/itemslost.pl">Items lost</a></li>
                <li><a href="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">Catalogue by itemtype</a></li>
                <li><a href="/cgi-bin/koha/reports/manager.pl?report_name=issues_by_borrower_category">Checkouts by patron category</a></li>
                <li><a href="/cgi-bin/koha/reports/issues_avg_stats.pl">Average loan time</a></li>