reindenting and removing tmpl_if in doc-head-close

diff --git a/acqui/basketgroup.pl b/acqui/basketgroup.pl
index 10eb565..7e407b3 100755 (executable)
--- a/acqui/basketgroup.pl
+++ b/acqui/basketgroup.pl
@@ -291,8 +291,8 @@ if ( $op eq "add" ) {
 
         # determine default billing and delivery places depending on librarian homebranch and existing basketgroup data
         my $borrower = GetMember( ( 'borrowernumber' => $loggedinuser ) );
-        my $billingplace  = $billingplace  || $borrower->{'branchcode'};
-        my $deliveryplace = $deliveryplace || $borrower->{'branchcode'};
+        $billingplace  = $billingplace  || $borrower->{'branchcode'};
+        $deliveryplace = $deliveryplace || $borrower->{'branchcode'};
         
         my $branches = GetBranches;
         

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
index 8811f97..e6da426 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
@@ -7,15 +7,23 @@
 <!-- TMPL_ELSE -->
     <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css/staff-global.css" />
 <!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="css_libs" --><!-- TMPL_LOOP NAME="css_libs" --><link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/<!-- TMPL_VAR NAME="lib" -->" /><!-- /TMPL_LOOP --><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="css_libs" -->
+    <!-- TMPL_LOOP NAME="css_libs" -->
+        <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/<!-- TMPL_VAR NAME="lib" -->" />
+    <!-- /TMPL_LOOP -->
+<!-- /TMPL_IF -->
 
-<!-- TMPL_IF NAME="css_module" --><link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css/modules/<!-- TMPL_VAR NAME="css_module" -->" /><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="css_page" --><link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css/pages/<!-- TMPL_VAR NAME="css_page" -->" /><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="css_module" -->
+    <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css/modules/<!-- TMPL_VAR NAME="css_module" -->" />
+<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="css_page" -->
+    <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css/pages/<!-- TMPL_VAR NAME="css_page" -->" />
+<!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="css_widgets" -->
-<!-- TMPL_LOOP NAME="css_widgets" -->
-<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/<!-- TMPL_VAR NAME="widget" -->" />
-<!-- /TMPL_LOOP -->
+    <!-- TMPL_LOOP NAME="css_widgets" -->
+    <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/<!-- TMPL_VAR NAME="widget" -->" />
+    <!-- /TMPL_LOOP -->
 <!-- /TMPL_IF -->
 
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/jquery.js"></script>
@@ -25,24 +33,28 @@
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.highlight-3.js"></script>
 
 <!-- TMPL_IF NAME="js_libs" -->
-<!-- TMPL_LOOP NAME="js_libs" --><script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/<!-- TMPL_VAR NAME="lib" -->"></script>
-<!-- /TMPL_LOOP -->
+    <!-- TMPL_LOOP NAME="js_libs" -->
+        <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/<!-- TMPL_VAR NAME="lib" -->"></script>
+    <!-- /TMPL_LOOP -->
 <!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="js_module" -->
-<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/js/modules/<!-- TMPL_VAR NAME="js_module" -->"></script>
+    <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/js/modules/<!-- TMPL_VAR NAME="js_module" -->"></script>
 <!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="js_page" -->
-<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/js/pages/<!-- TMPL_VAR NAME="js_page" -->"></script>
+    <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/js/pages/<!-- TMPL_VAR NAME="js_page" -->"></script>
 <!-- /TMPL_IF -->
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/js/tags.js"></script>
 
 <!-- TMPL_IF NAME="js_widgets" -->
-<!-- TMPL_LOOP NAME="js_widgets" -->
-<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/<!-- TMPL_VAR NAME="widget" -->"></script>
-<!-- /TMPL_LOOP -->
+    <!-- TMPL_LOOP NAME="js_widgets" -->
+        <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/<!-- TMPL_VAR NAME="widget" -->"></script>
+    <!-- /TMPL_LOOP -->
+<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="login" -->
+    <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css/login.css" />
 <!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="login" --><link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css/login.css" /><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="wizard" --><link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css/wizard.css" />
+<!-- TMPL_IF NAME="wizard" -->
+    <link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/css/wizard.css" />
 <!-- /TMPL_IF -->
 
 <!-- local colors -->
@@ -53,33 +65,38 @@
 <!-- yui js --> 
 <script type="text/javascript" src="<!-- TMPL_VAR NAME="yuipath" -->/utilities/utilities.js"></script> 
 <script type="text/javascript" src="<!-- TMPL_VAR NAME="yuipath" -->/datasource/datasource.js"></script> 
-<!-- TMPL_IF NAME="CircAutocompl" --><script type="text/javascript" src="<!-- TMPL_VAR NAME="yuipath" -->/autocomplete/autocomplete-min.js"></script> <!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="CircAutocompl" -->
+    <script type="text/javascript" src="<!-- TMPL_VAR NAME="yuipath" -->/autocomplete/autocomplete-min.js"></script>
+<!-- /TMPL_IF -->
 <script type="text/javascript" src="<!-- TMPL_VAR NAME="yuipath" -->/button/button-min.js"></script> 
 <script type="text/javascript" src="<!-- TMPL_VAR NAME="yuipath" -->/container/container_core-min.js"></script> 
 <script type="text/javascript" src="<!-- TMPL_VAR NAME="yuipath" -->/menu/menu-min.js"></script> 
 
 <!-- koha core js -->
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/js/staff-global.js"></script>
-<!-- TMPL_IF NAME="intranetuserjs" --><script type="text/javascript">
-//<![CDATA[
-<!-- TMPL_VAR NAME="intranetuserjs" -->
-//]]>
-</script><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="intranetuserjs" -->
+    <script type="text/javascript">
+    //<![CDATA[
+    <!-- TMPL_VAR NAME="intranetuserjs" -->
+    //]]>
+    </script>
+<!-- /TMPL_IF -->
 <script type="text/javascript" language="javascript">
-        //<![CDATA[
+    //<![CDATA[
     <!-- TMPL_IF NAME="intranetbookbag" -->var MSG_BASKET_EMPTY = _("Your cart is currently empty");
-    var MSG_RECORD_IN_BASKET = _("This item is already in your cart");
-    var MSG_RECORD_ADDED = _("This item has been added to your cart");
-    var MSG_NRECORDS_ADDED = _(" item(s) added to your cart");
-    var MSG_NRECORDS_IN_BASKET = _("already in your cart");
-    var MSG_NO_RECORD_SELECTED = _("No item was selected");
-    var MSG_NO_RECORD_ADDED = _("No item was added to your cart");
-    var MSG_CONFIRM_DEL_BASKET = _("Are you sure you want to empty your cart?");
-    var MSG_CONFIRM_DEL_RECORDS = _("Are you sure you want to remove the selected items?");
-    var MSG_NON_RESERVES_SELECTED = _("One or more selected items cannot be reserved.");
-<!-- /TMPL_IF -->
-//]]>
-</script>
-<!-- TMPL_IF EXPR="virtualshelves || intranetbookbag" --><script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/js/basket.js"></script><!-- /TMPL_IF -->
-<!-- /TMPL_IF -->
+        var MSG_RECORD_IN_BASKET = _("This item is already in your cart");
+        var MSG_RECORD_ADDED = _("This item has been added to your cart");
+        var MSG_NRECORDS_ADDED = _(" item(s) added to your cart");
+        var MSG_NRECORDS_IN_BASKET = _("already in your cart");
+        var MSG_NO_RECORD_SELECTED = _("No item was selected");
+        var MSG_NO_RECORD_ADDED = _("No item was added to your cart");
+        var MSG_CONFIRM_DEL_BASKET = _("Are you sure you want to empty your cart?");
+        var MSG_CONFIRM_DEL_RECORDS = _("Are you sure you want to remove the selected items?");
+        var MSG_NON_RESERVES_SELECTED = _("One or more selected items cannot be reserved.");
+    <!-- /TMPL_IF -->
+    //]]>
+    </script>
+    <!-- TMPL_IF EXPR="virtualshelves || intranetbookbag" -->
+        <script type="text/javascript" language="javascript" src="<!-- TMPL_VAR NAME="themelang" -->/js/basket.js"></script>
+    <!-- /TMPL_IF -->
 

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
index 24b5d84..42f8c23 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
@@ -15,6 +15,7 @@
                             <li><a href="/cgi-bin/koha/virtualshelves/shelves.pl">Lists</a></li>
                             <!-- TMPL_IF NAME="CAN_user_editcatalogue" -->
                             <li><a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloging</a></li>
+                            <!-- /TMPL_IF -->
                             <!-- TMPL_IF NAME="CAN_user_acquisition" -->
                             <li><a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a></li>
                             <!-- /TMPL_IF -->
@@ -22,7 +23,6 @@
                             <!-- TMPL_IF NAME="CAN_user_serials" -->
                             <li><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></li>
                             <!-- /TMPL_IF -->
-                            <!-- /TMPL_IF -->
                             <!-- TMPL_IF NAME="CAN_user_reports" -->
                             <li><a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a></li>
                             <!-- /TMPL_IF -->
@@ -37,34 +37,34 @@
                         </div>
                     </div>
                 </li>
-               <!-- TMPL_IF NAME="intranetbookbag" -->
-               <li><a href="#" id="cartmenulink"><i></i><span><i></i><span></span><img src="/intranet-tmpl/prog/img/cart.gif" width="14" height="14" alt="" border="0" />Cart<span id="basketcount"></span></span></a></li>
-               <!-- /TMPL_IF -->
+                <!-- TMPL_IF NAME="intranetbookbag" -->
+                    <li><a href="#" id="cartmenulink"><i></i><span><i></i><span></span><img src="/intranet-tmpl/prog/img/cart.gif" width="14" height="14" alt="" border="0" />Cart<span id="basketcount"></span></span></a></li>
+                <!-- /TMPL_IF -->
             </ul>
         </div>
     <div id="login">
         <!-- TMPL_IF NAME="AutoLocation" -->
-        <strong>
-        <!-- TMPL_VAR NAME="LoginBranchname" -->
-        </strong>
+            <strong>
+            <!-- TMPL_VAR NAME="LoginBranchname" -->
+            </strong>
         <!-- TMPL_ELSE -->
-        <strong><!-- TMPL_VAR NAME="LoginBranchname" --></strong>
-        <!-- TMPL_IF NAME="IndependantBranches" -->
-        <!-- TMPL_IF NAME="CAN_user_management" -->
-        (<a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set</a>)
-        <!-- /TMPL_IF -->
-        <!-- TMPL_ELSE -->
-        (<a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set</a>)
-        <!-- /TMPL_IF -->
+            <strong><!-- TMPL_VAR NAME="LoginBranchname" --></strong>
+            <!-- TMPL_IF NAME="IndependantBranches" -->
+                <!-- TMPL_IF NAME="CAN_user_management" -->
+                    (<a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set</a>)
+                <!-- /TMPL_IF -->
+            <!-- TMPL_ELSE -->
+                (<a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set</a>)
+            <!-- /TMPL_IF -->
         |
         <!-- /TMPL_IF -->
         <!-- TMPL_IF NAME="loggedinusername" -->
-        <span class="loggedinusername">
-            <!-- TMPL_VAR NAME="loggedinusername" -->
-        </span>
-        (<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log Out</a>) |
+            <span class="loggedinusername">
+                <!-- TMPL_VAR NAME="loggedinusername" -->
+            </span>
+            (<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log Out</a>) |
         <!-- TMPL_ELSE -->
-        You are not logged in |
+            You are not logged in |
         <!-- /TMPL_IF -->
         <a href="/cgi-bin/koha/help.pl" id="helper" onclick="window.open('/cgi-bin/koha/help.pl','Koha_Help','width=600,height=600,toolbar=false,scrollbars=yes'); return false;">[ ? ]</a>
     </div>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl
index 07159e1..ce69c63 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tmpl
@@ -59,10 +59,10 @@
        <ul>
         <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Add MARC Record</a></li>
         <li><a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a></li>
-               <!-- TMPL_IF NAME="CAN_user_serials" -->
-        <li><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></li>
-               <!-- /TMPL_IF -->
     </ul>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="CAN_user_serials" -->
+    <h3><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></h3>
     <!-- /TMPL_IF -->
        <!-- TMPL_IF NAME="CAN_user_acquisition" --> <h3><a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a></h3> <!-- /TMPL_IF -->
     <!-- TMPL_IF NAME="CAN_user_reports"     --> <h3><a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a> </h3> <!-- /TMPL_IF -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/tags.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/tags.tmpl
index 8681a8a..d2ba19f 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/tags.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/tags.tmpl
@@ -1,51 +1,52 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog &rsaquo; Tags
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog &rsaquo; Tags
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
 <style type="text/css">
-       fieldset { padding : .3em;margin:.3em 0;}
-       #tagcloud    {background-color: #F3F3F3; text-align: justify;padding:7px;}
-       .tag a       {text-decoration: none;}
-       .tag a:hover {text-decoration: underline;}
-       .tag         {display: block; padding-left: 1em;}
-       .tagcount    {display: none;}
-       .cloudweight {display: none;}
-       .tagweight {
-               display: none;
-               position: relative;
-               bottom: 0.4em;
-               color: red;
-               font-size: 12px;
-       }
+    fieldset { padding : .3em;margin:.3em 0;}
+    #tagcloud    {background-color: #F3F3F3; text-align: justify;padding:7px;}
+    .tag a       {text-decoration: none;}
+    .tag a:hover {text-decoration: underline;}
+    .tag         {display: block; padding-left: 1em;}
+    .tagcount    {display: none;}
+    .cloudweight {display: none;}
+    .tagweight {
+        display: none;
+        position: relative;
+        bottom: 0.4em;
+        color: red;
+        font-size: 12px;
+    }
 </style>
 <script type="text/javascript">
 //<![CDATA[
-       var fontsizes = new Array (12,14,16,18,20,22,24,26,28,30);
-       var fontcount = fontsizes.length;
-       var maxcloudweight = 1;
-       $(document).ready(function() {
-               // $('#tagcloud').css('background-color','lightgrey');
-               // $('#tagcloud .tag').css('border','1px solid black');
-               $('#tagcloud .tag').each(function() {
-                       if (maxcloudweight < this.title) { maxcloudweight = this.title; }
-                       // have to run through the set of tags once to get the max: cannot be combined w/ 2nd pass
-               });
-               $('#tagcloud .tag').each(function(i) {
-                       var pos = this.id;
-                       var weight = this.title;        // "cloudweight"
-                       weight = (! weight) ? 1 : (weight > maxcloudweight) ? maxcloudweight : weight ;
-                       var index = Math.round(fontcount * weight/maxcloudweight) - 1;
-                       index  = (! index ) ? 0 : ( index > fontcount     ) ? fontcount      : index  ;
-                       var newsize = fontsizes[index];
-                       // alert(pos+ " (" +i+ ") weight = " +weight+ " of " +maxcloudweight+ ", fontsize[" +index+ " of " +fontcount+ "] = " +newsize);
-                       $('#' + pos).css({"font-size":(newsize + 'px'), display:"inline"});
-               });
-               $("#mytagst").tablesorter({<!-- TMPL_IF EXPR="dateformat eq 'metric'" -->
+    var fontsizes = new Array (12,14,16,18,20,22,24,26,28,30);
+    var fontcount = fontsizes.length;
+    var maxcloudweight = 1;
+    $(document).ready(function() {
+        // $('#tagcloud').css('background-color','lightgrey');
+        // $('#tagcloud .tag').css('border','1px solid black');
+        $('#tagcloud .tag').each(function() {
+            if (maxcloudweight < this.title) { maxcloudweight = this.title; }
+            // have to run through the set of tags once to get the max: cannot be combined w/ 2nd pass
+        });
+        $('#tagcloud .tag').each(function(i) {
+            var pos = this.id;
+            var weight = this.title;   // "cloudweight"
+            weight = (! weight) ? 1 : (weight > maxcloudweight) ? maxcloudweight : weight ;
+            var index = Math.round(fontcount * weight/maxcloudweight) - 1;
+            index  = (! index ) ? 0 : ( index > fontcount     ) ? fontcount      : index  ;
+            var newsize = fontsizes[index];
+            // alert(pos+ " (" +i+ ") weight = " +weight+ " of " +maxcloudweight+ ", fontsize[" +index+ " of " +fontcount+ "] = " +newsize);
+            $('#' + pos).css({"font-size":(newsize + 'px'), display:"inline"});
+        });
+        $("#mytagst").tablesorter({<!-- TMPL_IF EXPR="dateformat eq 'metric'" -->
     dateFormat: 'uk',<!-- /TMPL_IF -->
             widgets : ['zebra'],
-                       headers: { 3: { sorter: false }},
+            headers: { 3: { sorter: false }},
             sortList: [[2,0]]
         });
-       });
+    });
 //]]>
 </script>
 </head>
@@ -55,94 +56,99 @@
 <!-- TMPL_INCLUDE NAME="masthead.inc" -->
 
 <div id="yui-main">
-  <div class="yui-b"><div class="yui-g">
-       <div class="container">
-       <!-- TMPL_IF NAME="ERRORS" -->
-       <!-- TMPL_LOOP NAME="ERRORS" -->
-               <div class="dialog alert">There was a problem with this operation:
-               <!-- TMPL_IF NAME="tagsdisabled" -->Sorry, tags are not enabled on this system.
-               <!-- TMPL_ELSIF NAME="badparam" -->ERROR: illegal parameter <!-- TMPL_VAR NAME="badparam" -->
-               <!-- TMPL_ELSIF NAME="login"    -->ERROR: You must log in to complete that action.
-               <!-- TMPL_ELSIF NAME="failed_delete" -->ERROR: You cannot delete the tag <!-- TMPL_VAR NAME="failed_delete" -->.
-                                       <br />Note: you can only delete your own tags.
-               <!-- TMPL_ELSIF NAME="scrubbed" -->Note: your tag contained markup code that was removed. 
-                                       <br />The tag was added as &quot;<!-- TMPL_VAR NAME="scrubbed" -->&quot;.
-               <!-- TMPL_ELSIF NAME="scrubbed_all_bad" -->Note: your tag was entirely markup code.  It was NOT added.
-                                       <br />Please try again with plain text.
-               <!-- TMPL_ELSE -->Unrecognized error.
-               <!-- /TMPL_IF -->
-               </div>
-       <!-- /TMPL_LOOP -->
-       <!-- /TMPL_IF -->
-       <h1>All Tags</h1>
-       
-               <form method="get" action="opac-tags.pl">
-               <fieldset>Show up to <input name="limit" style="text-align: right;" maxlength="4" size="4" value="<!-- TMPL_VAR NAME="limit" DEFAULT="100" -->" />
-                       tags from other users.
-                        <!-- TMPL_IF NAME="hidemytags" -->
-                       <input type="hidden" name="hidemytags" value="1" />
-                        <!-- /TMPL_IF -->
-                       <input type="submit" value="OK" />
-                        <!-- TMPL_UNLESS NAME="loggedinusername" -->
-                          <a href="/cgi-bin/koha/opac-user.pl">Log in</a> to see your own saved tags.
-                        <!-- TMPL_ELSE -->
-                          <!-- TMPL_IF NAME="hidemytags" --><a class="hidemytags" href="/cgi-bin/koha/opac-tags.pl?limit=<!-- TMPL_VAR NAME="limit" DEFAULT="100" -->">Show my tags</a>
-                          <!-- TMPL_ELSE --><a class="hidemytags" href="/cgi-bin/koha/opac-tags.pl?limit=<!-- TMPL_VAR NAME="limit" DEFAULT="100" -->&amp;hidemytags=1">Hide my tags</a>
-                          <!-- /TMPL_IF -->
-                        <!-- /TMPL_UNLESS --></fieldset>
-               </form>
-       
-       <!-- TMPL_IF NAME="TAGLOOP" -->
-       <div id="tagcloud">
-       <!-- TMPL_LOOP NAME="TAGLOOP" -->
-       <span class="tag" id="tag<!-- TMPL_VAR NAME="__counter__" -->" title="<!-- TMPL_VAR NAME="cloudweight" -->">
-               <a href="/cgi-bin/koha/opac-search.pl?tag=<!-- TMPL_VAR NAME="term" ESCAPE="URL" -->&amp;q=<!-- TMPL_VAR NAME="term" ESCAPE="URL" -->">
-               <!-- TMPL_VAR NAME="term" ESCAPE="HTML" --></a>
-                       <span class="tagweight"><!-- TMPL_VAR NAME="weight_total" --></span>
-       </span>
-       <!-- /TMPL_LOOP -->
-       </div>
-       <!-- /TMPL_IF -->
-       <!-- TMPL_IF NAME="add_op" -->
-         <!-- TMPL_IF NAME="added_count" -->
-               <div class="dialog message"><!-- TMPL_VAR NAME="added_count" --> <!-- TMPL_IF EXPR="added_count ==1" --> tag<!-- TMPL_ELSE -->tags<!-- /TMPL_IF --> successfully added.</div>
-         <!-- /TMPL_IF -->
-         <!-- TMPL_IF NAME="deleted_count" -->
-               <div class="dialog message"><!-- TMPL_VAR NAME="deleted_count" --><!-- TMPL_IF EXPR="deleted_count ==1" --> tag<!-- TMPL_ELSE -->tags<!-- /TMPL_IF --> successfully deleted.</div>
-         <!-- /TMPL_IF -->
-       <!-- /TMPL_IF -->
+<div class="yui-b"><div class="yui-g">
+    <div class="container">
+    <!-- TMPL_IF NAME="ERRORS" -->
+        <!-- TMPL_LOOP NAME="ERRORS" -->
+            <div class="dialog alert">There was a problem with this operation:
+            <!-- TMPL_IF NAME="tagsdisabled" -->Sorry, tags are not enabled on this system.
+            <!-- TMPL_ELSIF NAME="badparam" -->ERROR: illegal parameter <!-- TMPL_VAR NAME="badparam" -->
+            <!-- TMPL_ELSIF NAME="login"    -->ERROR: You must log in to complete that action.
+            <!-- TMPL_ELSIF NAME="failed_delete" -->ERROR: You cannot delete the tag <!-- TMPL_VAR NAME="failed_delete" -->.
+                        <br />Note: you can only delete your own tags.
+            <!-- TMPL_ELSIF NAME="scrubbed" -->Note: your tag contained markup code that was removed. 
+                        <br />The tag was added as &quot;<!-- TMPL_VAR NAME="scrubbed" -->&quot;.
+            <!-- TMPL_ELSIF NAME="scrubbed_all_bad" -->Note: your tag was entirely markup code.  It was NOT added.
+                        <br />Please try again with plain text.
+            <!-- TMPL_ELSE -->Unrecognized error.
+            <!-- /TMPL_IF -->
+            </div>
+        <!-- /TMPL_LOOP -->
+    <!-- /TMPL_IF -->
+    <h1>All Tags</h1>
+    
+        <form method="get" action="opac-tags.pl">
+            <fieldset>Show up to <input name="limit" style="text-align: right;" maxlength="4" size="4" value="<!-- TMPL_VAR NAME="limit" DEFAULT="100" -->" />
+                tags from other users.
+                <!-- TMPL_IF NAME="hidemytags" -->
+                    <input type="hidden" name="hidemytags" value="1" />
+                <!-- /TMPL_IF -->
+                <input type="submit" value="OK" />
+                <!-- TMPL_UNLESS NAME="loggedinusername" -->
+                    <a href="/cgi-bin/koha/opac-user.pl">Log in</a> to see your own saved tags.
+                <!-- TMPL_ELSE -->
+                    <!-- TMPL_IF NAME="hidemytags" -->
+                        <a class="hidemytags" href="/cgi-bin/koha/opac-tags.pl?limit=<!-- TMPL_VAR NAME="limit" DEFAULT="100" -->">Show my tags</a>
+                    <!-- TMPL_ELSE -->
+                        <a class="hidemytags" href="/cgi-bin/koha/opac-tags.pl?limit=<!-- TMPL_VAR NAME="limit" DEFAULT="100" -->&amp;hidemytags=1">Hide my tags</a>
+                    <!-- /TMPL_IF -->
+                <!-- /TMPL_UNLESS -->
+            </fieldset>
+        </form>
+    
+    <!-- TMPL_IF NAME="TAGLOOP" -->
+        <div id="tagcloud">
+        <!-- TMPL_LOOP NAME="TAGLOOP" -->
+            <span class="tag" id="tag<!-- TMPL_VAR NAME="__counter__" -->" title="<!-- TMPL_VAR NAME="cloudweight" -->">
+                <a href="/cgi-bin/koha/opac-search.pl?tag=<!-- TMPL_VAR NAME="term" ESCAPE="URL" -->&amp;q=<!-- TMPL_VAR NAME="term" ESCAPE="URL" -->">
+                <!-- TMPL_VAR NAME="term" ESCAPE="HTML" --></a>
+                    <span class="tagweight"><!-- TMPL_VAR NAME="weight_total" --></span>
+            </span>
+        <!-- /TMPL_LOOP -->
+        </div>
+    <!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="add_op" -->
+        <!-- TMPL_IF NAME="added_count" -->
+            <div class="dialog message"><!-- TMPL_VAR NAME="added_count" --> <!-- TMPL_IF EXPR="added_count ==1" --> tag<!-- TMPL_ELSE -->tags<!-- /TMPL_IF --> successfully added.</div>
+        <!-- /TMPL_IF -->
+        <!-- TMPL_IF NAME="deleted_count" -->
+            <div class="dialog message"><!-- TMPL_VAR NAME="deleted_count" --><!-- TMPL_IF EXPR="deleted_count ==1" --> tag<!-- TMPL_ELSE -->tags<!-- /TMPL_IF --> successfully deleted.</div>
+        <!-- /TMPL_IF -->
+    <!-- /TMPL_IF -->
 
-       <!-- TMPL_UNLESS NAME="hidemytags" -->
-       <!-- TMPL_IF NAME="MY_TAGS" -->
-               <form method="post" action="opac-tags.pl">
-               <h2>My Tags</h2>
-               <table id="mytagst">
-               <thead><tr><th>Term</th><th>Title</th><th>Date Added</th><th>Delete</th>
-               </tr></thead>
-       <tbody><!-- TMPL_LOOP NAME="MY_TAGS" -->
-               <tr><td><a href="/cgi-bin/koha/opac-search.pl?tag=<!-- TMPL_VAR NAME="term" ESCAPE="URL" -->&amp;q=<!-- TMPL_VAR NAME="term" ESCAPE="URL" -->">
-                               <!-- TMPL_VAR NAME="term" ESCAPE="HTML" --></a>
-                       </td>
-                       <td><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
-                               <!-- TMPL_VAR NAME="bib_summary" ESCAPE="HTML" --></a></td>
-                       <td><!-- TMPL_VAR NAME="date_created_display" --></td>
-                       <td><input type="submit" name="del<!-- TMPL_VAR NAME="tag_id" -->" value="Delete" /></td>
-               </tr>
-       <!-- /TMPL_LOOP --></tbody>
-               </table>
-               </form>
-       <!-- /TMPL_IF -->
-       <!-- /TMPL_UNLESS -->
+    <!-- TMPL_UNLESS NAME="hidemytags" -->
+        <!-- TMPL_IF NAME="MY_TAGS" -->
+            <form method="post" action="opac-tags.pl">
+            <h2>My Tags</h2>
+            <table id="mytagst">
+            <thead><tr><th>Term</th><th>Title</th><th>Date Added</th><th>Delete</th>
+            </tr></thead>
+            <tbody>
+                <!-- TMPL_LOOP NAME="MY_TAGS" -->
+                    <tr><td><a href="/cgi-bin/koha/opac-search.pl?tag=<!-- TMPL_VAR NAME="term" ESCAPE="URL" -->&amp;q=<!-- TMPL_VAR NAME="term" ESCAPE="URL" -->">
+                        <!-- TMPL_VAR NAME="term" ESCAPE="HTML" --></a>
+                    </td>
+                    <td><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
+                        <!-- TMPL_VAR NAME="bib_summary" ESCAPE="HTML" --></a></td>
+                    <td><!-- TMPL_VAR NAME="date_created_display" --></td>
+                    <td><input type="submit" name="del<!-- TMPL_VAR NAME="tag_id" -->" value="Delete" /></td>
+                    </tr>
+                <!-- /TMPL_LOOP -->
+            </tbody>
+            </table>
+            </form>
+        <!-- /TMPL_IF -->
+    <!-- /TMPL_UNLESS -->
 
 </div>
 </div>
 </div>
 </div>
 <!-- TMPL_IF EXPR="OpacNav||loggedinusername" -->
-<div class="yui-b"><div class="container">
-<!--TMPL_INCLUDE NAME="navigation.inc" -->
-<!--TMPL_INCLUDE NAME="usermenu.inc" -->
-</div></div>
+    <div class="yui-b"><div class="container">
+    <!--TMPL_INCLUDE NAME="navigation.inc" -->
+    <!--TMPL_INCLUDE NAME="usermenu.inc" -->
+    </div></div>
 <!-- /TMPL_IF -->
 </div>
 <!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->