Skip to content

Commit

Permalink
Issue #90 - Banner plugin (also #6 and GUI styling)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Moc
Moc committed Feb 4, 2013
1 parent a97020c commit 9547df9
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 22 deletions.
38 changes: 20 additions & 18 deletions e107_plugins/banner/admin_banner.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@
$fl = new e_file;

require_once(e_HANDLER.'message_handler.php');
$emessage = eMessage::getInstance();
//$emessage = eMessage::getInstance();
$mes = e107::getMessage();

//@FIXME mix up in banner language files
//include_//lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_menus.php');
Expand Down Expand Up @@ -92,7 +93,7 @@
$menuPref->save(false, true, false);

//banners_adminlog('01', $menu_pref['banner_caption'].'[!br!]'.$menu_pref['banner_amount'].', '.$menu_pref['banner_rendertype'].'[!br!]'.$menu_pref['banner_campaign']);
$emessage->add(BANNER_MENU_L2, E_MESSAGE_SUCCESS);
//$emessage->add(BANNER_MENU_L2, E_MESSAGE_SUCCESS);
}
}

Expand Down Expand Up @@ -147,7 +148,7 @@
/* DELETE ACTIONS */
if (isset($_POST['delete_cancel']))
{
$emessage->addSession(BNRLAN_6);
$mes->addSession(BNRLAN_6);

//redirect to main
session_write_close();
Expand All @@ -158,19 +159,19 @@
{
if($sql->db_Delete("banner", "banner_id=".intval($sub_action)))
{
$emessage->addSession(sprintf(BNRLAN_1, $sub_action), E_MESSAGE_SUCCESS);
$mes->addSession(sprintf(BNRLAN_1, $sub_action), E_MESSAGE_SUCCESS);
banners_adminlog('04','Id: '.intval($sub_action));
}
else $emessage->addSession(LAN_DELETED_FAILED, E_MESSAGE_WARNING);
else $mes->addSession(LAN_DELETED_FAILED, E_MESSAGE_WARNING);

//redirect to main
session_write_close();
header('Location:'.e_SELF);
exit;
}
elseif ($action == "delete" && $sub_action)
elseif ($action == "delete" && $sub_action)
{ // shown only if JS is disabled or by direct url hit (?delete.banner_id)
$emessage->add(BNRLAN_2, E_MESSAGE_WARNING);
$mes->addWarning(BNRLAN_2);
$text = "
<form method='post' action='".e_SELF."?".e_QUERY."'>
<fieldset id='core-banner-delete-confirm'>
Expand All @@ -183,7 +184,7 @@
</fieldset>
</form>
";
$e107->ns->tablerender(BNRLAN_5, $emessage->render().$text);
$ns->tablerender(BNRLAN_5, $mes->render() . $text);

require_once(e_ADMIN."footer.php");
exit;
Expand Down Expand Up @@ -316,7 +317,7 @@
</script>
";

$e107->ns->tablerender(BNRLAN_42.' - '.BNRLAN_7, $emessage->render().$text);
$ns->tablerender(BNRLAN_42.' - '.BNRLAN_7, $mes->render() . $text);
}

if ($action == "create") {
Expand Down Expand Up @@ -398,7 +399,7 @@
unset($for_var);
//TODO - ajax add campaign
$text .= "
</select> ".$frm->admin_button('add_new_campaign', BNRLAN_26a, 'action', '', array('other' => "onclick=\"e107Helper.toggle('add-new-campaign-cont', false); \$('banner_campaign_sel').selectedIndex=0; return false;\""))."
</select> ".$frm->admin_button('add_new_campaign', BNRLAN_26a, 'other', '', array('other' => "onclick=\"e107Helper.toggle('add-new-campaign-cont', false); \$('banner_campaign_sel').selectedIndex=0; return false;\""))."
</div>
<div class='field-spacer e-hideme' id='add-new-campaign-cont'>
Expand Down Expand Up @@ -436,7 +437,7 @@
unset($for_var);
//TODO - ajax add client
$text .= "
</select> ".$frm->admin_button('add_new_client', BNRLAN_29a, 'action', '', array('other' => "onclick=\"e107Helper.toggle('add-new-client-cont', false); \$('banner_client_sel').selectedIndex=0; return false;\""))."
</select> ".$frm->admin_button('add_new_client', BNRLAN_29a, 'other', '', array('other' => "onclick=\"e107Helper.toggle('add-new-client-cont', false); \$('banner_client_sel').selectedIndex=0; return false;\""))."
</div>
<div class='field-spacer e-hideme' id='add-new-client-cont'>
Expand Down Expand Up @@ -504,7 +505,7 @@ function Banner_Change_Details() {
<td>".BNRLAN_32."</td>
<td>
<div class='field-spacer'>
<button class='action' type='button' value='no-value' onclick='e107Helper.toggle(\"banner-repo\")'><span>".BNRLAN_43."</span></button>
<button class='btn button action' type='button' value='no-value' onclick='e107Helper.toggle(\"banner-repo\")'><span>".BNRLAN_43."</span></button>
</div>
<div class='e-hideme' id='banner-repo'>
";
Expand Down Expand Up @@ -651,7 +652,7 @@ function Banner_Change_Details() {
</form>
";

$e107->ns->tablerender(BNRLAN_42.' - '.($sub_action == "edit" ? BNRLAN_22 : BNRLAN_23), $text);
$ns->tablerender(BNRLAN_42.' - '.($sub_action == "edit" ? BNRLAN_22 : BNRLAN_23), $text);

}

Expand Down Expand Up @@ -731,8 +732,8 @@ function Banner_Change_Details() {
}
$text .= "
<div class='field-spacer'>
".$frm->admin_button('check_all', LAN_CHECKALL, 'action')."
".$frm->admin_button('uncheck_all', LAN_UNCHECKALL, 'action')."
".$frm->admin_button('check_all', LAN_CHECKALL, 'other')."
".$frm->admin_button('uncheck_all', LAN_UNCHECKALL, 'other')."
</div>
";
}
Expand Down Expand Up @@ -866,7 +867,7 @@ function saveMe(clid) {
</script>
";
*/
$e107->ns->tablerender(BNRLAN_68, $emessage->render().$text);
$ns->tablerender(BNRLAN_68, $mes->render() . $text);
}


