HTML-Code aufgeräumt, Attribute gequotet, HTML-Sonderzeichen in Werten escapet. Die...
authorMoritz Bunkus <m.bunkus@linet-services.de>
Thu, 24 Jan 2008 16:09:30 +0000 (16:09 +0000)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Thu, 24 Jan 2008 16:09:30 +0000 (16:09 +0000)
templates/webpages/ic/search_de.html
templates/webpages/ic/search_master.html

index a292e85..c9e7119 100644 (file)
 [%- USE LxERP %]
 <body>
 
-<form method=post action=[% script %]>
+ <form method="post" action="ic.pl">
 
-<input type=hidden name=searchitems value=[% searchitems %]>
-<input type=hidden name=title value="[% title %]">
+  <input type="hidden" name="searchitems" value="[% HTML.escape(searchitems) %]">
+  <input type="hidden" name="title" value="[% HTML.escape(title) %]">
 
-<input type=hidden name=revers value="[% revers %]">
-<input type=hidden name=lastsort value="[% lastsort %]">
+  <input type="hidden" name="revers" value="[% HTML.escape(revers) %]">
+  <input type="hidden" name="lastsort" value="[% HTML.escape(lastsort) %]">
 
-<table width="100%">
-  <tr><th class=listtop>[% title %]</th></tr>
-  <tr height="5"></tr>
-  <tr valign=top>
+  <input type="hidden" name="nextsub" value="generate_report">
+  <input type="hidden" name="sort" value="description">
+
+  <input type="hidden" name="ndxs_counter" value="[% HTML.escape(ndxs_counter) %]">
+
+  <div class="listtop">[% title %]</div>
+
+  <table width="100%">
+   <tr height="5"></tr>
+   <tr valign="top">
     <td>
-      <table>
-        <tr>
-          <th align=right nowrap>Artikelnummer</th>
-          <td><input name=partnumber size=20></td>
-          <th align=right nowrap>EAN</th>
-          <td><input name=ean size=20></td>
-        </tr>
-        <tr>
-          <th align=right nowrap>Artikelbeschreibung</th>
-          <td colspan=3><input name=description size=40></td>
-        </tr>
-       <tr>
-          <th align=right nowrap>Warengruppe</th>
-          <td><input name=partsgroup size=20></td>
-[%- UNLESS is_service %]
-          <th align=right nowrap>Seriennummer</th> <td><input name=serialnumber size=20></td> 
-[%- END %]
-       </tr>
-[%- UNLESS is_service %]
-        <tr>
-          <th align=right nowrap>Hersteller</th> <td><input name=make size=20></td>
-          <th align=right nowrap>Modell</th> <td><input name=model size=20></td>
-        </tr>
-[%- END %]
-        <tr>
-          <th align=right nowrap>Zeichnung</th>
-          <td><input name=drawing size=20></td>
-          <th align=right nowrap>Mikrofilm</th>
-          <td><input name=microfiche size=20></td>
-        </tr>
-[%- IF is_assembly %]
-        <tr>
-         <td></td>
-          <td colspan=3>
-         <input name=null class=radio type=radio value=1 checked>&nbsp;Hauptartikelbezeichnung
-         <input name=bom class=checkbox type=checkbox value=1>&nbsp;Einzelteile
-          </td>
-        </tr>
-[%- END %]
-        <tr>
-          <td></td>
-          <td colspan=3>
-            <input name=itemstatus class=radio type=radio value=active checked>&nbsp;Aktiv
-[%- UNLESS is_service %]
-           <input name=itemstatus class=radio type=radio value=onhand>&nbsp;Auf Lager
-            <input name=itemstatus class=radio type=radio value=short>&nbsp;Knapp 
-[%- END %]
-            <input name=itemstatus class=radio type=radio value=obsolete>&nbsp;Ungültig
-            <input name=itemstatus class=radio type=radio value=orphaned>&nbsp;Nie benutzt
-         </td>
-       </tr>
-        <tr>
-          <td></td>
-          <td colspan=3>
+     <table>
+      <tr>
+       <th align="right" nowrap>Artikelnummer</th>
+       <td><input name="partnumber" size="20"></td>
+       <th align="right" nowrap>EAN</th>
+       <td><input name="ean" size="20"></td>
+      </tr>
+
+      <tr>
+       <th align="right" nowrap>Artikelbeschreibung</th>
+       <td colspan="3"><input name="description" size="40"></td>
+      </tr>
+
+      <tr>
+       <th align="right" nowrap>Warengruppe</th>
+       <td><input name="partsgroup" size="20"></td>
+       [%- UNLESS is_service %]
+       <th align="right" nowrap>Seriennummer</th> <td><input name="serialnumber" size="20"></td>
+       [%- END %]
+      </tr>
+
+      [%- UNLESS is_service %]
+      <tr>
+       <th align="right" nowrap>Hersteller</th> <td><input name="make" size="20"></td>
+       <th align="right" nowrap>Modell</th> <td><input name="model" size="20"></td>
+      </tr>
+      [%- END %]
+
+      <tr>
+       <th align="right" nowrap>Zeichnung</th>
+       <td><input name="drawing" size="20"></td>
+       <th align="right" nowrap>Mikrofilm</th>
+       <td><input name="microfiche" size="20"></td>
+      </tr>
+
+      [%- IF is_assembly %]
+      <tr>
+       <td></td>
+       <td colspan="3">
+        <input name="null" id="null_1" class="radio" type="radio" value="1" checked>&nbsp;<label for="null_1">Hauptartikelbezeichnung</label>
+        <input name="bom" id="bom" class="checkbox" type="checkbox" value="1">&nbsp;<label for="bom">Einzelteile</label>
+       </td>
+      </tr>
+      [%- END %]
+
+      <tr>
+       <td></td>
+       <td colspan="3">
+        <input name="itemstatus" id="itemstatus_active" class="radio" type="radio" value="active" checked>
+        <label for="itemstatus_active">Aktiv</label>
+        [%- UNLESS is_service %]
+        <input name="itemstatus" id="itemstatus_onhand" class="radio" type="radio" value="onhand">
+        <label for="itemstatus_onhand">Auf Lager</label>
+        <input name="itemstatus" id="itemstatus_short" class="radio" type="radio" value="short">
+        <label for="itemstatus_short">Knapp</label>
+        [%- END %]
+        <input name="itemstatus" id="itemstatus_obsolete" class="radio" type="radio" value="obsolete">
+        <label for="itemstatus_obsolete">Ungültig</label>
+        <input name="itemstatus" id="itemstatus_orphaned" class="radio" type="radio" value="orphaned">
+        <label for="itemstatus_orphaned">Nie benutzt</label>
+       </td>
+      </tr>
+
+      <tr>
+       <td></td>
+       <td colspan="3">
         <table>
