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

diff --git a/koha-tmpl/intranet-tmpl/default/en/reports/inventory.tmpl b/koha-tmpl/intranet-tmpl/default/en/reports/inventory.tmpl
index 0167f83..d4b3bc1 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/reports/inventory.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/reports/inventory.tmpl
@@ -5,17 +5,17 @@
                <h2 class="reports">Select items you want to check</h2>
                <p>
                        Item Location (items.itemcallnumber) between 
-                               <input type="text" name="minlocation" value="<!-- TMPL_VAR name="minlocation" -->"> 
+                               <input type="text" name="minlocation" value="<!-- TMPL_VAR NAME="minlocation" -->"> 
                        and 
-                               <input type="text" name="maxlocation" value="<!-- TMPL_VAR name="maxlocation" -->">
+                               <input type="text" name="maxlocation" value="<!-- TMPL_VAR NAME="maxlocation" -->">
                </p>
                <p><label>not seen since</label>
-                       <input type="text" name="datelastseen" value="<!-- TMPL_VAR name="datelastseen" -->">
+                       <input type="text" name="datelastseen" value="<!-- TMPL_VAR NAME="datelastseen" -->">
                </p>
                <p><label>show</label>
-                       <input type="text" name="pagesize" value="<!-- TMPL_VAR name="pagesize" -->" maxlength=5 size=5>
+                       <input type="text" name="pagesize" value="<!-- TMPL_VAR NAME="pagesize" -->" maxlength="5" size="5">
                        <i> items beginning at offset</i>
-                       <input type="text" name="offset" value="<!-- TMPL_VAR name="offset" -->" size=5 maxlength=5>
+                       <input type="text" name="offset" value="<!-- TMPL_VAR NAME="offset" -->" size="5" maxlength="5">
                </p>
                <p>
                        <input type="submit" value="OK" class="button reports">
@@ -24,12 +24,12 @@
        
        <form method="post">
        <input type="hidden" name="markseen" value="1">
-       <input type="hidden" name="minlocation" value="<!-- TMPL_VAR name="minlocation" -->">
-       <input type="hidden" name="maxlocation" value="<!-- TMPL_VAR name="maxlocation" -->">
-       <input type="hidden" name="datelastseen" value="<!-- TMPL_VAR name="datelastseen" -->">
-       <input type="hidden" name="pagesize" value="<!-- TMPL_VAR name="pagesize" -->">
-       <input type="hidden" name="offset" value="<!-- TMPL_VAR name="offset" -->">
-       <!-- TMPL_IF name="loop" -->
+       <input type="hidden" name="minlocation" value="<!-- TMPL_VAR NAME="minlocation" -->">
+       <input type="hidden" name="maxlocation" value="<!-- TMPL_VAR NAME="maxlocation" -->">
+       <input type="hidden" name="datelastseen" value="<!-- TMPL_VAR NAME="datelastseen" -->">
+       <input type="hidden" name="pagesize" value="<!-- TMPL_VAR NAME="pagesize" -->">
+       <input type="hidden" name="offset" value="<!-- TMPL_VAR NAME="offset" -->">
+       <!-- TMPL_IF NAME="loop" -->
        <table>
                <tr>
                        <th class="reports">Seen</th>
@@ -38,22 +38,22 @@
                        <th class="reports">Title</th>
                        <th class="reports">Author</th>
                </tr>
-       <!-- TMPL_LOOP name="loop" -->
+       <!-- TMPL_LOOP NAME="loop" -->
                <tr>
                        <td>
-                               <input type="checkbox" name="SEEN-<!-- TMPL_VAR name="itemnumber" -->" value="1">
+                               <input type="checkbox" name="SEEN-<!-- TMPL_VAR NAME="itemnumber" -->" value="1">
                        </td>
                        <td>
-                               <!-- TMPL_VAR name="barcode" -->
+                               <!-- TMPL_VAR NAME="barcode" -->
                        </td>
                        <td>
