Umstellung weiterer Vorlagen von HTML::Template auf Template. Zusätzlich Bugfix:...

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index eab834bda66dedbef49f97c0eb75b19b24226a6a..a89de30c01593c8333f2860ffa724d382a8883fa 100644 (file)
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -2199,11 +2199,9 @@ sub display_row {
     push @ROWS, { ROW1 => \@ROW1, ROW2 => \@ROW2, HIDDENS => \@HIDDENS, colspan => $colspan, };
   }
 
     push @ROWS, { ROW1 => \@ROW1, ROW2 => \@ROW2, HIDDENS => \@HIDDENS, colspan => $colspan, };
   }
 

-  print $form->parse_html_template('oe/sales_order', { ROWS   => \@ROWS, 
-                                                       HEADER => \@HEADER,
-                                                       show_details_checked => ($form->{show_details} ? "checked" : ""),
-                                                       show_details_new     => !$form->{show_details},
-                                                     });
+  print $form->parse_html_template2('oe/sales_order', { ROWS   => \@ROWS,
+                                                        HEADER => \@HEADER,
+                                                      });

 
   if (0 != ($form->{sellprice_total} * 1)) {
     $form->{marge_percent} = ($form->{sellprice_total} - $form->{lastcost_total}) / $form->{sellprice_total} * 100;
 
   if (0 != ($form->{sellprice_total} * 1)) {
     $form->{marge_percent} = ($form->{sellprice_total} - $form->{lastcost_total}) / $form->{sellprice_total} * 100;

diff --git a/templates/webpages/oe/sales_order_de.html b/templates/webpages/oe/sales_order_de.html
index daa53a84142bb93f370e8ad6b5a9d1a8b21fc09a..7da135c02a58c4d5c6d2f7e695fce7ef072aa269 100644 (file)
--- a/templates/webpages/oe/sales_order_de.html
+++ b/templates/webpages/oe/sales_order_de.html
@@ -1,26 +1,26 @@
-
+[% USE HTML %]

 <tr>
  <td>
 <tr>
  <td>

-  <input type="hidden" name="show_details" value="<TMPL_VAR show_details>"  /> 
-  <input type="checkbox" id="cb_show_details" onclick="show_form_details(<TMPL_VAR show_details_new>);" <TMPL_VAR show_details_checked>>
+  <input type="hidden" name="show_details" value="[% HTML.escape(show_details) %]">
+  <input type="checkbox" id="cb_show_details" onclick="show_form_details([% IF show_details %]0[% ELSE %]1[% END %]);"[%- IF show_details %] checked[% END %]>

   <label for="cb_show_details">Details anzeigen</label><br>
   <table width="100%">
   <label for="cb_show_details">Details anzeigen</label><br>
   <table width="100%">

-   <tr class="listheading"><TMPL_LOOP HEADER><TMPL_IF display>
-    <th align="left" nowrap width="<TMPL_VAR width>" class="listheading"><TMPL_VAR value></th></TMPL_IF></TMPL_LOOP>
+   <tr class="listheading">[% FOREACH header = HEADER %][% IF header.display %]
+    <th align="left" nowrap width="[% header.width %]" class="listheading">[% header.value %]</th>[% END %][% END %]

    </tr>
 
    </tr>
 

-   <TMPL_LOOP ROWS>
-     <tr valign="top" class="listrow<TMPL_VAR __odd__>"><TMPL_LOOP ROW1>
-      <td align="<TMPL_VAR align>"><TMPL_VAR value></td></TMPL_LOOP>
+   [% FOREACH row = ROWS %]
+     <tr valign="top" class="listrow[% loop.count % 2 %]">[% FOREACH row1 = row.ROW1 %]
+      <td align="[% row1.align %]">[% row1.value %]</td>[% END %]

      </tr>
      </tr>

-     
-     <TMPL_LOOP HIDDENS><TMPL_VAR value>
-     </TMPL_LOOP>
-     
-     <tr class="listrow<TMPL_VAR __odd__>" <TMPL_UNLESS show_details>style="display:none;"</TMPL_UNLESS>><td colspan="<TMPL_VAR colspan>"><TMPL_LOOP ROW2>
-      <TMPL_VAR value></TMPL_LOOP>
+
+     [% FOREACH hidden = HIDDENS %][% hidden.value %]
+     [% END %]
+
+     <tr class="listrow[% loop.count % 2 %]" [% UNLESS show_details %]style="display:none;"[% END %]><td colspan="[% row.colspan %]">[% FOREACH row2 = row.ROW2 %]
+      [% row2.value %][% END %]

      </td></tr>
      </td></tr>

-   </TMPL_LOOP>
+   [% END %]

 
   </table>
  </td>
 
   </table>
  </td>

diff --git a/templates/webpages/oe/sales_order_master.html b/templates/webpages/oe/sales_order_master.html
index c5789c0ec1f64546d6615810447db01b3f777273..bb6b129efce100d5ba5c2e8445d3b0b4531c58ba 100644 (file)
--- a/templates/webpages/oe/sales_order_master.html
+++ b/templates/webpages/oe/sales_order_master.html
@@ -1,26 +1,26 @@
-
+[% USE HTML %]

 <tr>
  <td>
 <tr>
  <td>

-  <input type="hidden" name="show_details" value="<TMPL_VAR show_details>"  /> 
-  <input type="checkbox" id="cb_show_details" onclick="show_form_details(<TMPL_VAR show_details_new>);" <TMPL_VAR show_details_checked>>
+  <input type="hidden" name="show_details" value="[% HTML.escape(show_details) %]">
+  <input type="checkbox" id="cb_show_details" onclick="show_form_details([% IF show_details %]0[% ELSE %]1[% END %]);"[%- IF show_details %] checked[% END %]>

   <label for="cb_show_details"><translate>Show details</translate></label><br>
   <table width="100%">
   <label for="cb_show_details"><translate>Show details</translate></label><br>
   <table width="100%">

-   <tr class="listheading"><TMPL_LOOP HEADER><TMPL_IF display>
-    <th align="left" nowrap width="<TMPL_VAR width>" class="listheading"><TMPL_VAR value></th></TMPL_IF></TMPL_LOOP>
+   <tr class="listheading">[% FOREACH header = HEADER %][% IF header.display %]
+    <th align="left" nowrap width="[% header.width %]" class="listheading">[% header.value %]</th>[% END %][% END %]

    </tr>
 
    </tr>
 

-   <TMPL_LOOP ROWS>
-     <tr valign="top" class="listrow<TMPL_VAR __odd__>"><TMPL_LOOP ROW1>
-      <td align="<TMPL_VAR align>"><TMPL_VAR value></td></TMPL_LOOP>
+   [% FOREACH row = ROWS %]
+     <tr valign="top" class="listrow[% loop.count % 2 %]">[% FOREACH row1 = row.ROW1 %]
+      <td align="[% row1.align %]">[% row1.value %]</td>[% END %]

      </tr>
      </tr>

-     
-     <TMPL_LOOP HIDDENS><TMPL_VAR value>
-     </TMPL_LOOP>
-     
-     <tr class="listrow<TMPL_VAR __odd__>" <TMPL_UNLESS show_details>style="display:none;"</TMPL_UNLESS>><td colspan="<TMPL_VAR colspan>"><TMPL_LOOP ROW2>
-      <TMPL_VAR value></TMPL_LOOP>
+
+     [% FOREACH hidden = HIDDENS %][% hidden.value %]
+     [% END %]
+
+     <tr class="listrow[% loop.count % 2 %]" [% UNLESS show_details %]style="display:none;"[% END %]><td colspan="[% row.colspan %]">[% FOREACH row2 = row.ROW2 %]
+      [% row2.value %][% END %]

      </td></tr>
      </td></tr>

-   </TMPL_LOOP>
+   [% END %]

 
   </table>
  </td>
 
   </table>
  </td>