koha-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Koha-cvs] koha/koha-tmpl/intranet-tmpl/npl/en acqui/sugge... [rel_2_2]


From: Owen Leonard
Subject: [Koha-cvs] koha/koha-tmpl/intranet-tmpl/npl/en acqui/sugge... [rel_2_2]
Date: Mon, 02 Jul 2007 14:46:17 +0000

CVSROOT:        /sources/koha
Module name:    koha
Branch:         rel_2_2
Changes by:     Owen Leonard <oleonard> 07/07/02 14:46:17

Modified files:
        koha-tmpl/intranet-tmpl/npl/en/acqui: suggestion-select.tmpl 
        koha-tmpl/intranet-tmpl/npl/en/authorities: 
                                                    authorities-home.tmpl 
        koha-tmpl/intranet-tmpl/npl/en/barcodes: label-home.tmpl 
        koha-tmpl/intranet-tmpl/npl/en/bull: result.tmpl routing.tmpl 
                                             statecollection.tmpl 
                                             subscription-add.tmpl 
        koha-tmpl/intranet-tmpl/npl/en/circ: selectbranchprinter.tmpl 
        koha-tmpl/intranet-tmpl/npl/en/export: marc.tmpl 
        koha-tmpl/intranet-tmpl/npl/en/members: memberentry.tmpl 
        koha-tmpl/intranet-tmpl/npl/en: moditem.tmpl overdue.tmpl 
                                        request.tmpl 
        koha-tmpl/intranet-tmpl/npl/en/parameters: 
                                                   auth_tag_structure.tmpl 
                                                   issuingrules.tmpl 
                                                   systempreferences.tmpl 
        koha-tmpl/intranet-tmpl/npl/en/reports: bor_issues_top.tmpl 
                                                borrowers_out.tmpl 
                                                cat_issues_top.tmpl 
                                                catalogue_out.tmpl 
        koha-tmpl/intranet-tmpl/npl/en/search.marc: result.tmpl 
                                                    search.tmpl 
        koha-tmpl/intranet-tmpl/npl/en/suggestion: acceptorreject.tmpl 
        koha-tmpl/intranet-tmpl/npl/en/value_builder: 
                                                      unimarc_field_100.tmpl 
                                                      unimarc_field_105.tmpl 
                                                      unimarc_field_700-4.tmpl 

Log message:
        Fixes for Bug 1366. These have NOT BEEN TESTED, because I don't have 
access to a rel_2_2 installation at the moment. There are still some 
outstanding instances of this bug.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/suggestion-select.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.3&r2=1.1.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/authorities/authorities-home.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.9&r2=1.1.2.10
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/barcodes/label-home.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.6&r2=1.1.2.7
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/bull/result.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.4&r2=1.1.2.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/bull/routing.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/bull/statecollection.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.2.2.15&r2=1.2.2.16
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/bull/subscription-add.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.2.2.8&r2=1.2.2.9
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/circ/selectbranchprinter.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.2.2.1&r2=1.2.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/export/marc.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.2.2.3&r2=1.2.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/members/memberentry.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.3.2.10&r2=1.3.2.11
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/moditem.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.3&r2=1.3.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/overdue.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/request.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.3.2.3&r2=1.3.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/auth_tag_structure.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.4&r2=1.1.2.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/issuingrules.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/systempreferences.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.3.2.7&r2=1.3.2.8
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/reports/bor_issues_top.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.4&r2=1.1.2.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/reports/borrowers_out.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.3&r2=1.1.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/reports/cat_issues_top.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.3&r2=1.1.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/reports/catalogue_out.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/search.marc/result.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.5.2.5&r2=1.5.2.6
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/search.marc/search.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.6.2.8&r2=1.6.2.9
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/suggestion/acceptorreject.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/value_builder/unimarc_field_100.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1&r2=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/value_builder/unimarc_field_105.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1&r2=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/value_builder/unimarc_field_700-4.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1&r2=1.1.2.1

Patches:
Index: acqui/suggestion-select.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui/Attic/suggestion-select.tmpl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- acqui/suggestion-select.tmpl        18 May 2006 20:23:36 -0000      1.1.2.3
+++ acqui/suggestion-select.tmpl        2 Jul 2007 14:46:12 -0000       1.1.2.4
@@ -23,7 +23,7 @@
                        <th>&nbsp;</th>
                </tr>
                <!-- TMPL_LOOP NAME="suggestions_loop" -->
-                       <tr<!-- TMPL_IF name="even" --> class="highlight"<!-- 
/TMPL_IF -->>
+                       <!-- TMPL_IF name="even" --><tr class="highlight"><!-- 
TMPL_ELSE --><tr><!-- /TMPL_IF -->
                                <td>
                                        <p><!-- TMPL_VAR NAME="title" --> - 
<!-- TMPL_VAR NAME="author" --></p>
                                        <p>

Index: authorities/authorities-home.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/authorities/Attic/authorities-home.tmpl,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -b -r1.1.2.9 -r1.1.2.10
--- authorities/authorities-home.tmpl   10 Sep 2006 02:30:03 -0000      1.1.2.9
+++ authorities/authorities-home.tmpl   2 Jul 2007 14:46:12 -0000       1.1.2.10
@@ -14,7 +14,11 @@
                <h2>Search For: 
                        <select name="authtypecode">
                        <!-- TMPL_LOOP NAME="authtypesloop" -->
-                               <option value="<!-- TMPL_VAR NAME="value" -->" 
<!-- TMPL_IF name="selected" -->selected="selected"<!-- /TMPL_IF -->>
+                       <!-- 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="authtypetext" -->
                                </option>
                        <!-- /TMPL_LOOP -->
@@ -67,12 +71,16 @@
        <p><label for="authtypecode">Authority type</label>
        <select name="authtypecode" id="authtypecode">
                <!-- TMPL_LOOP name="authtypesloop" -->
-                       <option value="<!-- TMPL_VAR name="value" -->" <!-- 
TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->>
+               <!-- 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="authtypetext" -->
                        </option>
                <!-- /TMPL_LOOP -->
        </select>
-       <input type="submit" value="Add" class="submit">
+       <input type="submit" value="Add" class="submit" />
        </p>
 </form>
 </div>

Index: barcodes/label-home.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/barcodes/Attic/label-home.tmpl,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -b -r1.1.2.6 -r1.1.2.7
--- barcodes/label-home.tmpl    26 Jul 2006 23:52:14 -0000      1.1.2.6
+++ barcodes/label-home.tmpl    2 Jul 2007 14:46:12 -0000       1.1.2.7
@@ -6,57 +6,60 @@
 <div id="main">
 <form name="input" action="/cgi-bin/koha/barcodes/label-manager.pl" 
method="get">
 
-<h3>
-        Choose Fields to Print
-</h3>
+<h3>Choose Fields to Print</h3>
 <table summary="fields to print">
 <tr>
-        <td>
-                <input type="checkbox" name="itemtype" value=1 
-                <!-- TMPL_IF NAME="itemtype"-->
-                     checked
-                <!-- /TMPL_IF --> >
+        <td><!-- TMPL_IF NAME="itemtype"-->
+                <input type="checkbox" name="itemtype" value="1" 
checked="checked" />
+                               <!-- TMPL_ELSE -->
+                <input type="checkbox" name="itemtype" value="1" />
+                               <!-- /TMPL_IF -->
                 <label for="itemtype">Item Type</label>
         </td>
 
         <td>
-                <input type="checkbox" name="isbn" value=1 
                 <!-- TMPL_IF NAME="isbn" -->
-                     checked
-                <!-- /TMPL_IF -->>
+                <input type="checkbox" name="isbn" value="1" checked="checked" 
/>
+               <!-- TMPL_ELSE -->              
+                <input type="checkbox" name="isbn" value="1" />
+               <!-- /TMPL_IF -->               
                 <label for="isbn">ISBN</label>
         </td>
 
 </tr>
 <tr>
         <td>
-                <input type="checkbox" name="dcn" value=1 
                 <!-- TMPL_IF NAME="dewey" -->
-                     checked
-                <!-- /TMPL_IF -->>
+                <input type="checkbox" name="dcn" value="1" checked="checked" 
/>
+               <!-- TMPL_ELSE -->              
+                <input type="checkbox" name="dcn" value="1" />
+               <!-- /TMPL_IF -->               
                 <label for="dcn">Dewey / Call Number</label>
         </td>
         <td>
-                <input type="checkbox" name="classif" value=1  
                 <!-- TMPL_IF NAME="class" -->
-                     checked
-                <!-- /TMPL_IF -->>
+                <input type="checkbox" name="classif" value="1"  
checked="checked" />
+               <!-- TMPL_ELSE -->              
+                <input type="checkbox" name="classif" value="1" />
+               <!-- /TMPL_IF -->               
                 <label for="classif">Classification</label>
         </td>
 </tr>
 <tr>
         <td>
-                <input type="checkbox" name="itemcallnumber" value=1 
                 <!-- TMPL_IF NAME="itemcallnumber" -->
-                     checked
-                <!-- /TMPL_IF -->>
+                <input type="checkbox" name="itemcallnumber" value="1" 
checked="checked" />
+               <!-- TMPL_ELSE -->              
+                <input type="checkbox" name="itemcallnumber" value="1" />
+               <!-- /TMPL_IF -->               
                 <label for="itemcallnumber">Item Call Number</label>
         </td>
         <td>
-                <input type="checkbox" name="subclass" value=1  
                 <!-- TMPL_IF NAME="subclass" -->
-                     checked
-                <!-- /TMPL_IF -->>
+                <input type="checkbox" name="subclass" value="1" 
checked="checked" />
+               <!-- TMPL_ELSE -->              
+                <input type="checkbox" name="subclass" value="1" />
+               <!-- /TMPL_IF -->               
                 <label for="subclass">Sub-Class</label>
         </td>
 </tr>
@@ -65,147 +68,180 @@
 
 <h3>Confirm Label Type</h3>
 <select name="papertype">
-                <option value="gaylord-8511"
-                        <!-- TMPL_IF NAME="papertype_gaylord-8511" -->
-                             selected
-                        <!--/TMPL_IF -->
-                >Gaylord-8511</option>
-                <option value="opus-dot-matrix"
-                        <!-- TMPL_IF NAME="papertype_opus-dot-matrix" -->
-                             selected
-                        <!--/TMPL_IF -->
-                 >OPUS Dot-Matrix</option>
+<!-- TMPL_IF NAME="papertype_gaylord-8511" -->
+                <option value="gaylord-8511" 
selected="selected">Gaylord-8511</option>
+<!-- TMPL_ELSE -->
+                <option value="gaylord-8511">Gaylord-8511</option>
+<!--/TMPL_IF -->
+
+<!-- TMPL_IF NAME="papertype_opus-dot-matrix" -->
+                <option value="opus-dot-matrix" selected="selected">OPUS 
Dot-Matrix</option>
+<!-- TMPL_ELSE -->
+                <option value="opus-dot-matrix">OPUS Dot-Matrix</option>
+<!--/TMPL_IF -->
         </select>
 
 <h3>Confirm Barcode Type</h3>
  <select name="barcodetype">
-                <option value="COOP2of5"
+ 
                         <!-- TMPL_IF NAME="COOP2of5_checked" -->
-                             selected
+                <option value="COOP2of5" selected="selected">COOP2of5</option>
+                               <!-- TMPL_ELSE -->
+                <option value="COOP2of5">COOP2of5</option>
                         <!--/TMPL_IF -->
-                        >COOP2of5</option>
-                <option value="Code39"
+                               
                         <!-- TMPL_IF NAME="Code39_checked" -->
-                             selected
+                               <option value="Code39" 
selected="selected">Code39</option>
+                               <!-- TMPL_ELSE -->
+                <option value="Code39">Code39</option>
                         <!-- /TMPL_IF -->
