From dbd0ae115bd9a6ba0ede24f9655a29df6bf7dc3b Mon Sep 17 00:00:00 2001
From: =?utf8?q?Sven=20Sch=C3=B6ling?= <s.schoeling@linet-services.de>
Date: Fri, 9 Jul 2010 15:43:39 +0200
Subject: [PATCH] Vorlagenname werden in Zukunft nicht mehr _master.html als
 Postfix haben

---
 templates/webpages/ir/form_footer_master.html     | 6 ++----
 templates/webpages/is/form_footer_master.html     | 6 ++----
 templates/webpages/login/company_logo_master.html | 3 +--
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/templates/webpages/ir/form_footer_master.html b/templates/webpages/ir/form_footer_master.html
index 751b2d73c..9e751783b 100644
--- 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 36133a297..314e65af9 100644
--- 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 4dbcde37a..a30645605 100644
--- 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.'),
    %]
-- 
2.20.1