X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fmenuv3.pl;h=4ad56bd5e8f9b1d2f447eeadd75df61085f7ffc2;hb=8482e69b2e36af353705a84e4465668f7431dddf;hp=a877dcf9cabf424ca9eae12f4d1480eb323acb19;hpb=f3323945900d2b7a86aeade9c02d92655759496a;p=kivitendo-erp.git

diff --git a/bin/mozilla/menuv3.pl b/bin/mozilla/menuv3.pl
index a877dcf9c..4ad56bd5e 100644
--- a/bin/mozilla/menuv3.pl
+++ b/bin/mozilla/menuv3.pl
@@ -57,8 +57,8 @@ sub display {
 
 <div style="clear: both;"></div>
 
-<iframe id="win1" src="login.pl?login=$form->{login}&password=$form->{password}&action=company_logo&path=$form->{path}" width="100%" height="93%" name="main_window" style="position: absolute; border: 0px; z-index: 99; ">
-<p>Ihr Browser kann leider keine eingebetteten Frames anzeigen.
+<iframe id="win1" src="login.pl?login=$form->{login}&password=$form->{password}&action=company_logo" 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>
@@ -70,11 +70,12 @@ sub display {
 
 sub clock_line {
 
-  $login = "["
+  $fensterlink="menuv3.pl?login=$form->{login}&password=$form->{password}&action=display";
+  $fenster = "["."<a href=\"$fensterlink\" target=\"_blank\">neues Fenster</a>]";
+
+  $login = "[".$locale->text('User') . ": "
     . $form->{login}
-    . " - <a href=\"login.pl?path="
-    . $form->{"path"}
-    . "&password="
+    . " - <a href=\"login.pl?password="
     . $form->{"password"}
     . "&action=logout\" target=\"_top\">"
     . $locale->text('Logout')
@@ -105,18 +106,19 @@ sub clock_line {
   print qq|
 <script type="text/javascript">
 <!--
-var h=$Stunden; var m=$Minuten; var s=$Sekunden;
 function clockon() {
-  s=++s%60;if(s==0){m=++m%60;if(m==0)h=++h%24;}
-  document.getElementById('clock_id').innerHTML = (h<10?'0'+h:h)+":"+(m<10?'0'+m:m)+":"+(s<10?'0'+s:s);
-  var timer=setTimeout("clockon()", 1000);
+  var now = new Date();
+  var h = now.getHours();
+  var m = now.getMinutes();
+  document.getElementById('clock_id').innerHTML = (h<10?'0'+h:h)+":"+(m<10?'0'+m:m);
+  var timer=setTimeout("clockon()", 10000);
 }
-//window.onload=clockon
+window.onload=clockon
 //-->
 </script>
 <table border="0" width="100%" background="image/bg_titel.gif" cellpadding="0" cellspacing="0">
   <tr>
-    <td style="color:white; font-family:verdana,arial,sans-serif; font-size: 12px;"> &nbsp; [<a href="JavaScript:top.main_window.print()">drucken</a>]</td>
+    <td style="color:white; font-family:verdana,arial,sans-serif; font-size: 12px;"> &nbsp; $fenster &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>
       $login $datum <span id='clock_id' style='position:relative'></span>&nbsp;
     </td>
@@ -131,9 +133,6 @@ sub acc_menu {
   $mainlevel = $form->{level};
   $mainlevel =~ s/$mainlevel--//g;
   my $menu = new Menu "$menufile";
-  $menu = new Menu "custom_$menufile" if (-f "custom_$menufile");
-  $menu = new Menu "$form->{login}_$menufile"
-    if (-f "$form->{login}_$menufile");
 
   $| = 1;