-                        >Code39</option>
-                <option value="EAN13"
+                               
                         <!-- TMPL_IF NAME="EAN13_checked" -->
-                             selected
+                <option value="EAN13" selected="selected">EAN13(JAN13)</option>
+                               <!-- TMPL_ELSE -->
+                               <option value="EAN13">EAN13(JAN13)</option>
                         <!-- /TMPL_IF -->
-                        >EAN13(JAN13)</option>
-                <option value="EAN8"
+                               
                         <!-- TMPL_IF NAME="EAN8_checked" -->
-                             selected<!-- /TMPL_IF -->
-                        >EAN8(JAN8)</option>
-                <option value="ITF"
+                <option value="EAN8" selected="selected">EAN8(JAN8)</option>
+                               <!-- TMPL_ELSE -->
+                <option value="EAN8">EAN8(JAN8)</option>
+                               <!-- /TMPL_IF -->
+                               
                         <!-- TMPL_IF NAME="ITF_checked" -->
-                             selected
+                <option value="ITF" 
selected="selected">ITF(Interleaved2of5)</option>
+                               <!-- TMPL_ELSE -->
+                               <option 
value="ITF">ITF(Interleaved2of5)</option>
                         <!-- /TMPL_IF -->
-                        >ITF(Interleaved2of5)</option>
-                <option value="Industrial2of5"
+                               
                         <!-- TMPL_IF NAME="Industrial2of5_checked" -->
-                             selected
+                <option value="Industrial2of5" 
selected="selected">Industrial2of5</option>
+                               <!-- TMPL_ELSE -->
+                               <option 
value="Industrial2of5">Industrial2of5</option>
                         <!-- /TMPL_IF -->
-                        >Industrial2of5</option>
-                <option value="Matrix2of5"
+
                         <!-- TMPL_IF NAME="Matrix2of5_checked" -->
-                             selected
+                               <option value="Matrix2of5" 
selected="selected">Matrix2of5</option>
+                               <!-- TMPL_ELSE -->
+                <option value="Matrix2of5">Matrix2of5</option>
                         <!-- /TMPL_IF -->
-                        >Matrix2of5</option>
-                <option value="NW7"
+                               
                         <!-- TMPL_IF NAME="NW7_checked" -->
-                             selected
+                <option value="NW7" selected="selected">NW7</option>
+                               <!-- TMPL_ELSE -->
+                               <option value="NW7">NW7</option>
                         <!-- /TMPL_IF -->
-                        >NW7</option>
-                <option value="QRcode"
+                               
                         <!-- TMPL_IF NAME="QRcode_checked" -->
-                             selected
+                <option value="QRcode" selected="selected">QRcode</option>
+                               <!-- TMPL_ELSE -->
+                               <option value="QRcode">QRcode</option>
                         <!-- /TMPL_IF -->
-                        >QRcode</option>
-                <option value="UPC-A"
+                               
                         <!-- TMPL_IF NAME="UPC-A_checked" -->
-                             selected
+                <option value="UPC-A" selected="selected">UPC-A</option>
+                               <!-- TMPL_ELSE -->
+                               <option value="UPC-A">UPC-A</option>
                         <!-- /TMPL_IF -->
-                        >UPC-A</option>
-                <option value="UPC-E"
+                               
                         <!-- TMPL_IF NAME="UPC-E_checked" -->
-                             selected
+                <option value="UPC-E" selected="selected">UPC-E</option>
+                               <!-- TMPL_ELSE -->
+                               <option value="UPC-E">UPC-E</option>
                         <!-- /TMPL_IF -->
-                        >UPC-E</option>
+                               
         </select>
 </h3>
 
 
 <h3>Confirm Printing Type</h3>
-
-<input type="radio" name="printingtype" value="spine"
-        <!-- TMPL_IF NAME="printingtype_spine" -->
-                checked
-        <!--/TMPL_IF -->
-       >Spine Labels
-<input type="radio" name="printingtype" value="barcode"
-        <!-- TMPL_IF NAME="printingtype_barcode" -->
-                checked
-        <!--/TMPL_IF -->
-       >Barcode Labels
-<input type="radio" name="printingtype" value="both"  
-       <!-- TMPL_IF NAME="printingtype_both" -->
-               checked       
-       <!--/TMPL_IF -->
-       >Both Labels
-
+<!-- TMPL_IF NAME="printingtype_spine" -->
+<input type="radio" name="printingtype" value="spine" checked="checked">Spine 
Labels
+<!-- TMPL_ELSE -->
+<input type="radio" name="printingtype" value="spine">Spine Labels
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="printingtype_barcode" -->
+<input type="radio" name="printingtype" value="barcode" 
checked="checked">Barcode Labels
+<!-- TMPL_ELSE -->
+<input type="radio" name="printingtype" value="barcode">Barcode Labels
+<!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="printingtype_both" -->
+<input type="radio" name="printingtype" value="both" checked="checked">Both 
Labels
+<!-- TMPL_ELSE -->
+<input type="radio" name="printingtype" value="both">Both Labels
+<!-- /TMPL_IF -->
 
 <h3>
         Start printing from Row number:<select name="startrow">
-              <option value="1"
                       <!-- TMPL_IF NAME="startrow1_checked" -->
-                           selected
-                      <!-- /TMPL_IF -->>1</option>
-              <option value="2"
+              <option value="1" selected="selected">1</option>
+                         <!-- TMPL_ELSE -->
+                         <option value="1">1</option>
+                         <!-- /TMPL_IF -->
+                         
                       <!-- TMPL_IF NAME="startrow2_checked" -->
-                           selected
-                      <!-- /TMPL_IF -->>2</option>
-              <option value="3"
+              <option value="2" selected="selected">2</option>
+                         <!-- TMPL_ELSE -->
+              <option value="2">2</option>
+                         <!-- /TMPL_IF -->
+                         
                       <!-- TMPL_IF NAME="startrow3_checked" -->
-                           selected
-                      <!-- /TMPL_IF -->>3</option>
-              <option value="4"
+                         <option value="3" selected="selected">3</option>
+                         <!-- TMPL_ELSE -->
+              <option value="3">3</option>
+                         <!-- /TMPL_IF -->
+                         
                       <!-- TMPL_IF NAME="startrow4_checked" -->
-                          selected
-                      <!-- /TMPL_IF -->>4</option>
-              <option value="5"
+                         <option value="4" selected="selected">4</option>
+                         <!-- TMPL_ELSE -->
+               <option value="4">4</option>
+                         <!-- /TMPL_IF -->
+                         
                       <!-- TMPL_IF NAME="startrow5_checked" -->
-                           selected
-                      <!-- /TMPL_IF -->>5</option>
-              <option value="6"
+                         <option value="5" selected="selected">5</option>
+                         <!-- TMPL_ELSE -->
+              <option value="5">5</option>
+                         <!-- /TMPL_IF -->
+                         
                       <!-- TMPL_IF NAME="startrow6_checked" -->
-                           selected
-                      <!-- /TMPL_IF -->>6</option>
-              <option value="7"
+                         <option value="6" selected="selected">6</option>
+                         <!-- TMPL_ELSE -->
+              <option value="6">6</option>
+                         <!-- /TMPL_IF -->
+                         
                       <!-- TMPL_IF NAME="startrow7_checked" -->
-                           selected
-                      <!-- /TMPL_IF -->>7</option>
-              <option value="8"
+                         <option value="7" selected="selected">7</option>
+                         <!-- TMPL_ELSE -->
+              <option value="7">7</option>
+                         <!-- /TMPL_IF -->
+                         
                       <!-- TMPL_IF NAME="startrow8_checked" -->
-                           selected
-                      <!-- /TMPL_IF -->>8</option>
+                         <option value="8" selected="selected">8</option>
+                         <!-- TMPL_ELSE -->
+                         <option value="8">8</option>
+                         <!-- /TMPL_IF -->
+                         
         </select>
 </h3>
 
+
 <p>
-<p>
- <input type="checkbox" name="guidebox" value=1
-                <!-- TMPL_IF NAME="guidebox"-->
-                     checked
-                <!-- /TMPL_IF -->>
+
+<!-- TMPL_IF NAME="guidebox"-->
+ <input type="checkbox" name="guidebox" value="1" checked="checked" />
+ <!-- TMPL_ELSE -->
+ <input type="checkbox" name="guidebox" value="1" />
+ <!-- /TMPL_IF -->
+ 
                 <label for="guidebox">Draw Guide Boxes</label>
+</p>
+
 <p>
-<p>
-<p>
-        <input type="submit" value="Submit">
-        <input type="reset" value="Reset">
-        <input type="hidden" name=op value="save_conf">
+        <input type="submit" value="Submit" />
+        <input type="reset" value="Reset" />
+        <input type="hidden" name=op value="save_conf" />
 </p>
 </form>
 </div>

Index: bull/result.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/Attic/result.tmpl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -b -r1.1.2.4 -r1.1.2.5
--- bull/result.tmpl    10 Jan 2006 21:30:36 -0000      1.1.2.4
+++ bull/result.tmpl    2 Jul 2007 14:46:13 -0000       1.1.2.5
@@ -28,7 +28,7 @@
                        <th>&nbsp;</th>
                        </tr>
                        <!-- TMPL_LOOP name="result" -->
-                       <tr<!-- TMPL_IF name="even" --> class="highlight"<!-- 
/TMPL_IF -->>
+                       <!-- TMPL_IF name="even" --><tr class="highlight"><!-- 
TMPL_ELSE --><tr><!-- /TMPL_IF -->
                                <td><b><!-- TMPL_VAR NAME="title" 
--></b><br><!-- TMPL_VAR NAME="author" -->
                                                <!-- TMPL_IF 
name="publishercode" -->- <!-- TMPL_VAR name="publishercode" --><!-- /TMPL_IF 
-->
                                                <!-- TMPL_IF name="place" --> ; 
<!-- TMPL_VAR name="place" --><!-- /TMPL_IF -->

Index: bull/routing.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/Attic/routing.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- bull/routing.tmpl   23 Apr 2007 03:37:05 -0000      1.1.2.2
+++ bull/routing.tmpl   2 Jul 2007 14:46:13 -0000       1.1.2.3
@@ -15,9 +15,9 @@
 
 <div id="main">
 <!-- TMPL_IF NAME="op" -->
-<h1 class="bull">Create Routing List</h1>
+<h1>Create Routing List</h1>
 <!-- TMPL_ELSE -->
-<h1 class="bull">Edit Routing List</h1>
+<h1>Edit Routing List</h1>
 <!-- /TMPL_IF -->
 
 <form method="post" action="routing.pl">
@@ -28,7 +28,12 @@
 
 <select name="date_selected">
 <!-- TMPL_LOOP NAME="dates" -->
-<option value="<!-- TMPL_VAR NAME="serialseq" -->" <!-- 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" -->" selected="selected">
+<!-- TMPL_ELSE -->
+       <option value="<!-- TMPL_VAR NAME="serialseq" -->">
+<!-- /TMPL_IF -->
+<!-- TMPL_VAR NAME="serialseq" --> (<!-- TMPL_VAR NAME="planneddate" 
-->)</option>
 <!-- /TMPL_LOOP -->
 </select>
 

Index: bull/statecollection.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/Attic/statecollection.tmpl,v
retrieving revision 1.2.2.15
retrieving revision 1.2.2.16
diff -u -b -r1.2.2.15 -r1.2.2.16
--- bull/statecollection.tmpl   2 May 2007 13:59:53 -0000       1.2.2.15
+++ bull/statecollection.tmpl   2 Jul 2007 14:46:13 -0000       1.2.2.16
@@ -136,7 +136,12 @@
                                        <select id="itemstatus" 
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_ELSE -->
+                                                       <option value="<!-- 
TMPL_VAR name="itemval" -->">
+                                               <!-- /TMPL_IF -->
+                                                       <!-- TMPL_VAR 
name="itemlib" --></option>
                                                <!-- /TMPL_LOOP -->
                                        </select>
                                
