Markup corrections. You can't embed a <!-- TMPL_IF --> inside an HTML tag because...

Signed-off-by: Joshua Ferraro <jmf@liblime.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc
index 21788b6..181ad98 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc
@@ -1,27 +1,52 @@
 <select name="idx">
-<option value="kw" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Keyword</option>
-<option value="au" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Author</option>
-<option value="au,phr" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>&nbsp;&nbsp;&nbsp;&nbsp; Author as Phrase</option>
-<option value="cpn" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>&nbsp;&nbsp;&nbsp;&nbsp; Corporate Name</option>
-<option value="cfn" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>&nbsp;&nbsp;&nbsp;&nbsp; Conference Name</option>
-<option value="cpn,phr" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>&nbsp;&nbsp;&nbsp;&nbsp; Corporate Name as Phrase</option>
-<option value="cfn,phr" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>&nbsp;&nbsp;&nbsp;&nbsp; Conference Name as Phrase</option>
-<option value="pn" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>&nbsp;&nbsp;&nbsp;&nbsp; Personal Name</option>
-<option value="pn,phr" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>&nbsp;&nbsp;&nbsp;&nbsp; Personal Name as Phrase</option>
-<option value="ln" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Language</option>
-<option value="nt" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Notes/Comments</option>
-<option value="pb" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Publisher</option>
-<option value="pl" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Publisher Location</option>
-<option value="yr" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Publication Date (yyyy)</option>
-<option value="acqdate" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Acquisition Date (yyyy-mm-dd)</option>
-<option value="sn" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Standard Number</option>
-<option value="nb" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>&nbsp;&nbsp;&nbsp;&nbsp; ISBN</option>
-<option value="ns" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>&nbsp;&nbsp;&nbsp;&nbsp; ISSN</option>
-<option value="lcn,phr" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>&nbsp;&nbsp;&nbsp;&nbsp; Call Number</option>
-<option value="su" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Subject</option>
-<option value="su,phr" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>&nbsp;&nbsp;&nbsp;&nbsp; Subject as Phrase</option>
-<option value="ti" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Title</option>
-<option value="ti,phr" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>&nbsp;&nbsp;&nbsp;&nbsp; Title as Phrase</option>
-<option value="se" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>&nbsp;&nbsp;&nbsp;&nbsp; Series Title</option>
-<option value="bc" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Barcode</option>
+<!-- TMPL_IF NAME="selected" --><option value="kw" selected="selected">Keyword</option><!-- TMPL_ELSE --><option value="kw">Keyword</option><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="selected" --><option value="au" selected="selected">Author</option><!-- TMPL_ELSE --><option value="au">Author</option><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="selected" --><option value="au,phr" selected="selected">&nbsp;&nbsp;&nbsp;&nbsp; Author as Phrase</option><!-- TMPL_ELSE --><option value="au,phr">&nbsp;&nbsp;&nbsp;&nbsp; Author as Phrase</option><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="selected" --><option value="cpn" selected="selected">&nbsp;&nbsp;&nbsp;&nbsp; Corporate Name</option><!-- TMPL_ELSE --><option value="cpn">&nbsp;&nbsp;&nbsp;&nbsp; Corporate Name</option><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="selected" --><option value="cfn" selected="selected">&nbsp;&nbsp;&nbsp;&nbsp; Conference Name</option><!-- TMPL_ELSE --><option value="cfn">&nbsp;&nbsp;&nbsp;&nbsp; Conference Name</option><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="selected" --><option value="cpn,phr" selected="selected">&nbsp;&nbsp;&nbsp;&nbsp; Corporate Name as Phrase</option><!-- TMPL_ELSE --><option value="cpn,phr">&nbsp;&nbsp;&nbsp;&nbsp; Corporate Name as Phrase</option><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="selected" --><option value="cfn,phr" selected="selected">&nbsp;&nbsp;&nbsp;&nbsp; Conference Name as Phrase</option><!-- TMPL_ELSE --><option value="cfn,phr">&nbsp;&nbsp;&nbsp;&nbsp; Conference Name as Phrase</option><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="selected" --><option value="pn" selected="selected">&nbsp;&nbsp;&nbsp;&nbsp; Personal Name</option><!-- TMPL_ELSE --><option value="pn">&nbsp;&nbsp;&nbsp;&nbsp; Personal Name</option><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="selected" --><option value="pn,phr" selected="selected">&nbsp;&nbsp;&nbsp;&nbsp; Personal Name as Phrase</option><!-- TMPL_ELSE --><option value="pn,phr">&nbsp;&nbsp;&nbsp;&nbsp; Personal Name as Phrase</option><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="selected" --><option value="ln" selected="selected">Language</option><!-- TMPL_ELSE --><option value="ln">Language</option><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="selected" --><option value="nt" selected="selected">Notes/Comments</option><!-- TMPL_ELSE --><option value="nt">Notes/Comments</option><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="selected" --><option value="pb" selected="selected">Publisher</option><!-- TMPL_ELSE --><option value="pb">Publisher</option><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="selected" --><option value="pl" selected="selected">Publisher Location</option><!-- TMPL_ELSE --><option value="pl">Publisher Location</option><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="selected" --><option value="yr" selected="selected">Publication Date (yyyy)</option><!-- TMPL_ELSE --><option value="yr">Publication Date (yyyy)</option><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="selected" --><option value="acqdate" selected="selected">Acquisition Date (yyyy-mm-dd)</option><!-- TMPL_ELSE --><option value="acqdate">Acquisition Date (yyyy-mm-dd)</option><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="selected" --><option value="sn" selected="selected">Standard Number</option><!-- TMPL_ELSE --><option value="sn">Standard Number</option><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="selected" --><option value="nb" selected="selected">&nbsp;&nbsp;&nbsp;&nbsp; ISBN</option><!-- TMPL_ELSE --><option value="nb">&nbsp;&nbsp;&nbsp;&nbsp; ISBN</option><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="selected" --><option value="ns" selected="selected">&nbsp;&nbsp;&nbsp;&nbsp; ISSN</option><!-- TMPL_ELSE --><option value="ns">&nbsp;&nbsp;&nbsp;&nbsp; ISSN</option><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="selected" --><option value="lcn,phr" selected="selected">&nbsp;&nbsp;&nbsp;&nbsp; Call Number</option><!-- TMPL_ELSE --><option value="lcn,phr">&nbsp;&nbsp;&nbsp;&nbsp; Call Number</option><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="selected" --><option value="su" selected="selected">Subject</option><!-- TMPL_ELSE --><option value="su">Subject</option><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="selected" --><option value="su,phr" selected="selected">&nbsp;&nbsp;&nbsp;&nbsp; Subject as Phrase</option><!-- TMPL_ELSE --><option value="su,phr">&nbsp;&nbsp;&nbsp;&nbsp; Subject as Phrase</option><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="selected" --><option value="ti" selected="selected">Title</option><!-- TMPL_ELSE --><option value="ti">Title</option><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="selected" --><option value="ti,phr" selected="selected">&nbsp;&nbsp;&nbsp;&nbsp; Title as Phrase</option><!-- TMPL_ELSE --><option value="ti,phr">&nbsp;&nbsp;&nbsp;&nbsp; Title as Phrase</option><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="selected" --><option value="se" selected="selected">&nbsp;&nbsp;&nbsp;&nbsp; Series Title</option><!-- TMPL_ELSE --><option value="se">&nbsp;&nbsp;&nbsp;&nbsp; Series Title</option><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="selected" --><option value="bc" selected="selected">Barcode</option><!-- TMPL_ELSE --><option value="bc">Barcode</option>
+<!-- /TMPL_IF -->
 </select>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl
