From a74bcd6a6787ff29a7e636d027faa3d58b377219 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Wed, 17 Jul 2013 11:25:27 +0200 Subject: [PATCH] =?utf8?q?Men=C3=BCs=20in=20Untermen=C3=BC=20"menus"=20ver?= =?utf8?q?schoben?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- SL/Layout/Admin.pm | 2 +- SL/Layout/Base.pm | 3 +-- admin-menu.ini => menus/admin.ini | 0 menu.ini => menus/erp.ini | 0 scripts/locales.pl | 2 +- 5 files changed, 3 insertions(+), 4 deletions(-) rename admin-menu.ini => menus/admin.ini (100%) rename menu.ini => menus/erp.ini (100%) diff --git a/SL/Layout/Admin.pm b/SL/Layout/Admin.pm index a379df30e..8b75c89ea 100644 --- a/SL/Layout/Admin.pm +++ b/SL/Layout/Admin.pm @@ -11,7 +11,7 @@ use Rose::Object::MakeMethods::Generic ( sub init_menu { - Menu->new('admin-menu.ini'); + Menu->new('menus/admin.ini'); } sub start_content { diff --git a/SL/Layout/Base.pm b/SL/Layout/Base.pm index 467f56ee8..2312ecfd2 100644 --- a/SL/Layout/Base.pm +++ b/SL/Layout/Base.pm @@ -29,7 +29,7 @@ sub new { } sub init_menu { - Menu->new('crm/update/menu.ini', 'menu.ini'); + Menu->new('crm/update/menu.ini', 'menus/erp.ini'); } sub init_auto_reload_resources_param { @@ -327,4 +327,3 @@ None yet, if you don't count the horrible stylesheet/javascript interface. Sven Schöling Es.schoeling@linet-services.deE =cut - diff --git a/admin-menu.ini b/menus/admin.ini similarity index 100% rename from admin-menu.ini rename to menus/admin.ini diff --git a/menu.ini b/menus/erp.ini similarity index 100% rename from menu.ini rename to menus/erp.ini diff --git a/scripts/locales.pl b/scripts/locales.pl index e63b1b7b9..ed085487f 100755 --- a/scripts/locales.pl +++ b/scripts/locales.pl @@ -34,7 +34,7 @@ my $basedir = "../.."; my $locales_dir = "."; my $bindir = "$basedir/bin/mozilla"; my @progdirs = ( "$basedir/SL" ); -my @menufiles = ("${basedir}/menu.ini", "${basedir}/admin-menu.ini"); +my @menufiles = <${basedir}/menus/*.ini>; my @javascript_dirs = ($basedir .'/js', $basedir .'/templates/webpages'); my $javascript_output_dir = $basedir .'/js'; my $submitsearch = qr/type\s*=\s*[\"\']?submit/i; -- 2.20.1