Umstellung weiterer HTML-Vorlagen aus templates/webpages/generic von HTML::Template...

diff --git a/bin/mozilla/common.pl b/bin/mozilla/common.pl
index dee0e01..e05a146 100644 (file)
--- a/bin/mozilla/common.pl
+++ b/bin/mozilla/common.pl
@@ -307,9 +307,9 @@ sub delivery_customer_selection {
 
   $form->{"title"} = $locale->text("Select a Customer");
   $form->header();
-  print($form->parse_html_template("generic/select_delivery_customer", { "HEADER" => \@header,
-                                                                   "DELIVERY" => $delivery,
-                                                                   "onload" => $onload }));
+  print $form->parse_html_template2("generic/select_delivery_customer", { "HEADER"   => \@header,
+                                                                          "DELIVERY" => $delivery,
+                                                                          "onload"   => $onload });
 
   $lxdebug->leave_sub();
 }
@@ -349,9 +349,9 @@ sub vendor_selection {
 
   $form->{"title"} = $locale->text("Select a Customer");
   $form->header();
-  print($form->parse_html_template("generic/select_vendor", { "HEADER" => \@header,
-                                                                   "VENDOR" => $vendor,
-                                                                   "onload" => $onload }));
+  print $form->parse_html_template2("generic/select_vendor", { "HEADER" => \@header,
+                                                               "VENDOR" => $vendor,
+                                                               "onload" => $onload });
 
   $lxdebug->leave_sub();
 }
