mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-01-17 12:48:24 +01:00
Code Issues Releases Wiki Activity

More admin GUI Fixes - mailout, cpage etc.

Browse Source
This commit is contained in:
Cameron 2012-11-27 14:32:40 -08:00
parent 5559602531
commit f1ddcf9781
6 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
e107_admin/cpage.php
View File

@ -500,7 +500,7 @@ class page_admin_ui extends e_admin_ui
<form method='post' action='".e_SELF."?".$e_qry."' id='dataform' enctype='multipart/form-data'>
<fieldset id='core-cpage-create-general'>
<legend".($mode ? " class='e-hideme'" : "").">".CUSLAN_47."</legend>
<table class='adminedit'>
<table class='table adminform'>
<colgroup>
<col class='col-label' />
<col class='col-control' />

4
e107_admin/image.php
View File

@ -962,7 +962,7 @@ class media_admin_ui extends e_admin_ui
</ul>
<fieldset id='core-media-select'>
<legend>Library</legend>
<table class='adminedit'>
<table class='table adminform'>
<tbody><tr><td>
";
@ -1007,7 +1007,7 @@ class media_admin_ui extends e_admin_ui
{
$text .= "<fieldset id='core-media-style'>
<legend>Appearance</legend>
<table class='adminedit'>
<table class='table adminform'>
<colgroup>
<col class='col-label' />
<col class='col-control' />

18
e107_admin/mailout.php
View File

@ -766,7 +766,7 @@ function show_prefs($mailAdmin)
<form method='post' action='".e_SELF."?".e_QUERY."' id='mailsettingsform'>
<fieldset id='mail'>
<legend>".LAN_MAILOUT_110."</legend>
<table class='adminedit'>
<table class='table adminform'>
<colgroup>
<col class='col-label' />
<col class='col-control' />
@ -774,7 +774,7 @@ function show_prefs($mailAdmin)
<tbody>
<tr>
<td>".LAN_MAILOUT_110."<br /></td>
<td>".$frm->admin_button('testemail', LAN_MAILOUT_112)."&nbsp;
<td>".$frm->admin_button('testemail', LAN_MAILOUT_112,'other')."&nbsp;
<input name='testaddress' class='tbox' type='text' size='40' maxlength='80' value=\"".(varset($_POST['testaddress']) ? $_POST['testaddress'] : USEREMAIL)."\" />
</td>
</tr>
@ -930,7 +930,7 @@ function show_prefs($mailAdmin)
$text .= "</table></fieldset>
<fieldset id='core-mail-prefs-bounce'>
<legend>".LAN_MAILOUT_31."</legend>
<table class='adminedit'>
<table class='table adminform'>
<colgroup>
<col class='col-label' />
<col class='col-control' />
@ -953,7 +953,7 @@ function show_prefs($mailAdmin)
</tr></tbody></table>
<table class='adminedit' id='mail_bounce_auto' {$autoDisp}>
<table class='adminform' id='mail_bounce_auto' {$autoDisp}>
<colgroup>
<col class='col-label' />
<col class='col-control' />
@ -979,7 +979,7 @@ function show_prefs($mailAdmin)
// Parameters for mail-account based bounce processing
$text .= "
<table class='adminedit' id='mail_bounce_mail' {$autoMail}>
<table class='table adminform' id='mail_bounce_mail' {$autoMail}>
<colgroup>
<col class='col-label' />
<col class='col-control' />
@ -1007,7 +1007,7 @@ function show_prefs($mailAdmin)
</tbody>
</table></fieldset>
<div class='buttons-bar center'>".$frm->admin_button('updateprefs',LAN_MAILOUT_28)."</div>
<div class='buttons-bar center'>".$frm->admin_button('updateprefs',LAN_MAILOUT_28,'update')."</div>
</form>";
@ -1024,6 +1024,7 @@ function show_maint($debug = FALSE)
{
$mes = e107::getMessage();
$ns = e107::getRender();
$frm = e107::getForm();
$text = "<div style='text-align:center'>";
@ -1038,7 +1039,10 @@ function show_maint($debug = FALSE)
<tbody>";
$text .= "<tr><td>".LAN_MAILOUT_182."</td><td><input class='button' type='submit' name='email_dross' value=\"".LAN_SUBMIT."\" /> <br /><span class='field-help'>".LAN_MAILOUT_252."</span></td></tr>";
$text .= "<tr><td>".LAN_MAILOUT_182."</td><td>
".$frm->admin_button('email_dross','no-value','delete',LAN_SUBMIT)."
<br /><span class='field-help'>".LAN_MAILOUT_252."</span></td></tr>";
$text .= "</tbody></table>\n</fieldset></form></div>";
$ns->tablerender("<div style='text-align:center'>".ADLAN_136." :: ".ADLAN_40."</div>", $mes->render().$text);

3
e107_handlers/form_handler.php
View File

@ -1119,7 +1119,8 @@ class e_form
case 'execute':
$options['class'] .= 'btn-success';
break;
case 'other':
case 'login':
case 'batch':
case 'batch e-hide-if-js': // FIXME hide-js shouldn't be here.

23
e107_handlers/mailout_admin_class.php
View File

@ -489,13 +489,13 @@ class mailoutAdminClass extends e107MailManager
if ($m->mailerEnabled)
{
$tab .= "<li id='tab-main_".$key."'><a href='#main-mail-".$key."'>".$m->mailerName."</a></li>";
$tabc .= "<div id='main-mail-".$key."'>";
$tabc .= "<div id='main-mail-".$key."' style='padding:0px;border-collapse:collapse;'>";
$content = $m->showSelect(TRUE, varset($selectorInfo[$key], FALSE));
if(is_array($content))
{
$tabc .= "<table class='adminform' style='width:100%;margin-left:0px'>
$tabc .= "<table class='table adminform' style='width:100%;margin-left:0px'>
<colgroup span='2'>
<col class='col-label' />
<col class='col-control' />
@ -791,7 +791,7 @@ class mailoutAdminClass extends e107MailManager
$text .= "<div>
<form method='post' action='".e_SELF."?mode=makemail' id='mailout_form'>
".$this->emailSelector('all', varset($mailSource['mail_selectors'], FALSE))."
<table class='adminform'>
<table class='table adminform'>
<colgroup>
<col class='col-label' />
<col class='col-control' />
@ -865,7 +865,8 @@ class mailoutAdminClass extends e107MailManager
}
// TODO File-Picker from Media-Manager.
$text .= "
<tr>
@ -891,8 +892,8 @@ class mailoutAdminClass extends e107MailManager
$text .="
</td></tr>\n
<tr>
<td>&nbsp;</td>
<td>".$frm->bbarea('email_body',$email_body,'mailout','helpb')."</td>
<td colspan='2'>".$frm->bbarea('email_body',$email_body,'mailout','helpb')."</td>
</tr>";
$text .="
@ -904,10 +905,10 @@ class mailoutAdminClass extends e107MailManager
if(e_WYSIWYG)
{
$text .="<span style='vertical-align: super;margin-left:5%;margin-bottom:auto;margin-top:auto'><input type='button' class='button' name='usrname' value=\"".LAN_MAILOUT_16."\" onclick=\"tinyMCE.selectedInstance.execCommand('mceInsertContent',0,'|USERNAME|')\" />
<input type='button' class='button' name='usrlink' value=\"".LAN_MAILOUT_14."\" onclick=\"tinyMCE.selectedInstance.execCommand('mceInsertContent',0,'|DISPLAYNAME|')\" />
<input type='button' class='button' name='usrlink' value=\"".LAN_MAILOUT_17."\" onclick=\"tinyMCE.selectedInstance.execCommand('mceInsertContent',0,'|SIGNUP_LINK|')\" />
<input type='button' class='button' name='usrid' value=\"".LAN_MAILOUT_18."\" onclick=\"tinyMCE.selectedInstance.execCommand('mceInsertContent',0,'|USERID|')\" /></span>";
$text .="<span style='vertical-align: super;margin-left:5%;margin-bottom:auto;margin-top:auto'><input type='button' class='btn button' name='usrname' value=\"".LAN_MAILOUT_16."\" onclick=\"tinyMCE.selectedInstance.execCommand('mceInsertContent',0,'|USERNAME|')\" />
<input type='button' class='btn button' name='usrlink' value=\"".LAN_MAILOUT_14."\" onclick=\"tinyMCE.selectedInstance.execCommand('mceInsertContent',0,'|DISPLAYNAME|')\" />
<input type='button' class='btn button' name='usrlink' value=\"".LAN_MAILOUT_17."\" onclick=\"tinyMCE.selectedInstance.execCommand('mceInsertContent',0,'|SIGNUP_LINK|')\" />
<input type='button' class='btn button' name='usrid' value=\"".LAN_MAILOUT_18."\" onclick=\"tinyMCE.selectedInstance.execCommand('mceInsertContent',0,'|USERID|')\" /></span>";
}
$text .="
@ -927,7 +928,7 @@ class mailoutAdminClass extends e107MailManager
}
else
{
$text .= $frm->admin_button('save_email',LAN_SAVE);
$text .= $frm->admin_button('save_email',LAN_SAVE,'other');
}

2
e107_web/js/core/admin.jquery.js
View File

@ -20,7 +20,7 @@ $(document).ready(function()
// run tips on .field-help
$("input,textarea,select,label,.e-tip").each(function(c) {
$("button,input,textarea,select,label,.e-tip").each(function(c) {
var t = $(this).nextAll(".field-help");
t.hide();