projects / kivitendo-erp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 77c1a9e)
Umstellung der HTML-Vorlagen aus templates/webpages/menu von HTML::Template auf Template.
authorMoritz Bunkus <m.bunkus@linet-services.de>
Thu, 1 Nov 2007 10:25:18 +0000 (10:25 +0000)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Thu, 1 Nov 2007 10:25:18 +0000 (10:25 +0000)
bin/mozilla/menuv3.pl patch | blob | history
templates/webpages/menu/menuv3_de.html patch | blob | history
templates/webpages/menu/menuv3_master.html patch | blob | history

diff --git a/bin/mozilla/menuv3.pl b/bin/mozilla/menuv3.pl
index c2fef5d..38510e1 100644 (file)
--- a/bin/mozilla/menuv3.pl
+++ b/bin/mozilla/menuv3.pl
@@ -45,7 +45,7 @@ sub display {
   $form->{date} = clock_line();
   $form->{menu} = acc_menu();
 
-  print $form->parse_html_template("menu/menuv3");
+  print $form->parse_html_template2("menu/menuv3");
 
 }
 
diff --git a/templates/webpages/menu/menuv3_de.html b/templates/webpages/menu/menuv3_de.html
index b02ee65..3465907 100644 (file)
--- a/templates/webpages/menu/menuv3_de.html
+++ b/templates/webpages/menu/menuv3_de.html
@@ -1,4 +1,4 @@
-<body style="padding:0px; margin:0px;">
+[% USE HTML %]<body style="padding:0px; margin:0px;">
 
  <script type="text/javascript">
 <!--
@@ -17,14 +17,14 @@ window.onload=clockon
   <tr>
    <td style="color:white; font-family:verdana,arial,sans-serif; font-size: 12px;">
     &nbsp;
-    [<a href="menuv3.pl?action=display&login=<TMPL_VAR login ESCAPE=URL>&password=<TMPL_VAR password ESCAPE=URL>" target="_blank">neues Fenster</a>]
+    [<a href="menuv3.pl?action=display&login=[% HTML.url(login) %]&password=[% HTML.url(password) %]" target="_blank">neues Fenster</a>]
     &nbsp;
     [<a href="JavaScript:top.main_window.print()">drucken</a>]
    </td>
    <td align="right" style="vertical-align:middle; color:white; font-family:verdana,arial,sans-serif; font-size: 12px;" nowrap>
-    [Benutzer: <TMPL_VAR login ESCAPE=HTML> -
-    <a href="login.pl?action=logout&login=<TMPL_VAR login ESCAPE=URL>&password=<TMPL_VAR password ESCAPE=URL>" target="_top">abmelden</a>]
-    <TMPL_VAR date> <span id='clock_id' style='position:relative'></span>&nbsp;
+    [Benutzer: [% HTML.escape(login) %] -
+    <a href="login.pl?action=logout&login=[% HTML.url(login) %]&password=[% HTML.url(password) %]" target="_top">abmelden</a>]
+    [% date %] <span id='clock_id' style='position:relative'></span>&nbsp;
    </td>
   </tr>
  </table>
@@ -32,13 +32,13 @@ window.onload=clockon
 
  <div id="menu">
 
-  <TMPL_VAR menu>
+  [% menu %]
 
  </div>
 
  <div style="clear: both;"></div>
 
- <iframe id="win1" src="login.pl?action=company_logo&login=<TMPL_VAR login ESCAPE=URL>&password=<TMPL_VAR password ESCAPE=URL>" width="100%" height="94%" name="main_window" style="position: absolute; border: 0px; z-index: 99; ">
+ <iframe id="win1" src="login.pl?action=company_logo&login=[% HTML.url(login) %]&password=[% HTML.url(password) %]" width="100%" height="94%" name="main_window" style="position: absolute; border: 0px; z-index: 99; ">
   <p>Ihr Browser kann leider keine eingebetteten Frames anzeigen. Bitte w&auml;hlen Sie ein anderes Men&uuml; in der Benutzerkonfiguration im Administrationsmen&uuml; aus.</p>
  </iframe>
 </body>
diff --git a/templates/webpages/menu/menuv3_master.html b/templates/webpages/menu/menuv3_master.html
index e786544..e9c9224 100644 (file)
--- a/templates/webpages/menu/menuv3_master.html
+++ b/templates/webpages/menu/menuv3_master.html
@@ -1,4 +1,4 @@
-<body style="padding:0px; margin:0px;">
+[% USE HTML %]<body style="padding:0px; margin:0px;">
 
  <script type="text/javascript">
 <!--
@@ -17,14 +17,14 @@ window.onload=clockon
   <tr>
    <td style="color:white; font-family:verdana,arial,sans-serif; font-size: 12px;">
     &nbsp;
-    [<a href="menuv3.pl?action=display&login=<TMPL_VAR login ESCAPE=URL>&password=<TMPL_VAR password ESCAPE=URL>" target="_blank"><translate>new Window</translate></a>]
+    [<a href="menuv3.pl?action=display&login=[% HTML.url(login) %]&password=[% HTML.url(password) %]" target="_blank"><translate>new Window</translate></a>]
     &nbsp;
     [<a href="JavaScript:top.main_window.print()"><translate>print</translate></a>]
    </td>
    <td align="right" style="vertical-align:middle; color:white; font-family:verdana,arial,sans-serif; font-size: 12px;" nowrap>
-    [<translate>User</translate>: <TMPL_VAR login ESCAPE=HTML> -
-    <a href="login.pl?action=logout&login=<TMPL_VAR login ESCAPE=URL>&password=<TMPL_VAR password ESCAPE=URL>" target="_top"><translate>logout</translate></a>]
-    <TMPL_VAR date> <span id='clock_id' style='position:relative'></span>&nbsp;
+    [<translate>User</translate>: [% HTML.escape(login) %] -
+    <a href="login.pl?action=logout&login=[% HTML.url(login) %]&password=[% HTML.url(password) %]" target="_top"><translate>logout</translate></a>]
+    [% date %] <span id='clock_id' style='position:relative'></span>&nbsp;
    </td>
   </tr>
  </table>
@@ -32,13 +32,13 @@ window.onload=clockon
 
  <div id="menu">
 
-  <TMPL_VAR menu>
+  [% menu %]
 
  </div>
 
  <div style="clear: both;"></div>
 
- <iframe id="win1" src="login.pl?action=company_logo&login=<TMPL_VAR login ESCAPE=URL>&password=<TMPL_VAR password ESCAPE=URL>" width="100%" height="94%" name="main_window" style="position: absolute; border: 0px; z-index: 99; ">
+ <iframe id="win1" src="login.pl?action=company_logo&login=[% HTML.url(login) %]&password=[% HTML.url(password) %]" width="100%" height="94%" name="main_window" style="position: absolute; border: 0px; z-index: 99; ">
   <p><translate>MSG_BROWSER_DOES_NOT_SUPPORT_IFRAMES</translate></p>
  </iframe>
 </body>
Unnamed repository; edit this file 'description' to name the repository.