Some random changes, including search box and toolbar for bookfunds, formatting of...

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@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 76e48da..d77a1ee 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -524,9 +524,9 @@ fieldset.brief ol, fieldset.brief li {
        list-style-type : none;
 }
 
-fieldset.brief div.hint {
+fieldset.brief div.hint, fieldset.rows div.hint {
        color : #999999;
-       font-size : 90%;
+       font-size : 95%;
        margin-bottom : .4em;
 }
 
@@ -555,14 +555,23 @@ fieldset.rows label, fieldset.rows span.label {
        text-align: right;
 }
 
+
 .yui-b fieldset.rows label, .yui-b fieldset.rows span.label {  
        width: 9em;  
 }
 
+.yui-b fieldset.rows div.hint {
+       margin-left : 10.5em;
+}
+
 .yui-u fieldset.rows label, .yui-u fieldset.rows span.label {  
        width: 6em;  
 }
 
+.yui-u fieldset.rows div.hint {
+       margin-left : 7.5em;
+}
+
 fieldset.rows.left label, fieldset.rows.left span.label {
        width : 8em;
        text-align : left;      
@@ -951,4 +960,28 @@ div.first fieldset {
  
  .accesskey {
        text-decoration : underline;
+ }
+ 
+ #changelanguage {
+       background-color : #F3F3F3;
+       border-top : 1px solid #E8E8E8;
+       font-size : 93%;
+       margin-top : 2em;
+       padding : .3em .5em .5em .5em;
+ }
+ 
+ #changelanguage ul {
+       margin : 0;
+       padding : 0;
+ }
+ 
+ #changelanguage li {
+       border-left : 1px solid #CCC;
+       display : inline;
+       list-style : none;
+       padding : 0 .5em;
+ }
+ 
+ #changelanguage li:first-child {
+       border-left : 0;
  }
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/bookfund-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/bookfund-admin-search.inc
new file mode 100644 (file)
index 0000000..c6ea1c6
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/bookfund-admin-search.inc
@@ -0,0 +1,110 @@
+<!-- Begin Bookfund Admin Resident Search Box -->
+<!-- TMPL_IF NAME="CircAutocompl" --><script type="text/javascript">
+//<![CDATA[
+YAHOO.util.Event.onContentReady("header_search", function() {
+    new function() {
+        // Define a custom formatter function
+        this.fnCustomFormatter = function(oResultItem, sQuery) {
+            var name        = oResultItem[0];
+            var cardnumber  = oResultItem[1];
+            var address     = oResultItem[2];
+            var city        = oResultItem[3];
+            var zip         = oResultItem[4];
+            var aMarkup = [
+                "<div class=\"sample-result\">",
+                name,
+                " (",
+                cardnumber,
+                ")<small> -- ",
+                address,
+                ", ",
+                city,
+                "</small>",
+                "</div>"];
+            return (aMarkup.join(""));
+        };
+
+        // Instantiate one XHR DataSource and define schema as an array:
+        //     ["Record Delimiter",
+        //     "Field Delimiter"]
+        this.oACDS = new YAHOO.widget.DS_XHR("/cgi-bin/koha/circ/ysearch.pl", ["\n", "\t"]);
+        this.oACDS.responseType = YAHOO.widget.DS_XHR.TYPE_FLAT;
+        this.oACDS.maxCacheEntries = 60;
+        this.oACDS.queryMatchSubset = true;
+    
+        // Instantiate first AutoComplete
+        var myInput = document.getElementById('findborrower');
+        var myContainer = document.getElementById('yborrowercontainer');
+        this.oAutoComp = new YAHOO.widget.AutoComplete(myInput,myContainer,this.oACDS);
+        //this.oAutoComp.delimChar = ";";
+        //this.oAutoComp.queryDelay = 1;
+        this.oAutoComp.formatResult = this.fnCustomFormatter;
+}
+});
+ //]]>
+ </script>  <!-- /TMPL_IF -->
+<div id="header_search">
+       <div id="bookfund_search" class="residentsearch">
+       <p class="tip">Search Book Funds:</p>
+
+       <form action="/cgi-bin/koha/admin/aqbookfund.pl" method="post">
+      <label for="filter_bookfundid">Code: </label><select name="filter_bookfundid" id="filter_bookfundid">
+        <option value="">----</option>
+    <!-- TMPL_LOOP name="filter_bookfundids" -->
+      <!-- TMPL_IF NAME="selected" -->
+        <option value="<!-- TMPL_VAR name="bookfundid" -->" selected="selected"><!-- TMPL_VAR name="bookfundid" --></option>
+      <!-- TMPL_ELSE -->
+        <option value="<!-- TMPL_VAR name="bookfundid" -->"><!-- TMPL_VAR name="bookfundid" --></option>
+      <!-- /TMPL_IF -->
+    <!-- /TMPL_LOOP -->
+      </select>
+      <label for="filter_bookfundname">Name: </label><input type="text" name="filter_bookfundname" id="filter_bookfundname" size="10" value="<!-- TMPL_VAR name="filter_bookfundname" -->" />
+      <label for="filter_branchcode">Library: </label><select name="filter_branchcode" id="filter_branchcode">
+        <option value="">----</option>
+    <!-- TMPL_LOOP name="filter_branches" -->
+      <!-- TMPL_IF NAME="selected" -->
+        <option value="<!-- TMPL_VAR name="code" -->" selected="selected"><!-- TMPL_VAR name="name" --></option>
+      <!-- TMPL_ELSE -->
+        <option value="<!-- TMPL_VAR name="code" -->"><!-- TMPL_VAR name="name" --></option>
+      <!-- /TMPL_IF -->
+    <!-- /TMPL_LOOP -->
+      </select>
+      <input type="submit" name="filter" value="Submit" />
+</form>
+
+       </div>
+       <div id="circ_search" class="residentsearch">
+       <p class="tip">Enter patron card number or partial name:</p>
+    <form action="/cgi-bin/koha/circ/circulation.pl" method="post">
+    <!-- TMPL_IF NAME="CircAutocompl" -->
+    <div class="autocomplete">
+            <div id="borrowerautocomplete" class="autocomplete">
+                <input autocomplete="off" id="findborrower" name="findborrower" class="focus" type="text" />
+                <div id="yborrowercontainer"></div>
+                <input id="ysearchsubmit" type="submit" value="Submit" />
+                <input name="branch" value="<!-- TMPL_VAR name="branch" -->" type="hidden" />
+                <input name="printer" value="" type="hidden" />
+            </div>
+        </div>
+       <!-- TMPL_ELSE -->
+            <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" />
+       <!-- /TMPL_IF -->
+    </form>
+       </div>  
+       <div id="catalog_search" class="residentsearch">
+       <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="submit" value="Submit"  class="form-submit" />
+               </form>
+       </div>
+                       <ul>
+                       <li><a href="/cgi-bin/koha/admin/aqbookfund.pl#bookfund_search">Search Book Funds</a></li>
+                       <li><a href="/cgi-bin/koha/circ/circulation.pl#circ_search">Check Out</a></li>
+                       <li><a href="/cgi-bin/koha/catalogue/search.pl#catalog_search">Search the Catalog</a></li>
+                       </ul>   
+</div>
+<!-- End Suggestions Resident Search Box -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/bookfund-admin-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/bookfund-admin-toolbar.inc
new file mode 100644 (file)
index 0000000..f075bbf
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/bookfund-admin-toolbar.inc
@@ -0,0 +1,21 @@
+<div id="toolbar">
+       <script type="text/javascript">
+       //<![CDATA[
+
+       // prepare DOM for YUI Toolbar
+
+        $(document).ready(function() {
+           yuiToolbar();
+        });
+
+       // YUI Toolbar Functions
+
+       function yuiToolbar() {
+           new YAHOO.widget.Button("newfund");
+       }
+
+       //]]>
+       </script>
+       <ul class="toolbar">
+       <li><a id="newfund" href="/cgi-bin/koha/admin/aqbookfund.pl?op=add_form">New Fund</a></li>
+</ul></div>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc
index eb45f8a..2ca4fe0 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc
@@ -1,7 +1,7 @@
         </div>
 
 <!-- TMPL_IF NAME="languages_loop" -->
