1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-01 20:30:39 +02:00

More admin GUI refinements

This commit is contained in:
Cameron
2012-11-26 15:43:42 -08:00
parent d892fb0a85
commit 5e84eaf34d
12 changed files with 142 additions and 137 deletions

View File

@@ -1063,10 +1063,10 @@ class media_admin_ui extends e_admin_ui
$text .= "<div style='text-align:right;padding:5px'>
<button type='submit' class='submit e-dialog-save e-dialog-close' data-target='".$this->getQuery('tagid')."' name='save_image' value='Save it' >
<button type='submit' class='btn btn-success submit e-dialog-save e-dialog-close' data-target='".$this->getQuery('tagid')."' name='save_image' value='Save it' >
<span>Save</span>
</button>
<button type='submit' class='submit e-dialog-close' name='cancel_image' value='Cancel' >
<button type='submit' class='btn submit e-dialog-close' name='cancel_image' value='Cancel' >
<span>Cancel</span>
</button>
</div>";

View File

@@ -473,7 +473,7 @@ else
</tbody>
</table>
<div class='buttons-bar center'>
<button class='update' type='submit' name='update_main' value='no-value'><span>".LAN_UPDATE."</span></button>
".$frm->admin_button('update_main','no-value','update',LAN_UPDATE)."
</div>
</fieldset>
</form>
@@ -485,13 +485,12 @@ else
require_once("footer.php");
function search_adminmenu() {
global $query;
if ($query[0] == '' || $query[0] == 'main') {
$action = "main";
} else if ($query[0] == 'settings') {
$action = "settings";
}
function search_adminmenu()
{
$query = e_QUERY;
$action = vartrue($query,'main');
$var['main']['text'] = SEALAN_41;
$var['main']['link'] = e_SELF;

View File

@@ -526,7 +526,7 @@ class e_media
if($navMode === false)
{
$text .= "<div>Filter: <input type='text' id='media-search' title='Enter some text to filter the results' name='search' value='' class='e-tip' data-target='media-select-container' data-src='".$this->mediaSelectNav($category,"tagid=".$tagid."&bbcode=".$bbcode)."&amp;from=0' />";
$text .= "<input type='button' value='Go' class='e-media-nav' data-target='media-select-container' data-src='".$this->mediaSelectNav($category,"tagid=".$tagid."&bbcode=".$bbcode)."&amp;from=0' /> "; // Manual filter, if onkeyup ajax fails for some reason.
$text .= "<input type='button' value='Go' class='btn btn-primary e-media-nav' data-target='media-select-container' data-src='".$this->mediaSelectNav($category,"tagid=".$tagid."&bbcode=".$bbcode)."&amp;from=0' /> "; // Manual filter, if onkeyup ajax fails for some reason.
// $text .= "<input type='button' value='&laquo;' />"; // see previous page of images.
$text .= "<button title='previous page' class='button e-nav e-media-nav e-tip' data-target='media-select-container' data-nav-total='".$total."' data-nav-dir='down' data-nav-inc='".$limit."' data-src='".$this->mediaSelectNav($category,"tagid=".$tagid."&bbcode=".$bbcode)."&amp;from=0' >&laquo;</button>"; // see next page of images.

View File

@@ -538,7 +538,7 @@ class themeHandler
{
$itext .= "<tr>
<td style='vertical-align:top; width:24%'><b>".TPVLAN_50."</b>:</td>
<td style='vertical-align:top'><table class='fborder' style='margin-left:0px;margin-right:auto' >
<td style='vertical-align:top'><table style='margin-left:0px;margin-right:auto' >
<tr>";
$itext .= ($mode == 1) ? "<td class='fcaption' style='text-align:center;vertical-align:top;'>Default</td>" : "";
$itext .= "
@@ -891,7 +891,7 @@ class themeHandler
$text .= "
<tr><td style='vertical-align:top;'><b>".TPVLAN_22.":</b></td>
<td colspan='2' style='vertical-align:top'>
<table class='table adminlist' style='width:100%' >
<table class='table adminlist' >
<tr>
<td class='center' style='width:10%'>".TPVLAN_55."</td>
<td style='width:20%'>".TPVLAN_52."</td>

View File

@@ -368,15 +368,15 @@ if ($action == "create") {
<form method='post' action='".e_SELF."'>
<fieldset id='core-banner-edit'>
<legend class='e-hideme'>".($sub_action == "edit" ? BNRLAN_22 : BNRLAN_23)."</legend>
<table cellpadding='0' cellspacing='0' class='adminedit'>
<table class='table adminform'>
<colgroup span='2'>
<col class='col-label' />
<col class='col-control' />
</colgroup>
<tbody>
<tr>
<td class='label'>".BNRLAN_24."<div class='label-note'>".BNRLAN_25."</div></td>
<td class='control'>
<td>".BNRLAN_24."<div class='label-note'>".BNRLAN_25."</div></td>
<td>
";
if (count($campaigns)) {
@@ -414,8 +414,8 @@ if ($action == "create") {
</td>
</tr>
<tr>
<td class='label'>".BNRLAN_27."<div class='label-note'>".BNRLAN_28."</div></td>
<td class='control'>
<td>".BNRLAN_27."<div class='label-note'>".BNRLAN_28."</div></td>
<td>
";
if (count($clients)) {
@@ -488,20 +488,20 @@ if ($action == "create") {
</td>
</tr>
<tr>
<td class='label'>".BNRLAN_30."</td>
<td class='control'>
<td>".BNRLAN_30."</td>
<td>
<input class='tbox input-text' type='text' size='30' maxlength='20' id='clientlogin' name='client_login' value='".$_POST['client_login']."' />
</td>
</tr>
<tr>
<td class='label'>".BNRLAN_31."</td>
<td class='control'>
<td>".BNRLAN_31."</td>
<td>
<input class='tbox input-text' type='text' size='30' maxlength='50' id='clientpassword' name='client_password' value='".$_POST['client_password']."' />
</td>
</tr>
<tr>
<td class='label'>".BNRLAN_32."</td>
<td class='control'>
<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>
</div>
@@ -550,21 +550,21 @@ if ($action == "create") {
</td>
</tr>
<tr>
<td class='label'>".BNRLAN_33."</td>
<td class='control'>
<td>".BNRLAN_33."</td>
<td>
<input class='tbox input-text' type='text' size='50' maxlength='150' name='click_url' value='".$_POST['click_url']."' />
</td>
</tr>
<tr>
<td class='label'>".BNRLAN_34."</td>
<td class='control'>
<td>".BNRLAN_34."</td>
<td>
<input class='tbox input-text' type='text' size='10' maxlength='10' name='impressions_purchased' value='".$_POST['impressions_purchased']."' />
<div class='field-help'>0 = ".BNRLAN_35."</div>
</td>
</tr>
<tr>
<td class='label'>".BNRLAN_36."</td>
<td class='control'>
<td>".BNRLAN_36."</td>
<td>
<select name='startday' class='tbox'>
<option value='0'>&nbsp;</option>
";
@@ -595,8 +595,8 @@ if ($action == "create") {
</td>
</tr>
<tr>
<td class='label'>".BNRLAN_37."</td>
<td class='control'>
<td>".BNRLAN_37."</td>
<td>
<select name='endday' class='tbox'>
<option value='0'>&nbsp;</option>
";
@@ -624,8 +624,8 @@ if ($action == "create") {
</td>
</tr>
<tr>
<td class='label'>".MENLAN_4."</td>
<td class='control'>
<td>".MENLAN_4."</td>
<td>
".$e_userclass->uc_dropdown('banner_class', $_POST['banner_active'], 'public,member,guest,admin,classes,nobody,classes')."
</td>
</tr>
@@ -634,16 +634,16 @@ if ($action == "create") {
<div class='buttons-bar center'>
";
if ($sub_action == "edit" && $id) {
$text .= "
<input type='hidden' name='eid' value='".$id."' />
<button class='update' type='submit' name='updatebanner' value='no-value'><span>".BNRLAN_40."</span></button>
";
} else {
$text .= "
<button class='create' type='submit' name='createbanner' value='no-value'><span>".BNRLAN_41."</span></button>
";
if ($sub_action == "edit" && $id)
{
$text .= $frm->admin_button('updatebanner','no-value','create',LAN_UPDATE);
$text .= "<input type='hidden' name='eid' value='".$id."' />";
}
else
{
$text .= $frm->admin_button('createbanner','no-value','create',LAN_CREATE);
}
$text .= "
</div>
</fieldset>
@@ -684,21 +684,21 @@ if ($action == "menu")
<form method='post' action='".e_SELF."?menu' id='menu_conf_form'>
<fieldset id='core-banner-menu'>
<legend class='e-hideme'>".BANNER_MENU_L5."</legend>
<table cellpadding='0' cellspacing='0' class='adminform'>
<table class='table adminform'>
<colgroup span='2'>
<col class='col-label' />
<col class='col-control' />
</colgroup>
<tbody>
<tr>
<td class='label'>".BANNER_MENU_L3.": </td>
<td class='control'>
<td>".BANNER_MENU_L3.": </td>
<td>
<input class='tbox input-text' type='text' name='banner_caption' size='20' value='".$menu_pref['banner_caption']."' maxlength='100' />
</td>
</tr>
<tr>
<td class='label'>".BANNER_MENU_L6."</td>
<td class='control'>
<td>".BANNER_MENU_L6."</td>
<td>
";
//removed by SecretR; Reason - BAD UI, null usability
//".BANNER_MENU_L7."<br />
@@ -744,14 +744,14 @@ if ($action == "menu")
</td>
</tr>
<tr>
<td class='label'>".BANNER_MENU_L19."</td>
<td class='control'>
<td>".BANNER_MENU_L19."</td>
<td>
<input class='tbox input-text' type='text' name='banner_amount' size='10' value='".$menu_pref['banner_amount']."' maxlength='2' />
</td>
</tr>
<tr>
<td class='label'>".BANNER_MENU_L10."</td>
<td class='control'>
<td>".BANNER_MENU_L10."</td>
<td>
<select class='tbox select' id='banner_rendertype' name='banner_rendertype'>
".$frm->option(BANNER_MENU_L11, 0, (empty($menu_pref['banner_rendertype'])))."
".$frm->option("1 - ".BANNER_MENU_L12, 1, ($menu_pref['banner_rendertype'] == "1"))."
@@ -762,8 +762,8 @@ if ($action == "menu")
</tr>
</tbody>
</table>
<div class='buttons-bar center'>
<button class='update' type='submit' name='update_menu' value='no-value'><span>".BANNER_MENU_L18."</span></button>
<div class='buttons-bar center'>".
$frm->admin_button('update_menu','no-value','update',LAN_SAVE)."
</div>
</fieldset>
</form>
@@ -869,13 +869,12 @@ if ($action == "menu")
}
function admin_banner_adminmenu() {
function admin_banner_adminmenu()
{
global $action;
$act = $action;
if ($act == "") {
$act = "main";
}
$qry = e_QUERY;
$act = vartrue($qry,'main');
$var['main']['text'] = BNRLAN_58;
$var['main']['link'] = e_SELF;

View File

@@ -947,8 +947,8 @@ $columnInfo = array(
if(!empty($hook))
{
$text .= "<tr>
<td class='label'>".$hook['caption']."</td>
<td class='control'>".$hook['text']."</td>
<td>".$hook['caption']."</td>
<td>".$hook['text']."</td>
</tr>";
}
}

View File

@@ -470,7 +470,7 @@ function showStartPage()
<form method='get' action='".e_SELF."' id='core-import-form'>
<fieldset id='core-import-select-type'>
<legend class='e-hideme'>".'DBLAN_10'."</legend>
<table class='adminlist'>
<table class='table adminlist'>
<colgroup>
<col />
<col />
@@ -567,7 +567,7 @@ function showImportOptions($mode='csv')
$text = "
<form method='post' action='".e_SELF."?import_type=".$_GET['import_type']."'>
<table class='adminform'>
<table class='table adminform'>
<colgroup>
<col class='col-label' />
<col class='col-control' />

View File

@@ -50,7 +50,7 @@ $lw_context_areas = array(
// Yes, I know its a silly order - but that's history!
$lwaction_vals = array(1=>LWLAN_51, 0=>LWLAN_52, 2=>LWLAN_53, 3=>LWLAN_54);
$frm = e107::getForm();
// Generate dropdown for possible actions on finding a linkword
function lw_act_opts($curval)
{
@@ -204,57 +204,58 @@ else
if (($action == 'words') || ($action == 'edit'))
{
$frm = e107::getForm();
$text = "
<div class='center'>
<form method='post' action='".e_SELF."?words'>
<table style='".ADMIN_WIDTH."' class='fborder'>
<table class='table adminform'>
<colgroup>
<col style='width: 35%; vertical-align:top;' />
<col style='width: 65%; vertical-align:top;' />
<col class='col-label' />
<col class='col-control' />
</colgroup>
<tr>
<td class='forumheader3'>".LWLAN_21."</td>
<td class='forumheader3'>
<td>".LWLAN_21."</td>
<td>
<input class='tbox' type='text' name='linkword_word' size='40' value='".$linkword_word."' maxlength='100' />
</td>
</tr>
<tr>
<td class='forumheader3'>".LWLAN_6."</td>
<td class='forumheader3'>
<td>".LWLAN_6."</td>
<td>
<input class='tbox' type='text' name='linkword_link' size='60' value='".$linkword_link."' maxlength='250' /><br />
<input type='checkbox' name='linkword_newwindow' value='1'{$chkNewWindow} />".LWLAN_55."
</td>
</tr>
<tr>
<td class='forumheader3'>".LWLAN_50."</td>
<td class='forumheader3'>
<td>".LWLAN_50."</td>
<td>
<textarea rows='3' cols='80' class='tbox' name='linkword_tooltip'>".$linkword_tooltip."</textarea>
</td>
</tr>
<tr>
<td class='forumheader3'>".LWLAN_62."</td>
<td class='forumheader3'>
<td>".LWLAN_62."</td>
<td>
<input class='tbox' type='text' name='linkword_tip_id' size='10' value='".$linkword_tip_id."' maxlength='10' /> ".LWLAN_63."
</td>
</tr>
<tr>
<td class='forumheader3'>".LWLAN_22."</td>
<td style='text-align:left' class='forumheader3'><select class='tbox' name='linkword_active'>".lw_act_opts($linkword_active).
<td>".LWLAN_22."</td>
<td style='text-align:left'><select class='tbox' name='linkword_active'>".lw_act_opts($linkword_active).
"</select>
</td>
</tr>
<tr>
<td colspan='2' style='text-align:center' class='forumheader'>".
(defined("LW_EDIT") ? "<input class='button' type='submit' name='update_linkword' value='".LWLAN_15."' /><input type='hidden' name='lw_edit_id' value='{$id}' />" : "<input class='button' type='submit' name='submit_linkword' value='".LWLAN_14."' />")."
</td>
</tr>
</table>
<div class='buttons-bar center'>
".
(defined("LW_EDIT") ? $frm->admin_button('update_linkword','no-value','update',LAN_UPDATE) . "<input type='hidden' name='lw_edit_id' value='{$id}' />" : $frm->admin_button('submit_linkword','no-value','submit',LAN_CREATE))."
</div>
</form>
</div>\n";
@@ -275,7 +276,7 @@ if (($action == 'words') || ($action == 'edit'))
{
$text = "
<div class='center'>
<table style='".ADMIN_WIDTH."' class='fborder'>
<table class='table adminform'>
<colgroup>
<col style='width: 5%; vertical-align:top;' />
<col style='width: 15%; vertical-align:top;' />
@@ -286,28 +287,28 @@ if (($action == 'words') || ($action == 'edit'))
<col style='width: 10%; vertical-align:top; text-align: center;' />
<col style='width: 15%; vertical-align:top; text-align: center;' />
</colgroup> <tr>
<td class='forumheader'>".LWLAN_61."</td>
<td class='forumheader'>".LWLAN_5."</td>
<td class='forumheader'>".LWLAN_6."</td>
<td class='forumheader'>".LWLAN_56."</td>
<td class='forumheader'>".LWLAN_50."</td>
<td class='forumheader'>".LWLAN_60."</td>
<td class='forumheader'>".LWLAN_7."</td>
<td class='forumheader'>".LWLAN_8."</td>
<td>".LWLAN_61."</td>
<td>".LWLAN_5."</td>
<td>".LWLAN_6."</td>
<td>".LWLAN_56."</td>
<td>".LWLAN_50."</td>
<td>".LWLAN_60."</td>
<td>".LWLAN_7."</td>
<td>".LWLAN_8."</td>
</tr>\n";
while($row = $sql -> db_Fetch())
{
$text .= "
<tr>
<td class='forumheader'>{$row['linkword_id']}</td>
<td class='forumheader'>{$row['linkword_word']}</td>
<td class='forumheader'>{$row['linkword_link']}</td>
<td class='forumheader'>".($row['linkword_newwindow'] ? LAN_YES : LAN_NO)."</td>
<td class='forumheader'>{$row['linkword_tooltip']}</td>
<td class='forumheader'>".($row['linkword_tip_id'] > 0 ? $row['linkword_tip_id'] : '')."</td>
<td class='forumheader' >".$lwaction_vals[$row['linkword_active']]."</td>
<td class='forumheader' >
<td>{$row['linkword_id']}</td>
<td>{$row['linkword_word']}</td>
<td>{$row['linkword_link']}</td>
<td>".($row['linkword_newwindow'] ? LAN_YES : LAN_NO)."</td>
<td>{$row['linkword_tooltip']}</td>
<td>".($row['linkword_tip_id'] > 0 ? $row['linkword_tip_id'] : '')."</td>
<td >".$lwaction_vals[$row['linkword_active']]."</td>
<td >
<form action='".e_SELF."' method='post' id='myform_{$row['linkword_id']}' onsubmit=\"return jsconfirm('".LWLAN_18." [ID: {$row['linkword_id']} ]')\">
<div>
<input class='button' type='button' onclick=\"document.location='".e_SELF."?edit.{$row['linkword_id']}'\" value='".LWLAN_16."' id='edit_{$row['linkword_id']}' name='edit_linkword_id' />
@@ -333,57 +334,55 @@ if ($action=='options')
$menu_pages = str_replace("|", "\n", $menu_pages);
$AjaxEnable = varset($pref['lw_ajax_enable'],0);
$text = "
<div class='center'>
<div>
<form method='post' action='".e_SELF."?options'>
<table style='".ADMIN_WIDTH."' class='fborder'>
<table class='table adminform'>
<colgroup>
<col style='width: 30%; vertical-align:top;' />
<col style='width: 40%; vertical-align:top;' />
<col style='width: 30%; vertical-align:top;' />
</colgroup>
<tr>
<td class='forumheader3'>".LWLAN_26."</td>
<td class='forumheader3'>";
<td>".LWLAN_26."</td>
<td>";
foreach ($lw_context_areas as $lw_key=>$lw_desc)
{
$checked = $pref['lw_context_visibility'][$lw_key] ? "checked='checked'" : '';
$text .= "<input type='checkbox' name='lw_visibility_area[]' value='{$lw_key}' {$checked} />{$lw_desc}<br />";
}
$text .= "</td>
<td class='forumheader3'>".LWLAN_27."</td>
<td>".LWLAN_27."</td>
</tr>
<tr>
<td class='forumheader3'>".LWLAN_28."</td>
<td class='forumheader3'><textarea rows='5' cols='60' class='tbox' name='linkword_omit_pages' >".$menu_pages."</textarea>
<td>".LWLAN_28."</td>
<td><textarea rows='5' cols='60' class='tbox' name='linkword_omit_pages' >".$menu_pages."</textarea>
</td>
<td class='forumheader3'>".LWLAN_29."</td>
<td>".LWLAN_29."</td>
</tr>";
$checked = varset($pref['lw_ajax_enable'],0) ? 'checked=checked' : '';
$text .= "
<tr>
<td class='forumheader3'>".LWLAN_59."</td>
<td class='forumheader3'><input type='checkbox' name='lw_ajax_enable' {$checked} />
<td>".LWLAN_59."</td>
<td><input type='checkbox' name='lw_ajax_enable' {$checked} />
</td>
<td class='forumheader3'>".""."</td>
<td>".""."</td>
</tr>";
$checked = varset($pref['lw_notsamepage'],0) ? 'checked=checked' : '';
$text .= "
<tr>
<td class='forumheader3'>".LWLAN_64."</td>
<td class='forumheader3'><input type='checkbox' name='lw_notsamepage' {$checked} />
<td>".LWLAN_64."</td>
<td><input type='checkbox' name='lw_notsamepage' {$checked} />
</td>
<td class='forumheader3'>".LWLAN_65."</td>
<td>".LWLAN_65."</td>
</tr>
<tr>
<td colspan='3' style='text-align:center' class='forumheader'>
<input class='button' type='submit' name='saveopts_linkword' value='".LWLAN_30."' />
</td>
</tr>
</table>
<div class='buttons-bar center'>
".$frm->admin_button('saveopts_linkword','no-value','submit',LWLAN_30)."
</div>
</form>
</div>\n";

View File

@@ -194,7 +194,7 @@ function poll_list()
if ($poll_total = $sql->db_Select("polls", "*", "poll_type=1"))
{
$text .= "<table class='adminlist' cellpadding='0' cellspacing='0'>";
$text .= "<table class='table adminlist'>";
$text .= $frm->colGroup($fields,$fieldpref).
$frm->thead($fields,$fieldpref);
$text .= "<tbody>";
@@ -237,10 +237,10 @@ function poll_list()
function admin_config_adminmenu()
{
$action = varset($_GET['mode']) ? $_GET['mode'] : "list";
$var['list']['text'] = POLLAN_1;
$var['list']['text'] = LAN_EXISTING;
$var['list']['link'] = e_SELF;
$var['list']['perm'] = "P";
$var['create']['text'] = POLLAN_2 ;
$var['create']['text'] = LAN_CREATE ;
$var['create']['link'] = e_SELF."?mode=create";
$var['create']['perm'] = "P";
/* $var['import']['text'] = GSLAN_23;

View File

@@ -491,6 +491,8 @@ class poll
function renderPollForm($mode='admin')
{
$tp = e107::getParser();
$frm = e107::getForm();
//TODO Hardcoded FORUM code needs to be moved somewhere.
if ($mode == 'forum')
{
@@ -550,8 +552,8 @@ class poll
$text = "<div style='text-align:center'>
<form method='post' action='{$formgo}'>
<table class='adminform' cellpadding='0' cellspacing='0'>
<colgroup span='2'>
<table class='table adminform'>
<colgroup>
<col class='col-label' />
<col class='col-control' />
</colgroup>
@@ -631,14 +633,20 @@ class poll
}
else
{
$text .= "<input class='button' type='submit' name='submit' value='".POLLAN_23."' /> ";
$text .= $frm->admin_button('submit','no-value','submit',POLLAN_23);
// $text .= "<input class='button' type='submit' name='submit' value='".POLLAN_23."' /> ";
}
} else {
$text .= "<input class='button' type='submit' name='preview' value='".POLLAN_24."' /> ";
}
else
{
$text .= $frm->admin_button('preview','no-value','preview',POLLAN_24);
// $text .= "<input class='button' type='submit' name='preview' value='".POLLAN_24."' /> ";
}
if (defset('POLLID')) {
$text .= "<input class='button' type='submit' name='reset' value='".POLLAN_25."' /> ";
if (defset('POLLID'))
{
$text .= $frm->admin_button('reset','no-value','reset',POLLAN_25);
// $text .= "<input class='button' type='submit' name='reset' value='".POLLAN_25."' /> ";
}
$text .= "</div>

View File

@@ -302,8 +302,8 @@ class tinymce
{
$text .= "
<tr>
<td class='label'>".$att['title']."</td>
<td class='control'>".$this->renderElement($key,$row)."</td>
<td>".$att['title']."</td>
<td>".$this->renderElement($key,$row)."</td>
</tr>";
}
@@ -470,15 +470,15 @@ class tinymce
</colgroup>
<tbody>
<tr>
<td class='label'>".CUSLAN_29."</td>
<td class='control'>
<td>".CUSLAN_29."</td>
<td>
".$frm->radio_switch('listPages', $pref['listPages'])."
</td>
</tr>
<tr>
<td class='label'>".CUSLAN_30."</td>
<td class='control'>
<td>".CUSLAN_30."</td>
<td>
".$frm->text('pageCookieExpire', $pref['pageCookieExpire'], 10)."
</td>
</tr>

View File

@@ -32,7 +32,7 @@
td.center { text-align:center }
.col-label {
width:40%;
width:30%;
}
.sidebar-nav {