From dbae2bdf2fc3f15c448525e8f9dfb92deb8d40c0 Mon Sep 17 00:00:00 2001
From: Kyle M Hall <kyle@bywatersolutions.com>
Date: Wed, 30 Dec 2015 16:49:16 +0000
Subject: [PATCH] Bug 15099 [QA Followup] - Make bug pass koha-qa.pl

Cleaned up additional tab characters and such well. This is a very
good time to take care of these.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
---
 .../prog/en/includes/admin-menu.inc           |  29 ++-
 .../prog/en/modules/admin/admin-home.tt       | 200 +++++++++---------
 .../prog/en/modules/admin/categories.tt       | 158 +++++++-------
 3 files changed, 195 insertions(+), 192 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
index 7a8704fbf7..e055091d8d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
@@ -19,27 +19,27 @@
 
 <h5>Basic parameters</h5>
 <ul>
-	<li><a href="/cgi-bin/koha/admin/branches.pl">Libraries and groups</a></li>
-	<li><a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a></li>
-	<li><a href="/cgi-bin/koha/admin/authorised_values.pl">Authorized values</a></li>
+    <li><a href="/cgi-bin/koha/admin/branches.pl">Libraries and groups</a></li>
+    <li><a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a></li>
+    <li><a href="/cgi-bin/koha/admin/authorised_values.pl">Authorized values</a></li>
 </ul>
 
 <h5>Patrons and circulation</h5>
 <ul>
-	<li><a href="/cgi-bin/koha/admin/categories.pl">Patron types and categories</a></li>
+    <li><a href="/cgi-bin/koha/admin/categories.pl">Patron types and categories</a></li>
     <li><a href="/cgi-bin/koha/admin/smart-rules.pl">Circulation and fines rules</a></li>
-	<li><a href="/cgi-bin/koha/admin/patron-attr-types.pl">Patron attribute types</a></li>
-	<li><a href="/cgi-bin/koha/admin/branch_transfer_limits.pl">Library transfer limits</a></li>
-	<li><a href="/cgi-bin/koha/admin/transport-cost-matrix.pl">Transport cost matrix</a></li>
-	<li><a href="/cgi-bin/koha/admin/item_circulation_alerts.pl">Item circulation alerts</a></li>
+    <li><a href="/cgi-bin/koha/admin/patron-attr-types.pl">Patron attribute types</a></li>
+    <li><a href="/cgi-bin/koha/admin/branch_transfer_limits.pl">Library transfer limits</a></li>
+    <li><a href="/cgi-bin/koha/admin/transport-cost-matrix.pl">Transport cost matrix</a></li>
+    <li><a href="/cgi-bin/koha/admin/item_circulation_alerts.pl">Item circulation alerts</a></li>
     <li><a href="/cgi-bin/koha/admin/cities.pl">Cities and towns</a></li>
 </ul>
 
 <h5>Catalog</h5>
 <ul>
     <li><a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC bibliographic framework</a></li>
-	<li><a href="/cgi-bin/koha/admin/koha2marclinks.pl">Koha to MARC mapping</a></li>
-	<li><a href="/cgi-bin/koha/admin/fieldmapping.pl">Keywords to MARC mapping</a></li>
+    <li><a href="/cgi-bin/koha/admin/koha2marclinks.pl">Koha to MARC mapping</a></li>
+    <li><a href="/cgi-bin/koha/admin/fieldmapping.pl">Keywords to MARC mapping</a></li>
     <li><a href="/cgi-bin/koha/admin/checkmarc.pl">MARC bibliographic framework test</a></li>
     <li><a href="/cgi-bin/koha/admin/authtypes.pl">Authority types</a></li>
     <li><a href="/cgi-bin/koha/admin/classsources.pl">Classification sources</a></li>
@@ -51,16 +51,15 @@
 <h5>Acquisition parameters</h5>
 
 <ul>
-	<li><a href="/cgi-bin/koha/admin/currency.pl">Currencies and exchange rates</a></li>
-	<li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a></li>
-	<li><a href="/cgi-bin/koha/admin/aqbudgets.pl">Funds</a></li>
-
+    <li><a href="/cgi-bin/koha/admin/currency.pl">Currencies and exchange rates</a></li>
+    <li><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a></li>
+    <li><a href="/cgi-bin/koha/admin/aqbudgets.pl">Funds</a></li>
 </ul>
 
 <h5>Additional parameters</h5>
 
 <ul>
