Kompatibilitätsfix für ältere Template-Versionen: Das Whitespace-Removal ~ gibt es...

diff --git a/templates/webpages/generic/multibox.html b/templates/webpages/generic/multibox.html
index 5d8e863..49b7333 100644 (file)
--- a/templates/webpages/generic/multibox.html
+++ b/templates/webpages/generic/multibox.html
@@ -39,20 +39,20 @@
 [%- END -%]
 [%- IF DATA.size and limit < DATA.size %]
 <input type="text" 
- [%~ IF name     %] name="[%     HTML.escape(name)     %]"[% END ~%]
- [%~ IF id       %] id="[%       HTML.escape(id)       %]"[% END ~%]
- [%~ IF default  %] value="[%    HTML.escape(default)  %]"[% END ~%]
- [%~ IF style    %] style="[%    HTML.escape(style)    %]"[% END ~%]
+ [%- IF name     %] name="[%     HTML.escape(name)     %]"[% END %]
+ [%- IF id       %] id="[%       HTML.escape(id)       %]"[% END %]
+ [%- IF default  %] value="[%    HTML.escape(default)  %]"[% END %]
+ [%- IF style    %] style="[%    HTML.escape(style)    %]"[% END %]
 >
-[%~ IF select %]
+[%- IF select %]
   <button type="button" onclick="[% select %]">?</button>
-[% END ~%]
+[% END %]
 [%- ELSE %]
 <select 
- [%~ IF name     %] name="[%     HTML.escape(name)     %]"[% END ~%]
- [%~ IF id       %] id="[%       HTML.escape(id)       %]"[% END ~%]
- [%~ IF style    %] style="[%    HTML.escape(style)    %]"[% END ~%]
- [%~ IF onChange %] onChange="[% HTML.escape(onChange) %]"[% END ~%]
+ [%- IF name     %] name="[%     HTML.escape(name)     %]"[% END %]
+ [%- IF id       %] id="[%       HTML.escape(id)       %]"[% END %]
+ [%- IF style    %] style="[%    HTML.escape(style)    %]"[% END %]
+ [%- IF onChange %] onChange="[% HTML.escape(onChange) %]"[% END %]
 >
   [%- IF show_empty %]
   <option value=""></option>

diff --git a/templates/webpages/oe/orders_header_de.html b/templates/webpages/oe/orders_header_de.html
index 1e3ea8b..a251784 100644 (file)
--- a/templates/webpages/oe/orders_header_de.html
+++ b/templates/webpages/oe/orders_header_de.html
@@ -120,11 +120,11 @@
                   <tr>
                     <th align=right>Wechselkurs</th>
                     <td>
-                     [%~ IF forex ~%]
+                     [%- IF forex %]
                       [% LxERP.format_amount(exchangerate, 0) %]
-                     [%~ ELSE ~%]
+                     [%- ELSE %]
                       <input name=exchangerate size=10 value="[% HTML.escape(LxERP.format_amount(exchangerate)) %]">
-                     [%~ END ~%]
+                     [%- END %]
                     </td>
                   </tr>
 [%- END %]
@@ -214,21 +214,21 @@
 [%- END %]
                   <tr>
                     <th align=right nowrap>
-                     [%~ IF is_order ~%]
+                     [%- IF is_order %]
                       Auftragsdatum
-                     [%~ ELSE ~%]
+                     [%- ELSE %]
                       Angebotsdatum
-                     [%~ END ~%]
+                     [%- END %]
                     </th>
                     [% button1 %]
                   </tr>
                   <tr>
                     <th align=right nowrap>
-                     [%~ IF is_sales_quo ~%]
+                     [%- IF is_sales_quo %]
                       gültig bis
-                     [%~ ELSE ~%]
+                     [%- ELSE %]
                       Lieferdatum
-                     [%~ END ~%]
+                     [%- END %]
                     </th>
                     [% button2 %]
                   </tr>

diff --git a/templates/webpages/oe/orders_header_master.html b/templates/webpages/oe/orders_header_master.html
index 682daf5..76c3970 100644 (file)
--- a/templates/webpages/oe/orders_header_master.html
+++ b/templates/webpages/oe/orders_header_master.html
@@ -120,11 +120,11 @@
                   <tr>
                     <th align=right><translate>Exchangerate</translate></th>
                     <td>
-                     [%~ IF forex ~%]
+                     [%- IF forex %]
                       [% LxERP.format_amount(exchangerate, 0) %]
-                     [%~ ELSE ~%]
+                     [%- ELSE %]
                       <input name=exchangerate size=10 value="[% HTML.escape(LxERP.format_amount(exchangerate)) %]">
-                     [%~ END ~%]
+                     [%- END %]
                     </td>
                   </tr>
 [%- END %]
@@ -214,21 +214,21 @@
 [%- END %]
                   <tr>
                     <th align=right nowrap>
-                     [%~ IF is_order ~%]
+                     [%- IF is_order %]
                       <translate>Order Date</translate>
-                     [%~ ELSE ~%]
+                     [%- ELSE %]
                       <translate>Quotation Date</translate>
-                     [%~ END ~%]
+                     [%- END %]
                     </th>
                     [% button1 %]
                   </tr>
                   <tr>
                     <th align=right nowrap>
-                     [%~ IF is_sales_quo ~%]
+                     [%- IF is_sales_quo %]
                       <translate>Valid until</translate>
-                     [%~ ELSE ~%]
+                     [%- ELSE %]
                       <translate>Required by</translate>
-                     [%~ END ~%]
+                     [%- END %]
                     </th>
                     [% button2 %]
                   </tr>