mirror of
https://github.com/e107inc/e107.git
synced 2025-07-31 11:50:30 +02:00
combined several small menus : siteinfo_menu (compliance, sitebutton, poweredby) and user_menu (userlanguage, usertheme)
This commit is contained in:
lia
@@ -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;
|
||||
|
||||
|
||||
@@ -1,15 +0,0 @@
|
||||
<?php
|
||||
/*
|
||||
+ ----------------------------------------------------------------------------+
|
||||
| e107 website system - Language File.
|
||||
|
|
||||
| $Source: /cvs_backup/e107_0.8/e107_plugins/powered_by_menu/languages/English.php,v $
|
||||
| $Revision: 1.1.1.1 $
|
||||
| $Date: 2006-12-02 04:35:41 $
|
||||
| $Author: mcfly_e107 $
|
||||
+----------------------------------------------------------------------------+
|
||||
*/
|
||||
|
||||
define("POWEREDBY_L1", "Powered by");
|
||||
|
||||
?>
|
||||
@@ -1,22 +0,0 @@
|
||||
<?php
|
||||
/*
|
||||
+ ----------------------------------------------------------------------------+
|
||||
e107 website system
|
||||
|
|
||||
| <20>Steve Dunstan 2001-2002
|
||||
| http://e107.org
|
||||
| jalist@e107.org
|
||||
|
|
||||
| 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/languages/English.php,v $
|
||||
| $Revision: 1.1.1.1 $
|
||||
| $Date: 2006-12-02 04:35:43 $
|
||||
| $Author: mcfly_e107 $
|
||||
+----------------------------------------------------------------------------+
|
||||
*/
|
||||
|
||||
define("SITEBUTTON_MENU_L1", "Link to us");
|
||||
|
||||
?>
|
||||
@@ -3,8 +3,8 @@
|
||||
if (!defined('e107_INIT')) { exit; }
|
||||
|
||||
$text = "<div style='text-align:center'>
|
||||
<a href='http://validator.w3.org/check?uri=".e_SELF.(e_QUERY ? '?'.e_QUERY : '')."'><img style='border:0' src='".e_PLUGIN."compliance_menu/images/valid-xhtml11.png' alt='Valid XHTML 1.1!' height='31' width='88' /></a><br />
|
||||
<a href='http://jigsaw.w3.org/css-validator/validator?uri=".e_SELF.(e_QUERY ? '?'.e_QUERY : '')."'><img style='border:0' src='".e_PLUGIN."compliance_menu/images/vcss.png' alt='Valid CSS!' height='31' width='88' /></a>
|
||||
<a href='http://validator.w3.org/check?uri=".e_SELF.(e_QUERY ? '?'.e_QUERY : '')."'><img style='border:0' src='".e_PLUGIN."siteinfo_menu/images/valid-xhtml11.png' alt='Valid XHTML 1.1!' height='31' width='88' /></a><br />
|
||||
<a href='http://jigsaw.w3.org/css-validator/validator?uri=".e_SELF.(e_QUERY ? '?'.e_QUERY : '')."'><img style='border:0' src='".e_PLUGIN."siteinfo_menu/images/vcss.png' alt='Valid CSS!' height='31' width='88' /></a>
|
||||
</div>";
|
||||
$caption = (file_exists(THEME."images/compliance_menu.png") ? "<img src='".THEME."images/compliance_menu.png' alt='' /> ".COMPLIANCE_L1 : COMPLIANCE_L1);
|
||||
$ns->tablerender($caption, $text, 'compliance');
|
||||
|
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
@@ -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");
|
||||
|
||||
?>
|
||||
@@ -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; }
|
||||
@@ -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; }
|
||||
@@ -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:");
|
||||
|
||||
?>
|
||||
@@ -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_ $
|
||||
+----------------------------------------------------------------------------+
|
||||
*/
|
||||
|
||||
@@ -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]].")</option>\n";
|
||||
$text .= ">".($themelist[$counter] == $defaulttheme ? "[ ".$themelist[$counter]." ]" : $themelist[$counter])." (".LAN_UMENU_THEME_3." ".$themecount[$themelist[$counter]].")</option>\n";
|
||||
$counter++;
|
||||
}
|
||||
$text .= "</select>
|
||||
<br /><br />
|
||||
<input class='button' type='submit' name='settheme' value='".LAN_350."' />
|
||||
<input class='button' type='submit' name='settheme' value='".LAN_UMENU_THEME_1."' />
|
||||
</div></form>";
|
||||
|
||||
$ns->tablerender(LAN_351, $text, 'usertheme');
|
||||
$ns->tablerender(LAN_UMENU_THEME_2, $text, 'usertheme');
|
||||
}
|
||||
?>
|
||||
@@ -1,6 +0,0 @@
|
||||
<?php
|
||||
|
||||
define("LAN_350", "Set Theme");
|
||||
define("LAN_351", "Select Theme");
|
||||
|
||||
?>
|
||||
Reference in New Issue
Block a user