-                               <!-- TMPL_VAR name="itemcallnumber" -->
+                               <!-- TMPL_VAR NAME="itemcallnumber" -->
                        </td>
                        <td>
-                               <!-- TMPL_VAR name="title" -->
+                               <!-- TMPL_VAR NAME="title" -->
                        </td>
                        <td>
-                               <!-- TMPL_VAR name="author" -->
+                               <!-- TMPL_VAR NAME="author" -->
                        </td>
                </tr>
        <!-- /TMPL_LOOP -->
@@ -61,23 +61,23 @@
        <input type="submit" value="Mark seen" class="button reports">
        </form>
        <!-- /TMPL_IF -->
-       <!-- TMPL_IF name="offset" -->
+       <!-- TMPL_IF NAME="offset" -->
        <form method="post">
-               <input type="hidden" name="minlocation" value="<!-- TMPL_VAR name="minlocation" -->">
-               <input type="hidden" name="maxlocation" value="<!-- TMPL_VAR name="maxlocation" -->">
-               <input type="hidden" name="datelastseen" value="<!-- TMPL_VAR name="datelastseen" -->">
-               <input type="hidden" name="pagesize" value="<!-- TMPL_VAR name="pagesize" -->">
-               <input type="hidden" name="offset" value="<!-- TMPL_VAR name="prevoffset" -->">
+               <input type="hidden" name="minlocation" value="<!-- TMPL_VAR NAME="minlocation" -->">
+               <input type="hidden" name="maxlocation" value="<!-- TMPL_VAR NAME="maxlocation" -->">
+               <input type="hidden" name="datelastseen" value="<!-- TMPL_VAR NAME="datelastseen" -->">
+               <input type="hidden" name="pagesize" value="<!-- TMPL_VAR NAME="pagesize" -->">
+               <input type="hidden" name="offset" value="<!-- TMPL_VAR NAME="prevoffset" -->">
                <input type="submit" value="&lt;&lt;&lt;" class="button reports">
        </form>
        <!-- /TMPL_IF -->
-       <!-- TMPL_IF name="nextoffset" -->
+       <!-- TMPL_IF NAME="nextoffset" -->
        <form method="post">
-               <input type="hidden" name="minlocation" value="<!-- TMPL_VAR name="minlocation" -->">
-               <input type="hidden" name="maxlocation" value="<!-- TMPL_VAR name="maxlocation" -->">
-               <input type="hidden" name="datelastseen" value="<!-- TMPL_VAR name="datelastseen" -->">
-               <input type="hidden" name="pagesize" value="<!-- TMPL_VAR name="pagesize" -->">
-               <input type="hidden" name="offset" value="<!-- TMPL_VAR name="nextoffset" -->">
+               <input type="hidden" name="minlocation" value="<!-- TMPL_VAR NAME="minlocation" -->">
+               <input type="hidden" name="maxlocation" value="<!-- TMPL_VAR NAME="maxlocation" -->">
+               <input type="hidden" name="datelastseen" value="<!-- TMPL_VAR NAME="datelastseen" -->">
+               <input type="hidden" name="pagesize" value="<!-- TMPL_VAR NAME="pagesize" -->">
+               <input type="hidden" name="offset" value="<!-- TMPL_VAR NAME="nextoffset" -->">
                <input type="submit" value="&gt;&gt;&gt;" class="button reports">
        </form>
        <!-- /TMPL_IF -->

diff --git a/koha-tmpl/intranet-tmpl/default/en/reports/issues_by_borrower_category.tmpl b/koha-tmpl/intranet-tmpl/default/en/reports/issues_by_borrower_category.tmpl
index 039b1c6..06e7e1e 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/reports/issues_by_borrower_category.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/reports/issues_by_borrower_category.tmpl
@@ -1,35 +1,35 @@
 <!-- TMPL_INCLUDE NAME="reports-top.inc" -->
 <div id="mainbloc">
