Banner management/menu config ready;

Banlist administration - work in progress

e107_admin/eurl.php

@@ -9,8 +9,8 @@
  * URL Management
  *
  * $Source: /cvs_backup/e107_0.8/e107_admin/eurl.php,v $
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
- * $Date: 2008-12-20 12:30:18 $
+ * $Date: 2008-12-22 16:50:07 $
  * $Author: secretr $
 */
 
@@ -215,7 +215,7 @@ class admin_url_config {
 				if($custom) $checked_profile = ' disabled="disabled"';
 				$config_profiles .= "
 					<input type='radio' class='radio' id='{$section['path']}-profile-{$config_profile}' name='cprofile[{$section['path']}]' value='{$profile_id}'{$checked_profile} /><label for='{$section['path']}-profile-{$config_profile}'>".LAN_EURL_PROFILE." [".varsettrue($profile_info['title'], $config_profile)."]</label>
-					<a href='#{$section['path']}-profile-{$config_profile}-info' class='e-expandit' title='".LAN_EURL_INFOALT."'><img src='".e_IMAGE_ABS."admin_images/docs_16.png' alt='' /></a>
+					<a href='#{$section['path']}-profile-{$config_profile}-info' class='e-expandit' title='".LAN_EURL_INFOALT."'><img class='icon action' src='".e_IMAGE_ABS."admin_images/docs_16.png' alt='' /></a>
 					<div class='e-hideme' id='{$section['path']}-profile-{$config_profile}-info'>
 						<div class='indent'>
 							".(varsettrue($profile_info['title']) ? '<strong>'.$profile_info['title'].'</strong><br /><br />' : '')."

e107_files/jslib/core/admin.js

@@ -8,8 +8,8 @@
  * e107 Admin Helper
  * 
  * $Source: /cvs_backup/e107_0.8/e107_files/jslib/core/admin.js,v $
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
- * $Date: 2008-12-21 11:47:29 $
+ * $Date: 2008-12-22 16:50:07 $
  * $Author: secretr $
  * 
 */
@@ -46,8 +46,11 @@ e107Admin.Helper = {
 		element.select('button.action[name=check_all]').invoke('observe', 'click', this.allCheckedEventHandler);
 		element.select('button.action[name=uncheck_all]').invoke('observe', 'click', this.allUncheckedEventHandler);
 		element.select('button.delete', 'input.delete[type=image]', 'a.delete').invoke('observe', 'click', function(e) {
-			if(e.element().hasClassName('no-confirm') || (e.element().readAttribute('rel') &&  e.element().readAttribute('rel').toLowerCase == 'no-confirm')) return;
+			var el = e.findElement('a.delete'); 
-			var msg = e.element().readAttribute('title') || e107.getModLan('delete_confirm');
+			if(!el) el = e.element();
+			if(!el) return; 
+			if(el.hasClassName('no-confirm') || (el.readAttribute('rel') &&  el.readAttribute('rel').toLowerCase() == 'no-confirm')) return;
+			var msg = el.readAttribute('title') || e107.getModLan('delete_confirm');
 			if( !e107Helper.confirm(msg) ) e.stop(); 
 		});
 	},

e107_languages/English/admin/lan_admin.php

@@ -1,7 +1,7 @@
 <?php
 /*
  * Copyright e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
- * $Id: lan_admin.php,v 1.14 2008-12-21 12:59:56 e107steved Exp $
+ * $Id: lan_admin.php,v 1.15 2008-12-22 16:50:07 secretr Exp $
  *
  * Admin Language File
 */
@@ -216,7 +216,7 @@ define("LAN_SAVE","Save");
 define("LAN_SAVED","Saved");
 define("LAN_SETSAVED","Your settings have been saved");
 define("LAN_CONFIRMDEL","Please confirm you wish to delete");
-define("LAN_JSCONFIRM","Please confirm you wish to delete");
+define("LAN_JSCONFIRM","Are you sure?");
 define("LAN_OPTIONS","Options");
 define("LAN_PREFS","Preferences");
 define("LAN_DELETED","Successfully deleted");

e107_languages/English/admin/lan_banner.php

@@ -1,15 +1,12 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
+ * Copyright e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
-|     e107 website system - Language File.
+ * $Id: lan_banner.php,v 1.3 2008-12-22 16:50:07 secretr Exp $
-|
+ *
-|     $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/lan_banner.php,v $
+ * Administration Language File
-|     $Revision: 1.2 $
+ *
-|     $Date: 2008-08-26 19:45:22 $
-|     $Author: e107steved $
-+----------------------------------------------------------------------------+
 */
-define("BNRLAN_1", "Banner deleted.");
+define("BNRLAN_1", "Banner #%d deleted.");
 define("BNRLAN_2", "Please confirm you wish to delete this banner - once deleted it cannot be retrieved");
 define("BNRLAN_5", "Confirm Delete Banner");
 define("BNRLAN_6", "Delete cancelled.");
@@ -27,11 +24,9 @@ define("BNRLAN_21", "Ends");
 define("BNRLAN_22", "Update Banner");
 define("BNRLAN_23", "Add New Banner");
 define("BNRLAN_24", "Campaign");
-define("BNRLAN_25", "choose existing campaign");
+
-define("BNRLAN_26", "enter new campaign");
 define("BNRLAN_27", "Client");
-define("BNRLAN_28", "choose existing client");
+
-define("BNRLAN_29", "enter new client");
 define("BNRLAN_30", "Client Login");
 define("BNRLAN_31", "Client Password");
 define("BNRLAN_32", "Banner Image");
@@ -48,26 +43,38 @@ define("BNRLAN_42", "Banner Rotation System");
 define("BNRLAN_43", "Choose banner image");
 define("BNRLAN_45", "Starts");
 define("BNRLAN_46", "Code");
-define("BNRLAN_58", "banner front page");
+define("BNRLAN_58", "Banner front page");
-define("BNRLAN_59", "create new banner");
+define("BNRLAN_59", "Create new banner");
 define("BNRLAN_60", "campaigns");
-define("BNRLAN_61", "banner menu ");
+define("BNRLAN_61", "Banner menu");
-define("BNRLAN_62", "banner options");
+define("BNRLAN_62", "Banner Options");
 define("BNRLAN_63", "Banner Created");
 define("BNRLAN_64", "Banner Updated");
 
 define("BANNER_MENU_L1", "Advertisement");
 define("BANNER_MENU_L2", "Banner menu configuration saved");
 define("BANNER_MENU_L3", "Caption");
-define("BANNER_MENU_L5", "Banner Configuration"); 
+//define("BANNER_MENU_L5", "Banner Configuration");
 define("BANNER_MENU_L6", "choose campaigns to show in menu");
-define("BANNER_MENU_L7", "available campaigns");
+//define("BANNER_MENU_L7", "available campaigns");
-define("BANNER_MENU_L8", "selected campaigns");
+//define("BANNER_MENU_L8", "selected campaigns");
-define("BANNER_MENU_L9", "remove selection");
+//define("BANNER_MENU_L9", "remove selection");
 define("BANNER_MENU_L10", "Render type");
 //define("BANNER_MENU_L12", "plain");
 //define("BANNER_MENU_L13", "in captioned box");
 define("BANNER_MENU_L18", "Update Menu Settings");
 define("BANNER_MENU_L19", "number of banners to show:<br />this is only used when multiple campaigns are selected");
 
+define("BNRLAN_25", "add new or choose existing campaign");
+define("BNRLAN_26", "enter new campaign");
+define("BNRLAN_26a", "New Campaign");
+define("BNRLAN_28", "add new or choose existing client");
+define("BNRLAN_29", "enter new client");
+define("BNRLAN_29a", "New Client");
+
+define("BNRLAN_65", "Stats");
+define("BNRLAN_66", "N/A");
+
+define("BNRLAN_67", "No campaigns yet.");
+define("BNRLAN_68", "Banner Menu Configuration");
 ?>

e107_plugins/banner_menu/config.php

@@ -1,23 +1,29 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
+ * e107 website system
-|     e107 website system
+ *
-|
+ * Copyright (C) 2001-2008 e107 Inc (e107.org)
-|     <20>Steve Dunstan 2001-2002
+ * Released under the terms and conditions of the
-|     http://e107.org
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
-|     jalist@e107.org
+ *
-|
+ * Banner Menu Configuration (OLD - redirects to e107_admin/banner.php)
-|     Released under the terms and conditions of the
+ *
-|     GNU General Public License (http://gnu.org).
+ * $Source: /cvs_backup/e107_0.8/e107_plugins/banner_menu/config.php,v $
-|
+ * $Revision: 1.4 $
-|     $Source: /cvs_backup/e107_0.8/e107_plugins/banner_menu/config.php,v $
+ * $Date: 2008-12-22 16:50:07 $
-|     $Revision: 1.3 $
+ * $Author: secretr $
-|     $Date: 2008-12-08 22:23:53 $
+ *
-|     $Author: e107steved $
-+----------------------------------------------------------------------------+
 */
 $eplug_admin = TRUE;
 require_once("../../class2.php");
+
+/*
+ * The same, cleaned up code is already part of banner.php
+ * FIXME - we should be able to combine all core menus in a nice way... somehow
+ */
+header('Location:'.e_ADMIN_ABS.'banner.php?menu');
+exit;
+
 if (!getperms("1")) 		// Access to those who can change prefs, theme etc
 {
 	header("location:".e_BASE."index.php");
@@ -26,11 +32,11 @@ if (!getperms("1")) 		// Access to those who can change prefs, theme etc
 require_once(e_ADMIN."auth.php");
 require_once(e_HANDLER."form_handler.php");
 $rs = new form;
-	
+
 @include_lan(e_PLUGIN."banner_menu/languages/".e_LANGUAGE.".php");
 include_lan(e_LANGUAGEDIR.e_LANGUAGE."/admin/lan_menus.php");
-	
+
-if (e_QUERY) 
+if (e_QUERY)
 {
 	$tmp = explode(".", e_QUERY);
 	$action = $tmp[0];
@@ -38,29 +44,29 @@ if (e_QUERY)
 	$id = $tmp[2];
 	unset($tmp);
 }
-	
+
-if (isset($_POST['update_menu'])) 
+if (isset($_POST['update_menu']))
 {
 	unset($temp);
-	foreach($_POST as $k => $v) 
+	foreach($_POST as $k => $v)
 	{
-		if (strpos($k, "banner_") === 0) 
+		if (strpos($k, "banner_") === 0)
 		{
 			$temp[$k] = $v;
 		}
 	}
-	 
+
-	if (isset($_POST['catid'])) 
+	if (isset($_POST['catid']))
 	{
 		$array_cat = explode("-", $_POST['catid']);
-		for($i = 0; $i < count($array_cat); $i++) 
+		for($i = 0; $i < count($array_cat); $i++)
 		{
 			$cat .= $array_cat[$i]."|";
 		}
 		$cat = substr($cat, 0, -1);
 		$temp['banner_campaign'] = $cat;
 	}
-	 
+
 
 	if ($admin_log->logArrayDiffs($temp, $menu_pref, 'BANNER_05'))
 	{
@@ -73,25 +79,25 @@ if (isset($_POST['update_menu']))
 	}
 	$ns->tablerender("", "<div style='text-align:center'><b>".$message."</b></div>");
 }
-	
+
-if (!$menu_pref['banner_caption']) 
+if (!$menu_pref['banner_caption'])
 {
 	$menu_pref['banner2_caption'] = BANNER_MENU_L1;
 }
-	
+
 $text = "<div style='text-align:center'>
 	<form method='post' action='".e_SELF."' name='menu_conf_form'>
 	<table style='width:85%' class='fborder' >
-	 
+
 	<tr>
 	<td style='width:40%' class='forumheader3'>".BANNER_MENU_L3.": </td>
 	<td style='width:60%' class='forumheader3'>
 	<input class='tbox' type='text' name='banner_caption' size='20' value='".$menu_pref['banner_caption']."' maxlength='100' />
 	</td>
 	</tr>";
-	
+
 $array_cat_in = explode("|", $menu_pref['banner_campaign']);
-	
+
 $c = 0;
  $d = 0;
 $sql2 = new db;
@@ -106,12 +112,12 @@ while ($row = $sql2->db_Fetch()) {
 		$d++;
 	}
 }
-	
+
 $text .= "
 	<tr>
 	<td style='width:40%' class='forumheader3'>".BANNER_MENU_L6."</td>
 	<td style='width:60%' class='forumheader3'>
-	 
+
 	<table style='width:90%'>
 	<tr>
 	<td style='width:45%; vertical-align:top'>".BANNER_MENU_L7."<br />
@@ -134,10 +140,10 @@ $text .= "</select><br /><br />
 	</td>
 	</tr>
 	</table>
-	 
+
 	</td>
 	</tr>
-	 
+
 	<tr>
 	<td style='width:40%' class='forumheader3'>".BANNER_MENU_L10."</td>
 	<td style='width:60%' class='forumheader3'>
@@ -149,7 +155,7 @@ $text .= "</select><br /><br />
 	".$rs->form_select_close()."
 	</td>
 	</tr>
-	 
+
 	<tr>
 	<td style='width:40%' class='forumheader3'>".BANNER_MENU_L15."<br /><span class='smalltext' style='font-style:italic;'>".BANNER_MENU_L16."</span></td>
 	<td style='width:60%' class='forumheader3'>
@@ -161,32 +167,32 @@ for($b = 1; $b < 6; $b++) {
 $text .= $rs->form_select_close()."
 	</td>
 	</tr>
-	 
+
 	<tr>
 	<td colspan='2' class='forumheader' style='text-align:center'><input class='button' type='submit' name='update_menu' value='".BANNER_MENU_L18."' /></td>
 	</tr>
-	 
+
 	</table>
 	</form>
 	</div>";
-	
+
 $ns->tablerender(BANNER_MENU_L5, $text);
-	
+
-	
+
 require_once(e_ADMIN."footer.php");
-	
+
 function headerjs() {
-	 
+
 	$script_js = "<script type=\"text/javascript\">
 		//<!--
 		//<!-- Adapted from original:  Kathi O'Shea (Kathi.O'Shea@internet.com) -->
-		 
+
 		function moveOver(){
 		var boxLength = document.getElementById('catin').length;
 		var selectedItem = document.getElementById('catout').selectedIndex;
 		var selectedText = document.getElementById('catout').options[selectedItem].text;
 		var selectedValue = document.getElementById('catout').options[selectedItem].value;
-		 
+
 		var i;
 		var isNew = true;
 		if (boxLength != 0) {
@@ -204,10 +210,10 @@ function headerjs() {
 		document.getElementById('catout').options[selectedItem].text = '';
 		}
 		document.getElementById('catout').selectedIndex=-1;
-		 
+
 		saveMe();
 		}
-		 
+
 		function removeMe() {
 		var boxLength = document.getElementById('catin').length;
 		var boxLength2 = document.getElementById('catout').length;
@@ -234,14 +240,14 @@ function headerjs() {
 		}
 		boxLength = document.getElementById('catin').length;
 		}
-		 
+
 		saveMe();
 		}
-		 
+
 		//function clearMe(clid){
 		// location.href = document.location + \"?clear.\" + clid;
 		//}
-		 
+
 		function saveMe(clid) {
 		var strValues = \"\";
 		var boxLength = document.getElementById('catin').length;
@@ -265,10 +271,10 @@ function headerjs() {
 		document.getElementById('catid').value = strValues;
 		}
 		}
-		 
+
 		// -->
 		</script>\n";
 	return $script_js;
 }
-	
+
 ?>

e107_themes/_blank/admin_style.css

@@ -328,7 +328,6 @@ input.action.edit {}
 .admin-page-body { padding: 20px 15px 0; }
 .admin-footer {}
 legend { font-size: 14px; font-weight: bold; padding: 5px; }
-.admin-help p { margin-bottom: 10px } /* help side menu */
 
 /******** Layout */
 .main-table { width: 100%; border: 0 none; }