-	<!-- <li><a href="/cgi-bin/koha/admin/printers.pl">Network Printers</a></li> -->
+    <!-- <li><a href="/cgi-bin/koha/admin/printers.pl">Network Printers</a></li> -->
     <li><a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50/SRU servers</a></li>
     <li><a href="/cgi-bin/koha/admin/didyoumean.pl">Did you mean?</a></li>
     <li><a href="/cgi-bin/koha/admin/columns_settings.pl">Columns settings</a></li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
index 846439dc96..633b3ccb64 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
@@ -9,114 +9,110 @@
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Administration</div>
 
 <div id="doc" class="yui-t7">
-   
-   <div id="bd">
-	<div id="yui-main" class="sysprefs">
-    <div class="yui-g"><h1>Koha administration</h1></div>
-	<div class="yui-g">
+    <div id="bd">
+        <div id="yui-main" class="sysprefs">
+            <div class="yui-g"><h1>Koha administration</h1></div>
+            <div class="yui-g">
 
-<div class="yui-u first">
-<form action="/cgi-bin/koha/admin/preferences.pl" method="post">
-<fieldset>
-<h4><a href="/cgi-bin/koha/admin/preferences.pl">Global system preferences</a></h4>
-	<p>Manage global system preferences like MARC flavor, date format, administrator email, and templates.</p>
-        <input type="hidden" name="op" value="search" />
-        <input type="text" name="searchfield" value="[% searchfield %]" />
-        <input type="submit" name="ok" class="submit" value="Search" />
-</fieldset>
-</form>
+                <div class="yui-u first">
+                <form action="/cgi-bin/koha/admin/preferences.pl" method="post">
+                <fieldset>
+                    <h4><a href="/cgi-bin/koha/admin/preferences.pl">Global system preferences</a></h4>
+                    <p>Manage global system preferences like MARC flavor, date format, administrator email, and templates.</p>
+                    <input type="hidden" name="op" value="search" />
+                    <input type="text" name="searchfield" value="[% searchfield %]" />
+                    <input type="submit" name="ok" class="submit" value="Search" />
+                </fieldset>
+                </form>
 
+                <div class="hint"><h4>Hint:</h4><p>Configure these parameters in the order they appear.</p></div>
+                <h3>Basic parameters</h3>
+                <dl>
+                    <dt><a href="/cgi-bin/koha/admin/branches.pl">Libraries and groups</a></dt>
+                    <dd>Define libraries and groups.</dd>
+                    <dt><a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a></dt>
+                    <dd>Define item types used for circulation rules.</dd>
+                    <dt><a href="/cgi-bin/koha/admin/authorised_values.pl">Authorized values</a></dt>
+                    <dd>Define categories and authorized values for them.</dd>
+                </dl>
 
