Merge branch 'master' of vc.linet-services.de:public/lx-office-erp

diff --git a/SL/Layout/Css.pm b/SL/Layout/Css.pm
index 2bb0455..883353a 100644 (file)
--- a/SL/Layout/Css.pm
+++ b/SL/Layout/Css.pm
@@ -51,8 +51,7 @@ sub print_menu {
     my $menu_title = $::locale->text($item);
     my $menu_text = $menu_title;
 
-    if ($menu_item->{"submenu"} || !defined($menu_item->{"module"}) ||
-        ($menu_item->{"module"} eq "menu.pl")) {
+    if ($menu_item->{"submenu"} || !defined($menu_item->{"module"})) {
 
       my $h = $self->print_menu("${parent}${item}", $depth * 1 + 1)."\n";
       if (!$parent) {

diff --git a/SL/Layout/Javascript.pm b/SL/Layout/Javascript.pm
index d8f079f..6e6d655 100644 (file)
--- a/SL/Layout/Javascript.pm
+++ b/SL/Layout/Javascript.pm
@@ -114,7 +114,7 @@ sub create_menu {
     my $item      = { 'title' => $::locale->text($name) };
     push @{ $all_items }, $item;
 
-    if ($menu_item->{submenu} || !defined($menu_item->{module}) || ($menu_item->{module} eq "menu.pl")) {
+    if ($menu_item->{submenu} || !defined($menu_item->{module})) {
       $item->{subitems} = [];
       $item->{image} = _icon_path("$name.png");
       $self->create_menu($menu, $item->{subitems}, "${parent}${name}", $depth * 1 + 1);

diff --git a/SL/User.pm b/SL/User.pm
index 5255c8e..37a61c5 100644 (file)
--- a/SL/User.pm
+++ b/SL/User.pm
@@ -172,13 +172,7 @@ sub login {
       # remove lock file
       unlink($::lx_office_conf{paths}->{userspath} . "/nologin");
 
-      my $menufile =
-        $self->{"menustyle"} eq "v3" ? "menuv3.pl" :
-        $self->{"menustyle"} eq "neu" ? "menunew.pl" :
-        $self->{"menustyle"} eq "js" ? "menujs.pl" :
-        "menu.pl";
-
-      print $form->parse_html_template("dbupgrade/footer", { "menufile" => $menufile });
+      print $form->parse_html_template("dbupgrade/footer");
 
       $rc = -2;
     }

diff --git a/bin/mozilla/ar.pl b/bin/mozilla/ar.pl
index 2e82596..8d0e89d 100644 (file)
--- a/bin/mozilla/ar.pl
+++ b/bin/mozilla/ar.pl
@@ -524,10 +524,6 @@ $follow_ups_block
     }
   }
 
-  if ($form->{menubar}) {
-    require "bin/mozilla/menu.pl";
-    &menubar;
-  }
   # button for saving history
   if($form->{id} ne "") {
     print qq| <input type=button class=submit onclick=set_history_window($form->{id}); name=history id=history value=| . $locale->text('history') . qq|> |;

diff --git a/scripts/locales.pl b/scripts/locales.pl
index f663014..f526416 100755 (executable)
--- a/scripts/locales.pl
+++ b/scripts/locales.pl
@@ -254,20 +254,6 @@ sub handle_file {
     }
   }
 
-  # if this is the menu.pl file
-  if ($file eq 'menu.pl') {
-    foreach my $item (@menufiles) {
-      &scanmenu("$basedir/$item");
-    }
-  }
-
-  if ($file eq 'menunew.pl') {
-    foreach my $item (@menufiles) {
-      &scanmenu("$basedir/$item");
-      print "." if $opt_v;
-    }
-  }
-
   $file =~ s/\.pl//;
 
   foreach my $text (keys %$missing) {

diff --git a/templates/webpages/dbupgrade/footer.html b/templates/webpages/dbupgrade/footer.html
index d5e3b53..a6e26c6 100644 (file)
--- a/templates/webpages/dbupgrade/footer.html
+++ b/templates/webpages/dbupgrade/footer.html
@@ -1,9 +1,9 @@
 [%- USE T8 %]
 [% USE HTML %]<p>[% '...done' | $T8 %]</p>
 
-<form action="[% IF is_admin %]admin.pl[% ELSE %][% menufile %][% END %]">
+<form action="[% IF is_admin %]admin.pl[% ELSE %][% login.pl %][% END %]">
 
- <input type="hidden" name="action" value="[% IF is_admin %]login[% ELSE %]display[% END %]">
+ <input type="hidden" name="action" value="[% IF is_admin %]login[% ELSE %]company_logo[% END %]">
 
  <p><input type="submit" value="[% 'Continue' | $T8 %]"></p>
 </form>

diff --git a/templates/webpages/menu/menunew.html b/templates/webpages/menu/menunew.html
index ac040be..7285d86 100644 (file)
--- a/templates/webpages/menu/menunew.html
+++ b/templates/webpages/menu/menunew.html
@@ -19,7 +19,7 @@ $(clockon);
   <tr>
    <td>
     &nbsp;
-    [<a href="menunew.pl?action=display" target="_blank">[% 'new Window' | $T8 %]</a>]
+    [<a href="login.pl?action=company_logo" target="_blank">[% 'new Window' | $T8 %]</a>]
     &nbsp;
     [<a href="JavaScript:top.print()">[% 'print' | $T8 %]</a>]
    </td>

diff --git a/templates/webpages/menu/menuv3.html b/templates/webpages/menu/menuv3.html
index 13e43bb..eae64cc 100644 (file)
--- a/templates/webpages/menu/menuv3.html
+++ b/templates/webpages/menu/menuv3.html
@@ -42,7 +42,7 @@ $(clockon);
   <tr>
    <td style="color:white; font-family:verdana,arial,sans-serif; font-size: 12px;" nowrap>
     &nbsp;
-    [<a href="menuv3.pl?action=display" target="_blank">[% 'new Window' | $T8 %]</a>]
+    [<a href="login.pl?action=company_logo" target="_blank">[% 'new Window' | $T8 %]</a>]
     &nbsp;
     [<a href="JavaScript:top.print()">[% 'print' | $T8 %]</a>]
     &nbsp;