-<!-- TMPL_IF name="do_it" -->
-<!-- TMPL_LOOP name="mainloop" -->
-       <h1>Koha : Issues by borrower category <!--TMPL_IF name="borrower_category" --> for category = <!-- TMPL_VAR name="borrower_category" --><!-- /TMPL_IF --></h1>
+<!-- TMPL_IF NAME="do_it" -->
+<!-- TMPL_LOOP NAME="mainloop" -->
+       <h1>Koha : Issues by borrower category <!--TMPL_IF NAME="borrower_category" --> for category = <!-- TMPL_VAR NAME="borrower_category" --><!-- /TMPL_IF --></h1>
        <table>
                <tr>
                        <th>&nbsp;</th>
-                       <!-- TMPL_LOOP name="categorycodeloop" -->
-                               <th><!-- TMPL_VAR name="categorycode" --></th>
+                       <!-- TMPL_LOOP NAME="categorycodeloop" -->
+                               <th><!-- TMPL_VAR NAME="categorycode" --></th>
                        <!-- /TMPL_LOOP -->
                        <th>TOTAL</th>
                </tr>
-                       <!-- TMPL_LOOP name="loopborrowertype" -->
+                       <!-- TMPL_LOOP NAME="loopborrowertype" -->
                                <tr>
-                                       <!-- TMPL_IF name="hilighted" --><td class="hilighted"><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
-                                       <!-- TMPL_VAR name="itemtype" --></td>
-                                       <!-- TMPL_LOOP name="loopitemtype" -->
-                                               <!-- TMPL_IF name="hilighted" --><td class="numberhilighted"><!-- TMPL_ELSE --><td class="number"><!-- /TMPL_IF -->
-                                                       <!-- TMPL_VAR name="issues" -->
+                                       <!-- TMPL_IF NAME="hilighted" --><td class="hilighted"><!-- TMPL_ELSE --><td><!-- /TMPL_IF -->
+                                       <!-- TMPL_VAR NAME="itemtype" --></td>
+                                       <!-- TMPL_LOOP NAME="loopitemtype" -->
+                                               <!-- TMPL_IF NAME="hilighted" --><td class="numberhilighted"><!-- TMPL_ELSE --><td class="number"><!-- /TMPL_IF -->
+                                                       <!-- TMPL_VAR NAME="issues" -->
                                                </td>
                                        <!-- /TMPL_LOOP -->
-                                       <!-- TMPL_IF name="hilighted" --><td class="numberhilighted"><!-- TMPL_ELSE --><td class="number"><!-- /TMPL_IF -->
-                                               <!-- TMPL_VAR name="totalitemtype" -->
+                                       <!-- TMPL_IF NAME="hilighted" --><td class="numberhilighted"><!-- TMPL_ELSE --><td class="number"><!-- /TMPL_IF -->
+                                               <!-- TMPL_VAR NAME="totalitemtype" -->
                                        </td>
                                </tr>
-                       <!-- /TMPL_LOOP name="loopitemtype" -->
+                       <!-- /TMPL_LOOP NAME="loopitemtype" -->
                        <tr>
                                <th>TOTAL</th>
-                               <!-- TMPL_LOOP name="loopborrowertotal" -->
+                               <!-- TMPL_LOOP NAME="loopborrowertotal" -->
                                        <th>
-                                               <!-- TMPL_VAR name="issues" -->
+                                               <!-- TMPL_VAR NAME="issues" -->
                                        </th>
                                <!-- /TMPL_LOOP -->
                                <th>&nbsp;</th>
