From ecf971a32a54c84c7c275f35205a28cf36595063 Mon Sep 17 00:00:00 2001 From: lia Date: Fri, 23 Mar 2007 22:42:41 +0000 Subject: [PATCH] combined several small menus : siteinfo_menu (compliance, sitebutton, poweredby) and user_menu (userlanguage, usertheme) --- e107_admin/update_routines.php | 81 +++++++++++++++++- .../powered_by_menu/languages/English.php | 15 ---- .../sitebutton_menu/languages/English.php | 22 ----- .../compliance_menu.php | 4 +- .../images/valid-xhtml11.png | Bin .../images/vcss.png | Bin .../languages/English.php | 10 ++- .../powered_by_menu.php | 8 +- .../sitebutton_menu.php | 8 +- .../languages/English.php | 13 ++- .../userlanguage_menu.php | 8 +- .../usertheme_menu.php | 14 +-- .../usertheme_menu/languages/English.php | 6 -- 13 files changed, 114 insertions(+), 75 deletions(-) delete mode 100644 e107_plugins/powered_by_menu/languages/English.php delete mode 100644 e107_plugins/sitebutton_menu/languages/English.php rename e107_plugins/{compliance_menu => siteinfo_menu}/compliance_menu.php (66%) rename e107_plugins/{compliance_menu => siteinfo_menu}/images/valid-xhtml11.png (100%) rename e107_plugins/{compliance_menu => siteinfo_menu}/images/vcss.png (100%) rename e107_plugins/{compliance_menu => siteinfo_menu}/languages/English.php (51%) rename e107_plugins/{powered_by_menu => siteinfo_menu}/powered_by_menu.php (85%) rename e107_plugins/{sitebutton_menu => siteinfo_menu}/sitebutton_menu.php (79%) rename e107_plugins/{userlanguage_menu => user_menu}/languages/English.php (63%) rename e107_plugins/{userlanguage_menu => user_menu}/userlanguage_menu.php (86%) rename e107_plugins/{usertheme_menu => user_menu}/usertheme_menu.php (83%) delete mode 100644 e107_plugins/usertheme_menu/languages/English.php diff --git a/e107_admin/update_routines.php b/e107_admin/update_routines.php index 15c39c5f9..2128320aa 100644 --- a/e107_admin/update_routines.php +++ b/e107_admin/update_routines.php @@ -11,9 +11,9 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_admin/update_routines.php,v $ -| $Revision: 1.2 $ -| $Date: 2006-12-05 09:27:15 $ -| $Author: mrpete $ +| $Revision: 1.3 $ +| $Date: 2007-03-23 22:42:40 $ +| $Author: lisa_ $ +----------------------------------------------------------------------------+ */ @@ -71,6 +71,7 @@ if($sql->db_Select("plugin", "plugin_version", "plugin_path = 'pm' AND plugin_in } // $dbupdate["701_to_702"] = LAN_UPDATE_8." .7.1 ".LAN_UPDATE_9." .7.2"; +$dbupdate["706_to_800"] = LAN_UPDATE_8." .706 ".LAN_UPDATE_9." .8"; $dbupdate["70x_to_706"] = LAN_UPDATE_8." .70x ".LAN_UPDATE_9." .706"; $dbupdate["617_to_700"] = LAN_UPDATE_8." .617 ".LAN_UPDATE_9." .7"; $dbupdate["616_to_617"] = LAN_UPDATE_8." .616 ".LAN_UPDATE_9." .617"; @@ -117,6 +118,80 @@ function update_701_to_702($type='') { } */ +function update_706_to_800($type='') { + global $sql,$ns; + + if ($type == "do") + { + //change menu_path for usertheme_menu + if($sql->db_Select("menus", "menu_path", "menu_path='usertheme_menu'")) + { + $sql->db_Update("menus", "menu_path='user_menu' WHERE menu_path='usertheme_menu' "); + catch_error(); + } + //change menu_path for userlanguage_menu + if($sql->db_Select("menus", "menu_path", "menu_path='userlanguage_menu'")) + { + $sql->db_Update("menus", "menu_path='user_menu' WHERE menu_path='userlanguage_menu' "); + catch_error(); + } + //change menu_path for compliance_menu + if($sql->db_Select("menus", "menu_path", "menu_path='compliance_menu'")) + { + $sql->db_Update("menus", "menu_path='siteinfo_menu' WHERE menu_path='compliance_menu' "); + catch_error(); + } + //change menu_path for powered_by_menu + if($sql->db_Select("menus", "menu_path", "menu_path='powered_by_menu'")) + { + $sql->db_Update("menus", "menu_path='siteinfo_menu' WHERE menu_path='powered_by_menu' "); + catch_error(); + } + //change menu_path for sitebutton_menu + if($sql->db_Select("menus", "menu_path", "menu_path='sitebutton_menu'")) + { + $sql->db_Update("menus", "menu_path='siteinfo_menu' WHERE menu_path='sitebutton_menu' "); + catch_error(); + } + + return ''; + + } + else + { + + //change menu_path for usertheme_menu + if($sql->db_Select("menus", "menu_path", "menu_path='usertheme_menu'")) + { + return update_needed(); + } + //change menu_path for userlanguage_menu + if($sql->db_Select("menus", "menu_path", "menu_path='userlanguage_menu'")) + { + return update_needed(); + } + //change menu_path for compliance_menu + if($sql->db_Select("menus", "menu_path", "menu_path='compliance_menu'")) + { + return update_needed(); + } + //change menu_path for powered_by_menu + if($sql->db_Select("menus", "menu_path", "menu_path='powered_by_menu'")) + { + return update_needed(); + } + //change menu_path for sitebutton_menu + if($sql->db_Select("menus", "menu_path", "menu_path='sitebutton_menu'")) + { + return update_needed(); + } + + // No updates needed + return TRUE; + } +} + + function update_70x_to_706($type='') { global $sql,$ns; diff --git a/e107_plugins/powered_by_menu/languages/English.php b/e107_plugins/powered_by_menu/languages/English.php deleted file mode 100644 index 318ba40c8..000000000 --- a/e107_plugins/powered_by_menu/languages/English.php +++ /dev/null @@ -1,15 +0,0 @@ - \ No newline at end of file diff --git a/e107_plugins/sitebutton_menu/languages/English.php b/e107_plugins/sitebutton_menu/languages/English.php deleted file mode 100644 index 71012f576..000000000 --- a/e107_plugins/sitebutton_menu/languages/English.php +++ /dev/null @@ -1,22 +0,0 @@ - \ No newline at end of file diff --git a/e107_plugins/compliance_menu/compliance_menu.php b/e107_plugins/siteinfo_menu/compliance_menu.php similarity index 66% rename from e107_plugins/compliance_menu/compliance_menu.php rename to e107_plugins/siteinfo_menu/compliance_menu.php index d36417970..a4a29dbcc 100644 --- a/e107_plugins/compliance_menu/compliance_menu.php +++ b/e107_plugins/siteinfo_menu/compliance_menu.php @@ -3,8 +3,8 @@ if (!defined('e107_INIT')) { exit; } $text = "
- Valid XHTML 1.1!
- Valid CSS! + Valid XHTML 1.1!
+ Valid CSS!
"; $caption = (file_exists(THEME."images/compliance_menu.png") ? " ".COMPLIANCE_L1 : COMPLIANCE_L1); $ns->tablerender($caption, $text, 'compliance'); diff --git a/e107_plugins/compliance_menu/images/valid-xhtml11.png b/e107_plugins/siteinfo_menu/images/valid-xhtml11.png similarity index 100% rename from e107_plugins/compliance_menu/images/valid-xhtml11.png rename to e107_plugins/siteinfo_menu/images/valid-xhtml11.png diff --git a/e107_plugins/compliance_menu/images/vcss.png b/e107_plugins/siteinfo_menu/images/vcss.png similarity index 100% rename from e107_plugins/compliance_menu/images/vcss.png rename to e107_plugins/siteinfo_menu/images/vcss.png diff --git a/e107_plugins/compliance_menu/languages/English.php b/e107_plugins/siteinfo_menu/languages/English.php similarity index 51% rename from e107_plugins/compliance_menu/languages/English.php rename to e107_plugins/siteinfo_menu/languages/English.php index badf88705..1df322169 100644 --- a/e107_plugins/compliance_menu/languages/English.php +++ b/e107_plugins/siteinfo_menu/languages/English.php @@ -3,13 +3,15 @@ + ----------------------------------------------------------------------------+ | e107 website system - Language File. | -| $Source: /cvs_backup/e107_0.8/e107_plugins/compliance_menu/languages/English.php,v $ -| $Revision: 1.1.1.1 $ -| $Date: 2006-12-02 04:34:52 $ -| $Author: mcfly_e107 $ +| $Source: /cvs_backup/e107_0.8/e107_plugins/siteinfo_menu/languages/English.php,v $ +| $Revision: 1.1 $ +| $Date: 2007-03-23 22:42:40 $ +| $Author: lisa_ $ +----------------------------------------------------------------------------+ */ define("COMPLIANCE_L1", "W3C Compliance"); +define("SITEBUTTON_MENU_L1", "Link to us"); +define("POWEREDBY_L1", "Powered by"); ?> \ No newline at end of file diff --git a/e107_plugins/powered_by_menu/powered_by_menu.php b/e107_plugins/siteinfo_menu/powered_by_menu.php similarity index 85% rename from e107_plugins/powered_by_menu/powered_by_menu.php rename to e107_plugins/siteinfo_menu/powered_by_menu.php index 34527c955..4daeedb14 100644 --- a/e107_plugins/powered_by_menu/powered_by_menu.php +++ b/e107_plugins/siteinfo_menu/powered_by_menu.php @@ -10,10 +10,10 @@ | Released under the terms and conditions of the | GNU General Public License (http://gnu.org). | -| $Source: /cvs_backup/e107_0.8/e107_plugins/powered_by_menu/powered_by_menu.php,v $ -| $Revision: 1.1.1.1 $ -| $Date: 2006-12-02 04:35:41 $ -| $Author: mcfly_e107 $ +| $Source: /cvs_backup/e107_0.8/e107_plugins/siteinfo_menu/powered_by_menu.php,v $ +| $Revision: 1.1 $ +| $Date: 2007-03-23 22:42:40 $ +| $Author: lisa_ $ +----------------------------------------------------------------------------+ */ if (!defined('e107_INIT')) { exit; } diff --git a/e107_plugins/sitebutton_menu/sitebutton_menu.php b/e107_plugins/siteinfo_menu/sitebutton_menu.php similarity index 79% rename from e107_plugins/sitebutton_menu/sitebutton_menu.php rename to e107_plugins/siteinfo_menu/sitebutton_menu.php index 423d2b2a5..4bd5cbfe6 100644 --- a/e107_plugins/sitebutton_menu/sitebutton_menu.php +++ b/e107_plugins/siteinfo_menu/sitebutton_menu.php @@ -10,10 +10,10 @@ | Released under the terms and conditions of the | GNU General Public License (http://gnu.org). | -| $Source: /cvs_backup/e107_0.8/e107_plugins/sitebutton_menu/sitebutton_menu.php,v $ -| $Revision: 1.1.1.1 $ -| $Date: 2006-12-02 04:35:43 $ -| $Author: mcfly_e107 $ +| $Source: /cvs_backup/e107_0.8/e107_plugins/siteinfo_menu/sitebutton_menu.php,v $ +| $Revision: 1.1 $ +| $Date: 2007-03-23 22:42:40 $ +| $Author: lisa_ $ +----------------------------------------------------------------------------+ */ if (!defined('e107_INIT')) { exit; } diff --git a/e107_plugins/userlanguage_menu/languages/English.php b/e107_plugins/user_menu/languages/English.php similarity index 63% rename from e107_plugins/userlanguage_menu/languages/English.php rename to e107_plugins/user_menu/languages/English.php index 528678c7b..69ee985b8 100644 --- a/e107_plugins/userlanguage_menu/languages/English.php +++ b/e107_plugins/user_menu/languages/English.php @@ -10,14 +10,19 @@ | Released under the terms and conditions of the | GNU General Public License (http://gnu.org). | -| $Source: /cvs_backup/e107_0.8/e107_plugins/userlanguage_menu/languages/English.php,v $ -| $Revision: 1.1.1.1 $ -| $Date: 2006-12-02 04:35:44 $ -| $Author: mcfly_e107 $ +| $Source: /cvs_backup/e107_0.8/e107_plugins/user_menu/languages/English.php,v $ +| $Revision: 1.1 $ +| $Date: 2007-03-23 22:42:40 $ +| $Author: lisa_ $ +----------------------------------------------------------------------------+ */ define("UTHEME_MENU_L1", "Set Language"); define("UTHEME_MENU_L2", "Select Language"); define("UTHEME_MENU_L3", "tables"); + +define("LAN_UMENU_THEME_1", "Set Theme"); +define("LAN_UMENU_THEME_2", "Select Theme"); +define("LAN_UMENU_THEME_3", "users:"); + ?> \ No newline at end of file diff --git a/e107_plugins/userlanguage_menu/userlanguage_menu.php b/e107_plugins/user_menu/userlanguage_menu.php similarity index 86% rename from e107_plugins/userlanguage_menu/userlanguage_menu.php rename to e107_plugins/user_menu/userlanguage_menu.php index f1a3b8500..0a73e64ae 100644 --- a/e107_plugins/userlanguage_menu/userlanguage_menu.php +++ b/e107_plugins/user_menu/userlanguage_menu.php @@ -10,10 +10,10 @@ | Released under the terms and conditions of the | GNU General Public License (http://gnu.org). | -| $Source: /cvs_backup/e107_0.8/e107_plugins/userlanguage_menu/userlanguage_menu.php,v $ -| $Revision: 1.1.1.1 $ -| $Date: 2006-12-02 04:35:43 $ -| $Author: mcfly_e107 $ +| $Source: /cvs_backup/e107_0.8/e107_plugins/user_menu/userlanguage_menu.php,v $ +| $Revision: 1.1 $ +| $Date: 2007-03-23 22:42:40 $ +| $Author: lisa_ $ +----------------------------------------------------------------------------+ */ diff --git a/e107_plugins/usertheme_menu/usertheme_menu.php b/e107_plugins/user_menu/usertheme_menu.php similarity index 83% rename from e107_plugins/usertheme_menu/usertheme_menu.php rename to e107_plugins/user_menu/usertheme_menu.php index fdfe2b027..5b7b35f81 100644 --- a/e107_plugins/usertheme_menu/usertheme_menu.php +++ b/e107_plugins/user_menu/usertheme_menu.php @@ -10,10 +10,10 @@ | Released under the terms and conditions of the | GNU General Public License (http://gnu.org). | -| $Source: /cvs_backup/e107_0.8/e107_plugins/usertheme_menu/usertheme_menu.php,v $ -| $Revision: 1.1.1.1 $ -| $Date: 2006-12-02 04:35:44 $ -| $Author: mcfly_e107 $ +| $Source: /cvs_backup/e107_0.8/e107_plugins/user_menu/usertheme_menu.php,v $ +| $Revision: 1.1 $ +| $Date: 2007-03-23 22:42:40 $ +| $Author: lisa_ $ +----------------------------------------------------------------------------+ */ @@ -56,14 +56,14 @@ if (USER == TRUE) { if (($themelist[$counter] == USERTHEME) || (USERTHEME == FALSE && $themelist[$counter] == $defaulttheme)) { $text .= "selected='selected'"; } - $text .= ">".($themelist[$counter] == $defaulttheme ? "[ ".$themelist[$counter]." ]" : $themelist[$counter])." (users: ".$themecount[$themelist[$counter]].")\n"; + $text .= ">".($themelist[$counter] == $defaulttheme ? "[ ".$themelist[$counter]." ]" : $themelist[$counter])." (".LAN_UMENU_THEME_3." ".$themecount[$themelist[$counter]].")\n"; $counter++; } $text .= "

- + "; - $ns->tablerender(LAN_351, $text, 'usertheme'); + $ns->tablerender(LAN_UMENU_THEME_2, $text, 'usertheme'); } ?> \ No newline at end of file diff --git a/e107_plugins/usertheme_menu/languages/English.php b/e107_plugins/usertheme_menu/languages/English.php deleted file mode 100644 index 341982580..000000000 --- a/e107_plugins/usertheme_menu/languages/English.php +++ /dev/null @@ -1,6 +0,0 @@ - \ No newline at end of file