@@ -405,14 +405,9 @@ sub calculate_qty {
 sub set_longdescription {
   $lxdebug->enter_sub();
 
-
-  my $callback = "$form->{script}?action=set_longdescription&";
-  map({ $callback .= "$_=" . $form->escape($form->{$_}) . "&" }
-      (qw(login password name input_name input_id), grep({ /^[fl]_/ } keys %$form)));
-
-  $form->{"title"} = $locale->text("Enter longdescription");
+  $form->{title} = $locale->text("Enter longdescription");
   $form->header();
-  print($form->parse_html_template("generic/set_longdescription"));
+  print $form->parse_html_template2("generic/set_longdescription");
 
   $lxdebug->leave_sub();
 }

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index ca50587..1ec0ca4 100644 (file)
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -348,16 +348,13 @@ sub new_item {
   # save all form variables except action in a previousform variable
   my $previousform = join '&', map { $form->{$_} =~ s/&/%26/; "$_=$form->{$_}" } grep { !/action/ } keys %$form;
 
-  map { $form->{"${_}_$form->{rowcount}"} =~ s/\"/"/g } qw(partnumber description);
+  push @HIDDENS,      { 'name' => 'previousform', 'value' => $form->escape($previousform, 1) };
+  push @HIDDENS, map +{ 'name' => $_,             'value' => $form->{$_} },                       qw(rowcount vc login password);
+  push @HIDDENS, map +{ 'name' => $_,             'value' => $form->{"${_}_$form->{rowcount}"} }, qw(partnumber description unit sellprice);
+  push @HIDDENS,      { 'name' => 'taxaccount2',  'value' => $form->{taxaccounts} };
 
-  $form->header;
-
-  push @HIDDENS, { value => $cgi->hidden("-name" => "previousform", "-value" => $form->escape($previousform, 1)) };
-  push @HIDDENS, map +{ value => $cgi->hidden("-name" => $_, "-value" => $form->{$_}) },                       qw(rowcount vc login password);
-  push @HIDDENS, map +{ value => $cgi->hidden("-name" => $_, "-value" => $form->{"${_}_$form->{rowcount}"}) }, qw(partnumber description unit sellprice);
-  push @HIDDENS, { value => $cgi->hidden("-name" => "taxaccount2", "-value" => $form->{taxaccounts}) };
-
-  print $form->parse_html_template("generic/new_item", { HIDDENS => \@HIDDENS} );
+  $form->header();
+  print $form->parse_html_template2("generic/new_item", { HIDDENS => [ sort { $a->{name} cmp $b->{name} } @HIDDENS ] } );
 
   $lxdebug->leave_sub();
 }
@@ -837,13 +834,16 @@ sub print_options {
     remove_draft_checked => $form->{remove_draft} ? "checked" : ''
   );
 
-  my $print_options = $form->parse_html_template("generic/print_options", { SELECTS  => \@SELECTS, %template_vars } );
+  my $print_options = $form->parse_html_template2("generic/print_options", { SELECTS  => \@SELECTS, %template_vars } );
 
   if ($options{inline}) {
-    $lxdebug->leave_sub() and return $print_options;
-  } else {
-    print $print_options; $lxdebug->leave_sub();
+    $lxdebug->leave_sub();
+    return $print_options;
   }
+
+  print $print_options;
+
+  $lxdebug->leave_sub();
 }
 
 sub print {

diff --git a/templates/webpages/generic/new_item_de.html b/templates/webpages/generic/new_item_de.html
index b11a94b..dc39580 100644 (file)
--- a/templates/webpages/generic/new_item_de.html
+++ b/templates/webpages/generic/new_item_de.html
@@ -1,4 +1,4 @@
-  <body>
+[% USE HTML %]  <body>
 
     <h4 class="error">Dieser Artikel ist nicht in der Datenbank!
 
@@ -13,8 +13,9 @@
       <input class="radio" type="radio" name="item" value="service">&nbsp;Dienstleistung
       <p>
 
-      <TMPL_LOOP HIDDENS><TMPL_VAR value>
-      </TMPL_LOOP>
+      [%- FOREACH var = HIDDENS %]
+      <input type="hidden" name="[% HTML.escape(var.name) %]" value="[% HTML.escape(var.value) %]">
+      [%- END %]
 
       <input type="hidden" name="nextsub" value="add">
       <input class="submit" type="submit" name="action" value="Weiter">

diff --git a/templates/webpages/generic/new_item_master.html b/templates/webpages/generic/new_item_master.html
index a602495..45235ec 100644 (file)
--- a/templates/webpages/generic/new_item_master.html
+++ b/templates/webpages/generic/new_item_master.html
@@ -1,4 +1,4 @@
-  <body>
+[% USE HTML %]  <body>
 
     <h4 class="error"><translate>Item not on file!</translate>
 
@@ -13,8 +13,9 @@
       <input class="radio" type="radio" name="item" value="service">&nbsp;<translate>Service</translate>
       <p>
 
-      <TMPL_LOOP HIDDENS><TMPL_VAR value>
-      </TMPL_LOOP>
+      [%- FOREACH var = HIDDENS %]
+      <input type="hidden" name="[% HTML.escape(var.name) %]" value="[% HTML.escape(var.value) %]">
+      [%- END %]
 
       <input type="hidden" name="nextsub" value="add">
       <input class="submit" type="submit" name="action" value="<translate>Continue</translate>">

diff --git a/templates/webpages/generic/print_options_de.html b/templates/webpages/generic/print_options_de.html
index 1b952b9..b1906f5 100644 (file)
--- a/templates/webpages/generic/print_options_de.html
+++ b/templates/webpages/generic/print_options_de.html
@@ -1,31 +1,38 @@
-<table width=100% cellspacing=0 cellpadding=0>
-  <tr>
-    <td>
-      <table>
-  <tr>
-    <td>
-    <TMPL_LOOP SELECTS><TMPL_IF show>
-      <select name="<TMPL_VAR sname>"><TMPL_LOOP DATA>
-        <option value="<TMPL_VAR value>" <TMPL_VAR selected>><TMPL_VAR oname></option></TMPL_LOOP></select>
-    </TMPL_IF></TMPL_LOOP>
-    </td>
-    <TMPL_IF display_copies>
-      <td>Kopien <input name=copies size=2 value=<TMPL_VAR copies>></td>
-    </TMPL_IF>
-    <TMPL_IF display_groupitems>
-      <td>Waren gruppieren</td>
-      <td><input name=groupitems type=checkbox class=checkbox <TMPL_VAR groupitems_checked>></td>
-    </TMPL_IF>
-    <TMPL_IF display_remove_draft>
-      <td>Entwurf l&ouml;schen</td>
-      <td><input name=remove_draft type=checkbox class=checkbox <TMPL_VAR remove_draft_checked>></td>
-    </TMPL_IF>
+[% USE HTML %]
+
+<table width="100%" cellspacing="0" cellpadding="0">
+ <tr>
+  <td>
+   <table>
+    <tr>
+     <td>
+      [%- FOREACH row = SELECTS %]
+      [%- IF row.show %]
+      <select name="[% row.sname %]">
+       [%- FOREACH data = row.DATA %]
+       <option value="[% data.value %]" [% data.selected %]>[% data.oname %]</option>
+       [%- END %]
+      </select>
+      [%- END %]
+      [%- END %]
+     </td>
+     [%- IF display_copies %]
+     <td>Kopien <input name="copies" size="2" value="[% HTML.escape(copies) %]"></td>
+     [%- END %]
+     [%- IF display_groupitems %]
+     <td>Waren gruppieren</td>
+     <td><input name="groupitems" type="checkbox" class="checkbox" [% groupitems_checked %]></td>
+     [%- END %]
+     [%- IF display_remove_draft %]
+     <td>Entwurf l&ouml;schen</td>
+     <td><input name="remove_draft" type="checkbox" class="checkbox" [% remove_draft_checked %]></td>
+     [%- END %]
     </tr>
-      </table>
-    </td>
-    <td align=right>
-      <table><tr><th><TMPL_VAR status_msg></th></tr></table>
-    </td>
-  </tr>
+   </table>
+  </td>
+  <td align=right>
+   <table><tr><th>[% status_msg %]</th></tr></table>
+  </td>
+ </tr>
 </table>
 

diff --git a/templates/webpages/generic/print_options_master.html b/templates/webpages/generic/print_options_master.html
index c0a37ea..94a44b8 100644 (file)
--- a/templates/webpages/generic/print_options_master.html
+++ b/templates/webpages/generic/print_options_master.html
@@ -1,31 +1,38 @@
-<table width=100% cellspacing=0 cellpadding=0>
-  <tr>
-    <td>
-      <table>
-  <tr>
-    <td>
-    <TMPL_LOOP SELECTS><TMPL_IF show>
-      <select name="<TMPL_VAR sname>"><TMPL_LOOP DATA>
-        <option value="<TMPL_VAR value>" <TMPL_VAR selected>><TMPL_VAR oname></option></TMPL_LOOP></select>
-    </TMPL_IF></TMPL_LOOP>
-    </td>
-    <TMPL_IF display_copies>
-      <td><translate>Copies</translate> <input name=copies size=2 value=<TMPL_VAR copies>></td>
-    </TMPL_IF>
-    <TMPL_IF display_groupitems>
-      <td><translate>Group Items</translate></td>
-      <td><input name=groupitems type=checkbox class=checkbox <TMPL_VAR groupitems_checked>></td>
-    </TMPL_IF>
-    <TMPL_IF display_remove_draft>
-      <td><translate>Remove Draft</translate></td>
-      <td><input name=remove_draft type=checkbox class=checkbox <TMPL_VAR remove_draft_checked>></td>
-    </TMPL_IF>
+[% USE HTML %]
+
+<table width="100%" cellspacing="0" cellpadding="0">
+ <tr>
+  <td>
+   <table>
+    <tr>
+     <td>
+      [%- FOREACH row = SELECTS %]
+      [%- IF row.show %]
+      <select name="[% row.sname %]">
+       [%- FOREACH data = row.DATA %]
+       <option value="[% data.value %]" [% data.selected %]>[% data.oname %]</option>
+       [%- END %]
+      </select>
+      [%- END %]
+      [%- END %]
+     </td>
+     [%- IF display_copies %]
+     <td><translate>Copies</translate> <input name="copies" size="2" value="[% HTML.escape(copies) %]"></td>
+     [%- END %]
+     [%- IF display_groupitems %]
+     <td><translate>Group Items</translate></td>
+     <td><input name="groupitems" type="checkbox" class="checkbox" [% groupitems_checked %]></td>
+     [%- END %]
+     [%- IF display_remove_draft %]
+     <td><translate>Remove Draft</translate></td>
+     <td><input name="remove_draft" type="checkbox" class="checkbox" [% remove_draft_checked %]></td>
+     [%- END %]
     </tr>
-      </table>
-    </td>
-    <td align=right>
-      <table><tr><th><TMPL_VAR status_msg></th></tr></table>
-    </td>
-  </tr>
+   </table>
+  </td>
+  <td align=right>
+   <table><tr><th>[% status_msg %]</th></tr></table>
+  </td>
+ </tr>
 </table>
 

diff --git a/templates/webpages/generic/select_delivery_customer_de.html b/templates/webpages/generic/select_delivery_customer_de.html
index 93a1022..e269df8 100644 (file)
--- a/templates/webpages/generic/select_delivery_customer_de.html
+++ b/templates/webpages/generic/select_delivery_customer_de.html
@@ -1,14 +1,13 @@
-<body <TMPL_IF NAME=onload>onload="<TMPL_VAR NAME=onload>"</TMPL_IF>>
+[% USE HTML %]<body onload="[% onload %]">
 
  <form name="Form">
 
-  <input type="hidden" name="input_name" value="<TMPL_VAR NAME=input_name ESCAPE=HTML>">
-  <input type="hidden" name="input_id" value="<TMPL_VAR NAME=input_id ESCAPE=HTML>">
+  <input type="hidden" name="input_name" value="[% HTML.escape(input_name) %]">
+  <input type="hidden" name="input_id" value="[% HTML.escape(input_id) %]">
+
+  <div class="listtop">[% title %]</div>
 
   <table width="100%">
-   <tr>
-    <th class="listtop"><TMPL_VAR NAME=title></th>
-   </tr>
    <tr height="5"></tr>
 
    <tr><td>Bitte einen Endkunden aus der Liste auswählen</td></tr>
@@ -19,23 +18,27 @@
      <table>
       <tr class="listheading">
        <th class="listheading">&nbsp;</th>
-       <TMPL_LOOP NAME=HEADER>
-        <th nowrap class="listheading"><a href="<TMPL_VAR NAME=callback ESCAPE=HTML>"><TMPL_VAR NAME=column_title></a></th>
-       </TMPL_LOOP>
+       [%- FOREACH col = HEADER %]
+       <th nowrap class="listheading"><a href="[% HTML.escape(col.callback) %]">[% col.column_title %]</a></th>
+       [%- END %]
       </tr>
 
-      <TMPL_LOOP NAME=DELIVERY>
-       <tr class="listrow<TMPL_IF NAME=__odd__>1<TMPL_ELSE>0</TMPL_IF>">
-        <td><button type="button" onclick="customer_selected('<TMPL_VAR NAME=__counter__>')">Auswahl</button></td>
-        <td><input type="hidden" id="id_<TMPL_VAR NAME=__counter__>" name="id_<TMPL_VAR NAME=__counter__>" value="<TMPL_VAR NAME=id ESCAPE=HTML>">
-         <input type="hidden" id="name_<TMPL_VAR NAME=__counter__>" name="name_<TMPL_VAR NAME=__counter__>" value="<TMPL_VAR NAME=name ESCAPE=HTML>">
-         <TMPL_VAR NAME=name ESCAPE=HTML></td>
-         <td><TMPL_VAR NAME=customernumber ESCAPE=HTML></td>
-         <td><TMPL_VAR NAME=address ESCAPE=HTML></td>
-<!--         <td><input type="hidden" id="description_<TMPL_VAR NAME=__counter__>" name="description_<TMPL_VAR NAME=__counter__>" value="<TMPL_VAR NAME=description ESCAPE=HTML>"> -->
-<!--          <TMPL_VAR NAME=description ESCAPE=HTML></td> -->
-       </tr>
-      </TMPL_LOOP>
+      [%- FOREACH row = DELIVERY %]
+      <tr class="listrow[% loop.count % 2 %]">
+       <td><button type="button" onclick="customer_selected('[% loop.count %]')">Auswahl</button></td>
+       <td>
+        <input type="hidden" id="id_[% loop.count %]" name="id_[% loop.count %]" value="[% HTML.escape(row.id) %]">
+        <input type="hidden" id="name_[% loop.count %]" name="name_[% loop.count %]" value="[% HTML.escape(row.name) %]">
+        [% HTML.escape(row.name) %]
+       </td>
+       <td>[% HTML.escape(row.customernumber) %]</td>
+       <td>[% HTML.escape(row.address) %]</td>
+<!--        <td> -->
+<!--         <input type="hidden" id="description_[% loop.count %]" name="description_[% loop.count %]" value="[% HTML.escape(row.description) %]"> -->
+<!--         [% HTML.escape(row.description) %] -->
+<!--        </td> -->
+      </tr>
+      [%- END %]
      </table>
 
     </td>

diff --git a/templates/webpages/generic/select_delivery_customer_master.html b/templates/webpages/generic/select_delivery_customer_master.html
index 13234ff..272934d 100644 (file)
--- a/templates/webpages/generic/select_delivery_customer_master.html
+++ b/templates/webpages/generic/select_delivery_customer_master.html
@@ -1,14 +1,13 @@
-<body <TMPL_IF NAME=onload>onload="<TMPL_VAR NAME=onload>"</TMPL_IF>>
+[% USE HTML %]<body onload="[% onload %]">
 
  <form name="Form">
 
-  <input type="hidden" name="input_name" value="<TMPL_VAR NAME=input_name ESCAPE=HTML>">
-  <input type="hidden" name="input_id" value="<TMPL_VAR NAME=input_id ESCAPE=HTML>">
+  <input type="hidden" name="input_name" value="[% HTML.escape(input_name) %]">
+  <input type="hidden" name="input_id" value="[% HTML.escape(input_id) %]">
+
+  <div class="listtop">[% title %]</div>
 
   <table width="100%">
-   <tr>
-    <th class="listtop"><TMPL_VAR NAME=title></th>
-   </tr>
    <tr height="5"></tr>
 
    <tr><td><translate>Please select a customer from the list below.</translate></td></tr>
@@ -19,23 +18,27 @@
      <table>
       <tr class="listheading">
        <th class="listheading">&nbsp;</th>
-       <TMPL_LOOP NAME=HEADER>
-        <th nowrap class="listheading"><a href="<TMPL_VAR NAME=callback ESCAPE=HTML>"><TMPL_VAR NAME=column_title></a></th>
-       </TMPL_LOOP>
+       [%- FOREACH col = HEADER %]
+       <th nowrap class="listheading"><a href="[% HTML.escape(col.callback) %]">[% col.column_title %]</a></th>
+       [%- END %]
       </tr>
 
-      <TMPL_LOOP NAME=DELIVERY>
-       <tr class="listrow<TMPL_IF NAME=__odd__>1<TMPL_ELSE>0</TMPL_IF>">
-        <td><button type="button" onclick="customer_selected('<TMPL_VAR NAME=__counter__>')">Auswahl</button></td>
-        <td><input type="hidden" id="id_<TMPL_VAR NAME=__counter__>" name="id_<TMPL_VAR NAME=__counter__>" value="<TMPL_VAR NAME=id ESCAPE=HTML>">
-         <input type="hidden" id="name_<TMPL_VAR NAME=__counter__>" name="name_<TMPL_VAR NAME=__counter__>" value="<TMPL_VAR NAME=name ESCAPE=HTML>">
-         <TMPL_VAR NAME=name ESCAPE=HTML></td>
-         <td><TMPL_VAR NAME=customernumber ESCAPE=HTML></td>
-         <td><TMPL_VAR NAME=address ESCAPE=HTML></td>
-<!--         <td><input type="hidden" id="description_<TMPL_VAR NAME=__counter__>" name="description_<TMPL_VAR NAME=__counter__>" value="<TMPL_VAR NAME=description ESCAPE=HTML>"> -->
-<!--          <TMPL_VAR NAME=description ESCAPE=HTML></td> -->
-       </tr>
-      </TMPL_LOOP>
+      [%- FOREACH row = DELIVERY %]
+      <tr class="listrow[% loop.count % 2 %]">
+       <td><button type="button" onclick="customer_selected('[% loop.count %]')">Auswahl</button></td>
+       <td>
+        <input type="hidden" id="id_[% loop.count %]" name="id_[% loop.count %]" value="[% HTML.escape(row.id) %]">
+        <input type="hidden" id="name_[% loop.count %]" name="name_[% loop.count %]" value="[% HTML.escape(row.name) %]">
+        [% HTML.escape(row.name) %]
+       </td>
+       <td>[% HTML.escape(row.customernumber) %]</td>
+       <td>[% HTML.escape(row.address) %]</td>
+<!--        <td> -->
+<!--         <input type="hidden" id="description_[% loop.count %]" name="description_[% loop.count %]" value="[% HTML.escape(row.description) %]"> -->
+<!--         [% HTML.escape(row.description) %] -->
+<!--        </td> -->
+      </tr>
+      [%- END %]
      </table>
 
     </td>

diff --git a/templates/webpages/generic/select_vendor_de.html b/templates/webpages/generic/select_vendor_de.html
index e87c729..3fc4d31 100644 (file)
--- a/templates/webpages/generic/select_vendor_de.html
+++ b/templates/webpages/generic/select_vendor_de.html
@@ -1,14 +1,13 @@
-<body <TMPL_IF NAME=onload>onload="<TMPL_VAR NAME=onload>"</TMPL_IF>>
+[% USE HTML %]<body onload="[% onload %]">
 
  <form name="Form">
 
-  <input type="hidden" name="input_name" value="<TMPL_VAR NAME=input_name ESCAPE=HTML>">
-  <input type="hidden" name="input_id" value="<TMPL_VAR NAME=input_id ESCAPE=HTML>">
+  <input type="hidden" name="input_name" value="[% HTML.escape(input_name) %]">
+  <input type="hidden" name="input_id" value="[% HTML.escape(input_id) %]">
+
+  <div class="listtop">[% title %]</div>
 
   <table width="100%">
-   <tr>
-    <th class="listtop"><TMPL_VAR NAME=title></th>
-   </tr>
    <tr height="5"></tr>
 
    <tr><td>Bitte einen Händler aus der Liste auswählen</td></tr>
@@ -19,23 +18,27 @@
      <table>
       <tr class="listheading">
        <th class="listheading">&nbsp;</th>
-       <TMPL_LOOP NAME=HEADER>
-        <th nowrap class="listheading"><a href="<TMPL_VAR NAME=callback ESCAPE=HTML>"><TMPL_VAR NAME=column_title></a></th>
-       </TMPL_LOOP>
+       [%- FOREACH col = HEADER %]
+       <th nowrap class="listheading"><a href="[% HTML.escape(col.callback) %]">[% col.column_title %]</a></th>
+       [%- END %]
       </tr>
 
-      <TMPL_LOOP NAME=VENDOR>
-       <tr class="listrow<TMPL_IF NAME=__odd__>1<TMPL_ELSE>0</TMPL_IF>">
-        <td><button type="button" onclick="vendor_selected('<TMPL_VAR NAME=__counter__>')">Auswahl</button></td>
-        <td><input type="hidden" id="id_<TMPL_VAR NAME=__counter__>" name="id_<TMPL_VAR NAME=__counter__>" value="<TMPL_VAR NAME=id ESCAPE=HTML>">
-         <input type="hidden" id="name_<TMPL_VAR NAME=__counter__>" name="name_<TMPL_VAR NAME=__counter__>" value="<TMPL_VAR NAME=name ESCAPE=HTML>">
-         <TMPL_VAR NAME=name ESCAPE=HTML></td>
-         <td><TMPL_VAR NAME=customernumber ESCAPE=HTML></td>
-         <td><TMPL_VAR NAME=address ESCAPE=HTML></td>
-<!--         <td><input type="hidden" id="description_<TMPL_VAR NAME=__counter__>" name="description_<TMPL_VAR NAME=__counter__>" value="<TMPL_VAR NAME=description ESCAPE=HTML>"> -->
-<!--          <TMPL_VAR NAME=description ESCAPE=HTML></td> -->
-       </tr>
-      </TMPL_LOOP>
+      [%- FOREACH row = VENDOR %]
+      <tr class="listrow[% loop.count % 2 %]">
+       <td><button type="button" onclick="vendor_selected('[% loop.count %]')">Auswahl</button></td>
+       <td>
+        <input type="hidden" id="id_[% loop.count %]" name="id_[% loop.count %]" value="[% HTML.escape(row.id) %]">
+        <input type="hidden" id="name_[% loop.count %]" name="name_[% loop.count %]" value="[% HTML.escape(row.name) %]">
+        [% HTML.escape(name) %]
+       </td>
+       <td>[% HTML.escape(row.customernumber) %]</td>
+       <td>[% HTML.escape(row.address) %]</td>
+<!--        <td> -->
+<!--         <input type="hidden" id="description_[% loop.count %]" name="description_[% loop.count %]" value="[% HTML.escape(row.description) %]"> -->
+<!--         [% HTML.escape(row.description) %] -->
+<!--        </td> -->
+      </tr>
+      [%- END %]
      </table>
 
     </td>

diff --git a/templates/webpages/generic/select_vendor_master.html b/templates/webpages/generic/select_vendor_master.html
index f56b961..51b30b6 100644 (file)
--- a/templates/webpages/generic/select_vendor_master.html
+++ b/templates/webpages/generic/select_vendor_master.html
@@ -1,14 +1,13 @@
-<body <TMPL_IF NAME=onload>onload="<TMPL_VAR NAME=onload>"</TMPL_IF>>
+[% USE HTML %]<body onload="[% onload %]">
 
  <form name="Form">
 
-  <input type="hidden" name="input_name" value="<TMPL_VAR NAME=input_name ESCAPE=HTML>">
-  <input type="hidden" name="input_id" value="<TMPL_VAR NAME=input_id ESCAPE=HTML>">
+  <input type="hidden" name="input_name" value="[% HTML.escape(input_name) %]">
+  <input type="hidden" name="input_id" value="[% HTML.escape(input_id) %]">
+
+  <div class="listtop">[% title %]</div>
 
   <table width="100%">
-   <tr>
-    <th class="listtop"><TMPL_VAR NAME=title></th>
-   </tr>
    <tr height="5"></tr>
 
    <tr><td><translate>Please select a vendor from the list below.</translate></td></tr>
@@ -19,23 +18,27 @@
      <table>
       <tr class="listheading">
        <th class="listheading">&nbsp;</th>
-       <TMPL_LOOP NAME=HEADER>
-        <th nowrap class="listheading"><a href="<TMPL_VAR NAME=callback ESCAPE=HTML>"><TMPL_VAR NAME=column_title></a></th>
-       </TMPL_LOOP>
+       [%- FOREACH col = HEADER %]
+       <th nowrap class="listheading"><a href="[% HTML.escape(col.callback) %]">[% col.column_title %]</a></th>
+       [%- END %]
       </tr>
 
-      <TMPL_LOOP NAME=VENDOR>
-       <tr class="listrow<TMPL_IF NAME=__odd__>1<TMPL_ELSE>0</TMPL_IF>">
-        <td><button type="button" onclick="vendor_selected('<TMPL_VAR NAME=__counter__>')">Auswahl</button></td>
-        <td><input type="hidden" id="id_<TMPL_VAR NAME=__counter__>" name="id_<TMPL_VAR NAME=__counter__>" value="<TMPL_VAR NAME=id ESCAPE=HTML>">
-         <input type="hidden" id="name_<TMPL_VAR NAME=__counter__>" name="name_<TMPL_VAR NAME=__counter__>" value="<TMPL_VAR NAME=name ESCAPE=HTML>">
-         <TMPL_VAR NAME=name ESCAPE=HTML></td>
-         <td><TMPL_VAR NAME=customernumber ESCAPE=HTML></td>
-         <td><TMPL_VAR NAME=address ESCAPE=HTML></td>
-<!--         <td><input type="hidden" id="description_<TMPL_VAR NAME=__counter__>" name="description_<TMPL_VAR NAME=__counter__>" value="<TMPL_VAR NAME=description ESCAPE=HTML>"> -->
-<!--          <TMPL_VAR NAME=description ESCAPE=HTML></td> -->
-       </tr>
-      </TMPL_LOOP>
+      [%- FOREACH row = VENDOR %]
+      <tr class="listrow[% loop.count % 2 %]">
+       <td><button type="button" onclick="vendor_selected('[% loop.count %]')">Auswahl</button></td>
+       <td>
+        <input type="hidden" id="id_[% loop.count %]" name="id_[% loop.count %]" value="[% HTML.escape(row.id) %]">
+        <input type="hidden" id="name_[% loop.count %]" name="name_[% loop.count %]" value="[% HTML.escape(row.name) %]">
+        [% HTML.escape(name) %]
+       </td>
+       <td>[% HTML.escape(row.customernumber) %]</td>
+       <td>[% HTML.escape(row.address) %]</td>
+<!--        <td> -->
+<!--         <input type="hidden" id="description_[% loop.count %]" name="description_[% loop.count %]" value="[% HTML.escape(row.description) %]"> -->
+<!--         [% HTML.escape(row.description) %] -->
+<!--        </td> -->
+      </tr>
+      [%- END %]
      </table>
 
     </td>

diff --git a/templates/webpages/generic/set_longdescription_de.html b/templates/webpages/generic/set_longdescription_de.html
index 5c1e34c..7074780 100644 (file)
--- a/templates/webpages/generic/set_longdescription_de.html
+++ b/templates/webpages/generic/set_longdescription_de.html
@@ -1,26 +1,16 @@
-<body <TMPL_IF NAME=onload>onload="<TMPL_VAR NAME=onload>"</TMPL_IF>>
+[% USE HTML %]<body onload="[% onload %]">
 
  <form name="Form">
 
-  <input type="hidden" name="input_name" value="<TMPL_VAR NAME=input_name ESCAPE=HTML>">
+  <input type="hidden" name="input_name" value="[% HTML.escape(input_name) %]">
 
-  <table width="100%">
-   <tr>
-    <th class="listtop"><TMPL_VAR NAME=title></th>
-   </tr>
-   <tr height="5"></tr>
+  <div class="listtop">[% title %]</div>
 
-   <tr><td>Bitte den Langtext eingeben</td></tr>
+  <p>Bitte den Langtext eingeben</p>
 
-   <tr>
-    <td>
+  <p><textarea id="longdescription" name="longdescription" rows="15" cols="45" wrap="soft">[% HTML.escape(longdescription) %]</textarea></p>
 
-<textarea id="longdescription" name="longdescription" rows="15" cols="45" wrap="soft"><TMPL_VAR NAME=longdescription ESCAPE=HTML></textarea>
-
-    </td>
-   </tr>
-  </table>
- <button type="button" onclick="longdescription_updated()">Übernehmen</button></td>
+  <p><button type="button" onclick="longdescription_updated()">Übernehmen</button></p>
  </form>
 
  <script type="text/javascript">
@@ -30,7 +20,7 @@
 
         self.close();
       }