-          <tr>
-            <td>
-          <table>
+         <tr>
+          <td>
+           <table>
             <tr>
-[%- UNLESS is_assembly %]
-              <td><input name=bought class=checkbox type=checkbox value=1></td> <td nowrap>Gekauft</td>
-[%- END %]
-              <td><input name=sold class=checkbox type=checkbox value=1></td> <td nowrap>Verkauft</td>
+             [%- UNLESS is_assembly %]
+             <td><input name="bought" id="bought" class="checkbox" type="checkbox" value="1"></td>
+             <td nowrap><label for="bought">Gekauft</label></td>
+             [%- END %]
+             <td><input name="sold" id="sold" class="checkbox" type="checkbox" value="1"></td>
+             <td nowrap><label for="sold">Verkauft</label></td>
             </tr>
+
             <tr>
-              <td colspan=4><hr size=1 noshade></td>
+             <td colspan="4"><hr size="1" noshade></td>
             </tr>
+
             <tr>
-[%- UNLESS is_assembly %]
-              <td><input name=onorder class=checkbox type=checkbox value=1></td> <td nowrap>Ist bestellt</td>
-[%- END %]
-              <td><input name=ordered class=checkbox type=checkbox value=1></td> <td nowrap>Vom Kunde bestellt</td>
+             [%- UNLESS is_assembly %]
+             <td><input name="onorder" id="onorder" class="checkbox" type="checkbox" value="1"></td>
+             <td nowrap><label for="onorder">Ist bestellt</label></td>
+             [%- END %]
+             <td><input name="ordered" id="ordered" class="checkbox" type="checkbox" value="1"></td>
+             <td nowrap><label for="ordered">Vom Kunde bestellt</label></td>
             </tr>
+
             <tr>
-              <td colspan=4><hr size=1 noshade></td>
+             <td colspan="4"><hr size="1" noshade></td>
             </tr>
+
             <tr>
-[%- UNLESS is_assembly %]
-              <td><input name=rfq class=checkbox type=checkbox value=1></td> <td nowrap>Anfrage</td>
-[%- END %]
-              <td><input name=quoted class=checkbox type=checkbox value=1></td> <td nowrap>Angeboten</td>
+             [%- UNLESS is_assembly %]
+             <td><input name="rfq" id="rfq" class="checkbox" type="checkbox" value="1"></td>
+             <td nowrap><label for="rfq">Anfrage</label></td>
+             [%- END %]
+             <td><input name="quoted" id="quoted" class="checkbox" type="checkbox" value="1"></td>
+             <td nowrap><label for="quoted">Angeboten</label></td>
             </tr>
-          </table>
-        </td>
-        <td width=5%>&nbsp;</td>
-        <td>
-          <table>
+           </table>
+          </td>
+
+          <td width="5%">&nbsp;</td>
+
+          <td>
+           <table>
             <tr>