index 1137b84..a7daf51 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl
@@ -266,7 +266,7 @@
                <label for="categorytype">Category Type: </label>
             <select id="categorytype" name="categorytype">
             <!-- TMPL_LOOP NAME="categorytype" -->
-                <option value="<!-- TMPL_VAR NAME="type" -->" <!-- TMPL_IF NAME="selected" -->selected="selected"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="type" --></option>
+                <!-- TMPL_IF NAME="selected" --><option value="<!-- TMPL_VAR NAME="type" -->" selected="selected"><!-- TMPL_ELSE --><option value="<!-- TMPL_VAR NAME="type" -->"><!-- /TMPL_IF --><!-- TMPL_VAR NAME="type" --></option>
                 <!-- /TMPL_LOOP -->
             </select>
                </li>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tmpl
index 64b65e0..63f4d7a 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tmpl
@@ -49,7 +49,7 @@ $(document).ready(function() {
             <select name="branch" id="branch" style="width:20em;">
                 <option value="">Default</option>
             <!-- TMPL_LOOP NAME="branchloop" -->
-                <option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF NAME="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="branchname" --></option>
+                               <!-- TMPL_IF NAME="selected" --><option value="<!-- TMPL_VAR NAME="value" -->" selected="selected"><!-- TMPL_VAR NAME="branchname" --></option><!-- TMPL_ELSE --><option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="branchname" --></option><!-- /TMPL_IF -->
             <!-- /TMPL_LOOP -->
             </select>
         </form>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tmpl
index 3576062..76e0134 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tmpl
@@ -247,7 +247,7 @@
         <th>Delete</th>
     </tr></thead>
     <tbody><!-- TMPL_LOOP NAME="loop" -->
-    <tr<!-- TMPL_IF NAME="toggle" --> class="highlight"<!-- /TMPL_IF -->>
+    <!-- TMPL_IF NAME="toggle" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
 
         <td><strong><a href="<!-- TMPL_VAR NAME="edit" -->"><!-- TMPL_VAR NAME="variable" --></a></strong></td><td> <!-- TMPL_VAR NAME="explanation" ESCAPE="HTML" --></td>
         <td><!-- TMPL_IF NAME="yesno" -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/subject.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/subject.tmpl
index b8423bd..878b83d 100755 (executable)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/subject.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/subject.tmpl
@@ -26,8 +26,8 @@
                <th>Subject headings</th>
        </tr>
 <!-- TMPL_LOOP NAME="SEARCH_RESULTS" -->
-       <tr>
-               <td<!-- TMPL_IF NAME="even" --> class="hilighted"<!-- /TMPL_IF -->>
+       <!-- TMPL_IF NAME="even" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
+               <td>
                        <a href="/cgi-bin/koha/search.pl?type=<!-- TMPL_IF NAME="opac" -->opac<!-- TMPL_ELSE -->intra<!-- /TMPL_IF -->&amp;subjectitems=<!-- TMPL_VAR NAME="subject2" ESCAPE="HTML" -->"><!-- TMPL_VAR NAME="subject" --></a>
                </td>
        </tr>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstodo.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstodo.tmpl
index a2411eb..be6db2b 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstodo.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstodo.tmpl
@@ -51,7 +51,7 @@ $.tablesorter.addParser({
                 <th>Action</th>
             </tr></thead>
             <tbody><!-- TMPL_LOOP NAME="reserv" -->
-                <tr <!-- TMPL_IF NAME="messcompa" --> class="problem" <!-- /TMPL_IF -->>
+                <!-- TMPL_IF NAME="messcompa" --><tr class="problem"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
                     <td><p><!-- TMPL_VAR NAME="reservedate" --></p> <!-- TMPL_IF NAME="messcompa" --> Hold over <!-- /TMPL_IF --></td>
                     <td><!-- TMPL_IF name="BiblioDefaultViewmarc" -->
 <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --></a>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl
index 33fd17c..d55d5bc 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl
@@ -68,7 +68,7 @@ $.tablesorter.addParser({
                         <th>Action</th>
                 </tr></thead>
                         <tbody><!-- TMPL_LOOP NAME="reserveloop" -->
-                                <tr <!-- TMPL_IF NAME="messcompa" --> class="problem" <!-- /TMPL_IF -->>
+                        <!-- TMPL_IF NAME="messcompa" --><tr class="problem"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
                                         <td><p><!-- TMPL_VAR NAME="waitingdate" --></p> <!-- TMPL_IF NAME="messcompa" --> Hold Over <!-- /TMPL_IF --></td>
                                         <td>
 

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tmpl
index a2082e3..64007a3 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tmpl
@@ -261,9 +261,11 @@ Bibliographic Data to Print
 </fieldset>
 <br />
 <input type="radio" name="layoutchoice" value="layout_string" <!-- TMPL_IF NAME="layout_string" -->checked="checked"<!-- /TMPL_IF --> onclick="chooselayoutspec(this);"> List Fields </input>
-<fieldset id="layout_string" <!-- TMPL_UNLESS NAME="layout_string" -->class="disabled"<!-- /TMPL_UNLESS -->>
+<!-- TMPL_IF NAME="layout_string" --><fieldset id="layout_string"><!-- TMPL_ELSE --><fieldset id="layout_string" class="disabled"><!-- /TMPL_IF -->
 <label for="layoutname">Data Fields</label>
-   <input type="text" name="formatstring" id="formatstring" size="60" value="<!-- TMPL_VAR NAME="formatstring" -->" <!-- TMPL_UNLESS NAME="layout_string" -->disabled="true"<!-- /TMPL_UNLESS --> />
+  
+<!-- TMPL_IF NAME="layout_string" --><input type="text" name="formatstring" id="formatstring" size="60" value="<!-- TMPL_VAR NAME="formatstring" -->" /><!-- TMPL_ELSE --><input type="text" name="formatstring" id="formatstring" size="60" value="<!-- TMPL_VAR NAME="formatstring" -->" disabled="disabled" /><!-- /TMPL_IF -->
+
    <div class="help">
    <p>Enter a comma separated list of fields to print.  You may include any <em>Koha field</em> or MARC subfield.</p>
    <p>See online help for advanced options</p>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tmpl
index b468ecc..cd9f545 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tmpl
@@ -21,36 +21,92 @@ to add to Batch <!-- TMPL_VAR NAME="batch_id" -->
        <fieldset class="rows">
 <ol><li>
   <select name="idx" disabled="disabled"><!-- FIXME: script does keyword search regardless -->
-    <option value="kw" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Keyword</option>
-    <option value="au" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Author</option>
-    <option value="yr" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Publication Date</option>
-    <option value="sn" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Standard Number</option>
-    <option value="nb" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>ISBN</option>
-    <option value="ns" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>ISSN</option>
-    <option value="lcn,phr" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Call Number</option>
-    <option value="su" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Subject</option>
-   <option value="ti" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Title</option>
-    <option value="ti,phr" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Title Phrase</option>
-    <option value="se" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Series Title</option>
-    <option value="bc" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Barcode</option>
-    <option value="acqdate" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Acquisition Date</option>
+
+<!-- TMPL_IF NAME="selected" --><option value="kw" selected="selected">Keyword</option>
+<!-- TMPL_ELSE --><option value="kw">Keyword</option><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="selected" --><option value="au" selected="selected">Author</option>
+<!-- TMPL_ELSE --><option value="au">Author</option><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="selected" --><option value="yr" selected="selected">Publication Date</option>
+<!-- TMPL_ELSE --><option value="yr">Publication Date</option><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="selected" --><option value="sn" selected="selected">Standard Number</option>
+<!-- TMPL_ELSE --><option value="sn">Standard Number</option><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="selected" --><option value="nb" selected="selected">ISBN</option>
+<!-- TMPL_ELSE --><option value="nb">ISBN</option><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="selected" --><option value="ns" selected="selected">ISSN</option>
+<!-- TMPL_ELSE --><option value="ns">ISSN</option><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="selected" --><option value="lcn,phr" selected="selected">Call Number</option>
+<!-- TMPL_ELSE --><option value="lcn,phr">Call Number</option><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="selected" --><option value="su" selected="selected">Subject</option>
+<!-- TMPL_ELSE --><option value="su">Subject</option><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="selected" -->
+   <option value="ti" selected="selected">Title</option>
+<!-- TMPL_ELSE -->
+   <option value="ti" selected="selected">Title</option><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="selected" --><option value="ti,phr" selected="selected">Title Phrase</option>
+<!-- TMPL_ELSE --><option value="ti,phr">Title Phrase</option><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="selected" --><option value="se" selected="selected">Series Title</option>
+<!-- TMPL_ELSE --><option value="se">Series Title</option><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="selected" --><option value="bc" selected="selected">Barcode</option>
+<!-- TMPL_ELSE --><option value="bc">Barcode</option><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="selected" --><option value="acqdate" selected="selected">Acquisition Date</option>
+<!-- TMPL_ELSE --><option value="acqdate">Acquisition Date</option><!-- /TMPL_IF -->
 </select>
    <input type="text" size="30" id="marclist" name="marclist" class="focus" title="Enter search terms" value=""/>  
 </li><!-- FIXME: script does keyword search regardless<li>
 <select name="idx" disabled="disabled">
-    <option value="kw" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Keyword</option>
-    <option value="au" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Author</option>
-    <option value="yr" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Publication Date</option>
-    <option value="sn" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Standard Number</option>
-    <option value="nb" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>ISBN</option>
-    <option value="ns" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>ISSN</option>
-    <option value="lcn,phr" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Call Number</option>
-    <option value="su" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Subject</option>
-   <option value="ti" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Title</option>
-    <option value="ti,phr" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Title Phrase</option>
-    <option value="se" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Series Title</option>
-    <option value="bc" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Barcode</option>
-    <option value="acqdate" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->>Acquisition Date</option>
+
+<!-- TMPL_IF NAME="selected" --><option value="kw" selected="selected">Keyword</option>
+<!-- TMPL_ELSE --><option value="kw">Keyword</option><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="selected" --><option value="au" selected="selected">Author</option>
+<!-- TMPL_ELSE --><option value="au">Author</option><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="selected" --><option value="yr" selected="selected">Publication Date</option>
+<!-- TMPL_ELSE --><option value="yr">Publication Date</option><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="selected" --><option value="sn" selected="selected">Standard Number</option>
+<!-- TMPL_ELSE --><option value="sn">Standard Number</option><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="selected" --><option value="nb" selected="selected">ISBN</option>
+<!-- TMPL_ELSE --><option value="nb">ISBN</option><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="selected" --><option value="ns" selected="selected">ISSN</option>
+<!-- TMPL_ELSE --><option value="ns">ISSN</option><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="selected" --><option value="lcn,phr" selected="selected">Call Number</option>
+<!-- TMPL_ELSE --><option value="lcn,phr">Call Number</option><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="selected" --><option value="su" selected="selected">Subject</option>
+<!-- TMPL_ELSE --><option value="su">Subject</option><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="selected" -->
+   <option value="ti" selected="selected">Title</option>
+<!-- TMPL_ELSE -->
+   <option value="ti" selected="selected">Title</option><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="selected" --><option value="ti,phr" selected="selected">Title Phrase</option>
+<!-- TMPL_ELSE --><option value="ti,phr">Title Phrase</option><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="selected" --><option value="se" selected="selected">Series Title</option>
+<!-- TMPL_ELSE --><option value="se">Series Title</option><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="selected" --><option value="bc" selected="selected">Barcode</option>
+<!-- TMPL_ELSE --><option value="bc">Barcode</option><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="selected" --><option value="acqdate" selected="selected">Acquisition Date</option>
+<!-- TMPL_ELSE --><option value="acqdate">Acquisition Date</option><!-- /TMPL_IF -->
 </select>
    <input type="text" size="30" name="q" title="Enter search terms" value="" disabled="disabled" />  FIXME: script doesn't "catch" q param
 </li> -->
@@ -61,13 +117,16 @@ to add to Batch <!-- TMPL_VAR NAME="batch_id" -->
 <fieldset><legend>Sort by: </legend>
     <p><select id="sort_by" name="sort_by">
         <option value="">Field-weighted, Relevance Ranked</option>
+<!-- TMPL_ELSE --><!-- /TMPL_IF -->
         <!-- TMPL_LOOP NAME="sort_by_loop" -->
-        <option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF NAME="selected" -->selected="<!-- TMPL_VAR NAME="selected" -->"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="label" --></option>
+        
+<!-- TMPL_IF NAME="selected" --><option value="<!-- TMPL_VAR NAME="value" -->" selected="selected"><!-- TMPL_VAR NAME="label" --></option><!-- TMPL_ELSE --><option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="label" --></option><!-- /TMPL_IF -->
+
+<!-- TMPL_ELSE --><!-- /TMPL_IF -->
         <!-- /TMPL_LOOP -->
     </select>
         </p>
-</fieldset>
-<!-- /TMPL_IF -->
+</fieldset><!-- /TMPL_IF -->
 
 
        
@@ -120,12 +179,14 @@ to add to Batch <!-- TMPL_VAR NAME="batch_id" -->
                 <td colspan="2">
                     <select name="Filter" disabled="disabled">
                         <option value="">All Item Types</option>
+<!-- TMPL_ELSE --><!-- /TMPL_IF -->
                         <!-- TMPL_LOOP name="itemtypeloop" -->
                             <!-- TMPL_IF name="selected" -->
                                 <option value="<!-- TMPL_VAR name="value" -->"  selected="selected" >
                             <!-- TMPL_ELSE -->
                                 <option value="<!-- TMPL_VAR name="value" -->">
                             <!-- /TMPL_IF --><!-- TMPL_VAR name="description" --></option>
+<!-- TMPL_ELSE --><!-- /TMPL_IF -->
                         <!-- /TMPL_LOOP -->
                     </select>
                 </td>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tmpl
index 2a9d219..7ca036d 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tmpl
@@ -27,7 +27,7 @@
        </tr>
 
        <!-- TMPL_loop name="issueloop" -->
-       <tr<!-- TMPL_IF name="red" --> class="overdue"</TMPL_IF>>
+       <!-- TMPL_IF name="red" --><tr class="overdue"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF-->
                <td>
                <!-- TMPL_VAR NAME="title" -->
                <a href="/cgi-bin/koha/catalogue/detail.pl?item=<!-- TMPL_VAR NAME="itemnumber" -->&amp;biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->">

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl
index 396ca46..ee17a7f 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tmpl
@@ -130,7 +130,9 @@
                                <td><select name="Filter" id="itemtype">
                                        <option value=""> </option>
                                        <!-- TMPL_LOOP NAME="CGIItemType" -->
-                                       <option value="<!-- TMPL_VAR NAME='itemtype' -->" <!-- TMPL_IF NAME='selected' -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="description" --></option>
+                                       <!-- TMPL_IF NAME="selected" -->
+                                       <option value="<!-- TMPL_VAR NAME="itemtype" -->" selected="selected"><!-- TMPL_VAR NAME="description" --></option><!-- TMPL_ELSE --><option value="<!-- TMPL_VAR NAME="itemtype" -->"><!-- TMPL_VAR NAME="description" --></option><!-- /TMPL_IF -->
+
                                        <!-- /TMPL_LOOP -->
                                        </select>
                                </td>
@@ -154,7 +156,7 @@
                                <td><select name="Filter" id="branch">
                                        <option value=""> </option>
                                        <!-- TMPL_LOOP NAME="CGIBranch" -->
-                                       <option value="<!-- TMPL_VAR NAME='branchcode' -->" <!-- TMPL_IF NAME='selected' -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="branchname" --></option>
+                                       <!-- TMPL_IF NAME="selected" --><option value="<!-- TMPL_VAR NAME="branchcode" -->" selected="selected"><!-- TMPL_VAR NAME="branchname" --></option><!-- TMPL_ELSE --><option value="<!-- TMPL_VAR NAME="branchcode" -->"><!-- TMPL_VAR NAME="branchname" --></option><!-- /TMPL_IF -->
                                        <!-- /TMPL_LOOP -->
                                        </select>
                                </td>
@@ -166,7 +168,7 @@
                                <td><select name="Filter" id="location">
                                        <option value=""> </option>
                                        <!-- TMPL_LOOP NAME="locationloop" -->
-                                       <option value="<!-- TMPL_VAR NAME='code' -->" <!-- TMPL_IF NAME='selected' -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="description" --></option>
+                                       <!-- TMPL_IF NAME="selected" --><option value="<!-- TMPL_VAR NAME="code" -->" selected="selected"><!-- TMPL_VAR NAME="description" --></option><!-- TMPL_ELSE --><option value="<!-- TMPL_VAR NAME="code" -->"><!-- TMPL_VAR NAME="description" --></option><!-- /TMPL_IF -->
                                        <!-- /TMPL_LOOP -->
                                        </select>
                                </td>
@@ -178,7 +180,7 @@
                                <td><select name="Filter" id="ccode">
                                        <option value=""> </option>
                                        <!-- TMPL_LOOP NAME="authvals" -->
-                                       <option value="<!-- TMPL_VAR NAME='code' -->" <!-- TMPL_IF NAME='selected' -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="description" --></option>
+                                       <!-- TMPL_IF NAME="selected" --><option value="<!-- TMPL_VAR NAME="code" -->" selected="selected"><!-- TMPL_VAR NAME="description" --></option><!-- TMPL_ELSE --><option value="<!-- TMPL_VAR NAME="code" -->"><!-- TMPL_VAR NAME="description" --></option><!-- /TMPL_IF -->
                                        <!-- /TMPL_LOOP -->
                                        </select>
                                </td>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl
index d21da53..2b91b16 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tmpl
@@ -192,7 +192,8 @@
            <td><select name="Filter" id="borcat">
                <option value=""> </option>
                <!-- TMPL_LOOP NAME="categoryloop" -->
-                 <option value="<!-- TMPL_VAR NAME='categorycode' -->" <!-- TMPL_IF NAME='selected' -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="description" --></option>
+                 <!-- TMPL_IF NAME="selected" --><option value="<!-- TMPL_VAR NAME="categorycode" -->" selected=
+                                selected"><!-- TMPL_VAR NAME="description" --></option><!-- TMPL_ELSE --><option value="<!-- TMPL_VAR NAME="categorycode" -->"><!-- TMPL_VAR NAME="description" --></option><!-- /TMPL_IF -->
                <!-- /TMPL_LOOP -->
                </select>
              </td> 
@@ -204,7 +205,7 @@
            <td><select name="Filter" id="itemtype">
                <option value=""> </option>
                <!-- TMPL_LOOP NAME="itemtypeloop" -->
-                 <option value="<!-- TMPL_VAR NAME='code' -->" <!-- TMPL_IF NAME='selected' -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="description" --></option>
+                 <!-- TMPL_IF NAME="selected" --><option value="<!-- TMPL_VAR NAME="code" -->" selected="selected"><!-- TMPL_VAR NAME="description" --></option><!-- TMPL_ELSE --><option value="<!-- TMPL_VAR NAME="code" -->"><!-- TMPL_VAR NAME="description" --></option><!-- /TMPL_IF -->
                <!-- /TMPL_LOOP -->
                </select>
              </td> 
@@ -216,8 +217,8 @@
            <td><select name="Filter" id="branch">
                <option value=""> </option>
                <!-- TMPL_LOOP NAME="branchloop" -->
-                 <option value="<!-- TMPL_VAR NAME='code' -->" <!-- TMPL_IF NAME='selected' -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="description" --></option>
-               <!-- /TMPL_LOOP -->
+<!-- TMPL_IF NAME="selected" --><option value="<!-- TMPL_VAR NAME="code" -->" selected="selected"><!-- TMPL_VAR NAME="description" --></option><!-- TMPL_ELSE --><option value="<!-- TMPL_VAR NAME="code" -->"><!-- TMPL_VAR NAME="description" --></option><!-- /TMPL_IF -->
+                               <!-- /TMPL_LOOP -->
                </select>
              </td> 
         </tr>
@@ -228,7 +229,9 @@
                 <td><select name="Filter" id="ccode">
                     <option value=""> </option>
                     <!-- TMPL_LOOP NAME="ccodeloop" -->
-                    <option value="<!-- TMPL_VAR NAME='code' -->" <!-- TMPL_IF NAME='selected' -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="description" --></option>
+                                       
+                   <!-- TMPL_IF NAME="selected" --> <option value="<!-- TMPL_VAR NAME="code" -->" selected="selected"><!-- TMPL_VAR NAME="description" --></option><!-- TMPL_ELSE --><option value="<!-- TMPL_VAR NAME="code" -->"><!-- TMPL_VAR NAME="description" --></option><!-- /TMPL_IF -->
+
                     <!-- /TMPL_LOOP -->
                     </select>
                 </td>
@@ -240,8 +243,8 @@
            <td><select name="Filter" id="location">
                <option value=""> </option>
                <!-- TMPL_LOOP NAME="locationloop" -->
-                 <option value="<!-- TMPL_VAR NAME='code' -->" <!-- TMPL_IF NAME='selected' -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="description" --></option>
-               <!-- /TMPL_LOOP -->
+                               <!-- TMPL_IF NAME="selected" --><option value="<!-- TMPL_VAR NAME="code" -->" selected="selected"><!-- TMPL_VAR NAME="description" --></option><!-- TMPL_ELSE --><option value="<!-- TMPL_VAR NAME="code" -->"><!-- TMPL_VAR NAME="description" --></option><!-- /TMPL_IF -->
+                               <!-- /TMPL_LOOP -->
                </select>
              </td> 
         </tr>
@@ -259,7 +262,7 @@
            <td><select name="Filter" id="sort1">
                <option value=""> </option>
                <!-- TMPL_LOOP NAME="Bsort1" -->
-                 <option value="<!-- TMPL_VAR NAME='authorised_value' -->" <!-- TMPL_IF NAME='selected' -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="lib" --></option>
+                 <!-- TMPL_IF NAME="selected" --><option value="<!-- TMPL_VAR NAME="authorised_value" -->" selected="selected"><!-- TMPL_VAR NAME="lib" --></option><!-- TMPL_ELSE --><option value="<!-- TMPL_VAR NAME="authorised_value" -->" ><!-- TMPL_VAR NAME="lib" --></option><!-- /TMPL_IF -->
                <!-- /TMPL_LOOP -->
                </select>
              </td> 
@@ -272,7 +275,7 @@
                        <td><select name="Filter" id="sort1">
                <option value=""> </option>
                <!-- TMPL_LOOP NAME="Bsort2" -->
-                 <option value="<!-- TMPL_VAR NAME='authorised_value' -->" <!-- TMPL_IF NAME='selected' -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="lib" --></option>
+                 <!-- TMPL_IF NAME="selected" --><option value="<!-- TMPL_VAR NAME="authorised_value" -->" selected="selected"><!-- TMPL_VAR NAME="lib" --></option><!-- TMPL_ELSE --><option value="<!-- TMPL_VAR NAME="authorised_value" -->"><!-- TMPL_VAR NAME="lib" --></option><!-- /TMPL_IF -->
                <!-- /TMPL_LOOP -->
                </select>
              </td> 

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
index caea831..da02cd6 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
@@ -313,7 +313,7 @@ if (alreadyreserved > "0"){
             <option value="W" selected="selected">Waiting</option>
     <!-- /TMPL_IF -->
        <!-- TMPL_LOOP Name="optionloop" -->                 
-       <option value="<!-- TMPL_VAR NAME="num" -->" <!-- TMPL_IF Name="selected" --> selected <!-- /TMPL_IF -->><!-- TMPL_VAR NAME="num" --></option> 
+       <!-- TMPL_IF Name="selected" --><option value="<!-- TMPL_VAR NAME="num" -->" selected="selected"><!-- TMPL_VAR NAME="num" --></option><!-- TMPL_ELSE --><option value="<!-- TMPL_VAR NAME="num" -->"><!-- TMPL_VAR NAME="num" --></option><!-- /TMPL_IF --> 
        <!-- /TMPL_LOOP -->  
             <option value="del">del</option>
           </select>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tmpl
index 9f1e67e..0bd4edd 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/routing.tmpl
@@ -43,11 +43,10 @@ function search_member(subscriptionid){
 
 <select name="date_selected">
 <!-- TMPL_LOOP NAME="dates" -->
-<option value="<!-- TMPL_VAR NAME="serialseq" --> (<!-- TMPL_VAR NAME="planneddate" -->)" <!-- TMPL_IF NAME="selected" --> selected="selected" <!-- /TMPL_IF -->><!-- TMPL_VAR NAME="serialseq" --> (<!-- TMPL_VAR NAME="planneddate" -->)</option>
+<!-- TMPL_IF NAME="selected" --><option value="<!-- TMPL_VAR NAME="serialseq" --> (<!-- TMPL_VAR NAME="planneddate" -->)" selected="selected"><!-- TMPL_VAR NAME="serialseq" --> (<!-- TMPL_VAR NAME="planneddate" -->)</option><!-- TMPL_ELSE --><option value="<!-- TMPL_VAR NAME="serialseq" --> (<!-- TMPL_VAR NAME="planneddate" -->)"><!-- TMPL_VAR NAME="serialseq" --> (<!-- TMPL_VAR NAME="planneddate" -->)</option><!-- /TMPL_IF -->
 <!-- /TMPL_LOOP -->
 </select>
 
-
 <!-- TMPL_VAR NAME="issue" --></p>
 
 <!-- TMPL_IF NAME="memberloop" -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl
index 8a4a329..3c22af5 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/inventory.tmpl
@@ -47,22 +47,26 @@ $(document).ready(function(){
         <fieldset class="rows">
         <legend>Select items you want to check</legend>
         <ol><li>
-        <label for="branchloop">Library</label><select id="branchloop" name="branchcode">
+        <label for="branchloop">Library</label><select id="branchloop" name="branchcode" style="width:12em;">
         <!-- TMPL_LOOP NAME="branchloop" -->
             <!-- TMPL_IF name="selected" -->
-                <option value="<!-- TMPL_VAR NAME="value" -->" selected="selected"><!-- TMPL_VAR NAME='branchname' --></option>
+                <option value="<!-- TMPL_VAR NAME="value" -->" selected="selected"><!-- TMPL_VAR NAME="branchname" --></option>
             <!-- TMPL_ELSE -->
-                <option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME='branchname' --></option>
+                <option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="branchname" --></option>
             <!-- /TMPL_IF -->
         <!-- /TMPL_LOOP -->
         </select>
         </li>
         <li>
         <label for="itemtype">Item type</label>
-        <select name="itemtype" id="itemtype">
+        <select name="itemtype" id="itemtype" style="width:12em;">
             <option value="">Any</option>
         <!-- TMPL_LOOP name="itemtypeloop" -->
-            <option value="<!-- TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name="description" --></option>
+            <!-- TMPL_IF name="selected" -->
+                <option value="<!-- TMPL_VAR NAME="value" -->" selected="selected"><!-- TMPL_VAR NAME="description" --></option>
+            <!-- TMPL_ELSE -->
+                <option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="description" --></option>
+            <!-- /TMPL_IF -->
         <!-- /TMPL_LOOP -->
         </select>
         </li>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
index f2538f2..b322550 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
@@ -265,7 +265,7 @@ $(document).ready(function(){
 <table>
 <tr><th>Name</th><th>Owner</th><th>Category</th><th>Items</th><th>&nbsp;</th></tr>
 <!-- TMPL_LOOP NAME="shelvesloopall" -->
-<tr<!-- TMPL_IF NAME="toggle" --> class="highlight"<!-- /TMPL_IF -->>
+<!-- TMPL_IF NAME="toggle" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
 <td><a href="/cgi-bin/koha/virtualshelves/shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelf" -->"><!-- TMPL_VAR NAME="shelfname" --></a></td>
 <td><!-- TMPL_IF NAME="owner" --><!-- TMPL_VAR NAME="ownername" --><!-- TMPL_ELSE -->Koha Admin<!-- /TMPL_IF -->
 </td>

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
index f9c781d..ad41caf 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
@@ -157,9 +157,9 @@ $.tablesorter.addParser({
             <li><label for="shelfname">List Name: </label><input type="text" id="shelfname" name="shelfname" size="60" value="<!-- TMPL_VAR NAME="shelfname" ESCAPE="html" -->" /></li>
             <li><label for="sortfield" >Sort this list by: </label>
             <select name="sortfield">
-            <option value="title" <!-- TMPL_IF NAME="sort_title" -->selected="1"<!-- /TMPL_IF -->>title</option>
-            <option value="author" <!-- TMPL_IF NAME="sort_author" -->selected="1"<!-- /TMPL_IF -->>author</option>
-            <option value="copyrightdate" <!-- TMPL_IF NAME="sort_copyrightdate" -->selected="1"<!-- /TMPL_IF -->>copyrightdate</option>
+            <!-- TMPL_IF NAME="sort_title" --><option value="title" selected="selected">Title</option><!-- TMPL_ELSE --><option value="title">Title</option><!-- /TMPL_IF -->
+            <!-- TMPL_IF NAME="sort_author" --><option value="author" selected="selected">Author</option><!-- TMPL_ELSE --><option value="author">Author</option><!-- /TMPL_IF -->
+            <!-- TMPL_IF NAME="sort_copyrightdate" --><option value="copyrightdate" selected="selected">Copyrightdate</option><!-- TMPL_ELSE --><option value="copyrightdate">Copyrightdate</option><!-- /TMPL_IF -->
             </select></li>
             </ol>
             </fieldset>