Corrections to make markup more valid (quoting attributes, encoding amersands, etc.)

diff --git a/koha-tmpl/intranet-tmpl/default/en/authorities/auth_finder.tmpl b/koha-tmpl/intranet-tmpl/default/en/authorities/auth_finder.tmpl
index 0a0d7d9..bbde305 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/authorities/auth_finder.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/authorities/auth_finder.tmpl
@@ -11,17 +11,17 @@
                <h2 class="authority">Search on</h2>
                <p>
                        <label class="label100">Authority type</label>
-                       <!-- TMPL_VAR name="category" -->
+                       <!-- TMPL_VAR NAME="category" -->
                </p>
                <p>
                        <label class="label100">Search value</label>
-                       <input type="text" name="value" value="<!-- TMPL_VAR name="value" -->">
-                       <input type="hidden" name="authtypecode" value="<!-- TMPL_VAR name="category" -->">
+                       <input type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">
+                       <input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="category" -->">
                        <input type="hidden" name="marclist" value="">
                        <input type="hidden" name="and_or" value="and">
                        <input type="hidden" name="excluding" value="">
                        <input type="hidden" name="operator" value="contains">
-       <input type="hidden" name="index" value="<!-- TMPL_VAR name="index" -->"
+       <input type="hidden" name="index" value="<!-- TMPL_VAR NAME="index" -->"
                </p>
                <p>
                        <input type="submit" value="Start search" class="button authority">

diff --git a/koha-tmpl/intranet-tmpl/default/en/authorities/authorities-home.tmpl b/koha-tmpl/intranet-tmpl/default/en/authorities/authorities-home.tmpl
index 5f065dd..e6176e7 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/authorities/authorities-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/authorities/authorities-home.tmpl
@@ -12,16 +12,16 @@
                <p>
                        <label class="label100">Authority type</label>
                        <select name="authtypecode">
-                       <!-- TMPL_LOOP name="authtypesloop" -->
-                               <option value="<!-- TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->>
-                                       <!-- TMPL_VAR name="authtypetext" -->
+                       <!-- TMPL_LOOP NAME="authtypesloop" -->
+                               <option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->>
+                                       <!-- TMPL_VAR NAME="authtypetext" -->
                                </option>
                        <!-- /TMPL_LOOP -->
                        </select>
                </p>
                <p>
                        <label class="label100">Search value</label>
-                       <input type="text" name="value" value="<!-- TMPL_VAR name="value" -->">
+                       <input type="text" name="value" value="<!-- TMPL_VAR NAME="value" -->">
                        <input type="hidden" name="marclist" value="">
                        <input type="hidden" name="and_or" value="and">
                        <input type="hidden" name="excluding" value="">

diff --git a/koha-tmpl/intranet-tmpl/default/en/authorities/authorities.tmpl b/koha-tmpl/intranet-tmpl/default/en/authorities/authorities.tmpl
index f120695..ef9e238 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/authorities/authorities.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/authorities/authorities.tmpl
@@ -1,86 +1,78 @@
 <!-- TMPL_INCLUDE NAME="auth-top.inc" -->
-<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/marc-editor.css">
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/marc-editor.css">
 
 <div class="tabbed">
        <form method="post" name="f">
-       <h1 class="authority">Authority number <!-- TMPL_VAR name="authid" --></h1>
+       <h1 class="authority">Authority number <!-- TMPL_VAR NAME="authid" --></h1>
        <p>
                <input type="hidden" name="op" value="add">
                <input type="hidden" name="addfield_field">
-               <input type="hidden" name="authtypecode" value="<!-- TMPL_VAR name="authtypecode" -->">
-               <input type="hidden" name="authid" value="<!-- TMPL_VAR name="authid" -->">
+               <input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->">
+               <input type="hidden" name="authid" value="<!-- TMPL_VAR NAME="authid" -->">
                <!-- TMPL_IF name="authid" -->
-                       <input type="button" value="Save" onClick='Check(this.form)' accesskey="w" class="button authority">
+                       <input type="button" value="Save" onClick="Check(this.form)" accesskey="w" class="button authority">
                <!-- TMPL_ELSE -->
-                       <input type="button" value="Add authority" onClick='Check(this.form)' accesskey="w" class="button authority">
+                       <input type="button" value="Add authority" onClick="Check(this.form)" accesskey="w" class="button authority">
                <!-- /TMPL_IF -->
 <!--           <a href="javascript:PopupZ3950()" class="button authority">z3950 search</a> -->
        </p>
 </div>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<!-- TMPL_LOOP name="0XX" -->
+
+<br><br><br><br><br><br><br><br><br><br><br>
+
+<!-- TMPL_LOOP NAME="0XX" -->
        <!-- TMPL_IF name="tag" -->
                <p class="MARCtag">
-               <!-- TMPL_VAR name="tag" -->
-               <input type="hidden" name="ind_tag" value="<!-- TMPL_VAR name="tag" -->">
-               <input type="text" name="indicator" size=3 maxlength=2 value="<!-- TMPL_VAR name="indicator" -->"> - <tmpl_var name="tag_lib">
+               <!-- TMPL_VAR NAME="tag" -->
+               <input type="hidden" name="ind_tag" value="<!-- TMPL_VAR NAME="tag" -->">
+               <input type="text" name="indicator" size="3" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->"> - <TMPL_VAR NAME="tag_lib">
                <!-- TMPL_IF name="repeatable" -->