-              <th>Von</th>
-                      <td><input name=transdatefrom id=transdatefrom size=11 title="[% dateformat %]"></td>
-                      <td><input type=button name=transdatefrom id="trigger1" value="?"></td>
-              <th>Bis</th>
-                      <td><input name=transdateto id=transdateto size=11 title="[% dateformat %]"></td>
-                      <td><input type=button name=transdateto name=transdateto id="trigger2" value="?"></td>
+             <th>Von</th>
+             <td><input name="transdatefrom" id="transdatefrom" size="11" title="[% HTML.escape(dateformat) %]"></td>
+             <td><input type="button" name="transdatefrom" id="trigger1" value="?"></td>
+             <th>Bis</th>
+             <td><input name="transdateto" id="transdateto" size="11" title="[% HTML.escape(dateformat) %]"></td>
+             <td><input type="button" name="transdateto" name="transdateto" id="trigger2" value="?"></td>
             </tr>
-          </table>
-        </td>
-          </tr>
+           </table>
+          </td>
+         </tr>
         </table>
-      </td>
-    </tr>
-        <tr>
-         <td></td>
-          <td colspan=3>
-           <hr size=1 noshade>
-         </td>
-       </tr>
-       <tr>
-          <th align=right nowrap>In Bericht aufnehmen</th> <td colspan=3>
-            <table>
-              <tr>
-                <td><input name=l_partnumber class=checkbox type=checkbox value=Y checked>&nbsp;Artikelnummer</td>
-               <td><input name=l_description class=checkbox type=checkbox value=Y checked>&nbsp;Artikelbeschreibung</td>
-[%- UNLESS is_service %]
-                <td><input name=l_serialnumber class=checkbox type=checkbox value=Y>&nbsp;Seriennummer</td> 
-[%- END %]
-               <td><input name=l_unit class=checkbox type=checkbox value=Y checked>&nbsp;Maßeinheit</td>
-             </tr>
-             <tr>
-                <td><input name=l_listprice class=checkbox type=checkbox value=Y>&nbsp;Listenpreis</td>
-               <td><input name=l_sellprice class=checkbox type=checkbox value=Y checked>&nbsp;Verkaufspreis</td>
-               <td><input name=l_lastcost class=checkbox type=checkbox value=Y checked>&nbsp;Einkaufspreis</td>
-               <td><input name=l_linetotal class=checkbox type=checkbox value=Y checked>&nbsp;Zeilensumme</td>
-             </tr>
-             <tr>
-                <td><input name=l_priceupdate class=checkbox type=checkbox value=Y>&nbsp;Erneuert am</td>
-               <td><input name=l_bin class=checkbox type=checkbox value=Y>&nbsp;Lagerplatz</td>
-               <td><input name=l_rop class=checkbox type=checkbox value=Y>&nbsp;Mindestlagerbestand</td>
-               <td><input name=l_weight class=checkbox type=checkbox value=Y>&nbsp;Gewicht</td>
-              </tr>
-             <tr>
-                <td><input name=l_image class=checkbox type=checkbox value=Y>&nbsp;Grafik</td>
-               <td><input name=l_drawing class=checkbox type=checkbox value=Y>&nbsp;Zeichnung</td>
-               <td><input name=l_microfiche class=checkbox type=checkbox value=Y>&nbsp;Mikrofilm</td>
-               <td><input name=l_partsgroup class=checkbox type=checkbox value=Y>&nbsp;Warengruppe</td>
-              </tr>
-             <tr>
-                <td><input name=l_subtotal class=checkbox type=checkbox value=Y>&nbsp;Zwischensumme</td>
-               <td><input name=l_soldtotal class=checkbox type=checkbox value=Y>&nbsp;Verkaufte Anzahl</td>
-               <td><input name=l_deliverydate class=checkbox type=checkbox value=Y>&nbsp;Lieferdatum</td>    
-             </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-  <tr><td colspan=4><hr size=3 noshade></td></tr>
-</table>
+       </td>
+      </tr>
 