-               <div id="changelanguage">
+               <div id="changelanguage" class="ft">
                <ul>
                <!-- TMPL_LOOP NAME="languages_loop" -->
                <li><a href="/cgi-bin/koha/changelanguage.pl?language=<!-- TMPL_VAR NAME="language_code" -->"><!-- TMPL_VAR NAME="language_name" --></a></li>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
index c205c56..7ab32b3 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl
@@ -90,12 +90,12 @@ if (quantity ==0) {
 
 <!-- TMPL_IF name="basketno" -->
 <div id="basket-details">Basket Details
-    <p>Basket Number: <!-- TMPL_VAR NAME="basketno" --></p>
-    <p>Managed By: <!-- TMPL_VAR NAME="authorisedbyname" --></p>
-    <p>Open On: <!-- TMPL_VAR NAME="creationdate" --></p>
-    <p>ForSupplier Id: <!-- TMPL_VAR NAME="booksellerid" --></p>
-    <p>Invoice Number: <!-- TMPL_VAR NAME="booksellerinvoicenumber" --></p>
-    <!-- TMPL_IF name="closedate" --><p>Closed On: <!-- TMPL_VAR name="closedate" --></p><!-- /TMPL_IF -->
+  <ul>  <li>Basket number: <!-- TMPL_VAR NAME="basketno" --></li>
+    <li>Managed by: <!-- TMPL_VAR NAME="authorisedbyname" --></li>
+    <li>Open on: <!-- TMPL_VAR NAME="creationdate" --></li>
+    <li>For supplier id: <!-- TMPL_VAR NAME="booksellerid" --></li>
+    <li>Invoice number: <!-- TMPL_VAR NAME="booksellerinvoicenumber" --></li>
+    <!-- TMPL_IF name="closedate" --><li>Closed on: <!-- TMPL_VAR name="closedate" --></li><!-- /TMPL_IF --></ul>
 </div>
 <!-- /TMPL_IF -->
 
@@ -124,61 +124,61 @@ if (quantity ==0) {
                        <span class="label">Title</span>
                 <input type="hidden" size="20" name="title" value="<!-- TMPL_VAR NAME="title" -->" /><!-- TMPL_VAR NAME="title" -->
             <!-- TMPL_ELSE -->
-            <label for="entertitle" class="required">Title</label>
+            <label for="entertitle" class="required">Title: </label>
                 <input type="text" id="entertitle" size="20" name="title" value="<!-- TMPL_VAR NAME="title" -->" />
             <!-- /TMPL_IF -->
         </li>
         <li>
             <!-- TMPL_IF name="biblio" -->
-                       <span class="label">Author</label>
+                       <span class="label">Author: </label>
                 <input type="hidden" size="20" name="author" id="author" value="<!-- TMPL_VAR NAME="author" -->" /><!-- TMPL_VAR NAME="author" -->
             <!-- TMPL_ELSE -->
-            <label for="author">Author</label>
+            <label for="author">Author: </label>
                 <input type="text" size="20" name="author" id="author" value="<!-- TMPL_VAR NAME="author" -->" />
             <!-- /TMPL_IF -->
         </li>
         <li>
             <!-- TMPL_IF name="biblio" -->
-                       <span class="label">Publisher</label>
+                       <span class="label">Publisher: </label>
                 <input type="hidden" size="20" name="publishercode" id="publishercode" value="<!-- TMPL_VAR NAME="publishercode" -->" /><!-- TMPL_VAR NAME="publishercode" -->
             <!-- TMPL_ELSE -->
-            <label for="publishercode"> Publisher</label>
+            <label for="publishercode"> Publisher: </label>
                 <input type="text" size="20" name="publishercode" id="publishercode" value="<!-- TMPL_VAR NAME="publishercode" -->" />
             <!-- /TMPL_IF -->
         </li>
         <li>
             <!-- TMPL_IF name="biblio" -->
-                       <lspan class="label">Copyright Date</label>
+                       <span class="label">Copyright date: </span>
                 <input type="hidden" size="20" name="copyrightdate" id="copyrightdate" value="<!-- TMPL_VAR NAME="copyrightdate" -->" /><!-- TMPL_VAR NAME="copyrightdate" -->
             <!-- TMPL_ELSE -->
-            <label for="copyrightdate">Copyright Date</label>
+            <label for="copyrightdate">Copyright date: </label>
                 <input type="text" size="20" name="copyrightdate" id="copyrightdate" value="<!-- TMPL_VAR NAME="copyrightdate" -->" />
             <!-- /TMPL_IF -->
         </li>
         <li>
-            <label for="format">Format</label>
+            <label for="format">Format: </label>
             <!-- TMPL_VAR NAME="CGIitemtype" -->
         </li>
         <li>
             <!-- TMPL_IF name="biblio" -->
-                       <span class="label">ISBN</label>
+                       <span class="label">ISBN: </span>
                 <input type="hidden" size="20" name="ISBN" id="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->" /><!-- TMPL_VAR NAME="isbn" -->
             <!-- TMPL_ELSE -->
-            <label for="ISBN">ISBN</label>
+            <label for="ISBN">ISBN: </label>
                 <input type="text" size="20" name="ISBN" id="ISBN" value="<!-- TMPL_VAR NAME="isbn" -->" />
             <!-- /TMPL_IF -->
         </li>
         <li>
             <!-- TMPL_IF name="biblio" -->
-                       <span class="label">Series</label>
+                       <span class="label">Series: </span>
                 <input type="hidden" size="20" name="series" id="series" value="<!-- TMPL_VAR NAME="seriestitle" -->" /><!-- TMPL_VAR NAME="seriestitle" -->
             <!-- TMPL_ELSE -->
-            <label for="series">Series</label>
+            <label for="series">Series: </label>
                 <input type="text" size="20" name="series" id="series" value="<!-- TMPL_VAR NAME="seriestitle" -->" />
             <!-- /TMPL_IF -->
         </li>
         <li>
-            <label for="branch">Branch</label>
+            <label for="branch">Branch: </label>
             <select name="branch" id="branch">
             <!-- TMPL_LOOP name="branchloop" -->
                 <!-- TMPL_IF NAME="selected" --><option value="<!-- TMPL_VAR NAME="value" -->" selected="selected"><!-- TMPL_VAR NAME="branchname" --></option>
@@ -188,96 +188,98 @@ if (quantity ==0) {
             <!-- /TMPL_LOOP -->
             </select>
         </li>
+               </ol>
     </fieldset>
        <fieldset class="rows">
         <legend>Accounting details</legend>
+               <ol>
             <li>
                 <!-- TMPL_IF name="close" -->
-                       <span class="label">Quantity</label>
+                       <span class="label">Quantity: </span>
                     <input type="hidden" size="20" id="quantity" name="quantity" value="<!-- TMPL_VAR NAME="quantity" -->" /><!-- TMPL_VAR NAME="quantity" -->
                 <!-- TMPL_ELSE -->
-                <label for="quantity">Quantity</label>
+                <label for="quantity">Quantity: </label>
                     <input type="text" size="20" id="quantity" name="quantity" value="<!-- TMPL_VAR NAME="quantity" -->" onchange="update(this.form);" />
                 <!--/TMPL_IF-->
             </li>
             <li>
                 <!-- TMPL_IF name="close" -->
-                       <span class="label">Bookfund</label>
+                       <span class="label">Bookfund: </span>
                     <input type="hidden" size="20" name="bookfund" id="bookfund" value="<!-- TMPL_VAR NAME="bookfundid" -->" /><!-- TMPL_VAR NAME="bookfundname" -->
                 <!-- TMPL_ELSE -->
-                <label for="bookfund">Bookfund</label>
+                <label for="bookfund">Bookfund: </label>
                     <!-- TMPL_VAR NAME="CGIbookfund" -->
                 <!--/TMPL_IF-->
             </li>
             <li>
                 <!-- TMPL_IF name="close" -->
-                       <span class="label">Supplier price</label>
+                       <span class="label">Supplier price: </span>
                     <input type="hidden" size="20" name="list_price" id="list_price" value="<!-- TMPL_VAR NAME="listprice" -->" /><!-- TMPL_VAR NAME="listprice" -->
                 <!-- TMPL_ELSE -->
-                <label for="list_price">Supplier price</label>
+                <label for="list_price">Supplier price: </label>
                     <input type="text" size="20" name="list_price" id="list_price" value="<!-- TMPL_VAR NAME="listprice" -->" onchange="update(this.form)" />
                 <!--/TMPL_IF-->
             </li>
             <li>
                 <!-- TMPL_IF name="close" -->
-                       <span class="label">Replacement Cost</label>
+                       <span class="label">Replacement cost: </span>
                     <input type="hidden" size="20" name="rrp" id="rrp" value="<!-- TMPL_VAR NAME="rrp" -->" /><!-- TMPL_VAR NAME="rrp" -->
                 <!-- TMPL_ELSE -->
-                <label for="rrp">Replacement Cost </label>
+                <label for="rrp">Replacement cost : </label>
                     <input type="text" size="20" name="rrp" id="rrp" value="<!-- TMPL_VAR NAME="rrp" -->" />
                 <!--/TMPL_IF-->
             </li>
             <li>
                 <!-- TMPL_IF name="close" -->
-                       <label for="ecost">Budgeted Cost</label>
+                       <label for="ecost">Budgeted cost: </label>
                     <input type="text" size="20" name="ecost" id="ecost" value="<!-- TMPL_VAR NAME="ecost" -->" readonly="readonly"  />
                 <!-- TMPL_ELSE -->
-                <label for="ecost">Budgeted Cost</label>
+                <label for="ecost">Budgeted Cost: </label>
                     <input type="text" size="20" name="ecost" id="ecost" value="<!-- TMPL_VAR NAME="ecost" -->" />
                 <!--/TMPL_IF-->
             </li>
             <!-- TMPL_IF NAME="GST"-->
             <li>
                                <!-- TMPL_IF name="close" -->
-                       <label for="GST">Budgeted GST</label>
+                       <label for="GST">Budgeted GST: </label>
                 <input type="text" id="" size="20" name="GST" value="" id="GST" readonly="readonly" />
                                <!-- TMPL_ELSE -->
-                <label for="GST">Budgeted GST</label>
+                <label for="GST">Budgeted GST: </label>
                 <input type="text" size="20" name="GST" id="GST" value="" />
                                <!--/TMPL_IF-->
             </li>
             <!-- /TMPL_IF -->
             <li>
                 <!-- TMPL_IF name="close" -->
-                       <label for="total">Total</label>
+                       <label for="total">Total: </label>
                                <input type="text" id="total" size="20" name="total" value="<!-- TMPL_VAR name="total" -->" readonly="readonly" />
                                <!-- TMPL_ELSE -->
-                <label for="total">Total</label></label>
+                <label for="total">Total: </label>
                 <input type="text" id="total" size="20" name="total" value="<!-- TMPL_VAR name="total" -->" />
                                <!--/TMPL_IF-->
             </li>
             <li>
                                <!-- TMPL_IF name="close" -->
-                       <label for="cost">Actual Cost</label>
+                       <label for="cost">Actual cost: </label>
                 <input type="text" id="cost" size="20" name="cost" value="<!-- TMPL_VAR name="ecost"-->" readonly="readonly" />
                                <!-- TMPL_ELSE -->
-                <label for="cost">Actual Cost</label>
+                <label for="cost">Actual cost: </label>
                 <input type="text" id="cost" size="20" name="cost" value="<!-- TMPL_VAR name="ecost"-->" />
                                <!--/TMPL_IF-->
             </li>
             <li>
-                <label for="invoice">Invoice Number</label>
-                <input type="text" id="invoice" size="20" name="invoice"  value="<!-- TMPL_VAR name="invoice" -->" />(usually empty)
+                <label for="invoice">Invoice number: </label>
+                <input type="text" id="invoice" size="20" name="invoice"  value="<!-- TMPL_VAR name="invoice" -->" /> (usually empty)
             </li>
             <li>
-                <label for="notes">Notes</label>
-                <input type="text" id="notes" size="20" name="notes" value="<!-- TMPL_VAR NAME="notes" -->" />
+                <label for="notes">Notes: </label>
+                <textarea id="notes" cols="30" rows="3" name="notes"><!-- TMPL_VAR NAME="notes" --></textarea>
             </li>
-            <li><div>The 2 following fields are available for your own usage. They can be useful for statistical purposes</div>
+            <li><div class="hint">The 2 following fields are available for your own usage. They can be useful for statistical purposes</div>
                 <!-- TMPL_IF Name="CGIsort1" -->
                     <!-- TMPL_VAR Name="CGIsort1" -->
                 <!-- TMPL_ELSE -->
-                <label for="sort1">Sort field 1</label>
+                <label for="sort1">Sort field 1: </label>
                     <input type="text" id="sort1" size="20" name="sort1" value="<!-- TMPL_VAR NAME="sort1" -->" />
                 <!--/TMPL_IF -->
             </li>
@@ -285,7 +287,7 @@ if (quantity ==0) {
                 <!-- TMPL_IF Name="CGIsort2" -->
                     <!-- TMPL_VAR Name="CGIsort2" -->
                 <!-- TMPL_ELSE -->
-                <label for="sort2">Sort field 2</label>
+                <label for="sort2">Sort field 2: </label>
                     <input type="text" id="sort2" size="20" name="sort2" value="<!-- TMPL_VAR NAME="sort2" -->" />
                 <!--/TMPL_IF -->
             </li></ol>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl
index 908c5ea..cf3fbb1 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl
@@ -61,63 +61,30 @@
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
+<!-- TMPL_INCLUDE NAME="bookfund-admin-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; Funds and Budgets </div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <!-- TMPL_IF name="else" -->Funds and Budgets  <!-- /TMPL_IF --> <!-- TMPL_IF name="add_form" --><a href="/cgi-bin/koha/admin/aqbookfund.pl">Funds and Budgets</a> &rsaquo; Add book fund<!-- /TMPL_IF --></div>
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
        <div id="yui-main">
        <div class="yui-b">
+       
+<!-- TMPL_UNLESS NAME="header-is-add-p" --><!-- TMPL_INCLUDE NAME="bookfund-admin-toolbar.inc" --><!-- /TMPL_UNLESS -->
 
 <!-- TMPL_IF name="else" -->
 <h1>Funds and budgets administration</h1>
   <!-- TMPL_IF NAME="bookfund" -->
+<form action="aqbudget.pl" method="post">
 <table>
   <tr>
     <th>Code</th>
     <th>Name</th>
     <th>Branch</th>
-    <th>Actions</th>
-  </tr>
-
-<form action="<!-- TMPL_VAR name="scriptname" -->" method="post">
-  <tr class="filter">
-    <td>
-      <select name="filter_bookfundid">
-        <option value="">----</option>
-    <!-- TMPL_LOOP name="filter_bookfundids" -->
-      <!-- TMPL_IF NAME="selected" -->
-        <option value="<!-- TMPL_VAR name="bookfundid" -->" selected="selected"><!-- TMPL_VAR name="bookfundid" --></option>
-      <!-- TMPL_ELSE -->
-        <option value="<!-- TMPL_VAR name="bookfundid" -->"><!-- TMPL_VAR name="bookfundid" --></option>
-      <!-- /TMPL_IF -->
-    <!-- /TMPL_LOOP -->
-      </select>
-    </td>
-    <td>
-      <input type="text" name="filter_bookfundname" value="<!-- TMPL_VAR name="filter_bookfundname" -->" />
-    </td>
-    <td>
-      <select name="filter_branchcode">
-        <option value="">----</option>
-    <!-- TMPL_LOOP name="filter_branches" -->
-      <!-- TMPL_IF NAME="selected" -->
-        <option value="<!-- TMPL_VAR name="code" -->" selected="selected"><!-- TMPL_VAR name="name" --></option>
-      <!-- TMPL_ELSE -->
-        <option value="<!-- TMPL_VAR name="code" -->"><!-- TMPL_VAR name="name" --></option>
-      <!-- /TMPL_IF -->
-    <!-- /TMPL_LOOP -->
-      </select>
-    </td>
-    <td>
-      <input type="submit" name="filter" value="Filter" />
-    </td>
+    <th colspan="3">Actions</th>
   </tr>
-</form>
 
-<form action="aqbudget.pl" method="post">
     <!-- TMPL_LOOP name="bookfund" -->
       <!-- TMPL_IF NAME="toggle" -->
   <tr class="highlight">
@@ -137,8 +104,8 @@
       <!-- /TMPL_IF -->
     </td>
     <td>
-      <a href="<!-- TMPL_VAR name="scriptname" -->?op=add_form&amp;bookfundid=<!-- TMPL_VAR name="bookfundid" -->&amp;branchcode=<!-- TMPL_VAR name="branchcode" -->">Edit</a>
-      <a href="<!-- TMPL_VAR name="scriptname" -->?op=delete_confirm&amp;bookfundid=<!-- TMPL_VAR name="bookfundid" -->&amp;branchcode=<!-- TMPL_VAR name="branchcode" -->">Delete</a>
+      <a href="<!-- TMPL_VAR name="scriptname" -->?op=add_form&amp;bookfundid=<!-- TMPL_VAR name="bookfundid" -->&amp;branchcode=<!-- TMPL_VAR name="branchcode" -->">Edit</a></td><td>
+      <a href="<!-- TMPL_VAR name="scriptname" -->?op=delete_confirm&amp;bookfundid=<!-- TMPL_VAR name="bookfundid" -->&amp;branchcode=<!-- TMPL_VAR name="branchcode" -->">Delete</a></td><td>
       <a href="aqbudget.pl?op=add_form&amp;bookfundid=<!-- TMPL_VAR name="bookfundid" -->&amp;branchcode=<!-- TMPL_VAR name="branchcode" -->">Add budget</a>
       <!-- TMPL_IF NAME="has_budgets" -->
       <a href="aqbudget.pl?filter_bookfundid=<!-- TMPL_VAR name="bookfundid" -->">Show budgets</a>
@@ -148,16 +115,15 @@
 
     <!-- /TMPL_LOOP --> <!-- bookfund -->
 </table>
+</form>
 
 <div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div>
   <!-- /TMPL_IF --> <!-- bookfund -->
 
 <p>
-  <a href="<!-- TMPL_VAR name="scriptname" -->?op=add_form">Add fund</a>
   <a href="aqbudget.pl">Show all budgets</a>
 </p>
 
-</form>
 <!-- /TMPL_IF --> <!-- else -->
 
 <!-- TMPL_IF name="add_form" -->
@@ -213,9 +179,9 @@
     
   </fieldset>
 
-  <p>
-    <input type="button" value="Submit" onclick="Check(this.form); return false;" />
-  </p>
+  <fieldset class="action">
+    <input type="button" value="Submit" onclick="Check(this.form); return false;" /> <a class="cancel" href="/cgi-bin/koha/admin/aqbookfund.pl">Cancel</a>
+  </fieldset>
 </form>
 <!-- /TMPL_IF --> <!-- add_form -->
 

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl
index e42010c..230e816 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudget.tmpl
@@ -84,21 +84,10 @@
 
 <!-- TMPL_IF name="else" -->
 <h1>Budgets</h1>
-
 <form action="/cgi-bin/koha/admin/aqbudget.pl" method="post">
-<table>
-  <tr>
-    <th>Book fund</th>
-    <th>Branch</th>
-    <th>Start date</th>
-    <th>End date</th>
-    <th>Budget amount</th>
-    <th>Actions</th>
-  </tr>
-
-  <tr class="filter">
-    <td>
-      <select name="filter_bookfundid">
+<fieldset class="rows"><legend>Search Budgets</legend><ol>
+    <li><label for="filter_bookfundid"> Book fund:</label>
+      <select name="filter_bookfundid" id="filter_bookfundid">
         <option value="">----</option>
     <!-- TMPL_LOOP name="filter_bookfundids" -->
       <!-- TMPL_IF NAME="selected" -->
@@ -108,9 +97,9 @@
       <!-- /TMPL_IF -->
     <!-- /TMPL_LOOP -->
       </select>
-    </td>
-    <td>
-      <select name="filter_branchcode">
+    </li>
+    <li><label for="filter_branchcode">Library:</label>
+      <select name="filter_branchcode" id="filter_branchcode">
         <option value="">----</option>
     <!-- TMPL_LOOP name="filter_branches" -->
       <!-- TMPL_IF NAME="selected" -->
@@ -120,9 +109,9 @@
       <!-- /TMPL_IF -->
     <!-- /TMPL_LOOP -->
       </select>
-    </td>
-    <td>
-      <select name="filter_startdate_sign">
+    </li>
+    <li><label for="filter_startdate_sign"> Start date:</label>
+      <select name="filter_startdate_sign" id="filter_startdate_sign">
     <!-- TMPL_IF NAME="filter_startdate_sign_equal_selected" -->
         <option value="=" selected="selected">=</option>
     <!-- TMPL_ELSE -->
@@ -154,9 +143,9 @@
         );
       //]]>
 </script>
-    </td>
-    <td>
-      <select name="filter_enddate_sign">
+    </li>
+    <li><label for="filter_enddate_sign"> End date:</label>
+      <select name="filter_enddate_sign" id="filter_enddate_sign">
     <!-- TMPL_IF NAME="filter_enddate_sign_equal_selected" -->
         <option value="=" selected="selected">=</option>
     <!-- TMPL_ELSE -->
@@ -175,7 +164,7 @@
         <option value="&lt;=">&lt;=</option>
     <!-- /TMPL_IF -->
       </select>
-      <input type="text" size="8" maxlength="10" id="filter_enddate" name="filter_enddate" value="<!-- TMPL_VAR Name="filter_enddate" -->" />
+      <input type="text" size="10" id="filter_enddate" name="filter_enddate" value="<!-- TMPL_VAR Name="filter_enddate" -->" />
       <img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" id="filter_enddate_button" alt="Show Calendar" />
       <script type="text/javascript">
 //<![CDATA[
@@ -188,9 +177,9 @@
         );
       //]]>
 </script>
-    </td>
-    <td>
-      <select name="filter_amount_sign">
+    </li>
+    <li><label for="filter_amount_sign"> Budget amount:</label>
+      <select name="filter_amount_sign" id="filter_amount_sign">
     <!-- TMPL_IF NAME="filter_amount_sign_equal_selected" -->
         <option value="=" selected="selected">=</option>
     <!-- TMPL_ELSE -->
@@ -210,12 +199,21 @@
     <!-- /TMPL_IF -->
       </select>
       <input type="text" name="filter_amount" value="<!-- TMPL_VAR NAME="filter_amount" -->" size="8" />
-    </td>
-    <td>
-      <input type="submit" name="filter" value="Filter" />
-    </td>
+    </li>
+  </ol></fieldset>
+  <fieldset class="action"><input type="submit" name="filter" value="Search" /></fieldset>
+       </form>
+
+<table>
+  <tr>
+    <th>Book fund</th>
+    <th>Branch</th>
+    <th>Start date</th>
+    <th>End date</th>
+    <th>Budget amount</th>
+    <th colspan="2">Actions</th>
   </tr>
-  
+
   <!-- TMPL_LOOP name="budget" -->
     <!-- TMPL_IF NAME="toggle" -->
   <tr class="highlight">
@@ -228,13 +226,12 @@
     <td><!-- TMPL_VAR NAME="enddate" --></td>
     <td><!-- TMPL_VAR NAME="budgetamount" --></td>
     <td>
-      <a href="/cgi-bin/koha/admin/aqbudget.pl?op=add_form&amp;aqbudgetid=<!-- TMPL_VAR NAME="aqbudgetid" -->">Edit</a>
+      <a href="/cgi-bin/koha/admin/aqbudget.pl?op=add_form&amp;aqbudgetid=<!-- TMPL_VAR NAME="aqbudgetid" -->">Edit</a></td><td>
       <a href="/cgi-bin/koha/admin/aqbudget.pl?op=delete_confirm&amp;aqbudgetid=<!-- TMPL_VAR NAME="aqbudgetid" -->">Delete</a>
     </td>
   </tr>
   <!-- /TMPL_LOOP --> <!-- budget -->
 </table>
-</form>
 
 <div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div>
 <!-- /TMPL_IF --> <!-- else -->
@@ -323,14 +320,13 @@
   <!-- /TMPL_IF -->
 
   </fieldset>
-    <p id="action">
-      <input type="button" value="Submit" onclick="Check(this.form)" />
-     </p>
+    <fieldset class="action">
+      <input type="button" value="Submit" onclick="Check(this.form)" /> <a class="cancel" href="/cgi-bin/koha/admin/aqbudget.pl">Cancel</a>
+     </fieldset>
 </form>
 <!-- /TMPL_IF --> <!-- add_form -->
 
 <!-- TMPL_IF name="delete_confirm" -->
-<form action="<!-- TMPL_VAR NAME="action" -->" method="post">
   <fieldset>
     <legend>Delete Book Budget?</legend>
 
@@ -351,15 +347,18 @@
       </tr>
     </table>
 
+  </fieldset>
+   <fieldset class="action">
+<form action="<!-- TMPL_VAR NAME="action" -->" method="post">
     <input type="hidden" name="op" value="delete_confirmed" />
     <input type="hidden" name="aqbudgetid" value="<!-- TMPL_VAR NAME="aqbudgetid" -->" />
-
-    <p id="action">
       <input type="submit" value="Delete this budget" />
+         </form>
+       <form action="/cgi-bin/koha/admin/aqbudget.pl" method="get">
       <input type="submit" value="Do Not Delete" />
-    </p>
-  </fieldset>
-</form>
+         </form>
+   </fieldset>
+
 <!-- /TMPL_IF -->
 
 </div>

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 f148f86..4ee7757 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
@@ -44,23 +44,23 @@
                 <!-- TMPL_LOOP NAME="MARCAUTHORS" -->
                 <li><a href="/cgi-bin/koha/catalogue/search.pl?q=Koha-Auth-Number:<!-- TMPL_VAR NAME="link" -->">
                     <!-- TMPL_VAR NAME="value" -->
-                </a>&nbsp;</li>
+                </a></li>
                 <!-- /TMPL_LOOP -->
                                </ul>
             </li>
         <!-- /TMPL_IF -->
         <!-- TMPL_IF name="illus" -->
-            <li><strong>Illustrator:</strong> <!-- TMPL_VAR name="illus" -->&nbsp;</li>
+            <li><strong>Illustrator:</strong> <!-- TMPL_VAR name="illus" --></li>
         <!-- /TMPL_IF -->
         <!-- TMPL_IF name="publishercode" -->
             <li><strong>Publisher:</strong>
                 <a href="/cgi-bin/koha/catalogue/search.pl?q=pb,wrdl:<!-- TMPL_VAR NAME="publishercode" -->">
                     <!-- TMPL_VAR NAME="publishercode" -->
-                </a>&nbsp;
+                </a>
             </li>
         <!-- /TMPL_IF -->
         <!-- TMPL_IF name="publicationyear" -->
-            <li>in:<!-- TMPL_VAR NAME="publicationyear" -->&nbsp;</li>
+            <li>in:<!-- TMPL_VAR NAME="publicationyear" --></li>
         <!-- /TMPL_IF -->
         <li><strong>Description:</strong>
                 <!-- TMPL_IF name="pages" --> <!-- /TMPL_IF --><!-- TMPL_VAR name="pages" -->
@@ -78,10 +78,10 @@
                <div class="yui-u">
                <ul>
         <!-- TMPL_IF name="isbn" -->
-            <li><strong>ISBN:</strong> <!-- TMPL_VAR NAME="isbn" -->&nbsp;</li>
+            <li><strong>ISBN:</strong> <!-- TMPL_VAR NAME="isbn" --></li>
         <!-- /TMPL_IF -->
         <!-- TMPL_IF name="issn" -->
-            <li><strong>ISSN:</strong><!-- TMPL_VAR NAME="issn" -->&nbsp;</li>
+            <li><strong>ISSN:</strong><!-- TMPL_VAR NAME="issn" --></li>
         <!-- /TMPL_IF -->
         <!-- TMPL_IF name="collectiontitle" -->
             <li><strong>Collection: </strong>
@@ -93,7 +93,7 @@
             <ul>
                 <!-- TMPL_LOOP NAME="MARCSUBJCTS" -->
                     <li><a href="/cgi-bin/koha/catalogue/search.pl?q=<!-- TMPL_VAR NAME="link" ESCAPE="URL"-->"><!-- TMPL_VAR NAME="label" --></a>
-                    &nbsp;</li>
+                    </li>
                 <!-- /TMPL_LOOP -->
                                </ul>
             </li>
@@ -126,7 +126,7 @@
         <!-- TMPL_IF name="URLS" -->
             <li><strong>URL:</strong> 
                 <!-- TMPL_LOOP name="URLS" -->
-                    <a href="<!-- TMPL_VAR name="url" -->"><!-- TMPL_VAR NAME="url" --></a>&nbsp;
+                    <a href="<!-- TMPL_VAR name="url" -->"><!-- TMPL_VAR NAME="url" --></a>
                 <!-- /TMPL_LOOP -->
             </li>
         <!-- /TMPL_IF -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
index d3b3bb2..f57d5d8 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
@@ -6,6 +6,8 @@
 <!-- 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/catalogue/search.pl">Catalogue</a>  &rsaquo; Search for <i><!-- TMPL_VAR NAME="searchdesc" --></i></div>
+
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
@@ -26,7 +28,6 @@
     <!-- TMPL_IF NAME="total" -->
     <h3>
         <!-- TMPL_VAR NAME="total" --> results found for '<!-- TMPL_VAR NAME="searchdesc" -->'
-        <a href="/cgi-bin/koha/catalogue/search.pl">Perform a new search</a>
     </h3>
     <!-- TMPL_ELSE -->
         <!-- TMPL_IF NAME="searchdesc" -->
@@ -34,13 +35,11 @@
             <p>
                 No results match your search for <span style="font-weight: bold;">&ldquo;<!-- TMPL_VAR NAME="searchdesc" -->&rdquo;</span> in <!-- TMPL_VAR NAME="LibraryName" --> Catalog.
             </p>
-            <a href="/cgi-bin/koha/catalogue/search.pl" title="New search">Perform a new search</a>
         <!-- TMPL_ELSE -->
             <h3> No result found !</h3>
             <p>
             You did not specify any search criteria.
             </p>
-            <a href="/cgi-bin/koha/catalogue/search.pl" title="New search">Perform a new search</a>
         <!-- /TMPL_IF -->
     <!-- /TMPL_IF -->
     
@@ -94,7 +93,11 @@
                     <th>Count</th>
                 </tr>
                 <!-- TMPL_LOOP NAME="SEARCH_RESULTS" -->
-                    <tr<!-- TMPL_IF name="even" --> class="highlight"<!-- /TMPL_IF -->>
+                               <!-- TMPL_IF name="even" -->
+                    <tr class="highlight">
+                               <!-- TMPL_ELSE -->
+                                       <tr>
+                               <!-- /TMPL_IF -->
                         <td>
                             <a href="/cgi-bin/koha/catalogue/search.pl?q=<!-- TMPL_VAR NAME="scan_use" escape="url" -->&quot;<!-- TMPL_VAR NAME="title" -->&quot;"><!-- TMPL_VAR NAME="title" --></a>
                         </td>
@@ -312,7 +315,7 @@
         <!-- /TMPL_IF -->
     
        <div class="pages">
-           <!-- TMPL_VAR NAME='pagination_bar'-->
+           <!-- TMPL_VAR NAME="pagination_bar" -->
        </div>
     
         <!-- TMPL_IF NAME="outer_sup_results_loop" -->
@@ -334,7 +337,6 @@
 </div>
 </div>
 <div class="yui-b">
-<!-- TMPL_INCLUDE NAME="cat-menu.inc" -->
 <!-- TMPL_INCLUDE NAME="facets.inc" -->
 </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 975a320..3e760b2 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
@@ -22,10 +22,11 @@ $(document).ready(function(){
        });
 });
 
-function confirmDelete(s){
-               if (window.confirm(s))
-                       return true;
+function confirmDelete(s,n){
+               if (window.confirm(s)) {
+                       location.href="/cgi-bin/koha/virtualshelves/shelves.pl?shelves=1&amp;DEL-<!-- TMPL_VAR NAME="shelfnumber" -->=1"; } else { 
                return false;
+               }
        }
        /**
         * this function checks all checkbox 
@@ -129,8 +130,9 @@ function confirmDelete(s){
         </tr>
         <!-- /TMPL_LOOP --><!-- /itemsloop -->
     </table>
-       
-       <!-- TMPL_IF name="manageshelf" -->
+                       </fieldset>
+               <fieldset class="action">
+               <!-- TMPL_IF name="manageshelf" -->
         <!-- TMPL_IF NAME="itemsloop" -->
             <input type="submit" value="Remove selected Items" onclick="return confirmDelete('Are you sure you want to remove these items from the shelf?')" />
         <!-- /TMPL_IF --><!-- /itemsloop -->