@@ -40,9 +40,9 @@
        <h1>Issues by borrower category</h1>
        <form method="post">
                <p>Select a borrower category (or don't if you want to see global status) <input type="text" name="value"></p>
-               <p>Select a branch : <!-- TMPL_VAR name="CGIbranch" --></p>
+               <p>Select a branch : <!-- TMPL_VAR NAME="CGIbranch" --></p>
                <input type="submit" value="OK" class="button">
-               <input type="hidden" name="report_name" value="<!--TMPL_VAR name="report_name" -->">
+               <input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->">
                <input type="hidden" name="do_it" value="1">
        </form>
 <!-- /TMPL_IF -->

diff --git a/koha-tmpl/intranet-tmpl/default/en/reports/itemtypes.tmpl b/koha-tmpl/intranet-tmpl/default/en/reports/itemtypes.tmpl
index 5e0c468..d593cdc 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/reports/itemtypes.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/reports/itemtypes.tmpl
@@ -1,30 +1,30 @@
 <!-- TMPL_INCLUDE NAME="reports-top.inc" -->
 <div id="mainbloc">
-<!-- TMPL_IF name="do_it" -->
-<!-- TMPL_LOOP name="mainloop" -->
-       <h1>Koha : Reports on itemtypes <!--TMPL_IF name="branch" --> for branch = <!-- TMPL_VAR name="branch" --><!-- /TMPL_IF --></h1>
+<!-- TMPL_IF NAME="do_it" -->
+<!-- TMPL_LOOP NAME="mainloop" -->
+       <h1>Koha : Reports on itemtypes <!--TMPL_IF NAME="branch" --> for branch = <!-- TMPL_VAR NAME="branch" --><!-- /TMPL_IF --></h1>
        <table>
                <tr>
                        <th>Item type</th>
                        <th>count</th>
                </tr>
-                       <!-- TMPL_LOOP name="loopitemtype" -->
+                       <!-- TMPL_LOOP NAME="loopitemtype" -->
                                <tr>
-                                       <td><!-- TMPL_VAR name="itemtype" --></td>
-                                       <td><!-- TMPL_VAR name="count" --></td>
+                                       <td><!-- TMPL_VAR NAME="itemtype" --></td>
+                                       <td><!-- TMPL_VAR NAME="count" --></td>
                                </tr>
-                       <!-- /TMPL_LOOP name="loopitemtype" -->
+                       <!-- /TMPL_LOOP NAME="loopitemtype" -->
                        <tr>
                                <th>TOTAL</th>
-                               <th><!-- TMPL_VAR name="total" --></th>
+                               <th><!-- TMPL_VAR NAME="total" --></th>
        </table>
 <!-- /TMPL_LOOP -->
 <!-- TMPL_ELSE -->
        <h1>View catalogue group by itemtypes</h1>
        <form method="post">
-               Select a branch (or don't if you want the report for all branches) <!-- TMPL_VAR name="CGIbranch" -->
+               Select a branch (or don't if you want the report for all branches) <!-- TMPL_VAR NAME="CGIbranch" -->
                <input type="submit" value="OK" class="button">
-               <input type="hidden" name="report_name" value="<!--TMPL_VAR name="report_name" -->">
+               <input type="hidden" name="report_name" value="<!--TMPL_VAR NAME="report_name" -->">
                <input type="hidden" name="do_it" value="1">
        </form>
 <!-- /TMPL_IF -->

diff --git a/koha-tmpl/intranet-tmpl/default/en/reports/reports-home.tmpl b/koha-tmpl/intranet-tmpl/default/en/reports/reports-home.tmpl
index 776ab3e..d831f09 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/reports/reports-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/reports/reports-home.tmpl
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="reports-top.inc" -->
-<!--------------------------MAIN BODY OF PAGE-------------------------->
+<!-- ------------------------MAIN BODY OF PAGE------------------------ -->
 <div id="mainbloc">
 <h1>Reports</h1>
 <ul>

diff --git a/koha-tmpl/intranet-tmpl/default/en/search.marc/result.tmpl b/koha-tmpl/intranet-tmpl/default/en/search.marc/result.tmpl
index 9054c15..c5c5ca7 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/search.marc/result.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/search.marc/result.tmpl
@@ -7,27 +7,27 @@
        <h1 class="catalogue">MARC 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>
@@ -39,29 +39,29 @@
                        <th class="catalogue">Location</th>
                        <th class="catalogue">&nbsp;</th>
                        </tr>
-                       <!-- TMPL_LOOP name="result" -->
+                       <!-- TMPL_LOOP NAME="result" -->
                        <tr>
-                               <td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
+                               <td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->>
                                        <p>
                                                <p>                                                     <b><a class="transparent" href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --></a></b></p>
                                                <p><!-- TMPL_VAR NAME="author" -->
-                                               <!-- TMPL_IF name="publishercode" -->- <!-- TMPL_VAR name="publishercode" --><!-- /TMPL_IF -->
-                                               <!-- TMPL_IF name="place" --> ; <!-- TMPL_VAR name="place" --><!-- /TMPL_IF -->
-                                               <!-- TMPL_IF name="pages" --> - <!-- TMPL_VAR name="pages" --><!-- /TMPL_IF -->
-                                               <!-- TMPL_IF name="notes" --> : <!-- TMPL_VAR name="notes" --><!-- /TMPL_IF -->
-                                               <!-- TMPL_IF name="size" --> ; <!-- TMPL_VAR name="size" --><!-- /TMPL_IF -->
+                                               <!-- TMPL_IF NAME="publishercode" -->- <!-- TMPL_VAR NAME="publishercode" --><!-- /TMPL_IF -->
+                                               <!-- TMPL_IF NAME="place" --> ; <!-- TMPL_VAR NAME="place" --><!-- /TMPL_IF -->
+                                               <!-- TMPL_IF NAME="pages" --> - <!-- TMPL_VAR NAME="pages" --><!-- /TMPL_IF -->
+                                               <!-- TMPL_IF NAME="notes" --> : <!-- TMPL_VAR NAME="notes" --><!-- /TMPL_IF -->
+                                               <!-- TMPL_IF NAME="size" --> ; <!-- TMPL_VAR NAME="size" --><!-- /TMPL_IF -->
                                        </p>
                                </td>
-                               <td align="center" <!-- TMPL_IF name="even" --> class="hilighted"<!-- /TMPL_IF -->>
-                                       <!-- TMPL_VAR name="totitem" -->
+                               <td align="center" <!-- TMPL_IF NAME="even" --> class="hilighted"<!-- /TMPL_IF -->>
+                                       <!-- TMPL_VAR NAME="totitem" -->
                                </td>
-                               <td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
-                                       <!-- TMPL_LOOP name="CN" -->
-                                               <!-- TMPL_VAR name="holdingbranch" --> <!-- TMPL_IF name="itemcallnumber" -->(<!-- TMPL_VAR name="itemcallnumber" -->)<!-- /TMPL_IF -->
+                               <td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->>
+                                       <!-- TMPL_LOOP NAME="CN" -->
+                                               <!-- TMPL_VAR NAME="holdingbranch" --> <!-- TMPL_IF NAME="itemcallnumber" -->(<!-- TMPL_VAR NAME="itemcallnumber" -->)<!-- /TMPL_IF -->
                                        <!-- /TMPL_LOOP -->
                                </td>
-                               <td <!-- TMPL_IF name="even" -->class="hilighted"<!-- /TMPL_IF -->>
-                                       <!-- TMPL_UNLESS NAME="norequests" -->
+                               <td <!-- TMPL_IF NAME="even" -->class="hilighted"<!-- /TMPL_IF -->>
+                                       <!-- TMPL_UNLESS name="norequests" -->
                                                <a class="transparent" href="/cgi-bin/koha/opac-reserve.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">Request</a>
                                        <!-- TMPL_ELSE -->
                                                Not Reservable
@@ -73,18 +73,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/search.marc/search.tmpl b/koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl
index 8717dac..5e0c21e 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/search.marc/search.tmpl
@@ -67,7 +67,7 @@
                        <input type="hidden" name="and_or" value="and">
                        <input type="hidden" name="excluding" value="">
                        <input type="hidden" name="operator" value="=">
-                       <!-- TMPL_VAR name="CGIitemtype" -->
+                       <!-- TMPL_VAR NAME="CGIitemtype" -->
                </p>
                                                <p>
                                <label class="label20">branch</label>
@@ -75,7 +75,7 @@
                                <input type="hidden" name="and_or" value="and">
                                <input type="hidden" name="excluding" value="">
                                <input type="hidden" name="operator" value="=">
-                               <!-- TMPL_VAR name="CGIbranch" -->
+                               <!-- TMPL_VAR NAME="CGIbranch" -->
        </p>
 
        </div>
@@ -87,7 +87,7 @@
                                        <option value="and">and</option>
                                        <option <!-- TMPL_IF NAME="or" -->selected <!-- /TMPL_IF -->value="or">or</option>
                                </select>
-                               <!-- TMPL_VAR name="marclist" -->
+                               <!-- TMPL_VAR NAME="marclist" -->
                                <select name="excluding" size="1" onchange="sql_update()">
                                        <option value="0"> </option>
                                        <option <!-- TMPL_IF NAME="not" -->selected <!-- /TMPL_IF -->value="1">not</option>
@@ -111,7 +111,7 @@
        <div id="bloc25">
                <p>
                        <div name="sql">
-                               <textarea name="sql" rows=3 cols=70 disabled readonly></textarea>
+                               <textarea name="sql" rows="3" cols="70" disabled readonly></textarea>
                        </div>
                </p>
                <p>Results per page :
@@ -136,7 +136,7 @@
        </div>
 </form>
 
-<script>
+<script language="javascript" type="text/javascript">
 function sql_update() {
 document.f.sql.value="";
        for (i=0 ; i<document.f.marclist.length ; i++) {

diff --git a/koha-tmpl/intranet-tmpl/default/en/search.marc/suggest.tmpl b/koha-tmpl/intranet-tmpl/default/en/search.marc/suggest.tmpl
index d1c2542..7d4a246 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/search.marc/suggest.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/search.marc/suggest.tmpl
@@ -18,32 +18,32 @@
                                        Used X times
                                </th>
                        </tr>
-               <!-- TMPL_LOOP name="loop" -->
+               <!-- TMPL_LOOP NAME="loop" -->
                        <tr>
                                <td>
-                                       <!-- TMPL_VAR name="word" -->
+                                       <!-- TMPL_VAR NAME="word" -->
                                </td>
                                <td>
-                                       <a href="javascript:Import('<!-- TMPL_VAR name="word" -->','<!-- TMPL_VAR name="suggestion" -->')">
-                                               <!-- TMPL_VAR name="suggestion" -->
+                                       <a href="javascript:Import('<!-- TMPL_VAR NAME="word" -->','<!-- TMPL_VAR NAME="suggestion" -->')">
+                                               <!-- TMPL_VAR NAME="suggestion" -->
                                        </a>
                                </td>
                                <td>
-                                       <!-- TMPL_VAR name="count" -->
+                                       <!-- TMPL_VAR NAME="count" -->
                                </td>
                        </tr>
                <!-- /TMPL_LOOP -->
                </table>
        </div>
 </div>
-<script>
+<script language="javascript" type="text/javascript">
        function Import(Replaced,ReplaceBy) {
                for (i=0 ; i<opener.document.f.value.length ; i++) {
                                opener.document.forms[0].value[i].value = opener.document.forms[0].value[i].value.replace(Replaced,ReplaceBy);
 //                     if (document.forms[0].kohafield[i].value == "biblioitems.isbn" && document.forms[0].field_value[i].value.length>0) {
 //                             strQuery += "&isbn="+document.forms[0].field_value[i].value;
 //                     }
-//                     opener.document.location= "../acqui.simple/addbiblio.pl?z3950=1&oldbiblionumber=<!-- TMPL_VAR name="oldbiblionumber" -->&breedingid="+GetThisOne;
+//                     opener.document.location= "../acqui.simple/addbiblio.pl?z3950=1&oldbiblionumber=<!-- TMPL_VAR NAME="oldbiblionumber" -->&breedingid="+GetThisOne;
 //                     self.close();
 //                     return false;
                }