Correcting <!-- TMPL_IF -->'s nested inside HTML (breaks translator)

Signed-off-by: Chris Cormack <crc@liblime.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/acqui/neworderempty.tmpl b/koha-tmpl/intranet-tmpl/prog/en/acqui/neworderempty.tmpl
index 35deced..bbd37ad 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/acqui/neworderempty.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/acqui/neworderempty.tmpl
@@ -173,7 +173,10 @@ if (quantity ==0) {
             <label>Branch</label>
             <select name="branch">
             <!-- 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>
         </p>
@@ -215,7 +218,7 @@ if (quantity ==0) {
             <p>
                 <label>Budgeted Cost</label>
                 <!-- TMPL_IF name="close" -->
-                    <input type="text" size="20" name="ecost" value="<!-- TMPL_VAR NAME="ecost" -->" readonly  />
+                    <input type="text" size="20" name="ecost" value="<!-- TMPL_VAR NAME="ecost" -->" readonly="readonly"  />
                 <!-- TMPL_ELSE -->
                     <input type="text" size="20" name="ecost" value="<!-- TMPL_VAR NAME="ecost" -->" />
                 <!--/TMPL_IF-->
@@ -223,16 +226,28 @@ if (quantity ==0) {
             <!-- TMPL_IF NAME="GST"-->
             <p>
                 <label>Budgeted GST</label>
-                <input type="text" size="20" name="GST" value="" <!-- TMPL_IF name="close" -->readonly <!--/TMPL_IF--> />
+                               <!-- TMPL_IF name="close" -->
+                <input type="text" size="20" name="GST" value="" readonly="readonly" />
+                               <!-- TMPL_ELSE -->
+                <input type="text" size="20" name="GST" value="" />
+                               <!--/TMPL_IF-->
             </p>
             <!-- /TMPL_IF -->
             <p>
                 <label><b>Total</b></label>
-                <input type="text" size="20" name="total" value="<!-- TMPL_VAR name="total" -->" <!-- TMPL_IF name="close" -->readonly <!--/TMPL_IF--> />
+                <!-- TMPL_IF name="close" -->
+                               <input type="text" size="20" name="total" value="<!-- TMPL_VAR name="total" -->" readonly="readonly" />
+                               <!-- TMPL_ELSE -->
+                <input type="text" size="20" name="total" value="<!-- TMPL_VAR name="total" -->" />
+                               <!--/TMPL_IF-->
             </p>
             <p>
                 <label>Actual Cost</label>
-                <input type="text" size="20" name="cost" value="<!-- TMPL_VAR name="ecost"-->" <!-- TMPL_IF name="close" -->readonly <!--/TMPL_IF--> />
+                               <!-- TMPL_IF name="close" -->
+                <input type="text" size="20" name="cost" value="<!-- TMPL_VAR name="ecost"-->" readonly="readonly" />
+                               <!-- TMPL_ELSE -->
+                <input type="text" size="20" name="cost" value="<!-- TMPL_VAR name="ecost"-->" />
+                               <!--/TMPL_IF-->
             </p>
             <p>
                 <label>Invoice Number</label>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/acqui/supplier.tmpl b/koha-tmpl/intranet-tmpl/prog/en/acqui/supplier.tmpl
index a6c450d..69a38cc 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/acqui/supplier.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/acqui/supplier.tmpl
@@ -107,18 +107,33 @@
             </p>
             <!-- TMPL_IF NAME="GST" --><p>
                 <label>GST Registered</label>
-                    <input type="radio" name="gst" value="1" <!-- TMPL_IF name="gstreg" -->checked<!-- /TMPL_IF -->>Yes
-                    <input type="radio" name="gst" value="0" <!-- TMPL_UNLESS name="gstreg" -->checked<!-- /TMPL_UNLESS -->>No
-            </p><!-- TMPL_ELSE --><input type="hidden" name="gst" value="0"><!-- /TMPL_IF -->
+                               <!-- TMPL_IF name="gstreg" -->
+                                       <input type="radio" name="gst" value="1" checked="checked" />Yes
+                    <input type="radio" name="gst" value="0" />No
+                               <!-- TMPL_ELSE -->
+                    <input type="radio" name="gst" value="1" />Yes
+                    <input type="radio" name="gst" value="0" checked="checked" />No
+                               <!-- /TMPL_IF -->
+            </p><!-- TMPL_ELSE --><input type="hidden" name="gst" value="0" /><!-- /TMPL_IF -->
             <!-- TMPL_IF NAME="GST" --><p>
                 <label>Ordering prices</label>
-                    <input type="radio" name="list_gst" value="1" <!-- TMPL_IF name="listincgst" -->checked<!-- /TMPL_IF -->>include GST
-                    <input type="radio" name="list_gst" value="0" <!-- TMPL_UNLESS name="listincgst" -->checked<!-- /TMPL_UNLESS -->>don't include GST
+                               <!-- TMPL_IF name="listincgst" -->
+                               <input type="radio" name="list_gst" value="1" checked="checked" />include GST
+                    <input type="radio" name="list_gst" value="0" />don't include GST
+                               <!-- TMPL_ELSE -->
+                    <input type="radio" name="list_gst" value="1" />include GST
+                    <input type="radio" name="list_gst" value="0" checked="checked" />don't include GST
+                               <!-- /TMPL_IF -->
             </p><!-- TMPL_ELSE --><input type="hidden" name="list_gst" value="0"><!-- /TMPL_IF -->
             <!-- TMPL_IF NAME="GST" --><p>
                 <label>Invoice prices</label>
-                    <input type="radio" name="invoice_gst" value="1" <!-- TMPL_IF name= "invoiceincgst" -->checked<!-- /TMPL_IF -->>include GST
-                    <input type="radio" name="invoice_gst" value="0" <!-- TMPL_UNLESS name="invoiceincgst" -->checked<!-- /TMPL_UNLESS -->>don't include GST
+                               <!-- TMPL_IF name= "invoiceincgst" -->
+                    <input type="radio" name="invoice_gst" value="1" checked="checked" />include GST
+                    <input type="radio" name="invoice_gst" value="0" />don't include GST
+                                       <!-- TMPL_ELSE -->
+                    <input type="radio" name="invoice_gst" value="1">include GST
+                    <input type="radio" name="invoice_gst" value="0" checked="checked" />don't include GST
+
             </p><!-- TMPL_ELSE --><input type="hidden" name="invoice_gst" value="0"><!-- /TMPL_IF -->
             <p>
                 <label>Discount</label>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/auth_tag_structure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/admin/auth_tag_structure.tmpl
index e851ab9..10a62e0 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/admin/auth_tag_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/admin/auth_tag_structure.tmpl
@@ -70,11 +70,11 @@ return false;
         <input type="hidden" name="op" value="add_validate" />
         <input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
         <p><label>Tag</label><!-- TMPL_VAR NAME="searchfield" --></p>
-        <p><label>Text for librarians</label><input type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" escape=HTML -->" size="40" maxlength="100" /></p>
-        <p><label>Text for opac</label><input type="text" name="libopac" value="<!-- TMPL_VAR NAME="libopac" escape=HTML -->" size="40" maxlength="100" /></p>
+        <p><label>Text for librarians</label><input type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" escape="HTML" -->" size="40" maxlength="100" /></p>
+        <p><label>Text for opac</label><input type="text" name="libopac" value="<!-- TMPL_VAR NAME="libopac" escape="HTML" -->" size="40" maxlength="100" /></p>
         <p><label for="repeatable">Repeatable</label>
             <!-- TMPL_IF NAME="repeatable" -->
-                <input type="checkbox" name="repeatable" id="repeatable" value="1" checked/>
+                <input type="checkbox" name="repeatable" id="repeatable" value="1" checked="checked />
             <!-- TMPL_ELSE -->
                 <input type="checkbox" name="repeatable" id="repeatable" value="1"/>
             <!-- /TMPL_IF -->
@@ -82,7 +82,7 @@ return false;
         </p>
         <p><label for="mandatory">Mandatory</label>
             <!-- TMPL_IF NAME="mandatory" -->
-                <input type="checkbox" name="mandatory" id="mandatory" value="1" checked/>
+                <input type="checkbox" name="mandatory" id="mandatory" value="1" checked="checked />
             <!-- TMPL_ELSE -->
                 <input type="checkbox" name="mandatory" id="mandatory" value="1"/>
             <!-- /TMPL_IF -->
@@ -145,9 +145,12 @@ return false;
     <select name="authtypecode">
         <option value="">Default</option>
     <!-- TMPL_LOOP NAME="authtypeloop" -->
-        <option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF NAME="selected" -->selected<!-- /TMPL_IF -->>
-            <!-- TMPL_VAR NAME="authtypetext" -->
-        </option>
+               <!-- TMPL_IF NAME="selected" -->
+        <option value="<!-- TMPL_VAR NAME="value" -->" selected="selected"><!-- TMPL_VAR NAME="authtypetext" --></option>
+               <!-- TMPL_ELSE -->
+        <option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="authtypetext" --></option>
+               <!-- /TMPL_IF -->
+            
     <!-- /TMPL_LOOP -->
     </select>
     <input type="text" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->" />
@@ -184,10 +187,10 @@ return false;
         <input type="hidden" name="op" value="add_form" />
         <input type="submit" class="submit" value="Add Tag" />
         <!-- TMPL_IF NAME="isprevpage" -->
-            <a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&authtypecode=<!-- TMPL_VAR NAME="authtypecode" --> ">Previous Page</a>
+            <a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;authtypecode=<!-- TMPL_VAR NAME="authtypecode" --> ">Previous Page</a>
         <!-- /TMPL_IF -->
         <!-- TMPL_IF NAME="nextpage" -->
-            <a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&authtypecode=<!-- TMPL_VAR NAME="authtypecode" --> ">Next Page</a>
+            <a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;authtypecode=<!-- TMPL_VAR NAME="authtypecode" --> ">Next Page</a>
         <!-- /TMPL_IF -->
     </form>
 </div>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/branches.tmpl b/koha-tmpl/intranet-tmpl/prog/en/admin/branches.tmpl
index e15497c..ce49c09 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/admin/branches.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/admin/branches.tmpl
@@ -51,7 +51,11 @@
             <select id="branchprinter" name="branchprinter">
                 <option value="">None</option>
             <!-- TMPL_LOOP NAME="printerloop" -->
-                <option value="<!-- TMPL_VAR NAME="value" -->"<!-- TMPL_IF NAME="selected" --> selected="selected"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="branchprinter" --></option>
+                <!-- TMPL_IF NAME="selected" -->
+                               <option value="<!-- TMPL_VAR NAME="value" -->" selected="selected"><!-- TMPL_VAR NAME="branchprinter" --></option>
+                               <!-- TMPL_ELSE -->
+                               <option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="branchprinter" --></option>
+                               <!-- /TMPL_IF -->
                 <!-- /TMPL_LOOP -->
             </select>
         <p><input type="submit" value="Submit" /></p>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/categorie.tmpl b/koha-tmpl/intranet-tmpl/prog/en/admin/categorie.tmpl
index ee2a1c3..1867751 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/admin/categorie.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/admin/categorie.tmpl
@@ -91,14 +91,19 @@
        <!-- TMPL_ELSE -->
        <tr><th>Category code</th><td><input type="text" name="categorycode" size="10" maxlength="10" onblur="toUC(this)" /></td></tr>
        <!-- /TMPL_IF -->
-       <tr><th>Description</th><td>&nbsp; <input type="text" name="description" size="40" maxlength="80" value="<!-- TMPL_VAR NAME=description -->" /></td></tr>
-       <tr><th>Enrollment period</th><td>&nbsp; <input type="text" name="enrolmentperiod" size="2" maxlength="2" value="<!-- TMPL_VAR NAME=enrolmentperiod -->" /> months</td></tr>
-       <tr><th>Age required</th><td>&nbsp; <input type="text" name="dateofbirthrequired" value="<!-- TMPL_VAR NAME=dateofbirthrequired -->" size="3" maxlength="3" /> years</td></tr>
-       <tr><th>Upperage limit</th><td>&nbsp; <input type="text" name="upperagelimit" size="3" maxlength="3" value="<!-- TMPL_VAR NAME=upperagelimit -->" /> years</td></tr>
-       <tr><th>Enrollment fee</th><td>$ <input type="text" name="enrolmentfee" size="6" value="<!-- TMPL_VAR NAME=enrolmentfee -->" /></td></tr>
+       <tr><th>Description</th><td>&nbsp; <input type="text" name="description" size="40" maxlength="80" value="<!-- TMPL_VAR NAME="description" -->" /></td></tr>
+       <tr><th>Enrollment period</th><td>&nbsp; <input type="text" name="enrolmentperiod" size="2" maxlength="2" value="<!-- TMPL_VAR NAME="enrolmentperiod" -->" /> months</td></tr>
+       <tr><th>Age required</th><td>&nbsp; <input type="text" name="dateofbirthrequired" value="<!-- TMPL_VAR NAME="dateofbirthrequired" -->" size="3" maxlength="3" /> years</td></tr>
+       <tr><th>Upperage limit</th><td>&nbsp; <input type="text" name="upperagelimit" size="3" maxlength="3" value="<!-- TMPL_VAR NAME="upperagelimit" -->" /> years</td></tr>
+       <tr><th>Enrollment fee</th><td>$ <input type="text" name="enrolmentfee" size="6" value="<!-- TMPL_VAR NAME="enrolmentfee" -->" /></td></tr>
        <tr><th>Overdue notice required</th><td>&nbsp; <select name="overduenoticerequired" id="overduenoticerequired">
-                                               <option<!-- TMPL_UNLESS name="overduenoticerequired" --> selected="selected"<!-- /TMPL_UNLESS --> value="0">No</option>
-                                               <option<!-- TMPL_IF NAME="overduenoticerequired" --> selected="selected"<!-- /TMPL_IF --> value="1">Yes</option>
+                       <!-- TMPL_IF NAME="overduenoticerequired" -->
+                                               <option value="0">No</option>
+                                               <option value="1" selected="selected">Yes</option>
+                       <!-- TMPL_ELSE -->
+                                               <option value="0" selected="selected">No</option>
+                                               <option value="1">Yes</option>
+                       <!-- /TMPL_IF -->
                                        </select></td></tr>
        <tr><th>Reserve fee</th><td>$ <input type="text" name="reservefee" size="6" value="<!-- TMPL_VAR NAME="reservefee" -->" /></td></tr>
        <tr><th>Category type</th><td><SELECT name="category_type" >

diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/finesrules.tmpl b/koha-tmpl/intranet-tmpl/prog/en/admin/finesrules.tmpl
index cb3f7ba..041916f 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/admin/finesrules.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/admin/finesrules.tmpl
@@ -30,7 +30,12 @@
                        <select id="branch" name="branch">
                                <option value="">Default</option>
                        <!-- TMPL_LOOP NAME="branchloop" -->
-                               <option value="<!-- TMPL_VAR NAME="value" -->"<!-- TMPL_IF NAME="selected" --> selected="selected"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="branchname" --></option><!-- /TMPL_LOOP --></select>
+                               <!-- 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>
                        <input type="submit" value="Select" />
                </form>
                <form method="post" action="/cgi-bin/koha/admin/finesrules.pl">
@@ -46,7 +51,11 @@
                                <tr>
                                        <th><!-- TMPL_VAR NAME="categorycode" --></th>
                                        <!-- TMPL_LOOP NAME="cell" -->
-                                               <td<!-- TMPL_IF NAME="toggle" --> class="highlight"<!-- /TMPL_IF -->>
+                                               <!-- TMPL_IF NAME="toggle" -->
+   <td class="highlight">
+<!-- TMPL_ELSE -->
+   <td>
+<!-- /TMPL_IF -->
                                                        <input name="<!-- TMPL_VAR NAME="finesname" -->" value="<!-- TMPL_VAR NAME="finesvalue" -->" size="6" maxlength="10" />
                                                </td>
                                        <!-- /TMPL_LOOP -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/issuingrules.tmpl b/koha-tmpl/intranet-tmpl/prog/en/admin/issuingrules.tmpl
index 0ca5562..76bc297 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/admin/issuingrules.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/admin/issuingrules.tmpl
@@ -28,7 +28,11 @@
                        <select id="branch" name="branch">
                                <option value="">Default</option>
                        <!-- TMPL_LOOP NAME="branchloop" -->
-                               <option value="<!-- TMPL_VAR NAME="value" -->"<!-- TMPL_IF NAME="selected" --> selected="selected"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="branchname" --></option><!-- /TMPL_LOOP --></select>
+                               <!-- 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>
                        <input type="submit" value="Select" />
                </form>
                <form method="post" action="/cgi-bin/koha/admin/issuingrules.pl">
@@ -44,7 +48,11 @@
                                <tr>
                                        <th><!-- TMPL_VAR NAME="categorycode" --></th>
                                        <!-- TMPL_LOOP NAME="cell" -->
-                                               <td<!-- TMPL_IF NAME="toggle" --> class="highlight"<!-- /TMPL_IF -->>
+                                               <!-- TMPL_IF NAME="toggle" -->
+   <td class="highlight">
+<!-- TMPL_ELSE -->
+   <td>
+<!-- /TMPL_IF -->
                                                        <input name="<!-- TMPL_VAR NAME="issuingname" -->" value="<!-- TMPL_VAR NAME="issuingvalue" -->" size="6" maxlength="10" />
                                                </td>
                                        <!-- /TMPL_LOOP -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl
index c29e35b..98e9bf4 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/admin/marctagstructure.tmpl
@@ -122,7 +122,11 @@
         <select id="frameworkcode" name="frameworkcode">
             <option value="">Default</option>
             <!-- TMPL_LOOP NAME="frameworkloop" -->
-                <option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF NAME="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="frameworktext" --></option>
+                       <!-- TMPL_IF NAME="selected" -->
+                <option value="<!-- TMPL_VAR NAME="value" -->" selected="selected"><!-- TMPL_VAR NAME="frameworktext" --></option>
+                               <!-- TMPL_ELSE -->
+                <option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="frameworktext" --></option>
+                               <!-- /TMPL_IF -->
             <!-- /TMPL_LOOP -->
         </select>
     </p>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_700-4.tmpl b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_700-4.tmpl
index 188248a..6eb17fd 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_700-4.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/cataloguing/value_builder/unimarc_field_700-4.tmpl
@@ -1,4 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <html>
@@ -8,19 +8,43 @@
 </head>
 <body>
 <p>Sélectionnez la valeur pour le champ 700 $4. Elle sera automatiquement reportée dans la zone 700 $8 qui suit.</p>
-<form name="f_pop" onSubmit="javascript:report()">
+<form name="f_pop" onSubmit="report()">
 <table>
        <tr>
                <td>Code date publication </td><td><select name="f1" size="1">
-               <option value="075 - postface" <!-- TMPL_IF name="f1_075" -->SELECTED<!-- /TMPL_IF -->>postface</option>
-                       <option value="651 - dir. de publication" <!-- TMPL_IF name="f1_651" -->SELECTED<!-- /TMPL_IF -->>dir. de publication</option>
-                       <option value="440 - illustrateur" <!-- TMPL_IF name="f1_440" -->SELECTED<!-- /TMPL_IF -->>illustrateur</option>
-                       <option value="080 - préface, notes" <!-- TMPL_IF name="f1_080" -->SELECTED<!-- /TMPL_IF -->>préface, notes</option>
-                       <option value="730 - traducteur" <!-- TMPL_IF name="f1_730" -->SELECTED<!-- /TMPL_IF -->>traducteur</option>
+                       <!-- TMPL_IF name="f1_075" -->
+                       <option value="075 - postface" selected="selected">postface</option>
+                       <!-- TMPL_ELSE -->
+                       <option value="075 - postface">postface</option>
+                       <!-- /TMPL_IF -->
+                       
+                       <!-- TMPL_IF name="f1_651" -->
+                       <option value="651 - dir. de publication" selected="selected">dir. de publication</option>
+                       <!-- TMPL_ELSE -->
+                       <option value="651 - dir. de publication">dir. de publication</option>
+                       <!-- /TMPL_IF -->
+                       
+                        <!-- TMPL_IF name="f1_440" -->
+                       <option value="440 - illustrateur" selected="selected">illustrateur</option>
+                       <!-- TMPL_ELSE -->
+                       <option value="440 - illustrateur">illustrateur</option>
+                       <!-- /TMPL_IF -->
+                       
+                       <!-- TMPL_IF name="f1_080" -->
+                       <option value="080 - préface, notes" selected="selected">préface, notes</option>
+                       <!-- TMPL_ELSE -->
+                       <option value="080 - préface, notes">préface, notes</option>
+                       <!-- /TMPL_IF -->
+                       
+                       <!-- TMPL_IF name="f1_730" -->
+                       <option value="730 - traducteur" selected="selected">traducteur</option>
+                       <!-- TMPL_ELSE -->
+                       <option value="730 - traducteur">traducteur</option>
+                       <!-- /TMPL_IF -->
                        </select>
                </td>
        </tr>
-       <tr><td colspan=2><input type="submit" value="OK"></td></tr>
+       <tr><td colspan="2"><input type="submit" value="OK" /></td></tr>
 </table>
 </form>
 <script>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/circ/selectbranchprinter.tmpl b/koha-tmpl/intranet-tmpl/prog/en/circ/selectbranchprinter.tmpl
index 37aec12..3ee5c66 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/circ/selectbranchprinter.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/circ/selectbranchprinter.tmpl
@@ -14,7 +14,10 @@
 <!--branchselection-->
        <select name="branch" id="branch">
        <!-- TMPL_LOOP Name="branchloop" -->
-               <option value="<!-- TMPL_VAR Name="value" -->"<!-- TMPL_IF Name="selected" --> selected="selected"<!-- /TMPL_IF -->><!-- TMPL_VAR Name="name" --></option>
+               <!-- TMPL_IF NAME="selected" --><option value="<!-- TMPL_VAR NAME="value" -->" selected="selected"><!-- TMPL_VAR NAME="name" --></option>
+                               <!-- TMPL_ELSE -->
+                               <option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="name" --></option>
+                               <!-- /TMPL_IF -->
        <!-- /TMPL_LOOP -->
        </select>
 
@@ -24,7 +27,10 @@
     <!--printerselection-->
     <select name="printer" id="printer">
         <!-- TMPL_LOOP Name="printerloop" -->
-            <option value="<!-- TMPL_VAR Name="value" -->"<!-- TMPL_IF Name="selected" --> selected="selected"<!-- /TMPL_IF -->><!-- TMPL_VAR Name="name" -->
+            <!-- TMPL_IF NAME="selected" --><option value="<!-- TMPL_VAR NAME="value" -->" selected="selected"><!-- TMPL_VAR NAME="name" --></option>
+                               <!-- TMPL_ELSE -->
+                               <option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="name" --></option>
+                               <!-- /TMPL_IF -->
         <!-- /TMPL_LOOP -->
         </select>
 <!-- /TMPL_IF -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/serials-recieve.tmpl b/koha-tmpl/intranet-tmpl/prog/en/serials/serials-recieve.tmpl
index bf1637d..424c20f 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/serials/serials-recieve.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/serials/serials-recieve.tmpl
@@ -62,8 +62,10 @@
                                <br /><br />
                                <select name="branch" size="1">
                                                <option value="">Branch</option>
-                       <!-- TMPL_LOOP name="branchloop" -->
-                               <option value="<!-- TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name="branchname" --></option>
+                       <!-- TMPL_LOOP name="branchloop" --><!-- 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>
                        <!--/TMPL_IF -->
@@ -105,13 +107,22 @@
                                <!--TMPL_IF Name="itemstatus"-->
                                    <!--TMPL_IF Name="choice"-->
                                                <!-- TMPL_LOOP name="itemstatusloop" -->
-                                                       <!-- TMPL_VAR name="itemlib" -->: <input type="checkbox" name="itemstatus" value="<!-- TMPL_VAR name="itemval" -->" <!-- TMPL_IF name="selected" -->checked<!-- /TMPL_IF -->>
+                                                       <!-- TMPL_VAR name="itemlib" -->: 
+                                                       <!-- TMPL_IF name="selected" -->
+                                                       <input type="checkbox" name="itemstatus" value="<!-- TMPL_VAR name="itemval" -->" checked="checked" />
+                                                       <!-- TMPL_ELSE -->
+                                                       <input type="checkbox" name="itemstatus" value="<!-- TMPL_VAR name="itemval" -->" />
+                                                       <!-- /TMPL_IF -->
                                                <!-- /TMPL_LOOP -->
                                    <!--TMPL_ELSE-->
                                        <select name="itemstatus" size="1">
                                                <option value="">Item Status</option>
                                                <!-- TMPL_LOOP name="itemstatusloop" -->
-                                                       <option value="<!-- TMPL_VAR name="itemval" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name="itemlib" --></option>
+                                               <!-- TMPL_IF name="selected" -->
+                                                       <option value="<!-- TMPL_VAR name="itemval" -->" selected="selected"><!-- TMPL_VAR name="itemlib" --></option>
+                                                       <!-- TMPL_ELSE -->
+                                                       <option value="<!-- TMPL_VAR name="itemval" -->"><!-- TMPL_VAR name="itemlib" --></option>
+                                                       <!-- /TMPL_IF -->
                                                <!-- /TMPL_LOOP -->
                                        </select>
                                    <!--/TMPL_IF-->
@@ -129,7 +140,11 @@
                                        <select name="location" size="1">
                                                <option value="">Location</option>
                                                <!-- TMPL_LOOP name="itemlocationloop" -->
-                                                       <option value="<!-- TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name="itemlocationname" --></option>
+                                               <!-- TMPL_IF name="selected" -->
+                                                       <option value="<!-- TMPL_VAR name="value" -->" selected="selected"><!-- TMPL_VAR name="itemlocationname" --></option>
+                                                       <!-- TMPL_ELSE -->
+                                                       <option value="<!-- TMPL_VAR name="value" -->"><!-- TMPL_VAR name="itemlocationname" --></option>
+                                               <!-- /TMPL_IF -->
                                                <!-- /TMPL_LOOP -->
                                        </select>
                                <!-- TMPL_ELSE -->
@@ -162,7 +177,10 @@
                                <select name="branch" size="1">
                                                <option value="">Branch</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>
                        <!--/TMPL_IF-->
@@ -195,13 +213,22 @@
                                <!-- TMPL_IF Name="itemstatus"-->
                                    <!--TMPL_IF Name="choice"-->
                                                <!-- TMPL_LOOP name="itemstatusloop" -->
-                                                       <!-- TMPL_VAR name="itemlib" -->: <input type="checkbox" name="itemstatus" value="<!-- TMPL_VAR name="itemval" -->" <!-- TMPL_IF name="selected" -->checked<!-- /TMPL_IF -->>
+                                                       <!-- TMPL_VAR name="itemlib" -->: 
+                                                       <!-- TMPL_IF name="selected" -->
+                                                       <input type="checkbox" name="itemstatus" value="<!-- TMPL_VAR name="itemval" -->" checked="checked" />
+                                                       <!-- TMPL_ELSE -->
+                                                       <input type="checkbox" name="itemstatus" value="<!-- TMPL_VAR name="itemval" -->" />
+                                                       <!-- /TMPL_IF -->
                                                <!-- /TMPL_LOOP -->
                                    <!--TMPL_ELSE-->
                                        <select name="itemstatus" size="1">
                                                <option value="">Item Status</option>
                                                <!-- TMPL_LOOP name="itemstatusloop" -->
-                                                       <option value="<!-- TMPL_VAR name="itemval" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name="itemlib" --></option>
+                                               <!-- TMPL_IF name="selected" -->
+                                                       <option value="<!-- TMPL_VAR name="itemval" -->" selected="selected"><!-- TMPL_VAR name="itemlib" --></option>
+                                               <!-- TMPL_ELSE -->
+                                                       <option value="<!-- TMPL_VAR name="itemval" -->"><!-- TMPL_VAR name="itemlib" --></option>
+<!-- /TMPL_IF -->
                                                <!-- /TMPL_LOOP -->
                                        </select>
                                    <!-- /TMPL_IF -->
@@ -218,7 +245,11 @@
                                        <select name="location" size="1">
                                                <option value="">Location</option>
                                                <!-- TMPL_LOOP name="itemlocationloop" -->
-                                                       <option value="<!-- TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name="itemlocationname" --></option>
+                                               <!-- TMPL_IF name="selected" -->
+                                                       <option value="<!-- TMPL_VAR name="value" -->" selected="selected"><!-- TMPL_VAR name="itemlocationname" --></option>
+                                               <!-- TMPL_ELSE -->
+                                                       <option value="<!-- TMPL_VAR name="value" -->"><!-- TMPL_VAR name="itemlocationname" --></option>
+                                       <!-- /TMPL_IF -->
                                                <!-- /TMPL_LOOP -->
                                        </select>
                                <!-- TMPL_ELSE -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl b/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl
index 379962a..11e0cc6 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl
@@ -704,13 +704,13 @@ function check_input(e){
         </tr>
         <tr>
             <td><label>Supplier:</label></td>
-            <td><input type="text" name="aqbooksellerid" value="<!-- TMPL_VAR name="aqbooksellerid" -->" size="8"> (<input type="text" name="aqbooksellername" value="<!-- TMPL_VAR name="aqbooksellername" -->" disabled readonly>) <a href="#" onClick="FindAcqui(f)">Search for a Supplier</a></td>
+            <td><input type="text" name="aqbooksellerid" value="<!-- TMPL_VAR name="aqbooksellerid" -->" size="8"> (<input type="text" name="aqbooksellername" value="<!-- TMPL_VAR name="aqbooksellername" -->" disabled="disabled" readonly="readonly" />) <a href="#" onClick="FindAcqui(f)">Search for a Supplier</a></td>
         </tr>
         <tr>
             <td><label>Biblio</label></td>
             <td>
                 <input type="text" name="biblionumber" value="<!-- TMPL_VAR name="biblionumber" -->" size="8"> 
-                (<input type="text" name="title" value="<!-- TMPL_VAR name="bibliotitle" -->" disabled readonly>)
+                (<input type="text" name="title" value="<!-- TMPL_VAR name="bibliotitle" -->" disabled="disabled" readonly="readonly" />)
                 <a href="#" onClick="Plugin(f)">Search for Biblio</a> <!--TMPL_UNLESS Name="mod"--> |
                 <a href="#" onClick="Create_biblio(f)">Create Biblio</a><!--/TMPL_UNLESS-->
             </td>
@@ -724,8 +724,10 @@ function check_input(e){
             <td>
                 <select name="branchcode">
                     <option value="">Any branch</option>
-                    <!-- TMPL_LOOP name="branchloop" -->
-                        <option value="<!-- TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name="branchname" --></option>
+                    <!-- TMPL_LOOP name="branchloop" --><!-- 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> (select a branch)
             </td>
@@ -744,7 +746,11 @@ function check_input(e){
                 <select name="letter">
                     <option value="">un-activated</option>
                 <!-- TMPL_LOOP name="letterloop" -->
-                    <option value="<!-- TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name="lettername" --></option>
+                               <!-- TMPL_IF name="selected" -->
+                    <option value="<!-- TMPL_VAR name="value" -->" selected="selected"><!-- TMPL_VAR name="lettername" --></option>
+<!-- TMPL_ELSE -->
+                    <option value="<!-- TMPL_VAR name="value" -->"><!-- TMPL_VAR name="lettername" --></option>
+<!-- /TMPL_IF -->
                 <!-- /TMPL_LOOP -->
                 </select> (select a letter &amp; patrons will be able to "follow" this subscription and recieve a mail on every new issue)
             </td>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/tools/export.tmpl b/koha-tmpl/intranet-tmpl/prog/en/tools/export.tmpl
index 6a17f0f..0557abb 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/tools/export.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/tools/export.tmpl
@@ -29,10 +29,11 @@
             <select name="itemtype">
                 <option value="">-- All --</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>
         </p>
@@ -42,10 +43,10 @@
             <select id="branch" name="branch">
             <option value="">-- All --</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>
         </p>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/tools/itemslost.tmpl b/koha-tmpl/intranet-tmpl/prog/en/tools/itemslost.tmpl
index 1595558..bfc189b 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/tools/itemslost.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/tools/itemslost.tmpl
@@ -65,7 +65,10 @@
             <select name="branchfilter">
                 <option value="">All</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>
         </td>
@@ -73,7 +76,10 @@
             <select name="itemtypesfilter">
                 <option value="">All</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>
         </td>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/tools/overduerules.tmpl b/koha-tmpl/intranet-tmpl/prog/en/tools/overduerules.tmpl
index ec15d5b..46d35be 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/tools/overduerules.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/tools/overduerules.tmpl
@@ -16,7 +16,10 @@
                        <select id="branch" name="branch">
                                <option value="">Default</option>
                        <!-- TMPL_LOOP NAME="branchloop" -->
-                               <option value="<!-- TMPL_VAR NAME="value" -->"<!-- TMPL_IF NAME="selected" --> selected="selected"<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="branchname" --></option><!-- /TMPL_LOOP --></select>
+                               <!-- 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>
                        <input type="submit" value="Select" />
                </form>
                <!--TMPL_IF Name="ERROR"-->
@@ -48,56 +51,110 @@
                        <!-- TMPL_LOOP NAME="table" -->
                                <tr>
                                        <th><!-- TMPL_VAR NAME="line" --></th>
-                                       <td<!-- TMPL_IF NAME="toggle" --> class="highlight"<!-- /TMPL_IF -->>
+                                       <!-- TMPL_IF NAME="toggle" -->
+   <td class="highlight">
+<!-- TMPL_ELSE -->
+   <td>
+<!-- /TMPL_IF -->
                                                <input name="delay1-<!-- TMPL_VAR NAME="overduename" -->" size="5" value="<!-- TMPL_VAR NAME="delay1" -->" />
                                        </td>
-                                       <td<!-- TMPL_IF NAME="toggle" --> class="highlight"<!-- /TMPL_IF -->>
+                                       <!-- TMPL_IF NAME="toggle" -->
+   <td class="highlight">
+<!-- TMPL_ELSE -->
+   <td>
+<!-- /TMPL_IF -->
                                                <!--TMPL_IF Name="noletter" --><input type="text" name="letter1-<!-- TMPL_VAR NAME="overduename" -->" value="<!--TMPL_VAR Name="letter1"-->"/>
                                                <!--TMPL_ELSE -->
                                                        <select name="letter1-<!-- TMPL_VAR NAME="overduename" -->">
                                                                <option value="">Default</option>
                                                                <!-- TMPL_LOOP name="letterloop1" -->
-                                                                       <option value="<!-- TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name="lettername" --></option>
+                                                                       <!-- TMPL_IF NAME="selected" --><option value="<!-- TMPL_VAR NAME="value" -->" selected="selected"><!-- TMPL_VAR NAME="lettername" --></option>
+                               <!-- TMPL_ELSE -->
+                               <option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="lettername" --></option>
+                               <!-- /TMPL_IF -->
                                                                <!-- /TMPL_LOOP -->
                                                        </select>
                                                <!--/TMPL_IF -->
                                        </td>
-                                       <td<!-- TMPL_IF NAME="toggle" --> class="highlight"<!-- /TMPL_IF -->>
-                                               <input type="checkbox" name="debarred1-<!-- TMPL_VAR NAME="overduename" -->" <!-- TMPL_IF NAME="debarred1" -->checked<!-- /TMPL_IF --> value="1" />
+                                       <!-- TMPL_IF NAME="toggle" -->
+   <td class="highlight">
+<!-- TMPL_ELSE -->
+   <td>
+<!-- /TMPL_IF -->
+                                               <!-- TMPL_IF NAME="debarred1" --><input type="checkbox" name="debarred1-<!-- TMPL_VAR NAME="overduename" -->" checked="checked" value="1" />
+                                               <!-- TMPL_ELSE -->
+                                               <input type="checkbox" name="debarred1-<!-- TMPL_VAR NAME="overduename" -->" value="1" />
+                                               <!-- /TMPL_IF -->
                                        </td>
-                                       <td<!-- TMPL_IF NAME="toggle" --> class="highlight"<!-- /TMPL_IF -->>
+                                       <!-- TMPL_IF NAME="toggle" -->
+   <td class="highlight">
+<!-- TMPL_ELSE -->
+   <td>
+<!-- /TMPL_IF -->
                                                <input name="delay2-<!-- TMPL_VAR NAME="overduename" -->" size="5" value="<!-- TMPL_VAR NAME="delay2" -->" />
                                        </td>
-                                       <td<!-- TMPL_IF NAME="toggle" --> class="highlight"<!-- /TMPL_IF -->>
+                                       <!-- TMPL_IF NAME="toggle" -->
+   <td class="highlight">
+<!-- TMPL_ELSE -->
+   <td>
+<!-- /TMPL_IF -->
                                                <!--TMPL_IF Name="noletter" --><input type="text" name="letter2-<!-- TMPL_VAR NAME="overduename" -->" value="<!--TMPL_VAR Name="letter2"-->"/>
                                                <!--TMPL_ELSE -->
                                                        <select name="letter2-<!-- TMPL_VAR NAME="overduename" -->">
                                                                <option value="">Default</option>
                                                                <!-- TMPL_LOOP name="letterloop2" -->
-                                                                       <option value="<!-- TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name="lettername" --></option>
+                                                                       <!-- TMPL_IF NAME="selected" --><option value="<!-- TMPL_VAR NAME="value" -->" selected="selected"><!-- TMPL_VAR NAME="lettername" --></option>
+                               <!-- TMPL_ELSE -->
+                               <option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="lettername" --></option>
+                               <!-- /TMPL_IF -->
                                                                <!-- /TMPL_LOOP -->
                                                        </select>
                                                <!--/TMPL_IF -->
                                        </td>
-                                       <td<!-- TMPL_IF NAME="toggle" --> class="highlight"<!-- /TMPL_IF -->>
-                                               <input type="checkbox" name="debarred2-<!-- TMPL_VAR NAME="overduename" -->" <!-- TMPL_IF NAME="debarred2" -->checked<!-- /TMPL_IF --> value="1" />
+                                       <!-- TMPL_IF NAME="toggle" -->
+   <td class="highlight">
+<!-- TMPL_ELSE -->
+   <td>
+<!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="debarred2" -->
+                                               <input type="checkbox" name="debarred2-<!-- TMPL_VAR NAME="overduename" -->" checked="checked" value="1" />
+<!-- TMPL_ELSE -->
+                                               <input type="checkbox" name="debarred2-<!-- TMPL_VAR NAME="overduename" -->" value="1" />
+<!-- /TMPL_IF -->
                                        </td>
-                                       <td<!-- TMPL_IF NAME="toggle" --> class="highlight"<!-- /TMPL_IF -->>
+                                       <!-- TMPL_IF NAME="toggle" -->
+   <td class="highlight">
+<!-- TMPL_ELSE -->
+   <td>
+<!-- /TMPL_IF -->
                                                <input name="delay3-<!-- TMPL_VAR NAME="overduename" -->" size="5" value="<!-- TMPL_VAR NAME="delay3" -->" />
                                        </td>
-                                       <td<!-- TMPL_IF NAME="toggle" --> class="highlight"<!-- /TMPL_IF -->>
+                                       <!-- TMPL_IF NAME="toggle" -->
+   <td class="highlight">
+<!-- TMPL_ELSE -->
+   <td>
+<!-- /TMPL_IF -->
                                                <!--TMPL_IF Name="noletter" --><input type="text" name="letter3-<!-- TMPL_VAR NAME="overduename" -->" value="<!--TMPL_VAR Name="letter3"-->"/>
                                                <!--TMPL_ELSE -->
                                                        <select name="letter3-<!-- TMPL_VAR NAME="overduename" -->">
                                                                <option value="">Default</option>
                                                                <!-- TMPL_LOOP name="letterloop3" -->
-                                                                       <option value="<!-- TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name="lettername" --></option>
+                                                                       <!-- TMPL_IF NAME="selected" --><option value="<!-- TMPL_VAR NAME="value" -->" selected="selected"><!-- TMPL_VAR NAME="lettername" --></option>
+                               <!-- TMPL_ELSE -->
+                               <option value="<!-- TMPL_VAR NAME="value" -->"><!-- TMPL_VAR NAME="lettername" --></option>
+                               <!-- /TMPL_IF -->
                                                                <!-- /TMPL_LOOP -->
                                                        </select>
                                                <!--/TMPL_IF -->
                                        </td>
-                                       <td<!-- TMPL_IF NAME="toggle" --> class="highlight"<!-- /TMPL_IF -->>
-                                               <input type="checkbox" name="debarred3-<!-- TMPL_VAR NAME="overduename" -->" <!-- TMPL_IF NAME="debarred3" -->checked<!-- /TMPL_IF --> value="1" />
+                                       <!-- TMPL_IF NAME="toggle" -->
+   <td class="highlight">
+<!-- TMPL_ELSE -->
+   <td>
+<!-- /TMPL_IF --><!-- TMPL_IF NAME="debarred3" -->
+                                               <input type="checkbox" name="debarred3-<!-- TMPL_VAR NAME="overduename" -->" checked="checked" value="1" />
+                                               <!-- TMPL_ELSE -->
+                                               <input type="checkbox" name="debarred3-<!-- TMPL_VAR NAME="overduename" -->" value="1" /><!-- /TMPL_IF -->
                                        </td>
                                </tr>
                        <!-- /TMPL_LOOP -->