-<div class="hint"><h4>Hint:</h4><p>Configure these parameters in the order they appear.</p></div>
-<h3>Basic parameters</h3>
-<dl>
-        <dt><a href="/cgi-bin/koha/admin/branches.pl">Libraries and groups</a></dt>
-        <dd>Define libraries and groups.</dd>
-        <dt><a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a></dt>
-        <dd>Define item types used for circulation rules.</dd>
-        <dt><a href="/cgi-bin/koha/admin/authorised_values.pl">Authorized values</a></dt>
-		<dd>Define categories and authorized values for them.</dd>
-</dl>
+                <h3>Patrons and circulation</h3>
+                <dl>
+                    <dt><a href="/cgi-bin/koha/admin/categories.pl">Patron categories</a></dt>
+                    <dd>Define patron categories.</dd>
+                [% IF CAN_user_parameters_manage_circ_rules %]
+                    <dt><a href="/cgi-bin/koha/admin/smart-rules.pl">Circulation and fines rules</a></dt>
+                    <dd>Define circulation and fines rules for combinations of libraries, patron categories, and item types</dd>
+                [% END %]
+                    <dt><a href="/cgi-bin/koha/admin/patron-attr-types.pl">Patron attribute types</a></dt>
+                    <dd>Define extended attributes (identifiers and statistical categories) for patron records</dd>
+                    <dt><a href="/cgi-bin/koha/admin/branch_transfer_limits.pl">Library transfer limits</a></dt>
+                    <dd>Limit the ability to transfer items between libraries based on the library sending, the library receiving, and the item type involved. These rules only go into effect if the preference UseBranchTransferLimits is set to ON.</dd>
+                    <dt><a href="/cgi-bin/koha/admin/transport-cost-matrix.pl">Transport cost matrix</a></dt>
+                    <dd>Define transport costs between branches</dd>
+                    <dt><a href="/cgi-bin/koha/admin/item_circulation_alerts.pl">Item circulation alerts</a></dt>
+                    <dd>Define rules for check-in and checkout notifications for combinations of libraries, patron categories, and item types</dd>
+                    <dt><a href="/cgi-bin/koha/admin/cities.pl">Cities and towns</a></dt>
+                    <dd>Define cities and towns that your patrons live in.</dd>
+                </dl>
+                [% IF CAN_user_plugins %]
+                    <h3>Plugins</h3>
+                    <dl>
+                        <dt><a href="/cgi-bin/koha/plugins/plugins-home.pl">Manage plugins</a></dt>
+                        <dd>View, manage, configure and run plugins.</dd>
+                    </dl>
+                [% END %]
+                </div>
+                <div class="yui-u">
+                <h3>Catalog</h3>
+                <dl>
+                    <dt><a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC bibliographic framework</a></dt>
+                    <dd>Create and manage Bibliographic frameworks that define the characteristics of your MARC Records (field and subfield definitions) as well as templates for the MARC editor.</dd>
+                    <dt><a href="/cgi-bin/koha/admin/koha2marclinks.pl">Koha to MARC mapping</a></dt>
+                    <dd>Define the mapping between the Koha transactional database (SQL) and the MARC Bibliographic records. Note that the mapping can be defined through MARC Bibliographic Framework. This tool is just a shortcut to speed up linkage.</dd>
+                    <dt><a href="/cgi-bin/koha/admin/fieldmapping.pl">Keywords to MARC mapping</a></dt>
+                    <dd>Define the mapping between keywords and MARC fields, those keywords are used to find some datas independently of the framework.</dd>
+                    <dt><a href="/cgi-bin/koha/admin/checkmarc.pl">MARC Bibliographic framework test</a></dt>
+                    <dd>Checks the MARC structure. If you change your MARC Bibliographic framework it's recommended that you run this tool to test for errors in your definition.</dd>
+                    <dt><a href="/cgi-bin/koha/admin/authtypes.pl">Authority types</a></dt>
+                    <dd>Create and manage Authorities frameworks that define the characteristics of your MARC Records (field and subfield definitions).</dd>
+                    <dt><a href="/cgi-bin/koha/admin/classsources.pl">Classification sources</a></dt>
+                    <dd>Define classification sources (i.e., call number schemes) used by your collection.  Also define filing rules used for sorting call numbers.</dd>
+                    <dt><a href="/cgi-bin/koha/admin/matching-rules.pl">Record matching rules</a></dt>
+                    <dd>Manage rules for automatically matching MARC records during record imports.</dd>
+                    <dt><a href="/cgi-bin/koha/admin/oai_sets.pl">OAI sets configuration</a></dt>
+                    <dd>Manage OAI Sets</dd>
+                    <dt><a href="/cgi-bin/koha/admin/items_search_fields.pl">Items search fields</a></dt>
+                    <dd>Manage custom fields for items search</dd>
+                </dl>
 
