projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
------------------------------------------------------------------------
[kivitendo-erp.git]
/
bin
/
mozilla
/
menunew.pl
diff --git
a/bin/mozilla/menunew.pl
b/bin/mozilla/menunew.pl
index
44c918f
..
80f7335
100644
(file)
--- a/
bin/mozilla/menunew.pl
+++ b/
bin/mozilla/menunew.pl
@@
-52,7
+52,7
@@
sub display {
&acc_menu;
print qq|
&acc_menu;
print qq|
-<iframe id="win1" src="login.pl?
login=$form->{login}&password=$form->{password}&
action=company_logo" width="100%" height="93%" name="main_window" style="position: absolute; border:0px;">
+<iframe id="win1" src="login.pl?action=company_logo" width="100%" height="93%" name="main_window" style="position: absolute; border:0px;">
<p>Ihr Browser kann leider keine eingebetteten Frames anzeigen.
</p>
</iframe>
<p>Ihr Browser kann leider keine eingebetteten Frames anzeigen.
</p>
</iframe>
@@
-65,14
+65,12
@@
sub display {
sub clock_line {
sub clock_line {
- $fensterlink="menunew.pl?
login=$form->{login}&password=$form->{password}&
action=display";
+ $fensterlink="menunew.pl?action=display";
$fenster = "["."<a href=\"$fensterlink\" target=\"_blank\">neues Fenster</a>]";
$login = "[Nutzer "
. $form->{login}
$fenster = "["."<a href=\"$fensterlink\" target=\"_blank\">neues Fenster</a>]";
$login = "[Nutzer "
. $form->{login}
- . " - <a href=\"login.pl?password="
- . $form->{"password"}
- . "&action=logout\" target=\"_top\">"
+ . " - <a href=\"login.pl?action=logout\" target=\"_top\">"
. $locale->text('Logout')
. "</a>] ";
my ($Sekunden, $Minuten, $Stunden, $Monatstag, $Monat,
. $locale->text('Logout')
. "</a>] ";
my ($Sekunden, $Minuten, $Stunden, $Monatstag, $Monat,
@@
-101,11
+99,12
@@
sub clock_line {
print qq|
<script type="text/javascript">
<!--
print qq|
<script type="text/javascript">
<!--
-var h=$Stunden; var m=$Minuten; var s=$Sekunden;
function clockon() {
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
//-->
@@
-123,11
+122,8
@@
window.onload=clockon
sub acc_menu {
$mainlevel = $form->{level};
sub acc_menu {
$mainlevel = $form->{level};
- $mainlevel =~ s/
$mainlevel
--//g;
+ $mainlevel =~ s/
\Q$mainlevel\E
--//g;
my $menu = new Menu "$menufile";
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;
$| = 1;
@@
-372,7
+368,7
@@
sub section_menu {
$item = shift @menuorder;
$label = $item;
$ml = $item;
$item = shift @menuorder;
$label = $item;
$ml = $item;
- $label =~ s/
$level
--//g;
+ $label =~ s/
\Q$level\E
--//g;
$ml =~ s/--.*//;
$label = $locale->text($label);
$label =~ s/ / /g;
$ml =~ s/--.*//;
$label = $locale->text($label);
$label =~ s/ / /g;
@@
-425,7
+421,7
@@
sub section_menu {
print
qq|menu[$pm][0] = new Menu(true, '>', 0, 20, 180, defOver, defBack, 'itemBorder', 'itemText');\n|;
print
qq|menu[$pm][0] = new Menu(true, '>', 0, 20, 180, defOver, defBack, 'itemBorder', 'itemText');\n|;
- #print qq|<tr><td class="bg" height="22" align="left" valign="middle" ><img src="image/$item.png" style="vertical-align:middle"> <a href="menu.pl?action=acc_menu&level=$ml_
&login=$form->{login}&password=$form->{password}
" class="nohover">$label</a> </td></tr>\n|;
+ #print qq|<tr><td class="bg" height="22" align="left" valign="middle" ><img src="image/$item.png" style="vertical-align:middle"> <a href="menu.pl?action=acc_menu&level=$ml_" class="nohover">$label</a> </td></tr>\n|;
§ion_menu($menu, $item);
#print qq|<br>\n|;
§ion_menu($menu, $item);
#print qq|<br>\n|;