From 51d21e87a6eb173ed690ec24ef72d343bc4e06bb Mon Sep 17 00:00:00 2001 From: e107steved Date: Sun, 24 Jun 2007 16:30:48 +0000 Subject: [PATCH] Front page selection - sort out LANs and icons --- e107_admin/frontpage.php | 31 +++---------- .../English/admin/lan_frontpage.php | 43 +++++++++++++------ 2 files changed, 35 insertions(+), 39 deletions(-) diff --git a/e107_admin/frontpage.php b/e107_admin/frontpage.php index 0052d523e..1ba829c1a 100644 --- a/e107_admin/frontpage.php +++ b/e107_admin/frontpage.php @@ -11,8 +11,8 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_admin/frontpage.php,v $ -| $Revision: 1.2 $ -| $Date: 2007-05-02 19:47:47 $ +| $Revision: 1.3 $ +| $Date: 2007-06-24 16:30:42 $ | $Author: e107steved $ | +----------------------------------------------------------------------------+ @@ -31,27 +31,6 @@ $rs = new form; require_once(e_HANDLER.'userclass_class.php'); -// New language defs to be moved out (probably get rid of nearly all the existing ones) -define('FRTLAN_35', 'Post-login page'); -//define('FRTLAN_36', 'Yes'); -//define('FRTLAN_37', 'No'); -define('FRTLAN_38', 'The rules are searched in order, to find the first where the current user belongs to the class specified in the rule. That rule then determines the front (home) page and any specific post-login page.'); -define('FRTLAN_39', 'If no rule matches, news.php is set as the home page'); -define('FRTLAN_40', 'Order'); -define('FRTLAN_41', "The user is sent to the specified 'Post-login page' (if specified) immediately following a login"); -define('FRTLAN_42', 'Add new rule'); -define('FRTLAN_43', 'Class: '); -define('FRTLAN_44', 'Go to this page after login'); -define('FRTLAN_45', 'Values not changed'); -define('FRTLAN_46', 'Edit existing rule'); -define('FRTLAN_47', 'Move up'); -define('FRTLAN_48', 'Move down'); -define('FRTLAN_49', 'Home Page'); -define('FRTLAN_50', "(To disable, select 'Other' with a blank page)"); -define('FRTLAN_51', "Other"); -define('FRTLAN_52', "None"); -define('FRTLAN_53', 'User Class'); - // Get list of possible options for front page $front_page['news'] = array('page' => 'news.php', 'title' => ADLAN_0); @@ -290,7 +269,7 @@ class frontpage { function select_class($show_button = TRUE) { // Display existing data - global $fp_settings, $rs, $ns, $front_page; + global $fp_settings, $rs, $ns, $front_page, $imode; // List of current settings @@ -321,8 +300,8 @@ class frontpage ".$this->lookup_path($current_value['page'])." ".$this->lookup_path($current_value['force'])." - - + + diff --git a/e107_languages/English/admin/lan_frontpage.php b/e107_languages/English/admin/lan_frontpage.php index 0115f865d..a3f657e9f 100644 --- a/e107_languages/English/admin/lan_frontpage.php +++ b/e107_languages/English/admin/lan_frontpage.php @@ -4,29 +4,21 @@ | e107 website system - Language File. | | $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/lan_frontpage.php,v $ -| $Revision: 1.1.1.1 $ -| $Date: 2006-12-02 04:34:40 $ -| $Author: mcfly_e107 $ +| $Revision: 1.2 $ +| $Date: 2007-06-24 16:30:48 $ +| $Author: e107steved $ +----------------------------------------------------------------------------+ */ -define("FRTLAN_1", "Front Page settings updated."); +/* define("FRTLAN_2", "Set front page for"); define("FRTLAN_6", "Links"); -// define("FRTLAN_7", "Content Page"); -define("FRTLAN_12", "Update Front Page Settings"); -define("FRTLAN_13", "Front Page Settings"); -define("FRTLAN_15", "Other (enter url):"); define("FRTLAN_16", "error: no content main parent selected"); define("FRTLAN_17", "error: no content sub category selected"); define("FRTLAN_18", "error: no content item selected"); define("FRTLAN_19", "content main parent"); define("FRTLAN_20", "content category"); define("FRTLAN_21", "content item"); -// define("FRTLAN_22", ""); -// define("FRTLAN_23", ""); -// define("FRTLAN_24", ""); -// define("FRTLAN_25", ""); define("FRTLAN_26", "all users"); define("FRTLAN_27", "Guests"); @@ -34,7 +26,32 @@ define("FRTLAN_28", "Members"); define("FRTLAN_29", "Administrators"); define("FRTLAN_31", "All Users"); define("FRTLAN_32", "User Class"); -define("FRTLAN_33", "Current Settings"); define("FRTLAN_34", "Page"); +*/ + +define("FRTLAN_1", "Front Page settings updated."); +define("FRTLAN_12", "Update Front Page Settings"); +define("FRTLAN_13", "Front Page Settings"); +define("FRTLAN_15", "Other (enter url):"); +define("FRTLAN_33", "Current Settings"); +// New language defs for 0.8 +define('FRTLAN_35', 'Post-login page'); +define('FRTLAN_38', 'The rules are searched in order, to find the first where the current user belongs to the class specified in the rule. That rule then determines the front (home) page and any specific post-login page.'); +define('FRTLAN_39', 'If no rule matches, news.php is set as the home page'); +define('FRTLAN_40', 'Order'); +define('FRTLAN_41', "The user is sent to the specified 'Post-login page' (if specified) immediately following a login"); +define('FRTLAN_42', 'Add new rule'); +define('FRTLAN_43', 'Class: '); +define('FRTLAN_44', 'Go to this page after login'); +define('FRTLAN_45', 'Values not changed'); +define('FRTLAN_46', 'Edit existing rule'); +define('FRTLAN_47', 'Move up'); +define('FRTLAN_48', 'Move down'); +define('FRTLAN_49', 'Home Page'); +define('FRTLAN_50', "(To disable, select 'Other' with a blank page)"); +define('FRTLAN_51', "Other"); +define('FRTLAN_52', "None"); +define('FRTLAN_53', 'User Class'); + ?> \ No newline at end of file