From fea0d9f00e6eb61ea0e1029d0a5de6016fa10644 Mon Sep 17 00:00:00 2001 From: cookie Date: Fri, 11 Nov 2005 19:00:00 +0000 Subject: [PATCH] menues umgebaut git-svn-id: svn://svn.cccv.de/engel-system@43 29ba0400-6e00-0410-a75a-ca02368028f8 --- DB/Himmel.sql | 3 +-- www-ssl/admin/menu.php | 4 ++-- www-ssl/nonpublic/menu.php | 33 ++++++++++++++++++--------------- 3 files changed, 21 insertions(+), 19 deletions(-) diff --git a/DB/Himmel.sql b/DB/Himmel.sql index 8dbeb829..84f0cac6 100755 --- a/DB/Himmel.sql +++ b/DB/Himmel.sql @@ -589,7 +589,6 @@ CREATE TABLE IF NOT EXISTS `UserCVS` ( `nonpublic/waeckliste.php` char(1) NOT NULL default 'N', `nonpublic/faq.php` char(1) NOT NULL default 'Y', `nonpublic/einstellungen.php` char(1) NOT NULL default 'Y', - `MenueShowAdminSection` char(1) NOT NULL default 'N', `admin/index.php` char(1) NOT NULL default 'N', `admin/list.php` char(1) NOT NULL default 'N', `admin/dbUpdateFromXLS.php` char(1) NOT NULL default 'N', @@ -616,7 +615,7 @@ CREATE TABLE IF NOT EXISTS `UserCVS` ( -- Daten für Tabelle `UserCVS` -- -INSERT INTO `UserCVS` (`UID`, `MenueShowAdminSection`, `index.php`, `logout.php`, `faq.php`, `lageplan.php`, `makeuser.php`, `nonpublic/index.php`, `nonpublic/news.php`, `nonpublic/newsAddMeting`, `nonpublic/news_comments.php`, `nonpublic/myschichtplan.php`, `nonpublic/engelbesprechung.php`, `admin/index.php`, `nonpublic/schichtplan.php`, `nonpublic/schichtplan_add.php`, `nonpublic/schichtplan_beamer.php`, `nonpublic/wecken.php`, `nonpublic/waeckliste.php`, `nonpublic/faq.php`, `nonpublic/einstellungen.php`, `admin/list.php`, `admin/dbUpdateFromXLS.php`, `admin/room.php`, `admin/EngelType.php`, `admin/schichtplan.php`, `admin/shiftadd.php`, `admin/schichtplan_druck.php`, `admin/user.php`, `admin/user2.php`, `admin/aktiv.php`, `admin/tshirt.php`, `admin/news.php`, `admin/faq.php`, `admin/free.php`, `admin/sprache.php`, `admin/dect.php`, `Netz`, `Kassen`) VALUES (-1, 'N', 'Y', 'N', 'N', 'N', 'N', 'Y', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N'), (1, 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y'); +INSERT INTO `UserCVS` (`UID`, `index.php`, `logout.php`, `faq.php`, `lageplan.php`, `makeuser.php`, `nonpublic/index.php`, `nonpublic/news.php`, `nonpublic/newsAddMeting`, `nonpublic/news_comments.php`, `nonpublic/myschichtplan.php`, `nonpublic/engelbesprechung.php`, `admin/index.php`, `nonpublic/schichtplan.php`, `nonpublic/schichtplan_add.php`, `nonpublic/schichtplan_beamer.php`, `nonpublic/wecken.php`, `nonpublic/waeckliste.php`, `nonpublic/faq.php`, `nonpublic/einstellungen.php`, `admin/list.php`, `admin/dbUpdateFromXLS.php`, `admin/room.php`, `admin/EngelType.php`, `admin/schichtplan.php`, `admin/shiftadd.php`, `admin/schichtplan_druck.php`, `admin/user.php`, `admin/user2.php`, `admin/aktiv.php`, `admin/tshirt.php`, `admin/news.php`, `admin/faq.php`, `admin/free.php`, `admin/sprache.php`, `admin/dect.php`, `Netz`, `Kassen`) VALUES (-1, 'Y', 'N', 'N', 'N', 'N', 'Y', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N', 'N'), (1, 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y', 'Y'); -- -------------------------------------------------------- diff --git a/www-ssl/admin/menu.php b/www-ssl/admin/menu.php index 45c59725..499e1058 100755 --- a/www-ssl/admin/menu.php +++ b/www-ssl/admin/menu.php @@ -40,8 +40,8 @@ if ($_SESSION['CVS']["MenueShowAdminSection"] == "Y") $MenuAdmin["Name"] = "Erzengel"; $MenuAdmin["Entry"][0]["File"] = "../nonpublic/index.php"; $MenuAdmin["Entry"][0]["Name"] = "Engel-Menü"; + $MenuAdmin["Entry"][1]["File"] = "../index.php"; + $MenuAdmin["Entry"][1]["Name"] = "Login-Menü"; } // MenueShowAdminSection - - ?> diff --git a/www-ssl/nonpublic/menu.php b/www-ssl/nonpublic/menu.php index 10cf2a2d..af7981b3 100755 --- a/www-ssl/nonpublic/menu.php +++ b/www-ssl/nonpublic/menu.php @@ -8,28 +8,31 @@ $Menu["Entry"][1]["File"] = "engelbesprechung.php"; $Menu["Entry"][1]["Name"] = Get_Text("pub_menu_Engelbesprechung"); $Menu["Entry"][2]["File"] = "schichtplan.php"; $Menu["Entry"][2]["Name"] = Get_Text("pub_menu_Schichtplan"); -$Menu["Entry"][5]["File"] = "myschichtplan.php"; -$Menu["Entry"][5]["Name"] = Get_Text("pub_menu_mySchichtplan"); -$Menu["Entry"][9]["File"] = "schichtplan_beamer.php"; -$Menu["Entry"][9]["Name"] = Get_Text("pub_menu_SchichtplanBeamer"); -$Menu["Entry"][3]["File"] = "wecken.php"; -$Menu["Entry"][3]["Name"] = Get_Text("pub_menu_Wecken"); -$Menu["Entry"][4]["File"] = "waeckliste.php"; -$Menu["Entry"][4]["Name"] = Get_Text("pub_menu_Waeckerlist"); -$Menu["Entry"][6]["File"] = "faq.php"; -$Menu["Entry"][6]["Name"] = Get_Text("pub_menu_questionEngel"); -$Menu["Entry"][7]["File"] = "einstellungen.php"; -$Menu["Entry"][7]["Name"] = Get_Text("pub_menu_Einstellungen"); -$Menu["Entry"][8]["File"] = "../logout.php"; -$Menu["Entry"][8]["Name"] = Get_Text("pub_menu_Abmelden"); +$Menu["Entry"][3]["File"] = "myschichtplan.php"; +$Menu["Entry"][3]["Name"] = Get_Text("pub_menu_mySchichtplan"); +$Menu["Entry"][4]["File"] = "schichtplan_beamer.php"; +$Menu["Entry"][4]["Name"] = Get_Text("pub_menu_SchichtplanBeamer"); +$Menu["Entry"][5]["File"] = "wecken.php"; +$Menu["Entry"][5]["Name"] = Get_Text("pub_menu_Wecken"); +$Menu["Entry"][6]["File"] = "waeckliste.php"; +$Menu["Entry"][6]["Name"] = Get_Text("pub_menu_Waeckerlist"); +$Menu["Entry"][7]["File"] = "faq.php"; +$Menu["Entry"][7]["Name"] = Get_Text("pub_menu_questionEngel"); +$Menu["Entry"][8]["File"] = "einstellungen.php"; +$Menu["Entry"][8]["Name"] = Get_Text("pub_menu_Einstellungen"); +$Menu["Entry"][8]["Line"] = "
"; +$Menu["Entry"][9]["File"] = "../logout.php"; +$Menu["Entry"][9]["Name"] = Get_Text("pub_menu_Abmelden"); -if ($_SESSION['CVS']["MenueShowAdminSection"] == "Y") +if ($_SESSION['CVS']["admin/index.php"] == "Y") { $MenuAdmin["Path"] = ""; $MenuAdmin["Name"] = "Erzengel"; $MenuAdmin["Entry"][0]["File"] = "../admin/index.php"; $MenuAdmin["Entry"][0]["Name"] = "Erzengel-Menü"; + $MenuAdmin["Entry"][1]["File"] = "../index.php"; + $MenuAdmin["Entry"][1]["Name"] = "Login-Menü"; } // MenueShowAdminSection ?>