Bug 10515: make behavior of library category fetchers consistent with other fetchers
[koha_fer] / koha-tmpl / intranet-tmpl / prog / en / modules / admin / branches.tt
index 7c8f6a0..86fb8ce 100644 (file)
@@ -1,7 +1,7 @@
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Administration &rsaquo; Libraries and groups
 [% IF ( editcategory ) %]
-    &rsaquo;[% IF ( categorycode ) %]Edit group [% categorycode %][% ELSE %]New Group[% END %]
+    &rsaquo;[% IF ( categorycode ) %]Edit group [% categorycode %][% ELSE %]New group[% END %]
 [% ELSIF ( delete_category ) %]
     &rsaquo; Confirm deletion of group [% categorycode %]
 [% ELSIF ( add ) %]
 [% END %]
 </title>
 [% INCLUDE 'doc-head-close.inc' %]
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
-<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.pager.js"></script>
-<script type="text/javascript" src="[% themelang %]/js/tinymce/jscripts/tiny_mce/tiny_mce.js"></script>
-<script language="javascript" type="text/javascript">
+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
+<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
+[% INCLUDE 'datatables-strings.inc' %]
+<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
+<script type="text/javascript" src="[% interface %]/lib/tiny_mce/tiny_mce.js"></script>
+<script type="text/javascript">
+//<![CDATA[
+    $(document).ready(function() {
+        $("#branchest").dataTable($.extend(true, {}, dataTablesDefaults, {
+            "aoColumnDefs": [
+                { "aTargets": [ -1, -2 ], "bSortable": false, "bSearchable": false },
+            ],
+            "iDisplayLength": 10,
+            "aLengthMenu": [[10, 20, 50, 100, -1], [10, 20, 50, 100, "All"]],
+            "sPaginationType": "four_button"
+        }));
+    });
 tinyMCE.init({
     mode : "textareas",
     theme : "advanced",
     content_css : "[% themelang %]/css/tinymce.css",
-    plugins : "table,save,advhr,advlink,iespell,contextmenu",
+    plugins : "table,save,advhr,advlink,contextmenu",
     theme_advanced_buttons1 : "save,|,bold,italic,|,cut,copy,paste,|,justifyleft,justifycenter,justifyright,justifyfull,|,formatselect,|,link,unlink,anchor,cleanup,help,code,advhr,",
     theme_advanced_buttons2 : "tablecontrols,|,bullist,numlist,|,outdent,indent,|,undo,redo,|,removeformat,|,visualaid,|,sub,sup,|,charmap",
-    theme_advanced_buttons3 : "",
+    // theme_advanced_buttons3 : "",
     theme_advanced_toolbar_location : "top",
     theme_advanced_toolbar_align : "left",
     theme_advanced_path_location : "bottom",
     theme_advanced_resizing : true,
-    apply_source_formatting : true,
-    height : "300",
-    width : "700"
+    apply_source_formatting : true
 });
+//]]>
 </script>
 </head>
 <body id="admin_branches" class="admin">