-                       <a href="javascript:AddField(<!-- TMPL_VAR name="tag" -->)">+</a>
+                       <a href="javascript:AddField(<!-- TMPL_VAR NAME="tag" -->)">+</a>
                <!-- /TMPL_IF -->
                </p>
        <!-- /TMPL_IF -->
-       <!-- TMPL_LOOP name="subfield_loop" -->
+       <!-- TMPL_LOOP NAME="subfield_loop" -->
                <p>
                        <label class="labelsubfield">
-                               <b><!-- TMPL_VAR name="subfield" --></b>
+                               <b><!-- TMPL_VAR NAME="subfield" --></b>
                                <!-- TMPL_IF name="mandatory" --><b><!-- /TMPL_IF -->
-                               <!-- TMPL_VAR name="marc_lib" -->
+                               <!-- TMPL_VAR NAME="marc_lib" -->
                                <!-- TMPL_IF name="mandatory" --> *</b><!-- /TMPL_IF -->
                        </label>
-                       <!-- TMPL_VAR name="marc_value" -->
-                       <input type="hidden" name="tag" value="<!-- TMPL_VAR name="tag" -->">
-                       <input type="hidden" name="subfield" value="<!-- TMPL_VAR name="subfield" -->">
-                       <input type="hidden" name="mandatory" value="<!-- TMPL_VAR name="mandatory" -->">
-                       <input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
-                       <input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR name="tag_mandatory" -->">
+                       <!-- TMPL_VAR NAME="marc_value" -->
+                       <input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="tag" -->">
+                       <input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->">
+                       <input type="hidden" name="mandatory" value="<!-- TMPL_VAR NAME="mandatory" -->">
+                       <input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->">
+                       <input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->">
                </p>
        <!-- /tmpl_loop -->
 <!-- /tmpl_loop -->
                
                <div name="hidden" id="hidden" class="tab">
-               <!-- TMPL_LOOP name="hidden_loop" -->
-                               <input type="hidden" name="tag" value="<!-- TMPL_VAR name="tag" -->">
-                               <input type="hidden" name="subfield" value="<!-- TMPL_VAR name="subfield" -->">
-                               <input type="hidden" name="mandatory" value="<!-- TMPL_VAR name="mandatory" -->">
-                               <input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
-                               <input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR name="tag_mandatory" -->">
+               <!-- TMPL_LOOP NAME="hidden_loop" -->
+                               <input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="tag" -->">
+                               <input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->">
+                               <input type="hidden" name="mandatory" value="<!-- TMPL_VAR NAME="mandatory" -->">
+                               <input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->">
+                               <input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->">
                <!-- /TMPL_LOOP -->
                </div>
                <!-- TMPL_IF name="oldbiblionumtagfield" -->
-                       <input type="hidden" name="tag" value="<!-- TMPL_VAR name="oldbiblionumtagfield" -->">
-                       <input type="hidden" name="subfield" value="<!-- TMPL_VAR name="oldbiblionumtagsubfield" -->">
-                       <input type="hidden" name="field_value" value="<!-- TMPL_VAR name="oldbiblionumber" -->">
+                       <input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="oldbiblionumtagfield" -->">
+                       <input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="oldbiblionumtagsubfield" -->">
+                       <input type="hidden" name="field_value" value="<!-- TMPL_VAR NAME="oldbiblionumber" -->">
                        <input type="hidden" name="mandatory" value="0">
-                       <input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
-                       <input type="hidden" name="tag" value="<!-- TMPL_VAR name="oldbiblioitemnumtagfield" -->">
-                       <input type="hidden" name="subfield" value="<!-- TMPL_VAR name="oldbiblioitemnumtagsubfield" -->">
-                       <input type="hidden" name="field_value" value="<!-- TMPL_VAR name="oldbiblioitemnumber" -->">
+                       <input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->">
+                       <input type="hidden" name="tag" value="<!-- TMPL_VAR NAME="oldbiblioitemnumtagfield" -->">
+                       <input type="hidden" name="subfield" value="<!-- TMPL_VAR NAME="oldbiblioitemnumtagsubfield" -->">
+                       <input type="hidden" name="field_value" value="<!-- TMPL_VAR NAME="oldbiblioitemnumber" -->">
                        <input type="hidden" name="mandatory" value="0">
-                       <input type="hidden" name="kohafield" value="<!-- TMPL_VAR name="kohafield" -->">
-                       <input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR name="tag_mandatory" -->">
+                       <input type="hidden" name="kohafield" value="<!-- TMPL_VAR NAME="kohafield" -->">
+                       <input type="hidden" name="tag_mandatory" value="<!-- TMPL_VAR NAME="tag_mandatory" -->">
                <!-- /TMPL_IF -->
        </form>
-<script LANGUAGE="JavaScript">
+<script language="JavaScript" type="text/javascript">
 function _(s) { return s } // dummy function for gettext
 function active(numlayer)
 {
@@ -169,7 +161,7 @@ function PopupZ3950() {
                    strQuery += "&issn="+document.forms[0].field_value[i].value;
                }
        }
