Vorlagenname werden in Zukunft nicht mehr _master.html als Postfix haben

diff --git a/templates/webpages/ir/form_footer_master.html b/templates/webpages/ir/form_footer_master.html
index 751b2d73c452a0d635c784eaeb23987df1585203..9e751783bae1db901ad5fe8b5a56b25a5259a75f 100644 (file)
--- a/templates/webpages/ir/form_footer_master.html
+++ b/templates/webpages/ir/form_footer_master.html
@@ -73,11 +73,9 @@
    </td>
   </tr>
 
-[% SET webdav_template = 'webdav/_list_' _ LxERP.t8('master') _ '.html' %]
-[% PROCESS $webdav_template %]
+[% PROCESS 'webdav/_list.thml' %]
 
-[% SET payments_template = 'ir/_payments_' _ LxERP.t8('master') _ '.html' %]
-[% PROCESS $payments_template %]
+[% PROCESS 'ir/_payments.html' %]
 
   <tr>
     <td><hr size="3" noshade></td>

diff --git a/templates/webpages/is/form_footer_master.html b/templates/webpages/is/form_footer_master.html
index 36133a297936612074f66125466a8ab05aab29d0..314e65af9767db3250c2b37f2714db1b104b5945 100644 (file)
--- a/templates/webpages/is/form_footer_master.html
+++ b/templates/webpages/is/form_footer_master.html
@@ -101,11 +101,9 @@
    </td>
   </tr>
 
-[% SET webdav_template = 'webdav/_list_' _ LxERP.t8('master') _ '.html' %]
-[% PROCESS $webdav_template %]
+[% PROCESS 'webdav/_list.html' %]
 
-[% SET payments_template = 'is/_payments_' _ LxERP.t8('master') _ '.html' %]
-[% PROCESS $payments_template %]
+[% PROCESS 'is/_payments.html' %]
 
   <tr>
     <td><hr size="3" noshade></td>

diff --git a/templates/webpages/login/company_logo_master.html b/templates/webpages/login/company_logo_master.html
index 4dbcde37a05114b40cdb2d4a5bcdae03ee63570c..a306456055c1a603cf4a15bb71cbf2a7dc7bad27 100644 (file)
--- a/templates/webpages/login/company_logo_master.html
+++ b/templates/webpages/login/company_logo_master.html
@@ -41,8 +41,7 @@
    </table>
 
    <noscript>
-   [%- SET information_template = 'generic/information_' _ LxERP.t8('master') _ '.html' %]
-   [% INCLUDE $information_template
+   [% INCLUDE 'generic/information.html'
      title_information = LxERP.t8('Your browser does not currently support Javascript.'),
      label_information = LxERP.t8('A lot of the usability of Lx-Office has been enhanced with javascript. Although it is currently possible to use every aspect of Lx-Office without javascript, we strongly recommend it. In a future version this may change and javascript may be necessary to access advanced features.'),
    %]