-      //TESSSSST-->
+    -->
  </script>
 
 </body>

diff --git a/templates/webpages/generic/set_longdescription_master.html b/templates/webpages/generic/set_longdescription_master.html
index d9d7550..e071b89 100644 (file)
--- a/templates/webpages/generic/set_longdescription_master.html
+++ b/templates/webpages/generic/set_longdescription_master.html
@@ -1,26 +1,16 @@
-<body <TMPL_IF NAME=onload>onload="<TMPL_VAR NAME=onload>"</TMPL_IF>>
+[% USE HTML %]<body onload="[% onload %]">
 
  <form name="Form">
 
-  <input type="hidden" name="input_name" value="<TMPL_VAR NAME=input_name ESCAPE=HTML>">
+  <input type="hidden" name="input_name" value="[% HTML.escape(input_name) %]">
 
-  <table width="100%">
-   <tr>
-    <th class="listtop"><TMPL_VAR NAME=title></th>
-   </tr>
-   <tr height="5"></tr>
+  <div class="listtop">[% title %]</div>
 
-   <tr><td><translate>Please insert your longdescription below</translate></td></tr>
+  <p><translate>Please insert your longdescription below</translate></p>
 
-   <tr>
-    <td>
+  <p><textarea id="longdescription" name="longdescription" rows="15" cols="45" wrap="soft">[% HTML.escape(longdescription) %]</textarea></p>
 
-<textarea id="longdescription" name="longdescription" rows="15" cols="45" wrap="soft"><TMPL_VAR NAME=longdescription ESCAPE=HTML></textarea>
-
-    </td>
-   </tr>
-  </table>
- <button type="button" onclick="longdescription_updated()"><translate>Close</translate></button></td>
+  <p><button type="button" onclick="longdescription_updated()"><translate>Close</translate></button></p>
  </form>
 
  <script type="text/javascript">
@@ -30,7 +20,7 @@
 
         self.close();
       }
-      //TESSSSST-->
+    -->
  </script>
 
 </body>