-       newin=window.open("../z3950/search.pl?bibid=<!-- TMPL_VAR name="bibid" -->"+strQuery,"z3950search",'width=500,height=400,toolbar=false,scrollbars=yes');
+       newin=window.open("../z3950/search.pl?bibid=<!-- TMPL_VAR NAME="bibid" -->"+strQuery,"z3950search",'width=500,height=400,toolbar=false,scrollbars=yes');
 }
 
 function AddField(field) {

diff --git a/koha-tmpl/intranet-tmpl/default/en/authorities/blinddetail-biblio-search.tmpl b/koha-tmpl/intranet-tmpl/default/en/authorities/blinddetail-biblio-search.tmpl
index 4229180..d9ee3dd 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/authorities/blinddetail-biblio-search.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/authorities/blinddetail-biblio-search.tmpl
@@ -1,27 +1,28 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <body>
 <script language="JavaScript" type="text/javascript">
 
 function go()
 {
-var index_start = <!-- TMPL_VAR name="index" -->;
-opener.opener.document.f.field_value[index_start].value = '<!-- TMPL_VAR name="authid">';
+var index_start = <!-- TMPL_VAR NAME="index" -->;
+opener.opener.document.f.field_value[index_start].value = '<!-- TMPL_VAR NAME="authid">';
 var whichfield = opener.opener.document.f.tag[index_start].value;
 for (i=index_start ; i<opener.opener.document.f.field_value.length ; i++) {
 
 if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == '9') 
        {
-               opener.opener.document.f.field_value[i].value = '<!-- TMPL_VAR name="authid">';
+               opener.opener.document.f.field_value[i].value = '<!-- TMPL_VAR NAME="authid">';
        }
 
 }
-<!-- TMPL_LOOP name="0XX" -->
-   <!-- TMPL_LOOP name="subfield" -->
+<!-- TMPL_LOOP NAME="0XX" -->
+   <!-- TMPL_LOOP NAME="subfield" -->
 for (i=index_start ; i<opener.opener.document.f.field_value.length ; i++) {
 
-if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == '<!-- TMPL_VAR name="marc_subfield" -->') 
+if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == '<!-- TMPL_VAR NAME="marc_subfield" -->') 
        {
-               opener.opener.document.f.field_value[i].value = '<!-- TMPL_VAR name="marc_value" -->';
+               opener.opener.document.f.field_value[i].value = '<!-- TMPL_VAR NAME="marc_value" -->';
        }
 
 }
@@ -35,7 +36,7 @@ if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.documen
 
 }
 </script>
-<script>
+<script language="javascript" type="text/javascript">
 window.onload = go();
 </script>
 </body>

diff --git a/koha-tmpl/intranet-tmpl/default/en/authorities/detail-biblio-search.tmpl b/koha-tmpl/intranet-tmpl/default/en/authorities/detail-biblio-search.tmpl
index c1670ac..aef9c39 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/authorities/detail-biblio-search.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/authorities/detail-biblio-search.tmpl
@@ -1,35 +1,35 @@
 <!-- TMPL_INCLUDE NAME="auth-top.inc" -->
-<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/marc-editor.css">
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/marc-editor.css">
 <div class="tabbed">
-       <h1 class="authority">Authority number : <!-- TMPL_VAR name="authid" --></h1>
-       <a href="authorities.pl?authid=<!-- TMPL_VAR name="authid" -->">
-               <img border="0" src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png">
+       <h1 class="authority">Authority number : <!-- TMPL_VAR NAME="authid" --></h1>
+       <a href="authorities.pl?authid=<!-- TMPL_VAR NAME="authid" -->">
+               <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png">
        </a>
        <a href="javascript:confirm_deletion()">
-               <img border="0" src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/edittrash.png">
+               <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png">
        </a>
-       <a href="javascript:Dopop('detailprint.pl?authid=<!-- TMPL_VAR name="authid" -->&index=<!-- TMPL_VAR name="index" -->')" class="button authority">
+       <a href="javascript:Dopop('detailprint.pl?authid=<!-- TMPL_VAR NAME="authid" -->&index=<!-- TMPL_VAR NAME="index" -->')" class="button authority">
                Print
        </a>
-       <a href="javascript:CopyValues()">      <img border="0" src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/arrow.gif" height=45 width=45 ">
+       <a href="javascript:CopyValues()">      <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/arrow.gif" height="45" width="45" ">
 
        </a>
 </div>
 <br><br><br>
 <div name="0XX" id="0XX" class="tab" style="visibility:visible">
-       <!-- TMPL_LOOP name="0XX" -->
+       <!-- TMPL_LOOP NAME="0XX" -->
                        <p class="MARCtag">
-                               <!-- TMPL_VAR name="tag" -->
+                               <!-- TMPL_VAR NAME="tag" -->
                        </p>
-               <!-- TMPL_LOOP name="subfield" -->
+               <!-- TMPL_LOOP NAME="subfield" -->
                        <p>
                                <label class="labelsubfield">
-                               <a href="search.marc/search.pl?op=do_search&marclist=<!-- TMPL_VAR name="marc_tag" --><!-- TMPL_VAR name="marc_subfield" -->&operator=&#x003D&type=intranet&value=<!-- TMPL_VAR name="marc_value" ESCAPE=URL -->">
-                                       <img border="0" src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/filefind.png" height=15>
+                               <a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&#x003D&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+                                       <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15">
                                </a>
-                               <!-- TMPL_VAR name="marc_subfield" -->
-                               <!-- TMPL_VAR name="marc_lib" --></label>
-                               <!-- TMPL_VAR name="marc_value" -->
+                               <!-- TMPL_VAR NAME="marc_subfield" -->
+                               <!-- TMPL_VAR NAME="marc_lib" --></label>
+                               <!-- TMPL_VAR NAME="marc_value" -->
                        </p>
                <!-- /TMPL_LOOP -->
        <!-- /TMPL_LOOP -->