-<script type="text/javascript">
-<!-- 
- Calendar.setup({ inputField : "transdatefrom",  ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger1" });
- Calendar.setup({ inputField : "transdateto",    ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger2" });
- //-->
-</script>
+      <tr>
+       <td></td>
+       <td colspan="3">
+        <hr size="1" noshade>
+       </td>
+      </tr>
+
+      <tr>
+       <th align="right" nowrap>In Bericht aufnehmen</th> <td colspan="3">
+        <table>
+         <tr>
+          <td>
+           <input name="l_partnumber" id="l_partnumber" class="checkbox" type="checkbox" value="Y" checked>
+           <label for="l_partnumber">Artikelnummer</label>
+          </td>
+          <td>
+           <input name="l_description" id="l_description" class="checkbox" type="checkbox" value="Y" checked>
+           <label for="l_description">Artikelbeschreibung</label>
+          </td>
+          [%- UNLESS is_service %]
+          <td>
+           <input name="l_serialnumber" id="l_serialnumber" class="checkbox" type="checkbox" value="Y">
+           <label for="l_serialnumber">Seriennummer</label>
+          </td>
+          [%- END %]
+          <td>
+           <input name="l_unit" id="l_unit" class="checkbox" type="checkbox" value="Y" checked>
+           <label for="l_unit">Maßeinheit</label>
+          </td>
+         </tr>
 
+         <tr>
+          <td>
+           <input name="l_listprice" id="l_listprice" class="checkbox" type="checkbox" value="Y">
+           <label for="l_listprice">Listenpreis</label>
+          </td>
+          <td>
+           <input name="l_sellprice" id="l_sellprice" class="checkbox" type="checkbox" value="Y" checked>
+           <label for="l_sellprice">Verkaufspreis</label>
+          </td>
+          <td>
+           <input name="l_lastcost" id="l_lastcost" class="checkbox" type="checkbox" value="Y" checked>
+           <label for="l_lastcost">Einkaufspreis</label>
+          </td>
+          <td>
+           <input name="l_linetotal" id="l_linetotal" class="checkbox" type="checkbox" value="Y" checked>
+           <label for="l_linetotal">Zeilensumme</label>
+          </td>
+         </tr>
 
+         <tr>
+          <td>
+           <input name="l_priceupdate" id="l_priceupdate" class="checkbox" type="checkbox" value="Y">
+           <label for="l_priceupdate">Erneuert am</label>
+          </td>
+          <td>
+           <input name="l_bin" id="l_bin" class="checkbox" type="checkbox" value="Y">
+           <label for="l_bin">Lagerplatz</label>
+          </td>
+          <td>
+           <input name="l_rop" id="l_rop" class="checkbox" type="checkbox" value="Y">
+           <label for="l_rop">Mindestlagerbestand</label>
+          </td>
+          <td>
+           <input name="l_weight" id="l_weight" class="checkbox" type="checkbox" value="Y">
+           <label for="l_weight">Gewicht</label>
+          </td>
+         </tr>
 
-<input type=hidden name=nextsub value=generate_report>
+         <tr>
+          <td>
+           <input name="l_image" id="l_image" class="checkbox" type="checkbox" value="Y">
+           <label for="l_image">Grafik</label>
+          </td>
+          <td>
+           <input name="l_drawing" id="l_drawing" class="checkbox" type="checkbox" value="Y">
+           <label for="l_drawing">Zeichnung</label>
+          </td>
+          <td>
+           <input name="l_microfiche" id="l_microfiche" class="checkbox" type="checkbox" value="Y">
+           <label for="l_microfiche">Mikrofilm</label>
+          </td>
+          <td>
+           <input name="l_partsgroup" id="l_partsgroup" class="checkbox" type="checkbox" value="Y">
+           <label for="l_partsgroup">Warengruppe</label>
+          </td>
+         </tr>
 
-<input type=hidden name=revers value="[% revers %]">
-<input type=hidden name=lastsort value="[% lastsort %]">
-<input type=hidden name=sort value="description">
+         <tr>
+          <td>
+           <input name="l_subtotal" id="l_subtotal" class="checkbox" type="checkbox" value="Y">
+           <label for="l_subtotal">Zwischensumme</label>
+          </td>
+          <td>
+           <input name="l_soldtotal" id="l_soldtotal" class="checkbox" type="checkbox" value="Y">
+           <label for="l_soldtotal">Verkaufte Anzahl</label>
+          </td>
+          <td>
+           <input name="l_deliverydate" id="l_deliverydate" class="checkbox" type="checkbox" value="Y">
+           <label for="l_deliverydate">Lieferdatum</label>
+          </td>
+         </tr>
+        </table>
+       </td>
+      </tr>
+     </table>
+    </td>
+   </tr>
+   <tr><td colspan="4"><hr size="3" noshade></td></tr>
+  </table>
 
-<input type=hidden name=ndxs_counter value="[% ndxs_counter %]">
+  <script type="text/javascript">
+   <!--
+       Calendar.setup({ inputField : "transdatefrom",  ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger1" });
+       Calendar.setup({ inputField : "transdateto",    ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger2" });
+       //-->
+  </script>
 
-<br>
-<input class=submit type=submit name=action value="Weiter">
-<input class=submit type=submit name=action value="Top 100">
-</form>
+  <p>
+   <input class="submit" type="submit" name="action" value="Weiter">
+   <input class="submit" type="submit" name="action" value="Top 100">
+  </p>
+ </form>
 
 </body>
 </html>
index 607445c..6ca24f4 100644 (file)
 [%- USE LxERP %]
 <body>
 
-<form method=post action=[% script %]>
+ <form method="post" action="ic.pl">
 
-<input type=hidden name=searchitems value=[% searchitems %]>
-<input type=hidden name=title value="[% title %]">
+  <input type="hidden" name="searchitems" value="[% HTML.escape(searchitems) %]">
+  <input type="hidden" name="title" value="[% HTML.escape(title) %]">
 
-<input type=hidden name=revers value="[% revers %]">
-<input type=hidden name=lastsort value="[% lastsort %]">
+  <input type="hidden" name="revers" value="[% HTML.escape(revers) %]">
+  <input type="hidden" name="lastsort" value="[% HTML.escape(lastsort) %]">
 
-<table width="100%">
-  <tr><th class=listtop>[% title %]</th></tr>
-  <tr height="5"></tr>
-  <tr valign=top>
+  <input type="hidden" name="nextsub" value="generate_report">
+  <input type="hidden" name="sort" value="description">
+
+  <input type="hidden" name="ndxs_counter" value="[% HTML.escape(ndxs_counter) %]">
+
+  <div class="listtop">[% title %]</div>
+
+  <table width="100%">
+   <tr height="5"></tr>
+   <tr valign="top">
     <td>
-      <table>
-        <tr>
-          <th align=right nowrap><translate>Part Number</translate></th>
-          <td><input name=partnumber size=20></td>
-          <th align=right nowrap><translate>EAN</translate></th>
-          <td><input name=ean size=20></td>
-        </tr>
-        <tr>
-          <th align=right nowrap><translate>Part Description</translate></th>
-          <td colspan=3><input name=description size=40></td>
-        </tr>
-       <tr>
-          <th align=right nowrap><translate>Group</translate></th>
-          <td><input name=partsgroup size=20></td>
-[%- UNLESS is_service %]
-          <th align=right nowrap><translate>Serial Number</translate></th> <td><input name=serialnumber size=20></td> 
-[%- END %]
-       </tr>
-[%- UNLESS is_service %]
-        <tr>
-          <th align=right nowrap><translate>Make</translate></th> <td><input name=make size=20></td>
-          <th align=right nowrap><translate>Model</translate></th> <td><input name=model size=20></td>
-        </tr>
-[%- END %]
-        <tr>
-          <th align=right nowrap><translate>Drawing</translate></th>
-          <td><input name=drawing size=20></td>
-          <th align=right nowrap><translate>Microfiche</translate></th>
-          <td><input name=microfiche size=20></td>
-        </tr>
-[%- IF is_assembly %]
-        <tr>
-         <td></td>
-          <td colspan=3>
-         <input name=null class=radio type=radio value=1 checked>&nbsp;<translate>Top Level</translate>
-         <input name=bom class=checkbox type=checkbox value=1>&nbsp;<translate>Individual Items</translate>
-          </td>
-        </tr>
-[%- END %]
-        <tr>
-          <td></td>
-          <td colspan=3>
-            <input name=itemstatus class=radio type=radio value=active checked>&nbsp;<translate>Active</translate>
-[%- UNLESS is_service %]
-           <input name=itemstatus class=radio type=radio value=onhand>&nbsp;<translate>On Hand</translate>
-            <input name=itemstatus class=radio type=radio value=short>&nbsp;<translate>Short</translate> 
-[%- END %]
-            <input name=itemstatus class=radio type=radio value=obsolete>&nbsp;<translate>Obsolete</translate>
-            <input name=itemstatus class=radio type=radio value=orphaned>&nbsp;<translate>Orphaned</translate>
-         </td>
-       </tr>
-        <tr>
-          <td></td>
-          <td colspan=3>
+     <table>
+      <tr>
+       <th align="right" nowrap><translate>Part Number</translate></th>
+       <td><input name="partnumber" size="20"></td>
+       <th align="right" nowrap><translate>EAN</translate></th>
+       <td><input name="ean" size="20"></td>
+      </tr>
+
+      <tr>
+       <th align="right" nowrap><translate>Part Description</translate></th>
+       <td colspan="3"><input name="description" size="40"></td>
+      </tr>
+
+      <tr>
+       <th align="right" nowrap><translate>Group</translate></th>
+       <td><input name="partsgroup" size="20"></td>
+       [%- UNLESS is_service %]
+       <th align="right" nowrap><translate>Serial Number</translate></th> <td><input name="serialnumber" size="20"></td>
+       [%- END %]
+      </tr>
+
+      [%- UNLESS is_service %]
+      <tr>
+       <th align="right" nowrap><translate>Make</translate></th> <td><input name="make" size="20"></td>
+       <th align="right" nowrap><translate>Model</translate></th> <td><input name="model" size="20"></td>
+      </tr>
+      [%- END %]
+
+      <tr>
+       <th align="right" nowrap><translate>Drawing</translate></th>
+       <td><input name="drawing" size="20"></td>
+       <th align="right" nowrap><translate>Microfiche</translate></th>
+       <td><input name="microfiche" size="20"></td>
+      </tr>
+
+      [%- IF is_assembly %]
+      <tr>
+       <td></td>
+       <td colspan="3">
+        <input name="null" id="null_1" class="radio" type="radio" value="1" checked>&nbsp;<label for="null_1"><translate>Top Level</translate></label>
+        <input name="bom" id="bom" class="checkbox" type="checkbox" value="1">&nbsp;<label for="bom"><translate>Individual Items</translate></label>
+       </td>
+      </tr>
+      [%- END %]
+
+      <tr>
+       <td></td>
+       <td colspan="3">
+        <input name="itemstatus" id="itemstatus_active" class="radio" type="radio" value="active" checked>
+        <label for="itemstatus_active"><translate>Active</translate></label>
+        [%- UNLESS is_service %]
+        <input name="itemstatus" id="itemstatus_onhand" class="radio" type="radio" value="onhand">
+        <label for="itemstatus_onhand"><translate>On Hand</translate></label>
+        <input name="itemstatus" id="itemstatus_short" class="radio" type="radio" value="short">
+        <label for="itemstatus_short"><translate>Short</translate></label>
+        [%- END %]
+        <input name="itemstatus" id="itemstatus_obsolete" class="radio" type="radio" value="obsolete">
+        <label for="itemstatus_obsolete"><translate>Obsolete</translate></label>
+        <input name="itemstatus" id="itemstatus_orphaned" class="radio" type="radio" value="orphaned">
+        <label for="itemstatus_orphaned"><translate>Orphaned</translate></label>
+       </td>
+      </tr>
+
+      <tr>
+       <td></td>
+       <td colspan="3">
         <table>
-          <tr>
-            <td>
-          <table>
+         <tr>
+          <td>
+           <table>
             <tr>
-[%- UNLESS is_assembly %]
-              <td><input name=bought class=checkbox type=checkbox value=1></td> <td nowrap><translate>Bought</translate></td>
-[%- END %]
-              <td><input name=sold class=checkbox type=checkbox value=1></td> <td nowrap><translate>Sold</translate></td>
+             [%- UNLESS is_assembly %]
+             <td><input name="bought" id="bought" class="checkbox" type="checkbox" value="1"></td>
+             <td nowrap><label for="bought"><translate>Bought</translate></label></td>
+             [%- END %]
+             <td><input name="sold" id="sold" class="checkbox" type="checkbox" value="1"></td>
+             <td nowrap><label for="sold"><translate>Sold</translate></label></td>
             </tr>
+
             <tr>
-              <td colspan=4><hr size=1 noshade></td>
+             <td colspan="4"><hr size="1" noshade></td>
             </tr>
+
             <tr>
-[%- UNLESS is_assembly %]
-              <td><input name=onorder class=checkbox type=checkbox value=1></td> <td nowrap><translate>On Order</translate></td>
-[%- END %]
-              <td><input name=ordered class=checkbox type=checkbox value=1></td> <td nowrap><translate>Ordered</translate></td>
+             [%- UNLESS is_assembly %]
+             <td><input name="onorder" id="onorder" class="checkbox" type="checkbox" value="1"></td>
+             <td nowrap><label for="onorder"><translate>On Order</translate></label></td>
+             [%- END %]
+             <td><input name="ordered" id="ordered" class="checkbox" type="checkbox" value="1"></td>
+             <td nowrap><label for="ordered"><translate>Ordered</translate></label></td>
             </tr>
+
             <tr>
-              <td colspan=4><hr size=1 noshade></td>
+             <td colspan="4"><hr size="1" noshade></td>
             </tr>
+
             <tr>
-[%- UNLESS is_assembly %]
-              <td><input name=rfq class=checkbox type=checkbox value=1></td> <td nowrap><translate>RFQ</translate></td>
-[%- END %]
-              <td><input name=quoted class=checkbox type=checkbox value=1></td> <td nowrap><translate>Quoted</translate></td>
+             [%- UNLESS is_assembly %]
+             <td><input name="rfq" id="rfq" class="checkbox" type="checkbox" value="1"></td>
+             <td nowrap><label for="rfq"><translate>RFQ</translate></label></td>
+             [%- END %]
+             <td><input name="quoted" id="quoted" class="checkbox" type="checkbox" value="1"></td>
+             <td nowrap><label for="quoted"><translate>Quoted</translate></label></td>
             </tr>
-          </table>
-        </td>
-        <td width=5%>&nbsp;</td>
-        <td>
-          <table>
+           </table>
+          </td>
+
+          <td width="5%">&nbsp;</td>
+
+          <td>
+           <table>
             <tr>
-              <th><translate>From</translate></th>
-                      <td><input name=transdatefrom id=transdatefrom size=11 title="[% dateformat %]"></td>
-                      <td><input type=button name=transdatefrom id="trigger1" value="<translate>button</translate>"></td>
-              <th><translate>To (time)</translate></th>
-                      <td><input name=transdateto id=transdateto size=11 title="[% dateformat %]"></td>
-                      <td><input type=button name=transdateto name=transdateto id="trigger2" value="<translate>button</translate>"></td>
+             <th><translate>From</translate></th>
+             <td><input name="transdatefrom" id="transdatefrom" size="11" title="[% HTML.escape(dateformat) %]"></td>
+             <td><input type="button" name="transdatefrom" id="trigger1" value="<translate>button</translate>"></td>
+             <th><translate>To (time)</translate></th>
+             <td><input name="transdateto" id="transdateto" size="11" title="[% HTML.escape(dateformat) %]"></td>
+             <td><input type="button" name="transdateto" name="transdateto" id="trigger2" value="<translate>button</translate>"></td>
             </tr>
-          </table>
-        </td>
-          </tr>
+           </table>
+          </td>
+         </tr>
         </table>
-      </td>
-    </tr>
-        <tr>
-         <td></td>
-          <td colspan=3>
-           <hr size=1 noshade>
-         </td>
-       </tr>
-       <tr>
-          <th align=right nowrap><translate>Include in Report</translate></th> <td colspan=3>
-            <table>
-              <tr>
-                <td><input name=l_partnumber class=checkbox type=checkbox value=Y checked>&nbsp;<translate>Part Number</translate></td>
-               <td><input name=l_description class=checkbox type=checkbox value=Y checked>&nbsp;<translate>Part Description</translate></td>
-[%- UNLESS is_service %]
-                <td><input name=l_serialnumber class=checkbox type=checkbox value=Y>&nbsp;<translate>Serial Number</translate></td> 
-[%- END %]
-               <td><input name=l_unit class=checkbox type=checkbox value=Y checked>&nbsp;<translate>Unit of measure</translate></td>
-             </tr>
-             <tr>
-                <td><input name=l_listprice class=checkbox type=checkbox value=Y>&nbsp;<translate>List Price</translate></td>
-               <td><input name=l_sellprice class=checkbox type=checkbox value=Y checked>&nbsp;<translate>Sell Price</translate></td>
-               <td><input name=l_lastcost class=checkbox type=checkbox value=Y checked>&nbsp;<translate>Last Cost</translate></td>
-               <td><input name=l_linetotal class=checkbox type=checkbox value=Y checked>&nbsp;<translate>Line Total</translate></td>
-             </tr>
-             <tr>
-                <td><input name=l_priceupdate class=checkbox type=checkbox value=Y>&nbsp;<translate>Updated</translate></td>
-               <td><input name=l_bin class=checkbox type=checkbox value=Y>&nbsp;<translate>Bin</translate></td>
-               <td><input name=l_rop class=checkbox type=checkbox value=Y>&nbsp;<translate>ROP</translate></td>
-               <td><input name=l_weight class=checkbox type=checkbox value=Y>&nbsp;<translate>Weight</translate></td>
-              </tr>
-             <tr>
-                <td><input name=l_image class=checkbox type=checkbox value=Y>&nbsp;<translate>Image</translate></td>
-               <td><input name=l_drawing class=checkbox type=checkbox value=Y>&nbsp;<translate>Drawing</translate></td>
-               <td><input name=l_microfiche class=checkbox type=checkbox value=Y>&nbsp;<translate>Microfiche</translate></td>
-               <td><input name=l_partsgroup class=checkbox type=checkbox value=Y>&nbsp;<translate>Group</translate></td>
-              </tr>
-             <tr>
-                <td><input name=l_subtotal class=checkbox type=checkbox value=Y>&nbsp;<translate>Subtotal</translate></td>
-               <td><input name=l_soldtotal class=checkbox type=checkbox value=Y>&nbsp;<translate>soldtotal</translate></td>
-               <td><input name=l_deliverydate class=checkbox type=checkbox value=Y>&nbsp;<translate>deliverydate</translate></td>    
-             </tr>
-            </table>
-          </td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-  <tr><td colspan=4><hr size=3 noshade></td></tr>
-</table>
+       </td>
+      </tr>
 
-<script type="text/javascript">
-<!-- 
- Calendar.setup({ inputField : "transdatefrom",  ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger1" });
- Calendar.setup({ inputField : "transdateto",    ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger2" });
- //-->
-</script>
+      <tr>
+       <td></td>
+       <td colspan="3">
+        <hr size="1" noshade>
+       </td>
+      </tr>
+
+      <tr>
+       <th align="right" nowrap><translate>Include in Report</translate></th> <td colspan="3">
+        <table>
+         <tr>
+          <td>
+           <input name="l_partnumber" id="l_partnumber" class="checkbox" type="checkbox" value="Y" checked>
+           <label for="l_partnumber"><translate>Part Number</translate></label>
+          </td>
+          <td>
+           <input name="l_description" id="l_description" class="checkbox" type="checkbox" value="Y" checked>
+           <label for="l_description"><translate>Part Description</translate></label>
+          </td>
+          [%- UNLESS is_service %]
+          <td>
+           <input name="l_serialnumber" id="l_serialnumber" class="checkbox" type="checkbox" value="Y">
+           <label for="l_serialnumber"><translate>Serial Number</translate></label>
+          </td>
+          [%- END %]
+          <td>
+           <input name="l_unit" id="l_unit" class="checkbox" type="checkbox" value="Y" checked>
+           <label for="l_unit"><translate>Unit of measure</translate></label>
+          </td>
+         </tr>
 
+         <tr>
+          <td>
+           <input name="l_listprice" id="l_listprice" class="checkbox" type="checkbox" value="Y">
+           <label for="l_listprice"><translate>List Price</translate></label>
+          </td>
+          <td>
+           <input name="l_sellprice" id="l_sellprice" class="checkbox" type="checkbox" value="Y" checked>
+           <label for="l_sellprice"><translate>Sell Price</translate></label>
+          </td>
+          <td>
+           <input name="l_lastcost" id="l_lastcost" class="checkbox" type="checkbox" value="Y" checked>
+           <label for="l_lastcost"><translate>Last Cost</translate></label>
+          </td>
+          <td>
+           <input name="l_linetotal" id="l_linetotal" class="checkbox" type="checkbox" value="Y" checked>
+           <label for="l_linetotal"><translate>Line Total</translate></label>
+          </td>
+         </tr>
 
+         <tr>
+          <td>
+           <input name="l_priceupdate" id="l_priceupdate" class="checkbox" type="checkbox" value="Y">
+           <label for="l_priceupdate"><translate>Updated</translate></label>
+          </td>
+          <td>
+           <input name="l_bin" id="l_bin" class="checkbox" type="checkbox" value="Y">
+           <label for="l_bin"><translate>Bin</translate></label>
+          </td>
+          <td>
+           <input name="l_rop" id="l_rop" class="checkbox" type="checkbox" value="Y">
+           <label for="l_rop"><translate>ROP</translate></label>
+          </td>
+          <td>
+           <input name="l_weight" id="l_weight" class="checkbox" type="checkbox" value="Y">
+           <label for="l_weight"><translate>Weight</translate></label>
+          </td>
+         </tr>
 
-<input type=hidden name=nextsub value=generate_report>
+         <tr>
+          <td>
+           <input name="l_image" id="l_image" class="checkbox" type="checkbox" value="Y">
+           <label for="l_image"><translate>Image</translate></label>
+          </td>
+          <td>
+           <input name="l_drawing" id="l_drawing" class="checkbox" type="checkbox" value="Y">
+           <label for="l_drawing"><translate>Drawing</translate></label>
+          </td>
+          <td>
+           <input name="l_microfiche" id="l_microfiche" class="checkbox" type="checkbox" value="Y">
+           <label for="l_microfiche"><translate>Microfiche</translate></label>
+          </td>
+          <td>
+           <input name="l_partsgroup" id="l_partsgroup" class="checkbox" type="checkbox" value="Y">
+           <label for="l_partsgroup"><translate>Group</translate></label>
+          </td>
+         </tr>
 
-<input type=hidden name=revers value="[% revers %]">
-<input type=hidden name=lastsort value="[% lastsort %]">
-<input type=hidden name=sort value="description">
+         <tr>
+          <td>
+           <input name="l_subtotal" id="l_subtotal" class="checkbox" type="checkbox" value="Y">
+           <label for="l_subtotal"><translate>Subtotal</translate></label>
+          </td>
+          <td>
+           <input name="l_soldtotal" id="l_soldtotal" class="checkbox" type="checkbox" value="Y">
+           <label for="l_soldtotal"><translate>soldtotal</translate></label>
+          </td>
+          <td>
+           <input name="l_deliverydate" id="l_deliverydate" class="checkbox" type="checkbox" value="Y">
+           <label for="l_deliverydate"><translate>deliverydate</translate></label>
+          </td>
+         </tr>
+        </table>
+       </td>
+      </tr>
+     </table>
+    </td>
+   </tr>
+   <tr><td colspan="4"><hr size="3" noshade></td></tr>
+  </table>
 
-<input type=hidden name=ndxs_counter value="[% ndxs_counter %]">
+  <script type="text/javascript">
+   <!--
+       Calendar.setup({ inputField : "transdatefrom",  ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger1" });
+       Calendar.setup({ inputField : "transdateto",    ifFormat :"[% myconfig_jsc_dateformat %]", align : "BL", button : "trigger2" });
+       //-->
+  </script>
 
-<br>
-<input class=submit type=submit name=action value="<translate>Continue</translate>">
-<input class=submit type=submit name=action value="<translate>TOP100</translate>">
-</form>
+  <p>
+   <input class="submit" type="submit" name="action" value="<translate>Continue</translate>">
+   <input class="submit" type="submit" name="action" value="<translate>TOP100</translate>">
+  </p>
+ </form>
 
 </body>
 </html>