Further markup fixes, adding toolbars for some admin pages

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/modules/admin/branches.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl
index 35bd1bc..b4852af 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl
@@ -26,6 +26,30 @@
    <div id="bd">
        <div id="yui-main">
        <div class="yui-b">
+       
+       <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("newbranch");
+               new YAHOO.widget.Button("newcategory");
+       }
+
+       //]]>
+       </script>
+       <ul class="toolbar">
+       <li><a id="newbranch" href="/cgi-bin/koha/admin/branches.pl?op=add">New Library</a></li>
+       <li><a id="newcategory" href="/cgi-bin/koha/admin/branches.pl?op=editcategory">New Agency Category</a></li>
+</ul></div>
 
 <!-- TMPL_IF name="add" -->
   <h3><!-- TMPL_IF name="heading-branches-add-branch-p" -->Add library<!-- TMPL_ELSE -->Modify library<!-- /TMPL_IF --></h3>
@@ -164,10 +188,6 @@
             </tr>
         <!-- /TMPL_LOOP -->
     </table>
-<form action="<!-- TMPL_VAR name="action" -->" method="post">
-        <p><input type="hidden" name="op" value="add" />
-        <input type="submit" value="Add New Library" /></p>
-    </form>
     
     <!-- TMPL_IF NAME="branchcategories" -->
    
@@ -181,7 +201,7 @@
         <th>&nbsp;</th>
         <th>&nbsp;</th>
     </tr>
-    <!-- TMPL_LOOP name="catloop" -->
+<!-- TMPL_IF NAME="catloop" --><!-- TMPL_LOOP name="catloop" -->
         <tr>
         <td><!-- TMPL_VAR name="categoryname" --></td>
         <td><!-- TMPL_VAR name="categorycode" --></td>
@@ -191,7 +211,7 @@
         <td><a href="<!-- TMPL_VAR name="action" -->?op=delete_category&amp;categorycode=<!-- TMPL_VAR name="categorycode" escape="HTML" -->">Delete</a>
         </td>
         </tr>
-    <!-- /TMPL_LOOP -->
+    <!-- /TMPL_LOOP --><!-- TMPL_ELSE --><tr><td colspan="5">No <!-- TMPL_IF NAME="properties" -->Properties<!-- TMPL_ELSE --><!-- TMPL_IF NAME="searchdomain" -->Search Domain<!-- /TMPL_IF --><!-- /TMPL_IF --> Defined</td></tr><!-- /TMPL_IF -->
     </table>
     <!-- /TMPL_LOOP -->
 
@@ -200,10 +220,6 @@
             No Agency Categories defined.
         </p>
     <!-- /TMPL_IF --> <!-- NAME="branchcategories" -->
-    <form action="<!-- TMPL_VAR name="action" -->" method="post"><p>
-        <input type="hidden" name="op" value="editcategory" />
-        <input type="submit" value="Add New Category" /></p>
-    </form>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF name="editcategory" -->
@@ -231,7 +247,7 @@
             <input type="text" name="codedescription" id="codedescription" size="70" maxlength="80" value="<!-- TMPL_VAR name="codedescription" escape="HTML" -->" />
         </li>
                <li>
-               <label for="categorytype">Category Type</label>
+               <label for="categorytype">Category Type: </label>
             <select id="categorytype" name="categorytype">
             <!-- TMPL_LOOP NAME="categorytype" -->
                 <option value="<!-- TMPL_VAR NAME="type" -->" <!-- TMPL_IF NAME="selected" -->selected="selected"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="type" --></option>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl
index 3f05396..7dab37c 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl
@@ -79,6 +79,30 @@
    <div id="bd">
        <div id="yui-main">
        <div class="yui-b">
+       
+<!-- TMPL_IF NAME="else" -->
+<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("newcurrency");
+       }
+
+       //]]>
+       </script>
+       <ul class="toolbar">
+       <li><a id="newcurrency" href="/cgi-bin/koha/admin/currency.pl?op=add_form">New Currency</a></li>
+</ul></div>
+<!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="add_form" -->
         
@@ -110,7 +134,7 @@
                        </li></ol>
         </fieldset>
                
-               <input type="submit" value="Submit" onclick="Check(this.form)" /> 
+               <fieldset class="action"><input type="submit" value="Submit" onclick="Check(this.form)" /> </fieldset>
         </form>
 
 <!-- /TMPL_IF -->
@@ -163,7 +187,7 @@
 
 <!-- TMPL_IF NAME="else" -->
 
-<h2>Currencies</h2>
+<h2>Currencies and Exchange Rates</h2>
        <!-- TMPL_IF NAME="searchfield" -->
                You searched for <!-- TMPL_VAR NAME="searchfield" --></span>
        <!-- /TMPL_IF -->       
@@ -183,11 +207,6 @@
                </tr>
                <!-- /TMPL_LOOP -->
        </table>
-<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-        <input type="hidden" name="op" value="add_form" />
-               <input type="submit" value="Add Currency" />
-        </form>
-
        
        <!-- TMPL_IF NAME="offsetgtzero" -->
                <a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->">&lt;&lt; Prev</a>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl
index 904f3f8..1944179 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tmpl
@@ -106,6 +106,28 @@ Item Types Administration
    <div id="bd">
        <div id="yui-main">
        <div class="yui-b">
+       
+<!-- TMPL_IF NAME="else" --><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("newitemtype");
+       }
+
+       //]]>
+       </script>
+       <ul class="toolbar">
+       <li><a id="newitemtype" href="/cgi-bin/koha/admin/itemtypes.pl?op=add_form">New Item Type</a></li>
+</ul></div><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
 
 <!-- TMPL_IF name="add_form" -->
   <!-- TMPL_IF name="itemtype" -->
@@ -275,7 +297,6 @@ Item Types Administration
 
 <div class="paginationBar"><!-- TMPL_VAR NAME="pagination_bar" --></div>
 
-<p><a href="<!-- TMPL_VAR name="script_name" -->?op=add_form">Add Item type</a></p>
 <!-- /TMPL_IF -->
 
 

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 166bb41..5574c9a 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
@@ -6,7 +6,7 @@
 <!-- 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/circ/circulation.pl">Reports</a></div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Reports</div>
 <div id="doc" class="yui-t7">
 
    <div id="bd">
@@ -25,6 +25,12 @@
                <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>
+       
+       <h2>Inactive</h2>
+       <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></div>
 
 
@@ -32,25 +38,16 @@
        <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></div>
-</div>
-
-
-<div class="yui-g">    <div class="yui-u first"><h2>Inactive</h2>
-       <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></div>
-
-
-       <div class="yui-u"><h2>Other</h2>
+       </ul>
+       
+       <h2>Other</h2>
        <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>
                <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>
        </ul></div>
-       </div>
+</div>
 
 </div>
 </div>