@@ -40,7 +40,7 @@
 function confirm_deletion() {
        var is_confirmed = confirm('Are you sure you want to delete this biblio?');
        if (is_confirmed) {
-               window.location="acqui.simple/addbiblio.pl?op=delete&bibid=<!-- TMPL_VAR name="bibid" -->";
+               window.location="acqui.simple/addbiblio.pl?op=delete&amp;bibid=<!-- TMPL_VAR NAME="bibid" -->";
        }
 }
 function Dopop(link) {
@@ -49,26 +49,26 @@ function Dopop(link) {
 
 function CopyValues()
 {
-var index_start = <!-- TMPL_VAR name="index" -->;
-opener.opener.document.f.field_value[index_start].value = '<!-- TMPL_VAR name="authid">';
+var index_start = <!-- TMPL_VAR NAME="index" -->;
+opener.opener.document.f.field_value[index_start].value = '<!-- TMPL_VAR NAME="authid">';
 var whichfield = opener.opener.document.f.tag[index_start].value;
 for (i=index_start ; i<opener.opener.document.f.field_value.length ; i++) {
 
 if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == '9') 
        {
-               opener.opener.document.f.field_value[i].value = '<!-- TMPL_VAR name="authid">';
+               opener.opener.document.f.field_value[i].value = '<!-- TMPL_VAR NAME="authid">';
        }
 
 }
 
 
-<!-- TMPL_LOOP name="0XX" -->
-   <!-- TMPL_LOOP name="subfield" -->
+<!-- TMPL_LOOP NAME="0XX" -->
+   <!-- TMPL_LOOP NAME="subfield" -->
 for (i=index_start ; i<opener.opener.document.f.field_value.length ; i++) {
 
-if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == '<!-- TMPL_VAR name="marc_subfield" -->') 
+if (opener.opener.document.f.tag[i].value == whichfield && opener.opener.document.f.subfield[i].value == '<!-- TMPL_VAR NAME="marc_subfield" -->') 
        {
-               opener.opener.document.f.field_value[i].value = '<!-- TMPL_VAR name="marc_value" -->';
+               opener.opener.document.f.field_value[i].value = '<!-- TMPL_VAR NAME="marc_value" -->';
        }
 
 }

diff --git a/koha-tmpl/intranet-tmpl/default/en/authorities/detail.tmpl b/koha-tmpl/intranet-tmpl/default/en/authorities/detail.tmpl
index fd12f74..a21fae6 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/authorities/detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/authorities/detail.tmpl
@@ -1,32 +1,32 @@
 <!-- TMPL_INCLUDE NAME="auth-top.inc" -->
-<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR name="themelang" -->/includes/marc-editor.css">
+<link rel="stylesheet" type="text/css" href="<!-- TMPL_VAR NAME="themelang" -->/includes/marc-editor.css">
 <div class="tabbed">
-       <h1 class="authority">Authority number : <!-- TMPL_VAR name="authid" --></h1>
-       <a href="authorities.pl?authid=<!-- TMPL_VAR name="authid" -->">
-               <img border="0" src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png">
+       <h1 class="authority">Authority number : <!-- TMPL_VAR NAME="authid" --></h1>
+       <a href="authorities.pl?authid=<!-- TMPL_VAR NAME="authid" -->">
+               <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png">
        </a>
        <a href="javascript:confirm_deletion()">
-               <img border="0" src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/edittrash.png">
+               <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png">
        </a>
-       <a href="javascript:Dopop('detailprint.pl?authid=<!-- TMPL_VAR name="authid" -->')" class="button authority">
+       <a href="javascript:Dopop('detailprint.pl?authid=<!-- TMPL_VAR NAME="authid" -->')" class="button authority">
                Print
        </a>
 </div>
 
 <div name="0XX" id="0XX" class="tab" style="visibility:visible">
-       <!-- TMPL_LOOP name="0XX" -->
+       <!-- TMPL_LOOP NAME="0XX" -->
                        <p class="MARCtag">
-                               <!-- TMPL_VAR name="tag" -->
+                               <!-- TMPL_VAR NAME="tag" -->
                        </p>
-               <!-- TMPL_LOOP name="subfield" -->
+               <!-- TMPL_LOOP NAME="subfield" -->
                        <p>
                                <label class="labelsubfield">
-                               <a href="search.marc/search.pl?op=do_search&marclist=<!-- TMPL_VAR name="marc_tag" --><!-- TMPL_VAR name="marc_subfield" -->&operator=&#x003D&type=intranet&value=<!-- TMPL_VAR name="marc_value" ESCAPE=URL -->">
-                                       <img border="0" src="<!-- TMPL_VAR name="interface" -->/<!-- TMPL_VAR name="theme" -->/images/filefind.png" height=15>
+                               <a href="search.marc/search.pl?op=do_search&amp;marclist=<!-- TMPL_VAR NAME="marc_tag" --><!-- TMPL_VAR NAME="marc_subfield" -->&amp;operator=&#x003D&amp;type=intranet&amp;value=<!-- TMPL_VAR NAME="marc_value" ESCAPE=URL -->">
+                                       <img border="0" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/filefind.png" height="15">
                                </a>
-                               <!-- TMPL_VAR name="marc_subfield" -->
-                               <!-- TMPL_VAR name="marc_lib" --></label>
-                               <!-- TMPL_VAR name="marc_value" -->
+                               <!-- TMPL_VAR NAME="marc_subfield" -->
+                               <!-- TMPL_VAR NAME="marc_lib" --></label>
+                               <!-- TMPL_VAR NAME="marc_value" -->
                        </p>
                <!-- /TMPL_LOOP -->
        <!-- /TMPL_LOOP -->
@@ -37,7 +37,7 @@
 function confirm_deletion() {
        var is_confirmed = confirm('Are you sure you want to delete this biblio?');
        if (is_confirmed) {
-               window.location="acqui.simple/addbiblio.pl?op=delete&bibid=<!-- TMPL_VAR name="bibid" -->";
+               window.location="acqui.simple/addbiblio.pl?op=delete&amp;bibid=<!-- TMPL_VAR NAME="bibid" -->";
        }
 }
 function Dopop(link) {

diff --git a/koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist-auth.tmpl b/koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist-auth.tmpl
index 84559ac..aba7f2e 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist-auth.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist-auth.tmpl
@@ -3,26 +3,26 @@
        <h1 class="authority">Authority search results</h1>
        <div id="resultnumber">
                <p>
-                       <!-- TMPL_IF NAME=displayprev -->
-                               <a href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search>
-                                       <img src="/intranet-tmpl/default/images/numbers/prev.gif" border=0>
+                       <!-- TMPL_IF name="displayprev" -->
+                               <a href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">
+                                       <img src="/intranet-tmpl/default/images/numbers/prev.gif" border="0">
                                </a>
                        <!-- /TMPL_IF -->
-                       <!-- TMPL_LOOP NAME=numbers -->
-                               <!-- TMPL_IF NAME=highlight -->
-                                       <img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->-highlight.gif">
+                       <!-- TMPL_LOOP NAME="numbers" -->
+                               <!-- TMPL_IF name="highlight" -->
+                                       <img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
                                <!-- TMPL_ELSE -->
-                                       <a href=search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->.gif" border=0></a>
+                                       <a href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0"></a>
                                <!-- /TMPL_IF -->
-                       <!-- /TMPL_LOOP -->                     <!-- TMPL_IF NAME=displaynext -->
-                               <a href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->&resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/next.gif" border=0></a>
+                       <!-- /TMPL_LOOP -->                     <!-- TMPL_IF name="displaynext" -->
+                               <a href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><img src="/intranet-tmpl/default/images/numbers/next.gif" border="0"></a>
                                <!-- /TMPL_IF -->
                </p>
                <p>
-                       <!-- TMPL_IF name=total -->
-                       &nbsp<b>Results <!-- TMPL_VAR name="from" --> to <!-- TMPL_VAR name="to" --> of <!-- TMPL_VAR name="total" --></b><br><br>
+                       <!-- TMPL_IF name="total" -->
+                       &nbsp;<b>Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="total" --></b><br><br>
                        <!-- TMPL_ELSE -->
-                       &nbsp No results found.<br>
+                       &nbsp;No results found.<br>
                        <!-- /TMPL_IF -->
                </p>
        </div>
@@ -35,24 +35,24 @@
                                <th class="authority">Delete</th>
                                <th class="authority">Get It!</th>
                        </tr>
-                       <!-- TMPL_LOOP name="result" -->
+                       <!-- TMPL_LOOP NAME="result" -->
                                <tr>
-                                       <td><!-- TMPL_VAR name="summary" --></td>
-                                       <td><!-- TMPL_VAR name="used" --> <a href="../search.marc/search.pl?type=intranet&op=do_search&marclist=<!-- TMPL_VAR name="biblio_fields" -->&operator==&value=<!-- TMPL_VAR name="authid" -->&and_or=&excluding=">...</a></td>
+                                       <td><!-- TMPL_VAR NAME="summary" --></td>
+                                       <td><!-- TMPL_VAR NAME="used" --> <a href="../search.marc/search.pl?type=intranet&amp;op=do_search&amp;marclist=<!-- TMPL_VAR NAME="biblio_fields" -->&amp;operator==&amp;value=<!-- TMPL_VAR NAME="authid" -->&amp;and_or=&amp;excluding=">...</a></td>
                                        <td>
-                                               <a href="javascript:jumpfull('detail-biblio-search.pl?authid=<!-- TMPL_VAR name="authid" -->&index=<!-- TMPL_VAR name="index" -->')">
-                                                       <img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0" alt="Authority number <!-- TMPL_VAR name="authid" -->" title="Authority number<!-- TMPL_VAR name="authid" -->">
+                                               <a href="javascript:jumpfull('detail-biblio-search.pl?authid=<!-- TMPL_VAR NAME="authid" -->&index=<!-- TMPL_VAR NAME="index" -->')">
+                                                       <img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0" alt="Authority number <!-- TMPL_VAR NAME="authid" -->" title="Authority number<!-- TMPL_VAR NAME="authid" -->">
                                                </a>
                                        </td>
                                        <td>
                                                <!-- TMPL_UNLESS name="used" -->
-                                               <a href="authorities-home.pl?op=delete&authid=<!-- TMPL_VAR name="authid" -->">
-                                                       <img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR name="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0">
+                                               <a href="authorities-home.pl?op=delete&amp;authid=<!-- TMPL_VAR NAME="authid" -->">
+                                                       <img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0">
                                                </a>
                                                <!-- /TMPL_UNLESS -->
                                        </td>
                                        <td>
-                       <a href="javascript:jumpfull('blinddetail-biblio-search.pl?authid=<!-- TMPL_VAR name="authid" -->&index=<!-- TMPL_VAR name="index" -->')"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR name="theme" -->/images/arrow.gif" width="32" hspace="0" vspace="0" border="0"></a>
+                       <a href="javascript:jumpfull('blinddetail-biblio-search.pl?authid=<!-- TMPL_VAR NAME="authid" -->&amp;index=<!-- TMPL_VAR NAME="index" -->')"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/arrow.gif" width="32" hspace="0" vspace="0" border="0"></a>
                                        </td>
                                </tr>
                        <!-- /TMPL_LOOP -->
@@ -61,18 +61,18 @@
        </div>
        <div id="resultnumber">
                <p>
-                       <!-- TMPL_IF NAME=displayprev -->
-                       <a href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/prev.gif" border=0></a>
+                       <!-- TMPL_IF name="displayprev" -->
+                       <a href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><img src="/intranet-tmpl/default/images/numbers/prev.gif" border="0"></a>
                        <!-- /TMPL_IF -->
-                       <!-- TMPL_LOOP NAME=numbers -->
-                               <!-- TMPL_IF NAME=highlight -->
-                               <img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->-highlight.gif">
+                       <!-- TMPL_LOOP NAME="numbers" -->
+                               <!-- TMPL_IF name="highlight" -->
+                               <img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
                                <!-- TMPL_ELSE -->
-                               <a href=search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->.gif" border=0></a>
+                               <a href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0"></a>
                                <!-- /TMPL_IF -->
                        <!-- /TMPL_LOOP -->
-                       <!-- TMPL_IF NAME=displaynext -->
-                       <a href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->&resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/next.gif" border=0></a>
+                       <!-- TMPL_IF name="displaynext" -->
+                       <a href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><img src="/intranet-tmpl/default/images/numbers/next.gif" border="0"></a>
                                <!-- /TMPL_IF -->
                </p>
        </div>  

diff --git a/koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist.tmpl b/koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist.tmpl
index 586db07..cf32c7e 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/authorities/searchresultlist.tmpl
@@ -3,27 +3,27 @@
        <h1 class="authority">Authority search results</h1>
        <div id="resultnumber">
                <p>
-                       <!-- TMPL_IF NAME=displayprev -->
-                               <a href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search>
-                                       <img src="/intranet-tmpl/default/images/numbers/prev.gif" border=0>
+                       <!-- TMPL_IF name="displayprev" -->
+                               <a href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search>
+                                       <img src="/intranet-tmpl/default/images/numbers/prev.gif" border="0">
                                </a>
                        <!-- /TMPL_IF -->
-                       <!-- TMPL_LOOP NAME=numbers -->
-                               <!-- TMPL_IF NAME=highlight -->
-                                       <img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->-highlight.gif">
+                       <!-- TMPL_LOOP NAME="numbers" -->
+                               <!-- TMPL_IF name="highlight" -->
+                                       <img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
                                <!-- TMPL_ELSE -->
-                                       <a href=search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->.gif" border=0></a>
+                                       <a href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search><img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0"></a>
                                <!-- /TMPL_IF -->
                        <!-- /TMPL_LOOP -->
-                       <!-- TMPL_IF NAME=displaynext -->
-                               <a href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->&resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/next.gif" border=0></a>
+                       <!-- TMPL_IF name="displaynext" -->
+                               <a href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search><img src="/intranet-tmpl/default/images/numbers/next.gif" border="0"></a>
                                <!-- /TMPL_IF -->
                </p>
                <p>
-                       <!-- TMPL_IF name=total -->
-                       &nbsp<b>Results <!-- TMPL_VAR name="from" --> to <!-- TMPL_VAR name="to" --> of <!-- TMPL_VAR name="total" --></b><br><br>
+                       <!-- TMPL_IF name="total" -->
+                       &nbsp;<b>Results <!-- TMPL_VAR NAME="from" --> to <!-- TMPL_VAR NAME="to" --> of <!-- TMPL_VAR NAME="total" --></b><br><br>
                        <!-- TMPL_ELSE -->
-                       &nbsp No results found.<br>
+                       &nbsp;No results found.<br>
                        <!-- /TMPL_IF -->
                </p>
        </div>
@@ -35,19 +35,19 @@
                                <th class="authority">View</th>
                                <th class="authority">Delete</th>
                        </tr>
-                       <!-- TMPL_LOOP name="result" -->
+                       <!-- TMPL_LOOP NAME="result" -->
                                <tr>
-                                       <td><!-- TMPL_VAR name="summary" --></td>
-                                       <td><!-- TMPL_VAR name="used" --> <a href="../search.marc/search.pl?type=intranet&op=do_search&marclist=<!-- TMPL_VAR name="biblio_fields" -->&operator==&value=<!-- TMPL_VAR name="authid" -->&and_or=&excluding=">...</a></td>
+                                       <td><!-- TMPL_VAR NAME="summary" --></td>
+                                       <td><!-- TMPL_VAR NAME="used" --> <a href="../search.marc/search.pl?type=intranet&amp;op=do_search&amp;marclist=<!-- TMPL_VAR NAME="biblio_fields" -->&amp;operator==&amp;value=<!-- TMPL_VAR NAME="authid" -->&amp;and_or=&amp;excluding=">...</a></td>
                                        <td>
-                                               <a href="detail.pl?authid=<!-- TMPL_VAR name="authid" -->">
-                                                       <img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR name="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0" alt="Authority number <!-- TMPL_VAR name="authid" -->" title="Authority number<!-- TMPL_VAR name="authid" -->">
+                                               <a href="detail.pl?authid=<!-- TMPL_VAR NAME="authid" -->">
+                                                       <img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0" alt="Authority number <!-- TMPL_VAR NAME="authid" -->" title="Authority number<!-- TMPL_VAR NAME="authid" -->">
                                                </a>
                                        </td>
                                        <td>
                                                <!-- TMPL_UNLESS name="used" -->
-                                               <a href="javascript:do_delete('authorities-home.pl?op=delete&authid=<!-- TMPL_VAR name="authid" -->')">
-                                                       <img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR name="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0">
+                                               <a href="javascript:do_delete('authorities-home.pl?op=delete&authid=<!-- TMPL_VAR NAME="authid" -->')">
+                                                       <img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0">
                                                </a>
                                                <!-- /TMPL_UNLESS -->
                                        </td>
@@ -57,18 +57,18 @@
        </div>
        <div id="resultnumber">
                <p>
-                       <!-- TMPL_IF NAME=displayprev -->
-                       <a href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/prev.gif" border=0></a>
+                       <!-- TMPL_IF name="displayprev" -->
+                       <a href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><img src="/intranet-tmpl/default/images/numbers/prev.gif" border="0"></a>
                        <!-- /TMPL_IF -->
-                       <!-- TMPL_LOOP NAME=numbers -->
-                               <!-- TMPL_IF NAME=highlight -->
-                               <img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->-highlight.gif">
+                       <!-- TMPL_LOOP NAME="numbers" -->
+                               <!-- TMPL_IF name="highlight" -->
+                               <img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->-highlight.gif">
                                <!-- TMPL_ELSE -->
-                               <a href=search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME=number -->.gif" border=0></a>
+                               <a href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfrom" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><img src="/intranet-tmpl/default/images/numbers/<!-- TMPL_VAR NAME="number" -->.gif" border="0"></a>
                                <!-- /TMPL_IF -->
                        <!-- /TMPL_LOOP -->
-                       <!-- TMPL_IF NAME=displaynext -->
-                       <a href=search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&<!-- /TMPL_LOOP -->&resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&type=intranet&op=do_search><img src="/intranet-tmpl/default/images/numbers/next.gif" border=0></a>
+                       <!-- TMPL_IF name="displaynext" -->
+                       <a href="search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME="searchdata" --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR NAME="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><img src="/intranet-tmpl/default/images/numbers/next.gif" border="0"></a>
                                <!-- /TMPL_IF -->
                </p>
        </div>  

diff --git a/koha-tmpl/intranet-tmpl/default/en/bookshelves/addbookbybiblionumber.tmpl b/koha-tmpl/intranet-tmpl/default/en/bookshelves/addbookbybiblionumber.tmpl
index 0ca806f..5a5bd51 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/bookshelves/addbookbybiblionumber.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/bookshelves/addbookbybiblionumber.tmpl
@@ -2,10 +2,10 @@
 <div id="mainbloc">
 <h2 class="catalogue">Select bookshelf</h2>
 <form>
-       <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->">
-       <p><label>Title</label><!-- TMPL_VAR name="title" --></p>
-       <p><label>Author</label><!-- TMPL_VAR name="author" --></p>
-       <p><label>Add to virtual shelf</label><!-- TMPL_VAR name="CGIbookshelves" --></p>
+       <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->">
+       <p><label>Title</label><!-- TMPL_VAR NAME="title" --></p>
+       <p><label>Author</label><!-- TMPL_VAR NAME="author" --></p>
+       <p><label>Add to virtual shelf</label><!-- TMPL_VAR NAME="CGIbookshelves" --></p>
        <input type="submit" value="Add to virtual shelf" class="button catalogue">
 </form>
 <!-- TMPL_INCLUDE Name="popup-bottom.inc" -->

diff --git a/koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl b/koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl
index a2e8964..48ca52e 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/bookshelves/shelves.tmpl
@@ -6,42 +6,42 @@
                <table>
                        <tr>
                                <th class="catalogue">
-                                       Contents of <!-- TMPL_VAR Name="shelfname" -->
+                                       Contents of <!-- TMPL_VAR NAME="shelfname" -->
                                </th>
                        </tr>
                        <!-- TMPL_LOOP Name="itemsloop" -->
                                <tr>
-                                       <td bgcolor="<!-- TMPL_VAR Name="color" -->"><input type=checkbox name="REM-<!-- TMPL_VAR Name="itemnumber" -->"></td>
-                                       <td bgcolor="<!-- TMPL_VAR Name="color" -->"><!-- TMPL_VAR Name="barcode" --></td>
-                                       <td bgcolor="<!-- TMPL_VAR Name="color" -->"><!-- TMPL_VAR Name="title" --></td>
-                                       <td bgcolor="<!-- TMPL_VAR Name="color" -->"><!-- TMPL_VAR Name="author" --></td>
+                                       <td bgcolor="<!-- TMPL_VAR NAME="color" -->"><input type="checkbox" name="REM-<!-- TMPL_VAR NAME="itemnumber" -->"></td>
+                                       <td bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="barcode" --></td>
+                                       <td bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="title" --></td>
+                                       <td bgcolor="<!-- TMPL_VAR NAME="color" -->"><!-- TMPL_VAR NAME="author" --></td>
                                </tr>
                        <!-- /TMPL_LOOP -->
                </table>
                <br>
                <a href="shelves.pl" class="button">Shelf list</a>
-               <input type=hidden name=shelfnumber value="<!-- TMPL_VAR Name="shelfnumber" -->">
-               <input type=hidden name=modifyshelfcontents value=1>
-               <input type=hidden name=viewshelf value="<!-- TMPL_VAR Name="shelfnumber" -->">
+               <input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
+               <input type="hidden" name="modifyshelfcontents" value="1">
+               <input type="hidden" name="viewshelf" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
                <!-- TMPL_IF name="manageshelf" -->
-                       <input type=submit value="Remove Selected Items" class="button">
+                       <input type="submit" value="Remove Selected Items" class="button">
                <!-- /TMPL_IF -->
        </form>
 
        <!-- TMPL_IF name="manageshelf" -->
        <form>
-               <input type=hidden name=shelfnumber value="<!-- TMPL_VAR Name="shelfnumber" -->">
-               <input type=hidden name=modifyshelfcontents value=1>
-               <input type=hidden name=viewshelf value="<!-- TMPL_VAR Name="shelfnumber" -->">
+               <input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
+               <input type="hidden" name="modifyshelfcontents" value="1">
+               <input type="hidden" name="viewshelf" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
                <table>
                        <tr>
                                <td>
-                                       Add a book by barcode in <!-- TMPL_VAR name="shelfname" -->:
+                                       Add a book by barcode in <!-- TMPL_VAR NAME="shelfname" -->:
                                </td>
                                <td>
                                        <input name="addbarcode">
-                                       <input type=hidden name=modifyshelfcontents value=1>
-                                       <input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR Name="shelfnumber" -->">
+                                       <input type="hidden" name="modifyshelfcontents" value="1">
+                                       <input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelfnumber" -->">
                                        <input type="submit" value="Save" class="button">
                                </td>
                        </tr>
@@ -51,39 +51,39 @@
 <!-- TMPL_ELSE -->
        <!-- TMPL_IF Name="shelves" -->
                <!-- TMPL_IF Name="status1" -->
-                       <font color=red><!-- TMPL_VAR Name="string1" --></font><p>
+                       <font color="red"><!-- TMPL_VAR NAME="string1" --></font><p>
                <!-- /TMPL_IF -->
                <!-- TMPL_LOOP Name="paramsloop" -->
                        <!-- TMPL_IF Name="status" -->
-                               <font color=red><!-- TMPL_VAR Name="string" --></font><p>
+                               <font color="red"><!-- TMPL_VAR NAME="string" --></font><p>
                        <!-- /TMPL_IF -->
                <!-- /TMPL_LOOP -->
                <h1 class="catalogue">Bookshelves</h1>
                <div id="bloc25">
                                        <h2 class="catalogue">Select Shelves to Delete</h2>
-                                       <form method=post>
-                                       <input type="hidden" name="shelves" value=1>
+                                       <form method="post">
+                                       <input type="hidden" name="shelves" value="1">
                                                <!-- TMPL_LOOP Name="shelvesloop" -->
                                                <!-- TMPL_IF name="canmanage" -->
                                                <p>
                                                        <label>
-                                                               <input type=checkbox name="DEL-<!-- TMPL_VAR Name="shelf" -->">
+                                                               <input type="checkbox" name="DEL-<!-- TMPL_VAR NAME="shelf" -->">
                                                        </label>
-                                                               <!-- TMPL_VAR Name="shelfname" --> (<!-- TMPL_VAR Name="shelfbookcount" --> books)
+                                                               <!-- TMPL_VAR NAME="shelfname" --> (<!-- TMPL_VAR NAME="shelfbookcount" --> books)
                                                </p>
                                                <!-- /TMPL_IF -->
                                                <!-- /TMPL_LOOP -->
                                        <p>
-                                               <input type=submit value="Delete Shelves" class="button catalogue">
+                                               <input type="submit" value="Delete Shelves" class="button catalogue">
                                        </p>
                                        </form>
                </div>
                <div id="bloc25">
-                       <form method=post>
-                               <input type=hidden name=shelves value=1>
+                       <form method="post">
+                               <input type="hidden" name="shelves" value="1">
                                <h2 class="catalogue">Add Shelf</h2>
                                <p><label>Name</label><input type="text" name="addshelf" size="25"></p>
-                               <p><label>Owner</label><input type="hidden" name="owner" value="<!-- TMPL_VAR name="loggedinuser" -->"><!-- TMPL_VAR name="loggedinusername" --></p>
+                               <p><label>Owner</label><input type="hidden" name="owner" value="<!-- TMPL_VAR NAME="loggedinuser" -->"><!-- TMPL_VAR NAME="loggedinusername" --></p>
                                <p><label>Category</label>
                                        <select name="category">
                                                <option value="1">Private</option>
@@ -91,12 +91,12 @@
                                                <option value="3">Free</option>
                                        </select>
                                </p>
-                               <p> <li>a private bookshelf is managed by you & can be seen only by you.</li>
+                               <p> <li>a private bookshelf is managed by you &amp; can be seen only by you.</li>
                                        <li> A public can be seen by everybody, but managed only by you.</li>
                                        <li> A free can be managed by any user.</li>
                                </p>
                                <p>
-                                       <input type=submit value="Add New Shelf" class="button catalogue">
+                                       <input type="submit" value="Add New Shelf" class="button catalogue">
                                        <a href="shelves.pl" class="button catalogue">back to shelf list</a>
                                </p>
 
@@ -111,9 +111,9 @@
                        </tr>
                        <!-- TMPL_LOOP Name="shelvesloop" -->
                        <tr>
-                               <td bgcolor="<!-- TMPL_VAR Name="color" -->">
-                                       <a href="shelves.pl?viewshelf=<!-- TMPL_VAR Name="shelf" -->">
-                                               <!-- TMPL_VAR Name="shelfname" -->(<!-- TMPL_VAR Name="shelfbookcount" --> books)
+                               <td bgcolor="<!-- TMPL_VAR NAME="color" -->">
+                                       <a href="shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelf" -->">
+                                               <!-- TMPL_VAR NAME="shelfname" -->(<!-- TMPL_VAR NAME="shelfbookcount" --> books)
                                        </a>
                                </td>
                        </tr>