-<h3>Patrons and circulation</h3>
-<dl>
-	<dt><a href="/cgi-bin/koha/admin/categories.pl">Patron categories</a></dt>
-	<dd>Define patron categories.</dd>
-[% IF CAN_user_parameters_manage_circ_rules %]
-    <dt><a href="/cgi-bin/koha/admin/smart-rules.pl">Circulation and fines rules</a></dt>
-    <dd>Define circulation and fines rules for combinations of libraries, patron categories, and item types</dd>
-[% END %]
-    <dt><a href="/cgi-bin/koha/admin/patron-attr-types.pl">Patron attribute types</a></dt>
-    <dd>Define extended attributes (identifiers and statistical categories) for patron records</dd>
-    <dt><a href="/cgi-bin/koha/admin/branch_transfer_limits.pl">Library transfer limits</a></dt>
-	<dd>Limit the ability to transfer items between libraries based on the library sending, the library receiving, and the item type involved. These rules only go into effect if the preference UseBranchTransferLimits is set to ON.</dd>
-    <dt><a href="/cgi-bin/koha/admin/transport-cost-matrix.pl">Transport cost matrix</a></dt>
-    <dd>Define transport costs between branches</dd>
-    <dt><a href="/cgi-bin/koha/admin/item_circulation_alerts.pl">Item circulation alerts</a></dt>
-	<dd>Define rules for check-in and checkout notifications for combinations of libraries, patron categories, and item types</dd>
-    <dt><a href="/cgi-bin/koha/admin/cities.pl">Cities and towns</a></dt>
-    <dd>Define cities and towns that your patrons live in.</dd>
-</dl>
-[% IF CAN_user_plugins %]
-    <h3>Plugins</h3>
-    <dl>
-        <dt><a href="/cgi-bin/koha/plugins/plugins-home.pl">Manage plugins</a></dt>
-        <dd>View, manage, configure and run plugins.</dd>
-    </dl>
-[% END %]
-</div>
-<div class="yui-u">
-<h3>Catalog</h3>
-<dl>
-    <dt><a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC bibliographic framework</a></dt>
-	<dd>Create and manage Bibliographic frameworks that define the characteristics of your MARC Records (field and subfield definitions) as well as templates for the MARC editor.</dd>
-	<dt><a href="/cgi-bin/koha/admin/koha2marclinks.pl">Koha to MARC mapping</a></dt>
-	<dd>Define the mapping between the Koha transactional database (SQL) and the MARC Bibliographic records. Note that the mapping can be defined through MARC Bibliographic Framework. This tool is just a shortcut to speed up linkage.</dd>
-        <dt><a href="/cgi-bin/koha/admin/fieldmapping.pl">Keywords to MARC mapping</a></dt>
-        <dd>Define the mapping between keywords and MARC fields, those keywords are used to find some datas independently of the framework.</dd>
-	<dt><a href="/cgi-bin/koha/admin/checkmarc.pl">MARC Bibliographic framework test</a></dt>
-	<dd>Checks the MARC structure. If you change your MARC Bibliographic framework it's recommended that you run this tool to test for errors in your definition.</dd>
-    <dt><a href="/cgi-bin/koha/admin/authtypes.pl">Authority types</a></dt>
-    <dd>Create and manage Authorities frameworks that define the characteristics of your MARC Records (field and subfield definitions).</dd>
-    <dt><a href="/cgi-bin/koha/admin/classsources.pl">Classification sources</a></dt>
-    <dd>Define classification sources (i.e., call number schemes) used by your collection.  Also define filing rules used for sorting call numbers.</dd>
-    <dt><a href="/cgi-bin/koha/admin/matching-rules.pl">Record matching rules</a></dt>
-    <dd>Manage rules for automatically matching MARC records during record imports.</dd>
-    <dt><a href="/cgi-bin/koha/admin/oai_sets.pl">OAI sets configuration</a></dt>
-    <dd>Manage OAI Sets</dd>
-    <dt><a href="/cgi-bin/koha/admin/items_search_fields.pl">Items search fields</a></dt>
-    <dd>Manage custom fields for items search</dd>
-</dl>
-
-<h3>Acquisition parameters</h3>
-<dl>
-        <dt><a href="/cgi-bin/koha/admin/currency.pl">Currencies and exchange rates</a></dt>
-        <dd>Define currencies and exchange rates used for acquisitions.</dd>
-
-        <dt><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a></dt>
-        <dd>Define your budgets</dd>
-        
-        <dt><a href="/cgi-bin/koha/admin/aqbudgets.pl">Funds</a></dt>
-        <dd>Define funds within your budgets</dd>
+                <h3>Acquisition parameters</h3>
+                <dl>
+                        <dt><a href="/cgi-bin/koha/admin/currency.pl">Currencies and exchange rates</a></dt>
+                        <dd>Define currencies and exchange rates used for acquisitions.</dd>
 