Expand Down Expand Up @@ -894,11 +895,12 @@ function admin_banner_adminmenu()
// Log event to admin log
function banners_adminlog($msg_num='00', $woffle='')
{
global $pref, $admin_log;
global $admin_log;
$pref = e107::getPref();

// if (!varset($pref['admin_log_log']['admin_banners'],0)) return;
$admin_log->log_event('BANNER_'.$msg_num,$woffle,E_LOG_INFORMATIVE,'');
}



?>
8 changes: 4 additions & 4 deletions e107_plugins/banner/languages/English_admin_banner.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
define("BNRLAN_16", "Unlimited");
define("BNRLAN_17", "None");
define("BNRLAN_21", "Ends");
define("BNRLAN_22", "Update Banner"); //FIXME Use Generic
define("BNRLAN_23", "Add New Banner"); //FIXME Use Generic
//define("BNRLAN_22", "Update Banner"); //FIXME Use Generic
//define("BNRLAN_23", "Add New Banner"); //FIXME Use Generic
define("BNRLAN_24", "Campaign");

define("BNRLAN_27", "Client");
Expand Down Expand Up @@ -52,10 +52,10 @@
define("BNRLAN_64", "Banner Updated"); //FIXME Use Generic

define("BANNER_MENU_L1", "Advertisement");
define("BANNER_MENU_L2", "Banner menu configuration saved"); //FIXME Use Generic
//define("BANNER_MENU_L2", "Banner menu configuration saved"); //FIXME Use Generic
define("BANNER_MENU_L3", "Caption");
//define("BANNER_MENU_L5", "Banner Configuration");
define("BANNER_MENU_L6", "choose campaigns to show in menu");
define("BANNER_MENU_L6", "Choose campaigns to show in menu");
//define("BANNER_MENU_L7", "available campaigns");
//define("BANNER_MENU_L8", "selected campaigns");
//define("BANNER_MENU_L9", "remove selection");
Expand Down

0 comments on commit 9547df9

Please sign in to comment.