@@ -147,7 +152,12 @@
                                        <select id="location" 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_ELSE -->
+                                                       <option value="<!-- 
TMPL_VAR name="value" -->">
+                                               <!-- /TMPL_IF -->
+                                                       <!-- TMPL_VAR 
name="itemlocationname" --></option>
                                                <!-- /TMPL_LOOP -->
                                        </select>
                                <!-- TMPL_ELSE -->
@@ -203,7 +213,12 @@
                        <tr><th scope="row"><label for="manual-branch">Branch: 
</label></th><td>
                                <select id="manual-branch" name="branch" 
size="1">
                        <!-- 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_ELSE -->      
+                               <option value="<!-- TMPL_VAR name="value" -->">
+                       <!-- /TMPL_IF -->
+                               <!-- TMPL_VAR name="branchname" --></option>
                        <!-- /TMPL_LOOP -->
                                </select>
                        </td></tr>
@@ -212,7 +227,12 @@
                                        <select id="manual-itemstatus" 
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_ELSE -->
+                                                       <option value="<!-- 
TMPL_VAR name="itemval" -->">
+                                               <!-- /TMPL_IF -->
+                                                       <!-- TMPL_VAR 
name="itemlib" --></option>
                                                <!-- /TMPL_LOOP -->
                                        </select>
                                
@@ -222,7 +242,12 @@
                                        <select id="manual-location" 
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_ELSE -->
+                                                       <option value="<!-- 
TMPL_VAR name="value" -->">
+                                               <!-- /TMPL_IF -->               
                                        
+                                                       <!-- TMPL_VAR 
name="itemlocationname" --></option>
                                                <!-- /TMPL_LOOP -->
                                        </select>
                                <!-- TMPL_ELSE -->
@@ -252,7 +277,7 @@
                <input type="hidden" name="op" value="modsubscriptionhistory" />
                <input type="hidden" name="serial" value="<!-- TMPL_VAR 
name="serial" -->" />
                <input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR 
name="subscriptionid" -->" />
-               <input type="hidden" name="user" value="<!-- TMPL_VAR 
name="user" -->">
+               <input type="hidden" name="user" value="<!-- TMPL_VAR 
name="user" -->" />
                <table>
                <caption>Subscription summary</caption>
                <tr><th scope="row"><label>Librarian: </label></th><td><!-- 
TMPL_VAR name="user" --></td></tr>

Index: bull/subscription-add.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/bull/Attic/subscription-add.tmpl,v
retrieving revision 1.2.2.8
retrieving revision 1.2.2.9
diff -u -b -r1.2.2.8 -r1.2.2.9
--- bull/subscription-add.tmpl  27 Nov 2006 00:27:43 -0000      1.2.2.8
+++ bull/subscription-add.tmpl  2 Jul 2007 14:46:13 -0000       1.2.2.9
@@ -700,15 +700,15 @@
 <!-- TMPL_IF name="mod" -->
        <h1>Modify subscription</h1>
        <form method="post" name="f" action="subscription-detail.pl">
-               <input type="hidden" name="op" value="modsubscription">
-               <input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR 
name="subscriptionid" -->">
+               <input type="hidden" name="op" value="modsubscription" />
+               <input type="hidden" name="subscriptionid" value="<!-- TMPL_VAR 
name="subscriptionid" -->" />
 <!-- TMPL_ELSE -->
        <h1>Add a subscription (Serial Holdings Record)</h1>
        <form method="post" name="f">
-               <input type="hidden" name="op" value="addsubscription">
+               <input type="hidden" name="op" value="addsubscription" />
 <!-- /TMPL_IF -->
-               <input type="hidden" name="user" value="<!-- TMPL_VAR 
name="loggedinusername" -->">
-               <input type="hidden" name="irreg_check" value="0">
+               <input type="hidden" name="user" value="<!-- TMPL_VAR 
name="loggedinusername" -->" />
+               <input type="hidden" name="irreg_check" value="0" />
 
 
 <div class="data">
@@ -717,11 +717,11 @@
        <tr><td>Librarian:</td>
            <td><!-- TMPL_VAR name="loggedinusername" --></td></tr>
        <tr><td>Supplier:</td>
-           <td><input type="text" name="aqbooksellerid" value="<!-- TMPL_VAR 
name="aqbooksellerid" -->" size="4"> (<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="4" /> (<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><td>Biblio</td>
-           <td><input type="text" name="biblionumber" value="<!-- TMPL_VAR 
name="biblionumber" -->" size="4"> (<input type="text" name="title" value="<!-- 
TMPL_VAR name="bibliotitle" -->" disabled readonly>) <a href="#" 
onClick="Plugin(f)">Search for Biblio</a> | <a 
href="/cgi-bin/koha/acqui/acqui-home.pl">Create Biblio</a></td>
+           <td><input type="text" name="biblionumber" value="<!-- TMPL_VAR 
name="biblionumber" -->" size="4" /> (<input type="text" name="title" 
value="<!-- TMPL_VAR name="bibliotitle" -->" disabled="disabled" 
readonly="readonly" />) <a href="#" onClick="Plugin(f)">Search for Biblio</a> | 
<a href="/cgi-bin/koha/acqui/acqui-home.pl">Create Biblio</a></td>
        <tr><td>Call Number</td>
-           <td><input type="text" name="callnumber" value="<!-- TMPL_VAR 
name="callnumber" -->" size="20"></td></tr>
+           <td><input type="text" name="callnumber" value="<!-- TMPL_VAR 
name="callnumber" -->" size="20" /></td></tr>
        <tr><td>Notes</td>
            <td><textarea name="notes" cols="30" rows="2"><!-- TMPL_VAR 
name="notes" --></textarea></td>
        <tr><td><b>Warning:</b></td>
@@ -738,7 +738,7 @@
        <tr><td>First Issue ETA:</td>
            <td> <img src="<!-- TMPL_VAR Name="themelang" 
-->/includes/calendar/cal.gif" id="button2" style="cursor: pointer;"  />
 