@@ -58,39 +70,16 @@ tinyMCE.init({
        <div id="yui-main">
        <div class="yui-b">
        [% IF ( else ) %]
-       <div id="toolbar">
-       <script type="text/javascript">
-       //<![CDATA[
-
-       // prepare DOM for YUI Toolbar
-
-        $(document).ready(function() {
-           yuiToolbar();
-               $.tablesorter.defaults.widgets = ['zebra']; 
-               $("#branchest").tablesorter({
-                       sortList: [[0,0]],
-                       headers: { 3:{sorter:false},4:{sorter:false},5:{sorter:false},6:{sorter:false}}
-               }).tablesorterPager({container: $("#pagerbranchest"),positionFixed: false,size: 10}); 
-               }); 
-       // 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 group</a></li>
-</ul></div>
+    <div id="toolbar" class="btn-toolbar">
+        <a class="btn btn-small" id="newbranch" href="/cgi-bin/koha/admin/branches.pl?op=add"><i class="icon-plus"></i> New library</a>
+        <a class="btn btn-small" id="newcategory" href="/cgi-bin/koha/admin/branches.pl?op=editcategory"><i class="icon-plus"></i> New group</a>
+    </div>
 [% END %]
 
 [% IF ( add ) %]
     [% IF ( ERROR1 ) %]<div class="dialog message">Library with that code already exists &mdash; Please enter a unique code</div>[% END %]
   <h3>[% IF ( heading_branches_add_branch_p ) %]New library[% ELSE %]Modify library[% END %]</h3>
-    <form action="[% action %]" name="Aform" method="post">
+    <form action="[% action %]" id="Aform" name="Aform" class="validated" method="post">
        <fieldset class="rows">
         <input type="hidden" name="op" value="add_validate" />
         [% IF ( heading_branches_add_branch_p ) %]
@@ -100,25 +89,25 @@ tinyMCE.init({
         [% END %]
         <ol><li>
             [% IF ( heading_branches_add_branch_p ) %]
-            <label for="branchcode">Library code</label>
-                <input type="text" name="branchcode" id="branchcode" size="10" maxlength="10" value="[% branchcode |html %]" />
+            <label for="branchcode" class="required">Library code: </label>
+                <input type="text" name="branchcode" id="branchcode" size="10" maxlength="10" value="[% branchcode |html %]" class="required" required="required" /> <span class="required">Required</span>
             [% ELSE %]
-                       <label for="branchcode">Library code</label>
+            <label for="branchcode" class="required">Library code: </label>
                 <input type="hidden" name="branchcode" value="[% branchcode |html %]" />
                 [% branchcode %]
             [% END %]
         </li>
         <li>
-            <label for="branchname">Name</label>
-            <input type="text" name="branchname" id="branchname" size="80" value="[% branch_name |html %]" />&nbsp;
+            <label for="branchname" class="required">Name: </label>
+            <input type="text" name="branchname" id="branchname" size="80" value="[% branch_name |html %]" class="required" required="required" /> <span class="required">Required</span>
         </li>
        </ol>
        </fieldset>
        [% IF ( categoryloop ) %]<fieldset class="rows"><legend>Group(s):</legend>
         <ol>
                [% FOREACH categoryloo IN categoryloop %]
-            <li><label for="[% categoryloo.categorycode %]">[% categoryloo.categoryname %]</label>
-                [% IF ( categoryloo.checked ) %]
+            <li><label for="[% categoryloo.categorycode %]">[% categoryloo.categoryname %]</label>
+                [% IF categoryloo.selected %]
                     <input type="checkbox" id="[% categoryloo.categorycode %]" name="[% categoryloo.categorycode %]" checked="checked" />
                 [% ELSE %]
                     <input type="checkbox" id="[% categoryloo.categorycode %]" name="[% categoryloo.categorycode %]" />
@@ -130,21 +119,21 @@ tinyMCE.init({
 </fieldset>[% END %]
        <fieldset class="rows">
        <ol>
-        <li><label for="branchaddress1">Address line 1</label><input type="text" name="branchaddress1" id="branchaddress1" value="[% branchaddress1 |html %]" /></li>
-        <li><label for="branchaddress2">Address line 2</label><input type="text" name="branchaddress2" id="branchaddress2" value="[% branchaddress2 |html %]" /></li>
-        <li><label for="branchaddress3">Address line 3</label><input type="text" name="branchaddress3" id="branchaddress3" value="[% branchaddress3 |html %]" /></li>
-        <li><label for="branchcity">City</label><input type="text" name="branchcity" id="branchcity" value="[% branchcity |html %]" /></li>
-        <li><label for="branchstate">State</label><input type="text" name="branchstate" id="branchstate" value="[% branchstate |html %]" /></li>
-        <li><label for="branchzip">Zip/Postal code</label><input type="text" name="branchzip" id="branchzip" value="[% branchzip |html %]" /></li>
-        <li><label for="branchcountry">Country</label><input type="text" name="branchcountry" id="branchcountry" value="[% branchcountry |html %]" /></li>
-        <li><label for="branchphone">Phone</label><input type="text" name="branchphone" id="branchphone" value="[% branchphone |html %]" /></li>
-        <li><label for="branchfax">Fax</label><input type="text" name="branchfax" id="branchfax" value="[% branchfax |html %]" /></li>
-        <li><label for="branchemail">Email</label><input type="text" name="branchemail" id="branchemail" value="[% branchemail |html %]" /></li>
-        <li><label for="branchurl">URL</label><input type="text" name="branchurl" id="branchurl" value="[% branchurl |html %]" /></li>
-        <li><label for="opac_info">OPAC info</label><textarea name="opac_info" id="opac_info">[% opac_info |html %]</textarea></li>
-        <li><label for="branchip">IP</label><input type="text" name="branchip" id="branchip" value="[% branchip |html %]" /> <span class="hint">Can be entered as a single IP, or a subnet such as 192.168.1.*</span></li>
+        <li><label for="branchaddress1">Address line 1</label><input type="text" name="branchaddress1" id="branchaddress1" value="[% branchaddress1 |html %]" /></li>
+        <li><label for="branchaddress2">Address line 2</label><input type="text" name="branchaddress2" id="branchaddress2" value="[% branchaddress2 |html %]" /></li>
+        <li><label for="branchaddress3">Address line 3</label><input type="text" name="branchaddress3" id="branchaddress3" value="[% branchaddress3 |html %]" /></li>
+        <li><label for="branchcity">City</label><input type="text" name="branchcity" id="branchcity" value="[% branchcity |html %]" /></li>
+        <li><label for="branchstate">State</label><input type="text" name="branchstate" id="branchstate" value="[% branchstate |html %]" /></li>
+        <li><label for="branchzip">Zip/Postal code</label><input type="text" name="branchzip" id="branchzip" value="[% branchzip |html %]" /></li>
+        <li><label for="branchcountry">Country</label><input type="text" name="branchcountry" id="branchcountry" value="[% branchcountry |html %]" /></li>
+        <li><label for="branchphone">Phone</label><input type="text" name="branchphone" id="branchphone" value="[% branchphone |html %]" /></li>
+        <li><label for="branchfax">Fax</label><input type="text" name="branchfax" id="branchfax" value="[% branchfax |html %]" /></li>
+        <li><label for="branchemail">Email: </label><input type="text" name="branchemail" id="branchemail" class="email" value="[% branchemail |html %]" /></li>
+        <li><label for="branchurl">URL: </label><input type="text" name="branchurl" id="branchurl" value="[% branchurl |html %]" class="url" /></li>
+        <li><label for="opac_info">OPAC info</label><textarea name="opac_info" id="opac_info">[% opac_info |html %]</textarea></li>
+        <li><label for="branchip">IP</label><input type="text" name="branchip" id="branchip" value="[% branchip |html %]" /> <span class="hint">Can be entered as a single IP, or a subnet such as 192.168.1.*</span></li>
                <!--
-        <li><label for="branchprinter">Library Printer</label>
+        <li><label for="branchprinter">Library Printer</label>
             <select id="branchprinter" name="branchprinter">
                 <option value="">None</option>
             [% FOREACH printerloo IN printerloop %]
@@ -156,7 +145,7 @@ tinyMCE.init({
                 [% END %]
             </select></li>
                        -->
-        <li><label for="branchnotes">Notes</label><input type="text" name="branchnotes" id="branchnotes" value="[% branchnotes |html %]" /></li>
+        <li><label for="branchnotes">Notes</label><input type="text" name="branchnotes" id="branchnotes" value="[% branchnotes |html %]" /></li>
         </ol>
         </fieldset>
         <fieldset class="action"><input type="submit" value="Submit" /> <a class="cancel" href="/cgi-bin/koha/admin/branches.pl">Cancel</a></fieldset>
@@ -188,9 +177,6 @@ tinyMCE.init({
     [% IF ( MESSAGE10 ) %]<div class="dialog message">Library cannot be deleted because there are items held by that library</div>[% END %]
     [% IF ( MESSAGE11 ) %]<div class="dialog message">Library cannot be deleted because there are patrons registered at that library</div>[% END %]
 [% IF ( branches ) %]
-<div id="pagerbranchest">
-[% INCLUDE 'table-pager.inc' perpage='10' %]
-</div>
     <table id="branchest">
 <thead><tr>
                        <th>Name</th>
@@ -199,7 +185,8 @@ tinyMCE.init({
             <th>Properties</th>
             <th>IP</th>
             <!-- <th>Printer</th> -->
-            <th colspan="2">&nbsp;</th>
+            <th>&nbsp;</th>
+            <th>&nbsp;</th>
         </tr></thead><tbody>
         [% FOREACH branche IN branches %]
        [% IF ( loop.odd ) %]
@@ -269,30 +256,40 @@ tinyMCE.init({
    [% IF ( branchcategories ) %]
    [% FOREACH branchcategorie IN branchcategories %]
     <h3>Group(s):  [% IF ( branchcategorie.properties ) %]Properties[% ELSE %][% IF ( branchcategorie.searchdomain ) %]Search domain[% END %][% END %]</h3>
-       <table>
-    <tr>
-        <th>Name</th>
-        <th>Code</th>
-        <th>Description</th>
-        <th>&nbsp;</th>
-        <th>&nbsp;</th>
-    </tr>
-[% IF ( branchcategorie.catloop ) %][% FOREACH catloo IN branchcategorie.catloop %]
-        <tr>
-        <td>[% catloo.categoryname %]</td>
-        <td>[% catloo.categorycode %]</td>
-        <td>[% catloo.codedescription %]</td>
-        <td><a href="[% catloo.action %]?op=editcategory&amp;categorycode=[% catloo.categorycode |url %]">Edit</a>
-        </td>
-        <td><a href="[% catloo.action %]?op=delete_category&amp;categorycode=[% catloo.categorycode |url %]">Delete</a>
-        </td>
-        </tr>
-    [% END %][% ELSE %]<tr><td colspan="5">No [% IF ( branchcategorie.properties ) %]Properties[% ELSIF ( branchcategorie.searchdomain ) %]Search domain[% END %] Defined</td></tr>[% END %]
-    </table>
-    [% END %]
+    [% IF ( branchcategorie.catloop ) %]
+      <table>
+        <thead>
+          <tr>
+            <th>Name</th>
+            <th>Code</th>
+            <th>Description</th>
+            <th>&nbsp;</th>
+            <th>&nbsp;</th>
+          </tr>
+        </thead>
+        <tbody>
+          [% FOREACH catloo IN branchcategorie.catloop %]
+            <tr>
+              <td>[% catloo.categoryname %]</td>
+              <td>[% catloo.categorycode %]</td>
+              <td>[% catloo.codedescription %]</td>
+              <td>
+                <a href="[% catloo.action %]?op=editcategory&amp;categorycode=[% catloo.categorycode |url %]">Edit</a>
+              </td>
+              <td>
+                <a href="[% catloo.action %]?op=delete_category&amp;categorycode=[% catloo.categorycode |url %]">Delete</a>
+              </td>
+            </tr>
+          [% END %]
+        </tbody>
+      </table>
     [% ELSE %]
-        <p>No groups defined.</p>
-    [% END %] <!-- NAME="branchcategories" -->
+      No [% IF ( branchcategorie.properties ) %]properties[% ELSIF ( branchcategorie.searchdomain ) %]search domain[% END %] defined. <a href="/cgi-bin/koha/admin/branches.pl?op=editcategory">Add a new group</a>.
+    [% END %]
+  [% END %]
+  [% ELSE %]
+    <p>No groups defined.</p>
+  [% END %] <!-- NAME="branchcategories" -->
 [% END %]
 
 [% IF ( editcategory ) %]
@@ -336,6 +333,14 @@ tinyMCE.init({
             [% END %]
             </select>
                </li>
+        <li>
+            <label for="show_in_pulldown">Show in search pulldown: </label>
+            [% IF ( show_in_pulldown ) %]
+                <input type="checkbox" name="show_in_pulldown" id="show_in_pulldown" checked="checked"/>
+            [% ELSE %]
+                <input type="checkbox" name="show_in_pulldown" id="show_in_pulldown" />
+            [% END %]
+        </li>
                </ol>
     </fieldset>
        <fieldset class="action"><input type="submit" value="Update" /></fieldset>