-</dl>
+                        <dt><a href="/cgi-bin/koha/admin/aqbudgetperiods.pl">Budgets</a></dt>
+                        <dd>Define your budgets</dd>
 
-<h3>Additional parameters</h3>
-<dl>
-	<!-- <dt><a href="/cgi-bin/koha/admin/printers.pl">Network Printers</a></dt>
-	<dd>Printers (UNIX paths).</dd> -->
-    <dt><a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50/SRU servers</a></dt>
-    <dd>Define which external servers to query for MARC data.</dd>
-    <dt><a href="/cgi-bin/koha/admin/didyoumean.pl">Did you mean?</a></dt>
-    <dd>Choose which plugins to use to suggest searches to patrons and staff.</dd>
-    <dt><a href="/cgi-bin/koha/admin/columns_settings.pl">Configure columns</a></dt>
-    <dd>Hide or show columns for tables.</dd>
-    <dt><a href="/cgi-bin/koha/admin/audio_alerts.pl">Audio alerts</a></dt>
-    <dd>Define which events trigger which sounds</dd>
-</dl>
-</div>
+                        <dt><a href="/cgi-bin/koha/admin/aqbudgets.pl">Funds</a></dt>
+                        <dd>Define funds within your budgets</dd>
+                </dl>
 
-</div>
-</div>
+                <h3>Additional parameters</h3>
+                <dl>
+                    <!-- <dt><a href="/cgi-bin/koha/admin/printers.pl">Network Printers</a></dt>
+                    <dd>Printers (UNIX paths).</dd> -->
+                    <dt><a href="/cgi-bin/koha/admin/z3950servers.pl">Z39.50/SRU servers</a></dt>
+                    <dd>Define which external servers to query for MARC data.</dd>
+                    <dt><a href="/cgi-bin/koha/admin/didyoumean.pl">Did you mean?</a></dt>
+                    <dd>Choose which plugins to use to suggest searches to patrons and staff.</dd>
+                    <dt><a href="/cgi-bin/koha/admin/columns_settings.pl">Configure columns</a></dt>
+                    <dd>Hide or show columns for tables.</dd>
+                    <dt><a href="/cgi-bin/koha/admin/audio_alerts.pl">Audio alerts</a></dt>
+                    <dd>Define which events trigger which sounds</dd>
+                </dl>
+            </div>
+        </div>
+    </div>
 </div>
 [% INCLUDE 'intranet-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
index 1e74c1b395..d4d01309d0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
@@ -13,84 +13,93 @@
 //<![CDATA[
     $(document).ready(function() {
         $("#table_categorie").dataTable($.extend(true, {}, dataTablesDefaults, {
-            "aoColumnDefs": [
-                { "aTargets": [ -1, -2 ], "bSortable": false, "bSearchable": false },
-                { "aTargets": [ 3,4,5 ], "sType": "natural" },
+            "aoColumnDefs": [{
+                "aTargets": [-1, -2],
+                "bSortable": false,
+                "bSearchable": false
+            }, {
+                "aTargets": [3, 4, 5],
+                "sType": "natural"
+            }, ],
+            "aaSorting": [
+                [1, "asc"]
             ],
-            "aaSorting": [[ 1, "asc" ]],
             "sPaginationType": "four_button"
         }));
 
-    $( "#enrolmentperioddate" ).datepicker({ minDate: 1 }); // Require that "until date" be in the future
+        $("#enrolmentperioddate").datepicker({
+            minDate: 1
+        }); // Require that "until date" be in the future
 
-    if ( $("#branches option:selected").length < 1 ) {
-        $("#branches option:first").attr("selected", "selected");
+        if ($("#branches option:selected").length < 1) {
+            $("#branches option:first").attr("selected", "selected");
+        }
+    });
+
+    function isNotNull(f, noalert) {
+        if (f.value.length == 0) {
+            return false;
+        }
+        return true;
+    }
+
+    function isNum(v, maybenull) {
+        var n = new Number(v.value);
+        if (isNaN(n)) {
+            return false;
+        }
+        if (maybenull == 0 && v.value == '') {
+            return false;
+        }
+        return true;
+    }
+
+    // to check if the data are correctly entered.
+    function Check(ff) {
+        var ok = 0;
+        var _alertString = _("Form not submitted because of the following problem(s)");
+        _alertString += "\n-------------------------------------------------------------------\n\n";
+        ff.categorycode.value = $.trim(ff.categorycode.value);
+        if (ff.categorycode.value.length == 0) {
+            ok = 1;
+            _alertString += _("- categorycode missing") + "\n";
+        } else {
+            var patt = /^[a-zA-Z0-9\-_]+$/g;
+            if (!patt.test(ff.categorycode.value)) {
+                ok = 1;
+                _alertString += _("- category code can only contain the following characters: letters, numbers, - and _") + "\n";
+            }
+        }
+        if (!(ff.category_type.value)) {
+            ok = 1;
+            _alertString += _("- category type missing") + "\n";
+        }
+        if (!(isNotNull(ff.description, 1))) {
+            ok = 1;
+            _alertString += _("- description missing") + "\n";
+        }
+        if (!isNum(ff.upperagelimit, 0) && ff.category_type.value == 'C') {
+            ok = 1;
+            _alertString += _("- upperagelimit is not a number") + "\n";
+
+        }
+        if (!(ff.enrolmentperioddate.value || ff.enrolmentperiod.value)) {
+            ok = 1;
+            _alertString += _("- either Enrollment period or Until date must be provided") + "\n";
+        }
+        if (ff.enrolmentperioddate.value && ff.enrolmentperiod.value) {
+            document.getElementById('enrolmentmessage').className = "error";
+            return false;
+        }
+
+        if (ok) { // if there is a problem
+            alert(_alertString);
+            return false;
+        }
+        // if all is good
+        ff.submit();
     }
-});
-	function isNotNull(f,noalert) {
-		if (f.value.length ==0) {
-   return false;
-		}
-		return true;
-	}
-	//
-	function isNum(v,maybenull) {
-	var n = new Number(v.value);
-	if (isNaN(n)) {
-		return false;
-		}
-	if (maybenull==0 && v.value=='') {
-		return false;
-	}
-	return true;
-	}
-	// to check if the data are correctly entered.
-	function Check(ff) {
-	    var ok=0;
-		var _alertString=_("Form not submitted because of the following problem(s)");
-		_alertString +="\n-------------------------------------------------------------------\n\n";
-                ff.categorycode.value = $.trim(ff.categorycode.value);
-                if (ff.categorycode.value.length==0) {
-                   ok=1;
-                   _alertString += _("- categorycode missing") + "\n";
-                }
-                else{
-                   var patt=/^[a-zA-Z0-9\-_]+$/g;
-                   if ( !patt.test(ff.categorycode.value) ) {
-                      ok=1;
-                      _alertString += _("- category code can only contain the following characters: letters, numbers, - and _") + "\n";
-                   }
-                }
-		if (!(ff.category_type.value)){
-		    ok=1;
-		    _alertString += _("- category type missing") + "\n";
-		}
-		if (!(isNotNull(ff.description,1))) {
-		    ok=1;
-			_alertString += _("- description missing") + "\n";
-		}
-		if (!isNum(ff.upperagelimit,0) && ff.category_type.value=='C') {
-		    ok=1;
-			_alertString += _("- upperagelimit is not a number") + "\n";
-				
-		}
-                if(!(ff.enrolmentperioddate.value || ff.enrolmentperiod.value)) {
-                    ok=1;
-                    _alertString += _("- either Enrollment period or Until date must be provided") + "\n";
-                }
-		if(ff.enrolmentperioddate.value && ff.enrolmentperiod.value){
-			document.getElementById('enrolmentmessage').className = "error";
-			return false;
-		}
-		
-		if (ok) { // if there is a problem
-		    alert(_alertString);
-                    return false;
-                }
-                // if all is good
-		ff.submit();
-	}
-	//]]>
+//]]>
 </script>
 <style type="text/css">#enrolmentmessage.hint { display : none; }</style>
 </head>
@@ -104,10 +113,9 @@
 [% IF op == 'list' %]Patron categories[% END %]</div>
 
 <div id="doc3" class="yui-t2">
-   
    <div id="bd">
-	<div id="yui-main">
-	<div class="yui-b">
+    <div id="yui-main">
+    <div class="yui-b">
 
 [% FOR m IN messages %]
     <div class="dialog [% m.type %]">
-- 
2.39.5