-<input type="text" name="firstacquidate" value="<!-- TMPL_VAR name="startdate" 
-->" size=13 maxlength=10 id="acqui_date" style="border-width: 0px;">
+<input type="text" name="firstacquidate" value="<!-- TMPL_VAR name="startdate" 
-->" size="13" maxlength="10" id="acqui_date" style="border-width: 0px;" />
 <!-- both scripts for calendar must follow the input field --> 
                                         <script type="text/javascript">
                                             Calendar.setup({
@@ -870,7 +870,7 @@
 <div id="irregularity"></div></td></tr>
        <tr><td>Begins On: (*)</td>
            <td><img src="<!-- TMPL_VAR Name="themelang" 
-->/includes/calendar/cal.gif" id="button1" style="cursor: pointer;"  />
-<input type="text" name="startdate" value="<!-- TMPL_VAR name="startdate" -->" 
size=13 maxlength=10 id="beginning_date" style="border-width: 0px;">
+<input type="text" name="startdate" value="<!-- TMPL_VAR name="startdate" -->" 
size="13" maxlength="10" id="beginning_date" style="border-width: 0px;" />
 <!-- both scripts for calendar must follow the input field --> 
                                         <script type="text/javascript">
                                             Calendar.setup({
@@ -935,14 +935,19 @@
        <h2>Subscription length</h2>
                <p><select name="subtype">
 <!-- TMPL_LOOP NAME="subtype" -->
-<option value="<!-- TMPL_VAR NAME="name" -->" <!-- TMPL_IF NAME="selected" --> 
selected="SELECTED" <!-- /TMPL_IF -->><!-- TMPL_VAR NAME="name" --></option>
+<!-- TMPL_IF NAME="selected" -->
+<option value="<!-- TMPL_VAR NAME="name" -->" selected="selected">
+<!-- TMPL_ELSE -->
+<option value="<!-- TMPL_VAR NAME="name" -->">
+ <!-- /TMPL_IF -->
+<!-- TMPL_VAR NAME="name" --></option>
 <!-- /TMPL_LOOP -->
-</select> <input type="text" name="sublength" value="<!-- TMPL_VAR 
name="sublength" -->" size="3" onkeypress="return check_input(event)"> (*) 
(enter amount in numerals)</p>
+</select> <input type="text" name="sublength" value="<!-- TMPL_VAR 
name="sublength" -->" size="3" onkeypress="return check_input(event)" /> (*) 
(enter amount in numerals)</p>
 
 </div>
 <div class="data">
        <h2>Numbering calculation</h2>
-       <p>Numbering formula: <input type="text" name="numberingmethod" 
value="<!-- TMPL_VAR name="numberingmethod" -->"></p>
+       <p>Numbering formula: <input type="text" name="numberingmethod" 
value="<!-- TMPL_VAR name="numberingmethod" -->" /></p>
        <div id="basetable" style="display: none;">
                <table class="small">
                        <tr>
@@ -954,40 +959,40 @@
                        <tr>
                                <td >Add</td>
                                <td>
-                                       <input type="text" name="add1" 
value="<!-- TMPL_VAR name="add1" -->">
+                                       <input type="text" name="add1" 
value="<!-- TMPL_VAR name="add1" -->" />
                                </td>
                                <td>
-                                       <input type="text" name="add2" 
value="<!-- TMPL_VAR name="add2" -->">
+                                       <input type="text" name="add2" 
value="<!-- TMPL_VAR name="add2" -->" />
                                </td>
                                <td>
-                                       <input type="text" name="add3" 
value="<!-- TMPL_VAR name="add3" -->">
+                                       <input type="text" name="add3" 
value="<!-- TMPL_VAR name="add3" -->" />
                                </td>
                        </tr>
                        <tr>
                                <td >once every</td>
-                               <td><input type="text" name="every1" 
value="<!-- TMPL_VAR name="every1" -->"></td>
-                               <td><input type="text" name="every2" 
value="<!-- TMPL_VAR name="every2" -->"></td>
-                               <td><input type="text" name="every3" 
value="<!-- TMPL_VAR name="every3" -->"></td>
+                               <td><input type="text" name="every1" 
value="<!-- TMPL_VAR name="every1" -->" /></td>
+                               <td><input type="text" name="every2" 
value="<!-- TMPL_VAR name="every2" -->" /></td>
+                               <td><input type="text" name="every3" 
value="<!-- TMPL_VAR name="every3" -->" /></td>
                        </tr>
                        <tr>
                                <td >When more than</td>
-                               <td><input type="text" name="whenmorethan1" 
value="<!-- TMPL_VAR name="whenmorethan1" -->"></td>
-                               <td><input type="text" name="whenmorethan2" 
value="<!-- TMPL_VAR name="whenmorethan2" -->"></td>
-                               <td><input type="text" name="whenmorethan3" 
value="<!-- TMPL_VAR name="whenmorethan3" -->"></td>
+                               <td><input type="text" name="whenmorethan1" 
value="<!-- TMPL_VAR name="whenmorethan1" -->" /></td>
+                               <td><input type="text" name="whenmorethan2" 
value="<!-- TMPL_VAR name="whenmorethan2" -->" /></td>
+                               <td><input type="text" name="whenmorethan3" 
value="<!-- TMPL_VAR name="whenmorethan3" -->" /></td>
                        </tr>
                        <!-- TMPL_IF name="mod" -->
                        <tr>
                                <td >The loop is for instance</td>
-                               <td><input type="text" name="innerloop1" 
value="<!-- TMPL_VAR name="innerloop1" -->"></td>
-                               <td><input type="text" name="innerloop2" 
value="<!-- TMPL_VAR name="innerloop2" -->"></td>
-                               <td><input type="text" name="innerloop3" 
value="<!-- TMPL_VAR name="innerloop3" -->"></td>
+                               <td><input type="text" name="innerloop1" 
value="<!-- TMPL_VAR name="innerloop1" -->" /></td>
+                               <td><input type="text" name="innerloop2" 
value="<!-- TMPL_VAR name="innerloop2" -->" /></td>
+                               <td><input type="text" name="innerloop3" 
value="<!-- TMPL_VAR name="innerloop3" -->" /></td>
                        </tr>
                        <!-- /TMPL_IF -->
                        <tr>
                                <td >Set back to</td>
-                               <td><input type="text" name="setto1" 
value="<!-- TMPL_VAR name="setto1" -->"></td>
-                               <td><input type="text" name="setto2" 
value="<!-- TMPL_VAR name="setto2" -->"></td>
-                               <td><input type="text" name="setto3" 
value="<!-- TMPL_VAR name="setto3" -->"></td>
+                               <td><input type="text" name="setto1" 
value="<!-- TMPL_VAR name="setto1" -->" /></td>
+                               <td><input type="text" name="setto2" 
value="<!-- TMPL_VAR name="setto2" -->" /></td>
+                               <td><input type="text" name="setto3" 
value="<!-- TMPL_VAR name="setto3" -->" /></td>
                        </tr>
                        <tr>
                                <td >
@@ -997,16 +1002,16 @@
                                                Begins with
                                        <!-- /TMPL_IF -->
                                </td>
-                               <td><input type="text" name="lastvalue1" 
value="<!-- TMPL_VAR name="lastvalue1" -->"></td>
-                               <td><input type="text" name="lastvalue2" 
value="<!-- TMPL_VAR name="lastvalue2" -->"></td>
-                               <td><input type="text" name="lastvalue3" 
value="<!-- TMPL_VAR name="lastvalue3" -->"></td>
+                               <td><input type="text" name="lastvalue1" 
value="<!-- TMPL_VAR name="lastvalue1" -->" /></td>
+                               <td><input type="text" name="lastvalue2" 
value="<!-- TMPL_VAR name="lastvalue2" -->" /></td>
+                               <td><input type="text" name="lastvalue3" 
value="<!-- TMPL_VAR name="lastvalue3" -->" /></td>
                        </tr>
                </table> </div>
 </div>
 <!-- TMPL_IF name="mod" -->
-       <input type="button" value="Save subscription" 
onclick="Check(this.form)" accesskey="w" class="button bull">
+       <input type="button" value="Save subscription" 
onclick="Check(this.form)" accesskey="w" class="submit" />
 <!-- TMPL_ELSE -->
-       <input type="button" value="Add subscription" 
onclick="Check(this.form)" accesskey="w" class="button bull">
+       <input type="button" value="Add subscription" 
onclick="Check(this.form)" accesskey="w" class="submit" />
 <!-- /TMPL_IF -->
 </form>
 </div>

Index: circ/selectbranchprinter.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ/Attic/selectbranchprinter.tmpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -b -r1.2.2.1 -r1.2.2.2
--- circ/selectbranchprinter.tmpl       3 Aug 2006 15:57:17 -0000       1.2.2.1
+++ circ/selectbranchprinter.tmpl       2 Jul 2007 14:46:13 -0000       1.2.2.2
@@ -13,7 +13,12 @@
 <!--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_ELSE -->
+               <option value="<!-- TMPL_VAR Name="value" -->">
+       <!-- /TMPL_IF -->
+               <!-- TMPL_VAR Name="name" --></option>
        <!-- /TMPL_LOOP -->
        </select>
 </div>
@@ -22,7 +27,12 @@
 <!--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_ELSE -->
+       <option value="<!-- TMPL_VAR Name="value" -->">
+       <!-- /TMPL_IF -->
+       <!-- TMPL_VAR Name="name" -->
        <!-- /TMPL_LOOP -->
        </select>
 <input type="hidden" name="setcookies" value="1" />

Index: export/marc.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/export/Attic/marc.tmpl,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -u -b -r1.2.2.3 -r1.2.2.4
--- export/marc.tmpl    9 Mar 2006 20:36:22 -0000       1.2.2.3
+++ export/marc.tmpl    2 Jul 2007 14:46:13 -0000       1.2.2.4
@@ -7,22 +7,27 @@
 <form method="post" action="/cgi-bin/koha/export/marc.pl">
 <table>
 <caption>Select biblios to export</caption>
-<tr><th scope="row">From biblio number:</th><td><input type="text" 
name="start_bib"></td></tr>
-<tr><th scope="row">...to biblio number:</th><td><input type="text" 
name="end_bib"></td></tr>
+<tr><th scope="row">From biblio number:</th><td><input type="text" 
name="start_bib" /></td></tr>
+<tr><th scope="row">...to biblio number:</th><td><input type="text" 
name="end_bib" /></td></tr>
 <tr><th scope="row">Item Type: </th><td><!--TMPL_VAR 
Name="CGIitemtype"--></td></tr>
 <tr><th scope="row">Branch:</th><td><select name="branch">
                        <option value="">Default</option>
                         <!-- TMPL_LOOP name="branchloop" -->
-                                <option value="<!-- TMPL_VAR name="value" -->" 
<!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name
+                                               <!-- 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
 ="branchname" --></option>
                         <!-- /TMPL_LOOP -->
                         </select></td></tr>
-<tr><th scope="row">From itemcallnumber:</th><td><input type="text" 
name="start_callnumber"></td></tr>
-<tr><th scope="row">...to itemcallnumber:</th><td><input type="text" 
name="end_callnumber"></td></tr>
-<tr><th scope="row">Limit to: </th><td><input type="text" name="limit"> first 
biblio</td></tr>
+<tr><th scope="row">From itemcallnumber:</th><td><input type="text" 
name="start_callnumber" /></td></tr>
+<tr><th scope="row">...to itemcallnumber:</th><td><input type="text" 
name="end_callnumber" /></td></tr>
+<tr><th scope="row">Limit to: </th><td><input type="text" name="limit" /> 
first biblio</td></tr>
 </table></div>
-<p>                    <input type="hidden" name="op" value="export">
-                       <input type="submit" value="Export" class="submit"></p>
+<p>                    <input type="hidden" name="op" value="export" />
+                       <input type="submit" value="Export" class="submit" 
/></p>
                </form>
 
 </div>

Index: members/memberentry.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/members/Attic/memberentry.tmpl,v
retrieving revision 1.3.2.10
retrieving revision 1.3.2.11
diff -u -b -r1.3.2.10 -r1.3.2.11
--- members/memberentry.tmpl    20 Jun 2006 18:15:23 -0000      1.3.2.10
+++ members/memberentry.tmpl    2 Jul 2007 14:46:14 -0000       1.3.2.11
@@ -51,14 +51,14 @@
        <!-- /TMPL_IF -->
        <form action="/cgi-bin/koha/members/memberentry.pl" method="post">
                <input type="hidden" name="destination" value="<!-- TMPL_VAR 
NAME="destination" -->" />
-               <input type="hidden" name="type" value="borrowers">
-               <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR 
NAME="borrowernumber" -->">
-               <input type="hidden" name="updtype" value="<!-- TMPL_VAR 
NAME="updtype" -->">
-       <input type="hidden" name="actionType" value="<!-- TMPL_VAR 
NAME="actionType" -->">
+               <input type="hidden" name="type" value="borrowers" />
+               <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR 
NAME="borrowernumber" -->" />
+               <input type="hidden" name="updtype" value="<!-- TMPL_VAR 
NAME="updtype" -->" />
+       <input type="hidden" name="actionType" value="<!-- TMPL_VAR 
NAME="actionType" -->" />
                <!-- TMPL_IF NAME="addAction" -->
-                       <input type="hidden" name="op" value="add">
+                       <input type="hidden" name="op" value="add" />
                <!-- TMPL_ELSE -->
-                       <input type="hidden" name="op" value="modify">
+                       <input type="hidden" name="op" value="modify" />
                <!-- /TMPL_IF -->
 <div class="table members"><table>
 
@@ -73,19 +73,32 @@
                                        <option value="Sir" <!-- TMPL_VAR 
NAME="title_Sir" -->>Sir</option>
                                </select>
                                </td></tr><!-- /TMPL_UNLESS -->
-       <!-- TMPL_UNLESS name="institution" --><tr><th><label 
for="initials">Initials:</label></th><td colspan="4"><input type="text" 
id="initials" name="initials" size="5" value="<!-- TMPL_VAR NAME="initials" 
-->"></td></tr><!-- /TMPL_UNLESS -->
+       <!-- TMPL_UNLESS name="institution" --><tr><th><label 
for="initials">Initials:</label></th><td colspan="4"><input type="text" 
id="initials" name="initials" size="5" value="<!-- TMPL_VAR NAME="initials" 
-->" /></td></tr><!-- /TMPL_UNLESS -->
 
-       <tr><th><!-- TMPL_IF NAME="ERROR_surname" --><label for="surname" 
class="focus"><!-- TMPL_ELSE --><label for="surname"><!-- /TMPL_IF --><a 
name="lastname" id="lastname"><!-- TMPL_IF NAME="institution" -->Institution 
name:<!-- TMPL_ELSE -->Last Name: <!-- /TMPL_IF --></a></label></th><td><input 
type="text" id="surname" name="surname" size="20" value="<!-- TMPL_VAR 
NAME="surname" -->"<!-- TMPL_IF NAME="ERROR_surname" --> class="focus"<!-- 
/TMPL_IF -->></td>
+       <tr><th><!-- TMPL_IF NAME="ERROR_surname" --><label for="surname" 
class="focus"><!-- TMPL_ELSE --><label for="surname"><!-- /TMPL_IF --><a 
name="lastname" id="lastname"><!-- TMPL_IF NAME="institution" -->Institution 
name:<!-- TMPL_ELSE -->Last Name: <!-- /TMPL_IF --></a></label></th><td>
+<!-- TMPL_IF NAME="ERROR_surname" -->
+<input type="text" id="surname" name="surname" size="20" value="<!-- TMPL_VAR 
NAME="surname" -->" class="focus" />
+<!-- TMPL_ELSE -->
+<input type="text" id="surname" name="surname" size="20" value="<!-- TMPL_VAR 
NAME="surname" -->" />
+<!-- /TMPL_IF -->
+</td>
 
-<!-- TMPL_UNLESS name="institution" --><th><!-- TMPL_IF NAME="ERROR_gender" 
--><label for="sex" class="focus"><!-- TMPL_ELSE --><label for="sex"><!-- 
/TMPL_IF --><a name="sex" id="sex">Sex:</a> </label></th><td><input 
type="radio" id="sex" name="sex" value="F"<!-- TMPL_IF NAME="female" --> 
checked="checked"<!-- /TMPL_IF --><!-- TMPL_IF NAME="ERROR_gender" --> 
class="focus"<!-- /TMPL_IF -->>F     <input type="radio" name="sex" 
value="M"<!-- TMPL_UNLESS name="female" --> checked="checked"<!-- /TMPL_UNLESS 
--><!-- TMPL_IF NAME="ERROR_gender" --> class="focus"<!-- /TMPL_IF -->> 
M</td><!-- /TMPL_UNLESS -->
+<!-- TMPL_UNLESS name="institution" --><th><!-- TMPL_IF NAME="ERROR_gender" 
--><label for="sex" class="focus"><!-- TMPL_ELSE --><label for="sex"><!-- 
/TMPL_IF --><a name="sex" id="sex">Sex:</a> </label></th>
+<td><input type="radio" id="sex" name="sex" value="F"<!-- TMPL_IF 
NAME="female" --> checked="checked"<!-- /TMPL_IF --><!-- TMPL_IF 
NAME="ERROR_gender" --> class="focus"<!-- /TMPL_IF -->>F    <input type="radio" 
name="sex" value="M"<!-- TMPL_UNLESS name="female" --> checked="checked"<!-- 
/TMPL_UNLESS --><!-- TMPL_IF NAME="ERROR_gender" --> class="focus"<!-- /TMPL_IF 
-->> M</td><!-- /TMPL_UNLESS -->
 </tr>
 
-       <!-- TMPL_UNLESS name="institution" --><tr><th><!-- TMPL_IF 
NAME="ERROR_firstname" --><label for="firstname" class="focus"><!-- TMPL_ELSE 
--><label for="firstname"><!-- /TMPL_IF --><a name="firstname" 
id="firstname">First Name:</a></label> </th><td><input type="text" 
id="firstname" name="firstname" size="20" value="<!-- TMPL_VAR NAME="firstname" 
-->"<!-- TMPL_IF NAME="ERROR_firstname" --> class="focus"<!-- /TMPL_IF -->></td>
+       <!-- TMPL_UNLESS name="institution" --><tr><th><!-- TMPL_IF 
NAME="ERROR_firstname" --><label for="firstname" class="focus"><!-- TMPL_ELSE 
--><label for="firstname"><!-- /TMPL_IF --><a name="firstname" 
id="firstname">First Name:</a></label> </th><td>
+<!-- TMPL_IF NAME="ERROR_firstname" -->
+       <input type="text" id="firstname" name="firstname" size="20" 
value="<!-- TMPL_VAR NAME="firstname" -->" class="focus" />
+<!-- TMPL_ELSE -->
+       <input type="text" id="firstname" name="firstname" size="20" 
value="<!-- TMPL_VAR NAME="firstname" -->" />
+<!-- /TMPL_IF -->
+</td>
 
-<!-- TMPL_UNLESS name="institution" --><th><label for="dateofbirth">Date of 
Birth: </label></th><td><input type="text" id="dateofbirth" name="dateofbirth" 
size="10" value="<!-- TMPL_VAR NAME="dateofbirth" -->"> (<!-- TMPL_VAR 
NAME="dateformat" -->)</td><!-- /TMPL_UNLESS -->
+<!-- TMPL_UNLESS name="institution" --><th><label for="dateofbirth">Date of 
Birth: </label></th><td><input type="text" id="dateofbirth" name="dateofbirth" 
size="10" value="<!-- TMPL_VAR NAME="dateofbirth" -->" /> (<!-- TMPL_VAR 
NAME="dateformat" -->)</td><!-- /TMPL_UNLESS -->
 </tr><!-- /TMPL_UNLESS -->
                                        
-       <!-- TMPL_UNLESS name="institution" --><tr><th><label 
for="othernames">Preferred Name:</label></th><td colspan="4"><input type="text" 
id="othernames" name="othernames" size="20" value="<!-- TMPL_VAR 
NAME="othernames" -->"></td></tr><!-- /TMPL_UNLESS -->
+       <!-- TMPL_UNLESS name="institution" --><tr><th><label 
for="othernames">Preferred Name:</label></th><td colspan="4"><input type="text" 
id="othernames" name="othernames" size="20" value="<!-- TMPL_VAR 
NAME="othernames" -->" /></td></tr><!-- /TMPL_UNLESS -->
 
        <tr><th>Addresses:</th><td colspan="4"><fieldset><legend>Mailing 
Address</legend><!-- TMPL_IF NAME="ERROR_address" --><label for="streetaddress" 
class="focus"><!-- TMPL_ELSE --><label for="streetaddress"><!-- /TMPL_IF --><a 
name="address" id="address">Address:</a> </label>
 <!-- TMPL_IF NAME="ERROR_address" -->
@@ -132,8 +145,8 @@
 <!-- TMPL_UNLESS name="institution" -->
                <div class="table members"><table>
                <caption>Alternate Contact</caption>
-               <tr><th><label for="contactname">Name: </label></th><td><input 
type="text" id="contactname"  name="contactname" size="40" value="<!-- TMPL_VAR 
NAME="contactname" -->"></td></tr>
-               <tr><th><label for="altphone">Phone:</label> </th><td><input 
type="text" id="altphone" name="altphone" size="20" value="<!-- TMPL_VAR 
NAME="altphone" -->"></td></tr>
+               <tr><th><label for="contactname">Name: </label></th><td><input 
type="text" id="contactname"  name="contactname" size="40" value="<!-- TMPL_VAR 
NAME="contactname" -->" /></td></tr>
+               <tr><th><label for="altphone">Phone:</label> </th><td><input 
type="text" id="altphone" name="altphone" size="20" value="<!-- TMPL_VAR 
NAME="altphone" -->" /></td></tr>
                <tr><th><label for="altrelationship">Relationship:</label> 
</th><td><select id="altrelationship" name="altrelationship" size="1">
                                        <!-- TMPL_LOOP NAME="relshiploop" -->
                                                <option <!-- TMPL_VAR 
NAME="selected" -->><!-- TMPL_VAR NAME="relationship" --></option>
@@ -145,7 +158,7 @@
 <div class="table members"><table>
        <caption>Flags</caption>
        <!-- TMPL_LOOP NAME="flagloop" -->
-       <tr><th><label for="<!-- TMPL_VAR NAME="name" -->"><!-- TMPL_VAR 
NAME="html" --></label></th><td><input type="radio" id="<!-- TMPL_VAR 
NAME="name" -->" name="<!-- TMPL_VAR NAME="name" -->" value="1" <!-- TMPL_VAR 
NAME="yes" -->>Yes <input type="radio" name="<!-- TMPL_VAR NAME="name" -->" 
value="0" <!-- TMPL_VAR NAME="no" -->>No</td></tr>
+       <tr><th><label for="<!-- TMPL_VAR NAME="name" -->"><!-- TMPL_VAR 
NAME="html" --></label></th><td><input type="radio" id="<!-- TMPL_VAR 
NAME="name" -->" name="<!-- TMPL_VAR NAME="name" -->" value="1" <!-- TMPL_VAR 
NAME="yes" --> />Yes <input type="radio" name="<!-- TMPL_VAR NAME="name" -->" 
value="0" <!-- TMPL_VAR NAME="no" --> />No</td></tr>
                                <!-- /TMPL_LOOP -->
 </table></div>
 
@@ -154,7 +167,7 @@
        <!-- TMPL_UNLESS NAME="addAction" --><tr><th><label>Member 
Number:</label></th><td><span class="ex"><!-- TMPL_VAR NAME="member" 
--></span></td></tr><!-- /TMPL_UNLESS -->
        <tr><th><label for="categorycode">Category:</label> </th><td><!-- 
TMPL_VAR NAME="catcodepopup" --></td></tr>
        <tr><th><label for="branchcode"><a name="branch" 
id="branch">Branch:</a></label></th><td><!-- TMPL_VAR NAME="CGIbranch" 
--></td></tr>   
-       <tr><th><label for="cardnumber"<!-- TMPL_IF NAME="ERROR_cardnumber" --> 
class="focus"<!-- /TMPL_IF --><!-- TMPL_IF NAME="ERROR_invalid_cardnumber" --> 
class="focus"<!-- /TMPL_IF -->><a name="cardnumber" id="cardnumber">Card 
Number</a></label></th><td><input id="cardnumber" type="text" name="cardnumber" 
size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->"<!-- TMPL_IF 
NAME="ERROR_cardnumber" --> class="focus"<!-- /TMPL_IF --><!-- TMPL_IF 
NAME="ERROR_invalid_cardnumber" --> class="focus"<!-- /TMPL_IF -->></td></tr>
+       <tr><th><label for="cardnumber"<!-- TMPL_IF NAME="ERROR_cardnumber" --> 
class="focus"<!-- /TMPL_IF --><!-- TMPL_IF NAME="ERROR_invalid_cardnumber" --> 
class="focus"<!-- /TMPL_IF -->><a name="cardnumber" id="cardnumber">Card 
Number</a></label></th><td><input id="cardnumber" type="text" name="cardnumber" 
size="10" value="<!-- TMPL_VAR NAME="cardnumber" -->"<!-- TMPL_IF 
NAME="ERROR_cardnumber" --> class="focus"<!-- /TMPL_IF --><!-- TMPL_IF 
NAME="ERROR_invalid_cardnumber" --> class="focus"<!-- /TMPL_IF --> /></td></tr>
 </table>
 <table><caption>Additional Fields</caption>
        <tr><th><label for="sort1">Sorting field 1</label></th><td><!-- TMPL_IF 
Name="CGIsort1" -->
@@ -170,7 +183,7 @@
 </table>
 </div>
 
-<p>    <input type="hidden" name="type" value="<!-- TMPL_VAR NAME="type" 
-->"><!-- TMPL_IF NAME="addAction" -->
+<p>    <input type="hidden" name="type" value="<!-- TMPL_VAR NAME="type" -->" 
/><!-- TMPL_IF NAME="addAction" -->
        <input name="submit" type="submit" class="submit" value="Add This 
Patron" /><!-- TMPL_ELSE --><input name="submit" type="submit" class="submit" 
value="Update This Patron" /><!-- /TMPL_IF --></p>
        </form>
 </div>

Index: moditem.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/Attic/moditem.tmpl,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -b -r1.3 -r1.3.2.1
--- moditem.tmpl        21 Oct 2004 16:38:35 -0000      1.3
+++ moditem.tmpl        2 Jul 2007 14:46:14 -0000       1.3.2.1
@@ -24,17 +24,34 @@
 <caption>Set Item Status:</caption>
 <tr>
 <th><label for="Lost">Lost:</label></th>
-<td><input type="radio" id="Lost" name="Lost" value="1"<!-- TMPL_IF 
Name="itemlost" --> checked="checked"<!-- /TMPL_IF -->>
+<td><!-- TMPL_IF Name="itemlost" -->
+<input type="radio" id="Lost" name="Lost" value="1" checked="checked" />
+<!-- TMPL_ELSE -->
+<input type="radio" id="Lost" name="Lost" value="1" />
+<!-- /TMPL_IF -->
 Yes
-<input type="radio" name="Lost" value="0"<!-- TMPL_UNLESS Name="itemlost" --> 
checked="checked"<!-- /TMPL_UNLESS --> />
+<!-- TMPL_IF Name="itemlost" -->
+<input type="radio" name="Lost" value="0" checked="checked" />
+<!-- TMPL_ELSE -->
+<input type="radio" name="Lost" value="0" />
+<!-- /TMPL_IF -->
 No
 </td>
 </tr>
 <tr>
 <th><label for="withdrawn">Damaged</label></th>
-<td><input type="radio" id="withdrawn" name="withdrawn" value="1"<!-- TMPL_IF 
Name="itemwithdrawn" --> checked="checked"<!-- /TMPL_IF -->>
+<td>
+<!-- TMPL_IF Name="itemwithdrawn" -->
+<input type="radio" id="withdrawn" name="withdrawn" value="1" 
checked="checked" />
+<!-- TMPL_ELSE -->
+<input type="radio" id="withdrawn" name="withdrawn" value="1" />
+<!-- /TMPL_IF -->
 Yes
-<input type="radio" name="withdrawn" value="0"<!-- TMPL_UNLESS 
Name="itemwithdrawn" --> checked="checked"<!-- /TMPL_UNLESS -->>
+<!-- TMPL_IF Name="itemwithdrawn" -->
+<input type="radio" name="withdrawn" value="0" checked="checked" />
+<!-- TMPL_ELSE -->
+<input type="radio" name="withdrawn" value="0" />
+<!-- /TMPL_IF -->
 No
 </td>
 </tr>

Index: overdue.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/Attic/overdue.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- overdue.tmpl        26 Jan 2006 21:42:39 -0000      1.1.2.2
+++ overdue.tmpl        2 Jul 2007 14:46:14 -0000       1.1.2.3
@@ -12,13 +12,23 @@
                <tr><th scope="row"><label for="borname">Name or cardnumber 
:</label></th><td><input type="text" name="borname" id="borname" 
value="<!--TMPL_VAR Name="borname"-->"></td></tr>
                <tr><th scope="row"><label for="borcat">Borrower categorycode 
:</label></th><td><select name="borcat" id="borcat"><option 
value="">Any</option>
                        <!-- TMPL_LOOP name="borcatloop" -->
-                               <option value="<!-- TMPL_VAR name="value" 
-->"<!-- TMPL_IF name="selected" --> selected="selected"<!-- /TMPL_IF -->><!-- 
TMPL_VAR name="catname" --></option>
+                       <!-- 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="catname" --></option>
                        <!-- /TMPL_LOOP -->
                        </select></td></tr>
                <tr><th scope="row"><label for="">Borrower Flags 
:</label></th><td><!--TMPL_VAR Name="CGIflags" --></td></tr>
                <tr><th scope="row"><label for="itemtype">Itemtype 
:</label></th><td><select name="itemtype" id="itemtype"><option 
value="">Any</option>
                        <!-- TMPL_LOOP name="itemtypeloop" -->
-                               <option value="<!-- TMPL_VAR name="value" 
-->"<!-- TMPL_IF name="selected" --> selected="selected"<!-- /TMPL_IF -->><!-- 
TMPL_VAR name="itemtypename" --></option>
+                       <!-- 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="itemtypename" --></option>
                        <!-- /TMPL_LOOP -->
                        </select></td></tr>
                <tr><th scope="row"><label for="branch">Branch 
:</label></th><td><select name="branch" id="branch">

Index: request.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/Attic/request.tmpl,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -u -b -r1.3.2.3 -r1.3.2.4
--- request.tmpl        19 Apr 2007 22:54:58 -0000      1.3.2.3
+++ request.tmpl        2 Jul 2007 14:46:14 -0000       1.3.2.4
@@ -16,7 +16,11 @@
                <tr><th>Rank</th><td>
 <select name="rank-request">
                        <!-- TMPL_LOOP Name="optionloop" -->
-                               <option value="<!-- TMPL_VAR Name="num" 
-->"<!-- TMPL_IF Name="selected" --> selected="selected"<!-- /TMPL_IF -->>
+                       <!-- TMPL_IF Name="selected" -->
+                               <option value="<!-- TMPL_VAR Name="num" -->" 
selected="selected">
+                       <!-- TMPL_ELSE -->      
+                               <option value="<!-- TMPL_VAR Name="num" -->">
+                       <!-- /TMPL_IF -->       
                                        <!-- TMPL_VAR Name="num" -->
                                </option>
                        <!-- /TMPL_LOOP -->
@@ -47,9 +51,9 @@
                        <!-- TMPL_IF Name="itemlost" -->
                                Cannot be selected
                        <!-- TMPL_ELSE -->
-                               <input type="checkbox" name="reqbib" value=<!-- 
TMPL_VAR Name="biblioitemnumber" -->>
-                               <input type="hidden" name="biblioitem" 
value=<!-- TMPL_VAR Name="biblioitemnumber" -->>
-                               <input type="hidden" name="itemnumber" 
value="<!-- TMPL_VAR Name="itemnumber" -->">
+                               <input type="checkbox" name="reqbib" 
value="<!-- TMPL_VAR Name="biblioitemnumber" -->" />
+                               <input type="hidden" name="biblioitem" 
value="<!-- TMPL_VAR Name="biblioitemnumber" -->" />
+                               <input type="hidden" name="itemnumber" 
value="<!-- TMPL_VAR Name="itemnumber" -->" />
                        <!-- /TMPL_IF -->
                </td><!-- /Hide from NPL -->
                <td>
@@ -100,7 +104,11 @@
                                        <option value="W" 
selected="selected">Consigned</option>
                                <!-- /TMPL_IF -->
                                <!-- TMPL_LOOP Name="optionloop" -->
-                                       <option value="<!-- TMPL_VAR Name="num" 
-->"<!-- TMPL_IF Name="selected" --> selected="selected"<!-- /TMPL_IF -->>
+                               <!-- TMPL_IF Name="selected" -->
+                                       <option value="<!-- TMPL_VAR Name="num" 
-->" selected="selected">
+                               <!-- TMPL_ELSE -->
+                                       <option value="<!-- TMPL_VAR Name="num" 
-->">
+                               <!-- /TMPL_IF -->
                                                <!-- TMPL_VAR Name="num" -->
                                        </option>
                                <!-- /TMPL_LOOP -->
@@ -122,7 +130,11 @@
                                <!-- TMPL_ELSE -->
                                        <select name="pickup">
                                                <!-- TMPL_LOOP 
Name="branchloop" -->
-                                                       <option value="<!-- 
TMPL_VAR Name="branch" -->"<!-- TMPL_IF Name="selected" --> 
selected="selected"<!-- /TMPL_IF -->>
+                                               <!-- TMPL_IF Name="selected" -->
+                                                       <option value="<!-- 
TMPL_VAR Name="branch" -->" selected="selected">
+                                               <!-- TMPL_ELSE -->
+                                                       <option value="<!-- 
TMPL_VAR Name="branch" -->">
+                                               <!-- /TMPL_IF -->
                                                                <!-- TMPL_VAR 
Name="branchname" -->
                                                        </option>
                                                <!-- /TMPL_LOOP -->

Index: parameters/auth_tag_structure.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/Attic/auth_tag_structure.tmpl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -b -r1.1.2.4 -r1.1.2.5
--- parameters/auth_tag_structure.tmpl  7 Mar 2006 20:23:37 -0000       1.1.2.4
+++ parameters/auth_tag_structure.tmpl  2 Jul 2007 14:46:14 -0000       1.1.2.5
@@ -127,7 +127,11 @@
        <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_IF NAME="selected" -->
+               <option value="<!-- TMPL_VAR NAME="value" -->" 
selected="selected">
+       <!-- TMPL_ELSE -->
+               <option value="<!-- TMPL_VAR NAME="value" -->">
+       <!-- /TMPL_IF -->
                        <!-- TMPL_VAR NAME="authtypetext" -->
                </option>
        <!-- /TMPL_LOOP -->

Index: parameters/issuingrules.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/Attic/issuingrules.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- parameters/issuingrules.tmpl        4 Feb 2005 19:24:46 -0000       1.1.2.2
+++ parameters/issuingrules.tmpl        2 Jul 2007 14:46:14 -0000       1.1.2.3
@@ -32,7 +32,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_ELSE -->
+                               <option value="<!-- TMPL_VAR NAME="value" -->">
+                       <!-- /TMPL_IF -->       
+                               <!-- TMPL_VAR NAME="branchname" 
--></option><!-- /TMPL_LOOP --></select>
                        <input type="submit" value="Select" class="submit" />
                </form>
                <form method="post" 
action="/cgi-bin/koha/admin/issuingrules.pl">
@@ -47,7 +52,7 @@
                                <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" /> /
                                                        <input name="<!-- 
TMPL_VAR NAME="finesname" -->" value="<!-- TMPL_VAR NAME="finesvalue" -->" 
size="6" maxlength="10" />
                                                </td>

Index: parameters/systempreferences.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/parameters/Attic/systempreferences.tmpl,v
retrieving revision 1.3.2.7
retrieving revision 1.3.2.8
diff -u -b -r1.3.2.7 -r1.3.2.8
--- parameters/systempreferences.tmpl   6 Oct 2006 02:41:41 -0000       1.3.2.7
+++ parameters/systempreferences.tmpl   2 Jul 2007 14:46:14 -0000       1.3.2.8
@@ -240,7 +240,7 @@
                <th colspan="3">Explanation</th>
        </tr>
        <!-- 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><!-- TMPL_VAR NAME="variable" --></td>
                <td><!-- TMPL_VAR NAME="value" escape=HTML--></td>
                <td><!-- TMPL_VAR NAME="explanation" --></td>

Index: reports/bor_issues_top.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/reports/Attic/bor_issues_top.tmpl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -b -r1.1.2.4 -r1.1.2.5
--- reports/bor_issues_top.tmpl 31 Jan 2006 22:39:52 -0000      1.1.2.4
+++ reports/bor_issues_top.tmpl 2 Jul 2007 14:46:15 -0000       1.1.2.5
@@ -96,7 +96,7 @@
                        </tr>
                        <tr><th scope="col" colspan="3">Filters</th></tr>
                        <tr class="highlight"><th scope="row">Issue date</th>
-                               <td colspan="2"> From <input type="text" 
readonly="readonly" size="10" id="from" name="Filter" >
+                               <td colspan="2"> From <input type="text" 
readonly="readonly" size="10" id="from" name="Filter" />
                                                        <img src="<!-- TMPL_VAR 
Name="themelang" -->/includes/calendar/cal.gif" border="0" hspace="0" 
vspace="0" id="openCalendarFrom" style="cursor: pointer;" valign="top">
                                                                <script 
language="JavaScript" type="text/javascript">
                                                                        
function validate1(date) {
@@ -125,7 +125,7 @@
                                                                                
}
                                                                        );
                                                                </script>
-                                       To <input readonly="readonly" size="10" 
id="to" name="Filter" value="" type="text">
+                                       To <input readonly="readonly" size="10" 
id="to" name="Filter" value="" type="text" />
                                                <img src="<!-- TMPL_VAR 
Name="themelang" -->/includes/calendar/cal.gif" id="openCalendarTo" 
style="cursor: pointer;" valign="top" border="0" hspace="0" vspace="0">
                                                        <script 
type="text/javascript">
                                                                function 
validate2(date) {
@@ -158,7 +158,7 @@
                        </tr>
                        <tr>
                                <th scope="row">Returns</th>
-                               <td colspan="2"> From <input type="text" 
readonly="readonly" size="10" id="fromRO" name="Filter" >
+                               <td colspan="2"> From <input type="text" 
readonly="readonly" size="10" id="fromRO" name="Filter" />
                                                        <img src="<!-- TMPL_VAR 
Name="themelang" -->/includes/calendar/cal.gif" border="0" hspace="0" 
vspace="0" id="openCalendarFromRO" style="cursor: pointer;" valign="top">
                                                                <script 
language="JavaScript" type="text/javascript">
                                                                        
function validate1(date) {
@@ -187,7 +187,7 @@
                                                                                
}
                                                                        );
                                                                </script>
-                                       To <input type="text" 
readonly="readonly" size="10" id="toRO" name="Filter" value="" >
+                                       To <input type="text" 
readonly="readonly" size="10" id="toRO" name="Filter" value="" />
                                                <img src="<!-- TMPL_VAR 
Name="themelang" -->/includes/calendar/cal.gif" id="openCalendarToRO" 
style="cursor: pointer;" valign="top" border="0" hspace="0" vspace="0">
                                                        <script 
type="text/javascript">
                                                                function 
validate2(date) {
@@ -223,7 +223,12 @@
                                        <select name="Filter">
                                                <option value="">All 
branches</option>
                                                <!-- TMPL_LOOP 
name="branchloop" -->
-                                                       <option value="<!-- 
TMPL_VAR name="value" -->"<!-- TMPL_IF name="selected" --> 
selected="selected"<!-- /TMPL_IF -->><!-- TMPL_VAR name
+                                               <!-- 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
        ="branchname" --></option>
                                                <!-- /TMPL_LOOP -->
                                        </select>
@@ -234,8 +239,12 @@
                                        <select name="Filter">
                                                <option value="">All Item 
Types</option>
                                                <!-- TMPL_LOOP 
name="itemtypeloop" -->
-                                                       <option value="<!-- 
TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" --> 
selected="selected"<!-- /TMPL_IF -->><!-- TMPL_VAR name
-       ="description" --></option>
+                                                <!-- 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_LOOP -->
                                        </select>
                                </td>
@@ -245,8 +254,12 @@
                                        <select name="Filter">
                                                <option value="">All Borrower 
Categories</option>
                                                <!-- TMPL_LOOP 
name="borcatloop" -->
-                                                       <option value="<!-- 
TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" --> 
selected="selected"<!-- /TMPL_IF -->><!-- TMPL_VAR name
-       ="description" --></option>
+                                               <!-- 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_LOOP -->
                                        </select>
                                </td>
@@ -285,7 +298,7 @@
                                </td>
                        </tr>
                        <tr><th scope="row">Year</th>
-                               <td colspan="2"><input type="text" 
name="Filter" value=""></td>
+                               <td colspan="2"><input type="text" 
name="Filter" value="" /></td>
                        </tr>
                </tbody>
        </table>
@@ -293,17 +306,17 @@
        
        <div class="details">
                <h3> Output </h3>
-               <input type="radio" checked name="output" value="screen" > To 
screen into the browser
+               <input type="radio" checked="checked" name="output" 
value="screen" /> To screen into the browser
                <br>
-               <input type="radio" name="output" value="file"> To file <input 
type="text" name="basename" value="Export"> into an application  
+               <input type="radio" name="output" value="file"> To file <input 
type="text" name="basename" value="Export" /> into an application  
                <!-- TMPL_VAR NAME="CGIextChoice" -->
                <!-- TMPL_VAR NAME="CGIsepChoice" -->
        </p>
        </div>
        <p>
-       <input TYPE="submit" value="Generate Report" class="submit">
-       <input type="hidden" name="report_name" value="<!--TMPL_VAR 
NAME="report_name" -->">
-       <input type="hidden" name="do_it" value="1">
+       <input type="submit" value="Generate Report" class="submit" />
+       <input type="hidden" name="report_name" value="<!--TMPL_VAR 
NAME="report_name" -->" />
+       <input type="hidden" name="do_it" value="1" />
        </form>
 <!-- /TMPL_IF -->
 </div>

Index: reports/borrowers_out.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/reports/Attic/borrowers_out.tmpl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- reports/borrowers_out.tmpl  4 Jan 2006 22:26:53 -0000       1.1.2.3
+++ reports/borrowers_out.tmpl  2 Jul 2007 14:46:15 -0000       1.1.2.4
@@ -79,7 +79,12 @@
                                        <select name="Filter">
                                                <option value="">All Borrower 
Categories</option>
                                                <!-- TMPL_LOOP 
name="borcatloop" -->
-                                                       <option value="<!-- 
TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- 
/TMPL_IF -->><!-- TMPL_VAR name
+                                               <!-- 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_LOOP -->
                                        </select>
@@ -88,8 +93,8 @@
                        <tr class="hilighted">
                                
                                <th scope="row">Without issues since</th>
-                               <td colspan="2"><input size="10" id="to" 
name="Filter" value="" type="text">
-                                               <img src="<!-- TMPL_VAR 
Name="themelang" -->/includes/calendar/cal.gif" id="openCalendarTo" 
style="cursor: pointer;" valign="top" border="0" hspace="0" vspace="0">
+                               <td colspan="2"><input size="10" id="to" 
name="Filter" value="" type="text" />
+                                               <img src="<!-- TMPL_VAR 
Name="themelang" -->/includes/calendar/cal.gif" id="openCalendarTo" 
style="cursor: pointer;" valign="top" border="0" hspace="0" vspace="0" />
                                                        <script 
type="text/javascript">
                                                                Calendar.setup(
                                                                        {
@@ -105,17 +110,17 @@
        </div>
        <div class="details">
                <h3> Output </h3>
-               <input type="radio" checked="checked" name="output" 
value="screen" > To screen into the browser
+               <input type="radio" checked="checked" name="output" 
value="screen" /> To screen into the browser
                <br>
-               <input type="radio" name="output" value="file"> To file <input 
type="text" name="basename" value="Export"> into an application  
+               <input type="radio" name="output" value="file"> To file <input 
type="text" name="basename" value="Export" /> into an application  
                <!-- TMPL_VAR NAME="CGIextChoice" -->
                <!-- TMPL_VAR NAME="CGIsepChoice" -->
        </p>
        </div>
        <p>
-       <input type="submit" value="Generate Report" class="submit">
-       <input type="hidden" name="report_name" value="<!--TMPL_VAR 
NAME="report_name" -->">
-       <input type="hidden" name="do_it" value="1">
+       <input type="submit" value="Generate Report" class="submit" />
+       <input type="hidden" name="report_name" value="<!--TMPL_VAR 
NAME="report_name" -->" />
+       <input type="hidden" name="do_it" value="1" />
        </form>
 <!-- /TMPL_IF -->
 </div>

Index: reports/cat_issues_top.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/reports/Attic/cat_issues_top.tmpl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- reports/cat_issues_top.tmpl 4 Jan 2006 22:26:53 -0000       1.1.2.3
+++ reports/cat_issues_top.tmpl 2 Jul 2007 14:46:15 -0000       1.1.2.4
@@ -221,8 +221,12 @@
                                        <select name="Filter">
                                                <option value="">All 
branches</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_ELSE -->      
+                                                       <option value="<!-- 
TMPL_VAR name="value" -->">
+                                               <!-- /TMPL_IF -->       
+                                                       <!-- TMPL_VAR 
name="branchname" --></option>
                                                <!-- /TMPL_LOOP -->
                                        </select>
                                </td>
@@ -233,8 +237,12 @@
                                        <select name="Filter">
                                                <option value="">All Item 
Types</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_ELSE -->      
+                                                       <option value="<!-- 
TMPL_VAR name="value" -->">
+                                               <!-- /TMPL_IF -->
+                                                       <!-- TMPL_VAR 
name="description" --></option>
                                                <!-- /TMPL_LOOP -->
                                        </select>
                                </td>
@@ -245,8 +253,12 @@
                                        <select name="Filter">
                                                <option value="">All Borrower 
Categories</option>
                                                <!-- TMPL_LOOP 
name="borcatloop" -->
-                                                       <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_ELSE -->
+                                                       <option value="<!-- 
TMPL_VAR name="value" -->">
+                                               <!-- /TMPL_IF -->
+                                                       <!-- TMPL_VAR 
name="description" --></option>
                                                <!-- /TMPL_LOOP -->
                                        </select>
                                </td>
@@ -288,24 +300,24 @@
                        </tr>
                        <tr>
                                <th scope="row">Year</th>
-                               <td colspan="2"><input type="text" 
name="Filter" value=""></td>
+                               <td colspan="2"><input type="text" 
name="Filter" value="" /></td>
                        </tr>
                </tbody>
        </table>
        </div>
        <div class="details">
                <h3> Output </h3>
-               <input type="radio" checked name="output" value="screen" > To 
screen into the browser
+               <input type="radio" checked name="output" value="screen" /> To 
screen into the browser
                <br>
-               <input type="radio" name="output" value="file"> To file <input 
type="text" name="basename" value="Export"> into an application  
+               <input type="radio" name="output" value="file" /> To file 
<input type="text" name="basename" value="Export" /> into an application  
                <!-- TMPL_VAR NAME="CGIextChoice" -->
                <!-- TMPL_VAR NAME="CGIsepChoice" -->
        </p>
        </div>
        <p>
-       <input type="submit" value="OK" class="submit">
-       <input type="hidden" name="report_name" value="<!--TMPL_VAR 
NAME="report_name" -->">
-       <input type="hidden" name="do_it" value="1">
+       <input type="submit" value="OK" class="submit" />
+       <input type="hidden" name="report_name" value="<!--TMPL_VAR 
NAME="report_name" -->" />
+       <input type="hidden" name="do_it" value="1" />
        </form>
 <!-- /TMPL_IF -->
 

Index: reports/catalogue_out.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/reports/Attic/catalogue_out.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- reports/catalogue_out.tmpl  4 Jan 2006 22:26:53 -0000       1.1.2.2
+++ reports/catalogue_out.tmpl  2 Jul 2007 14:46:15 -0000       1.1.2.3
@@ -80,8 +80,12 @@
                                        <select name="Filter">
                                                <option value="">All 
branches</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_ELSE -->      
+                                                       <option value="<!-- 
TMPL_VAR name="value" -->">
+                                               <!-- /TMPL_IF -->
+                                                       <!-- TMPL_VAR 
name="branchname" --></option>
                                                <!-- /TMPL_LOOP -->
                                        </select>
                                </td>
@@ -92,8 +96,12 @@
                                        <select name="Filter">
                                                <option value="">All Item 
Types</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_ELSE -->
+                                                       <option value="<!-- 
TMPL_VAR name="value" -->">
+                                               <!-- /TMPL_IF -->       
+                                                       <!-- TMPL_VAR 
name="description" --></option>
                                                <!-- /TMPL_LOOP -->
                                        </select>
                                </td>
@@ -103,16 +111,16 @@
        </div>
        <div class="details">
                <h3> Output </h3>
-               <input type="radio" checked name="output" value="screen" > To 
screen into the browser
+               <input type="radio" checked name="output" value="screen" /> To 
screen into the browser
                <br>
-               <input type="radio" name="output" value="file"> To file <input 
type="text" name="basename" value="Export"> into an application  
+               <input type="radio" name="output" value="file" /> To file 
<input type="text" name="basename" value="Export" /> into an application  
                <!-- TMPL_VAR NAME="CGIextChoice" -->
                <!-- TMPL_VAR NAME="CGIsepChoice" -->
        </div>
        <p>
-       <input type="submit" value="Generate Report" class="submit">
-       <input type="hidden" name="report_name" value="<!--TMPL_VAR 
NAME="report_name" -->">
-       <input type="hidden" name="do_it" value="1">
+       <input type="submit" value="Generate Report" class="submit" />
+       <input type="hidden" name="report_name" value="<!--TMPL_VAR 
NAME="report_name" -->" />
+       <input type="hidden" name="do_it" value="1" />
        </form>
 <!-- /TMPL_IF -->
 

Index: search.marc/result.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/search.marc/Attic/result.tmpl,v
retrieving revision 1.5.2.5
retrieving revision 1.5.2.6
diff -u -b -r1.5.2.5 -r1.5.2.6
--- search.marc/result.tmpl     15 Jun 2006 16:58:17 -0000      1.5.2.5
+++ search.marc/result.tmpl     2 Jul 2007 14:46:15 -0000       1.5.2.6
@@ -34,7 +34,7 @@
        </tr>
 <tbody>
        <!-- TMPL_LOOP name="result" -->
-               <tr<!-- TMPL_IF NAME="even" --> class="highlight"<!-- /TMPL_IF 
-->>
+               <!-- TMPL_IF name="even" --><tr class="highlight"><!-- 
TMPL_ELSE --><tr><!-- /TMPL_IF -->
                        <td><p>
                        <!-- TMPL_IF name="BiblioDefaultViewmarc" --><a 
href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" 
ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" 
--></a><!-- TMPL_ELSE --><!-- TMPL_IF name="BiblioDefaultViewisbd" --><a 
href="/cgi-bin/koha/ISBDdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" 
ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" 
--></a><!-- TMPL_ELSE --><a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR 
NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --> <!-- 
TMPL_VAR NAME="subtitle" --></a><!-- /TMPL_IF --><!-- /TMPL_IF --></p>
                                                <p><!-- TMPL_VAR NAME="author" 
-->

Index: search.marc/search.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/search.marc/Attic/search.tmpl,v
retrieving revision 1.6.2.8
retrieving revision 1.6.2.9
diff -u -b -r1.6.2.8 -r1.6.2.9
--- search.marc/search.tmpl     31 Jan 2006 22:41:07 -0000      1.6.2.8
+++ search.marc/search.tmpl     2 Jul 2007 14:46:16 -0000       1.6.2.9
@@ -135,16 +135,21 @@
                                        <option <!-- TMPL_IF NAME="lt" 
-->selected<!-- /TMPL_IF --> value="<">Is lower than</option>
                                        <option <!-- TMPL_IF NAME="le" 
-->selected<!-- /TMPL_IF --> value="<=">Is lower or equal to</option>
                                </select>
-                               <input type="text" name="value" 
onchange="sql_update();" <!-- TMPL_IF NAME="value" -->value="<!-- TMPL_VAR 
NAME="value" -->"<!-- /TMPL_IF -->></td>
+                               <!-- TMPL_IF NAME="value" -->
+                               <input type="text" name="value" 
onchange="sql_update();" value="<!-- TMPL_VAR NAME="value" -->" />
+                               <!-- TMPL_ELSE -->
+                               <input type="text" name="value" 
onchange="sql_update();" />
+                               <!-- /TMPL_IF -->
+</td>
                        </tr>
                <!-- /TMPL_LOOP -->
                <tr>
-               <td><input type="button" value="Add criteria" 
onclick="AddStatement(); return false;" class="submit">
+               <td><input type="button" value="Add criteria" 
onclick="AddStatement(); return false;" class="submit" />
                Warning : the "contains" statement does NOT work if you enter 2 
or less letters</td>
        </tr>
        <tr>
                        <td><div name="sql">
-                               <textarea name="sql" rows="3" cols="55" 
disabled readonly></textarea>
+                               <textarea name="sql" rows="3" cols="55" 
disabled="disabled" readonly="readonly"></textarea>
                        </div></td>
                </tr>
                <tr>

Index: suggestion/acceptorreject.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/suggestion/Attic/acceptorreject.tmpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- suggestion/acceptorreject.tmpl      20 Jan 2005 21:27:52 -0000      1.1.2.2
+++ suggestion/acceptorreject.tmpl      2 Jul 2007 14:46:16 -0000       1.1.2.3
@@ -7,7 +7,7 @@
 <!-- TMPL_IF name="op_else" -->
        <h1>Suggestions Management</h1>
        <form method="post" action="/cgi-bin/koha/suggestion/acceptorreject.pl">
-       <input type="hidden" name="op" value="aorr_confirm">
+       <input type="hidden" name="op" value="aorr_confirm" />
        <table>
                <tr>
                        <th>Status</th>
@@ -15,7 +15,7 @@
                        <th>Suggested by</th>
                </tr>
                <!-- TMPL_LOOP NAME="suggestions_loop" -->
-                       <tr<!-- TMPL_IF name="even" --> class="highlight"<!-- 
/TMPL_IF -->>
+                       <!-- TMPL_IF name="even" --><tr class="highlight"><!-- 
TMPL_ELSE --><tr><!-- /TMPL_IF -->
                                <td>
                                        <select name="aorr">
                                                <option value=""> -- Choose 
Action --</option>
@@ -35,7 +35,7 @@
                        </tr>
                <!-- /TMPL_LOOP -->
                </table>
-               <p><input type="submit" class="submit" value="Change 
Status"></p>
+               <p><input type="submit" class="submit" value="Change Status" 
/></p>
 </form>
        
 <!-- /TMPL_IF -->

Index: value_builder/unimarc_field_100.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/value_builder/Attic/unimarc_field_100.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -b -r1.1 -r1.1.2.1
--- value_builder/unimarc_field_100.tmpl        19 Feb 2004 19:19:55 -0000      
1.1
+++ value_builder/unimarc_field_100.tmpl        2 Jul 2007 14:46:16 -0000       
1.1.2.1
@@ -7,27 +7,52 @@
 <table>
        <tr>
                <td>Date d'enregistrement </td>
-               <td><input type="text" name="f1" maxlength=8 size=8 value="<!-- 
TMPL_VAR name="f1" -->"></td>
+               <td><input type="text" name="f1" maxlength="8" size="8" 
value="<!-- TMPL_VAR name="f1" -->"></td>
        </tr>
        <tr>
                <td>Code date publication </td><td><select name="f2" size="1">
-               <option value="a" <!-- TMPL_IF name="f2a" -->SELECTED<!-- 
/TMPL_IF -->>périodique en cours</option>
-                       <option value="b" <!-- TMPL_IF name="f2b" 
-->SELECTED<!-- /TMPL_IF -->>périodique mort</option>
-                       <option value="c" <!-- TMPL_IF name="f2c" 
-->SELECTED<!-- /TMPL_IF -->>périodique d'état inconnu</option>
-                       <option value="d" <!-- TMPL_IF name="f2d" 
-->SELECTED<!-- /TMPL_IF -->>monographie complète</option>
-                       <option value="e" <!-- TMPL_IF name="f2e" 
-->SELECTED<!-- /TMPL_IF -->>reproduction</option>
+               <!-- TMPL_IF name="f2a" -->
+               <option value="a" selected="selected">périodique en 
cours</option>
+               <!-- TMPL_ELSE -->
+               <option value="a">périodique en cours</option>
+               <!-- /TMPL_IF -->
+               
+               <!-- TMPL_IF name="f2b" -->             
+               <option value="b" selected="selected">périodique mort</option>
+               <!-- TMPL_ELSE -->
+               <option value="b">périodique mort</option>
+               <!-- /TMPL_IF -->
+               
+                <!-- TMPL_IF name="f2c" -->
+               <option value="c"selected="selected">périodique d'état 
inconnu</option>
+               <!-- TMPL_ELSE -->
+               <option value="c">périodique d'état inconnu</option>
+               <!-- /TMPL_IF -->
+               
+                <!-- TMPL_IF name="f2d" -->
+               <option value="d"selected="selected">monographie 
complète</option>
+               <!-- TMPL_ELSE -->
+               <option value="d">monographie complète</option>
+               <!-- /TMPL_IF -->
+               
+               <!-- TMPL_IF name="f2e" -->
+               <option value="e" selected="selected">reproduction</option>
+               <!-- TMPL_ELSE -->
+               <option value="e">reproduction</option>
+               <!-- /TMPL_IF -->
+               
                        </select>
                </td>
        </tr>
        <tr>
                <td>Année début</td>
-               <td><input type="text" name="f3" maxlength=4 size=5 value="<!-- 
TMPL_VAR name="f3" -->"></td>
+               <td><input type="text" name="f3" maxlength="4" size="5" 
value="<!-- TMPL_VAR name="f3" -->"></td>
        </tr>
        <tr>
        <td>Année fin</td>
-       <td><input type="text" name="f4" maxlength=4 size=5 value="<!-- 
TMPL_VAR name="f4" -->"></td>
+       <td><input type="text" name="f4" maxlength="4" size="5" value="<!-- 
TMPL_VAR name="f4" -->"></td>
        </tr>
-       <tr><td colspan=2><input type="submit" value="OK"></td></tr>
+       <tr><td colspan=2><input type="submit" class="submit" 
value="OK"></td></tr>
 </table>
 </form>
 <script>

Index: value_builder/unimarc_field_105.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/value_builder/Attic/unimarc_field_105.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -b -r1.1 -r1.1.2.1
--- value_builder/unimarc_field_105.tmpl        19 Feb 2004 19:19:55 -0000      
1.1
+++ value_builder/unimarc_field_105.tmpl        2 Jul 2007 14:46:16 -0000       
1.1.2.1
@@ -3,31 +3,57 @@
 <title>UNIMARC Field 100 builder</title>
 </head>
 <body>
-<form name="f_pop" onSubmit="javascript:report()">
+<form name="f_pop" onsubmit="report()">
 <table>
        <tr>
                <td>Date d'enregistrement </td>
-               <td><input type="text" name="f1" maxlength=8 size=8 value="<!-- 
TMPL_VAR name="f1" -->"></td>
+               <td><input type="text" name="f1" maxlength="8" size="8" 
value="<!-- TMPL_VAR name="f1" -->" /></td>
        </tr>
        <tr>
                <td>Code date publication </td><td><select name="f2" size="1">
-               <option value="a" <!-- TMPL_IF name="f2a" -->SELECTED<!-- 
/TMPL_IF -->>p?riodique en cours</option>
-                       <option value="b" <!-- TMPL_IF name="f2b" 
-->SELECTED<!-- /TMPL_IF -->>p?riodique mort</option>
-                       <option value="c" <!-- TMPL_IF name="f2c" 
-->SELECTED<!-- /TMPL_IF -->>p?riodique d'?tat inconnu</option>
-                       <option value="d" <!-- TMPL_IF name="f2d" 
-->SELECTED<!-- /TMPL_IF -->>monographie compl?te</option>
-                       <option value="e" <!-- TMPL_IF name="f2e" 
-->SELECTED<!-- /TMPL_IF -->>reproduction</option>
+               
+               <!-- TMPL_IF name="f2a" -->
+               <option value="a" selected="selected">p?riodique en 
cours</option>
+               <!-- TMPL_ELSE -->
+               <option value="a">p?riodique en cours</option>
+               <!-- /TMPL_IF -->
+               
+               <!-- TMPL_IF name="f2b" -->
+               <option value="b" selected="selected">p?riodique mort</option>
+               <!-- TMPL_ELSE -->
+               <option value="b">p?riodique mort</option>
+               <!-- /TMPL_IF -->
+               
+               <!-- TMPL_IF name="f2b" -->
+               <option value="b" selected="selected">p?riodique mort</option>
+               <!-- TMPL_ELSE -->
+               <option value="b">p?riodique mort</option>
+               <!-- /TMPL_IF -->
+               
+               <!-- TMPL_IF name="f2d" -->
+               <option value="d" selected="selected">monographie 
compl?te</option>
+               <!-- TMPL_ELSE -->
+               <option value="d">monographie compl?te</option>
+               <!-- /TMPL_IF -->
+               
+               <!-- TMPL_IF name="f2e" -->
+               <option value="e" selected="selected">reproduction</option>
+               <!-- TMPL_ELSE -->
+               <option value="e">reproduction</option>
+               <!-- /TMPL_IF -->
+               
                        </select>
                </td>
        </tr>
        <tr>
                <td>Ann?e d?but</td>
-               <td><input type="text" name="f3" maxlength=4 size=5 value="<!-- 
TMPL_VAR name="f3" -->"></td>
+               <td><input type="text" name="f3" maxlength="4" size="5" 
value="<!-- TMPL_VAR name="f3" -->" /></td>
        </tr>
        <tr>
        <td>Ann?e fin</td>
-       <td><input type="text" name="f4" maxlength=4 size=5 value="<!-- 
TMPL_VAR name="f4" -->"></td>
+       <td><input type="text" name="f4" maxlength="4" size="5" value="<!-- 
TMPL_VAR name="f4" -->" /></td>
        </tr>
-       <tr><td colspan=2><input type="submit" value="OK"></td></tr>
+       <tr><td colspan="2"><input type="submit" class="submit" value="OK" 
/></td></tr>
 </table>
 </form>
 <script>

Index: value_builder/unimarc_field_700-4.tmpl
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/value_builder/Attic/unimarc_field_700-4.tmpl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -b -r1.1 -r1.1.2.1
--- value_builder/unimarc_field_700-4.tmpl      19 Feb 2004 19:19:55 -0000      
1.1
+++ value_builder/unimarc_field_700-4.tmpl      2 Jul 2007 14:46:17 -0000       
1.1.2.1
@@ -4,19 +4,44 @@
 </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" class="submit" value="OK" 
/></td></tr>
 </table>
 </form>
 <script>




reply via email to

[Prev in Thread] Current Thread [Next in Thread]