mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-04-20 20:51:53 +02:00
Code Issues Releases Wiki Activity

Merge pull request #2423 from yesszus/patch-1

Browse Source 
Issue #6 Update lan_notify.php
This commit is contained in:
Cameron 2017-02-13 07:45:05 -08:00 committed by GitHub
commit 0e106a4235
13 changed files with 33 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
e107_admin/eurl.php
View File

@ -275,7 +275,7 @@ class eurl_admin_ui extends e_admin_controller_ui
));
$text .= "<tr class='active'><td><h4>" . $plg->getName() . "</h4></td><td colspan='2'>" . $switch . "</td></tr>";
$text .= "<tr><th>Key</th><th>Regular Expression</th>
$text .= "<tr><th>".LAN_EURL_KEY."</th><th>".LAN_EURL_REGULAR_EXPRESSION."</th>
<th>".LAN_URL."</th>
@ -647,7 +647,7 @@ class eurl_admin_form_ui extends e_admin_form_ui
$text .= '</p>
</div>
<div class="modal-footer">
<a href="#" data-dismiss="modal" class="btn btn-primary">Close</a>
<a href="#" data-dismiss="modal" class="btn btn-primary">'.LAN_CLOSE.'</a>
</div>
</div>';

6
e107_admin/mailout.php
View File

@ -1588,7 +1588,7 @@ class mailout_admin_form_ui extends e_admin_form_ui
$preview = e_SELF."?mode=main&action=preview&id=".$id;
$text .= "<span class='btn-group'>";
$text .= "<a href='".$link."' class='btn btn-default' title='".LAN_MAILOUT_08."'>".E_32_MAIL."</a>";
$text .= "<a rel='external' class='btn btn-default e-modal' data-modal-caption='Email preview' href='".$preview."' title='".LAN_PREVIEW."'>".E_32_SEARCH."</a>";
$text .= "<a rel='external' class='btn btn-default e-modal' data-modal-caption='".LAN_PREVIEW."' href='".$preview."' title='".LAN_PREVIEW."'>".E_32_SEARCH."</a>";
$text .= $this->renderValue('options',$value,$attributes,$id);
@ -1603,7 +1603,7 @@ class mailout_admin_form_ui extends e_admin_form_ui
$text = "<span class='btn-group'>";
$text .= "<a href='".$link."' class='btn btn-default e-modal' data-modal-caption='Recipients for Mail #".$id."' title='".LAN_MAILOUT_173."'>".E_32_USER."</a>";
$text .= "<a rel='external' class='btn btn-default e-modal' data-modal-caption='Email preview' href='".$preview."' title='".LAN_PREVIEW."'>".E_32_SEARCH."</a>";
$text .= "<a rel='external' class='btn btn-default e-modal' data-modal-caption='".LAN_PREVIEW."' href='".$preview."' title='".LAN_PREVIEW."'>".E_32_SEARCH."</a>";
$attributes['readParms']['editClass'] = e_UC_NOBODY;
$text .= $this->renderValue('options',$value,$attributes,$id);
@ -1774,7 +1774,7 @@ class mailout_recipients_form_ui extends e_admin_form_ui
$preview = e_SELF."?mode=main&action=preview&id=".$eid.'&user='.$user;
$text = "<span class='btn-group'>";
$text .= "<a rel='external' class='btn btn-default e-modal' data-modal-caption='Email preview' href='".$preview."' class='btn' title='Preview'>".E_32_SEARCH."</a>";
$text .= "<a rel='external' class='btn btn-default e-modal' data-modal-caption='".LAN_PREVIEW."' href='".$preview."' class='btn' title='".LAN_PREVIEW."'>".E_32_SEARCH."</a>";

2
e107_admin/menus.php
View File

@ -991,7 +991,7 @@ class e_menu_layout
<div class="dropdown pull-right">
<a class="btn btn-default btn-sm e-mm-selector " title="Activate">'.LAN_GO." ".e107::getParser()->toGlyph('fa-chevron-right').'</a>';
<a class="btn btn-default btn-sm e-mm-selector " title="'.LAN_ACTIVATE.'">'.LAN_GO." ".e107::getParser()->toGlyph('fa-chevron-right').'</a>';
$menuButtonLabel = defset("MENLAN_59", "Area [x]");

8
e107_admin/newspost.php
View File

@ -454,7 +454,7 @@ class news_admin_ui extends e_admin_ui
'news_allow_comments' => array('title' => LAN_COMMENTS, 'type' => 'boolean', 'data'=>'int', 'tab'=>2, 'writeParms'=>'inverse=1', 'data' => 'int', 'width' => 'auto', 'thclass' => 'center', 'class' => 'center', 'nosort' => false,'batch'=>true, 'filter'=>true,'readParms'=>'reverse=1'),
'news_comment_total' => array('title' => LAN_NEWS_60, 'type' => 'number', 'data'=>'int', 'tab'=>2, 'noedit'=>true, 'width' => '10%', 'thclass' => '', 'class' => null, 'nosort' => false),
// admin_news_notify
'news_email_notify' => array('title' => LAN_NEWS_103, 'type' => 'checkbox', 'tab'=>2, 'data'=>false, 'writeParms'=>array('show'=>1, 'tdClassRight'=>'form-inline'), 'help'=>'Trigger an email notification when you submit this form.'),
'news_email_notify' => array('title' => LAN_NEWS_103, 'type' => 'checkbox', 'tab'=>2, 'data'=>false, 'writeParms'=>array('show'=>1, 'tdClassRight'=>'form-inline'), 'help'=>LAN_NEWS_109),
'submitted_id' => array('title' => LAN_NEWS_68, 'type' => 'hidden', 'tab'=>2, 'data'=>false, 'writeParms'=>'show=0'),
'options' => array('title' => LAN_OPTIONS, 'type' => null, 'width' => '10%', 'thclass' => 'center last', 'class' => 'center', 'nosort' => true, 'forced' => TRUE)
@ -1174,13 +1174,13 @@ class news_admin_ui extends e_admin_ui
</td>
</tr>";
// TODO LAN
$tab1 .= "
<tr>
<td>News Cache Timeout </td>
<td>".LAN_NEWS_110."</td>
<td>
".$frm->number('news_cache_timeout',varset($pref['news_cache_timeout'],0), 6)."
<div class='field-help'>Time in minutes. Applies only when system cache is enabled.</div>
<div class='field-help'>".LAN_NEWS_111."</div>
</td>
</tr>";

4
e107_admin/notify.php
View File

@ -359,7 +359,7 @@ class plugin_notify_admin_ui extends e_admin_ui
if(isset($this->notify_prefs['event'][$id]['class']) && $this->notify_prefs['event'][$id]['class'] != e_UC_NOBODY)
{
$text .= $frm->button('test['.$id.']', $id, 'confirm', 'Test');
$text .= $frm->button('test['.$id.']', $id, 'confirm', LAN_TEST);
}
@ -939,7 +939,7 @@ class notify_config
if(isset($this->notify_prefs['event'][$id]['class']) && $this->notify_prefs['event'][$id]['class'] != e_UC_NOBODY)
{
$text .= $frm->button('test['.$id.']', $id, 'confirm', 'Test');
$text .= $frm->button('test['.$id.']', $id, 'confirm', LAN_TEST);
}

2
e107_admin/update_routines.php
View File

@ -349,7 +349,7 @@ class e107Update
";
$ns->tablerender("Updates",$mes->render() . $text);
$ns->tablerender(LAN_UPDATES,$mes->render() . $text);
}

2
e107_admin/users.php
View File

@ -268,7 +268,7 @@ class users_admin_ui extends e_admin_ui
*/
protected $disallow = array('create');
protected $tabs = array('Basic', 'Extended');
protected $tabs = array(LAN_BASIC, LAN_EXTENDED);
//TODO - finish 'user' type, set 'data' to all editable fields, set 'noedit' for all non-editable fields
protected $fields = array(

6
e107_handlers/mailout_admin_class.php
View File

@ -1604,10 +1604,10 @@ class mailoutAdminClass extends e107MailManager
// Show the table of advanced options
$text .= "<div class='buttons-bar center'>";
$text .= "<a href='".e_SELF."?mode=main&action=sendnow&id=".$mailMainID."' class='btn btn-primary'>Send Now</a>";
$text .= "<a href='".e_SELF."?mode=main&action=sendnow&id=".$mailMainID."' class='btn btn-primary'>".LAN_MAILOUT_158."</a>";
// $text .= $frm->admin_button('email_sendnow', "Send Now", 'primary');
$text .= $frm->admin_button('email_send', "Send Later");
$text .= $frm->admin_button('email_send', LAN_MAILOUT_269);
// $text .= "<input type='submit' name='email_send' value=\"".LAN_SEND."\" />";
@ -2244,4 +2244,4 @@ class mailoutAdminClass extends e107MailManager
}
?>
?>

4
e107_handlers/notify_class.php
View File

@ -400,8 +400,8 @@ class notify
$template = "<h4><a href='{NEWS_URL}'>{NEWS_TITLE}</a></h4>
<div class='summary'>{NEWS_SUMMARY}</div>
<div class='author'>by {NEWS_AUTHOR}</div>
<div><a class='btn btn-primary' href='{NEWS_URL}'>View now</a></div>
<div class='author'>".LAN_POSTED_BY.": {NEWS_AUTHOR}</div>
<div><a class='btn btn-primary' href='{NEWS_URL}'>".LAN_CLICK_TO_VIEW."</a></div>
";
$shortcodes = array(

21
e107_languages/English/admin/lan_admin.php
View File

@ -239,6 +239,7 @@ Below is the list of files that could potentially be malicious:");
define("LAN_CREATE","Create");
define("LAN_MANAGE","Manage");
define("LAN_UPDATE","Update");
define("LAN_UPDATES", "Updates");
define("LAN_INSTALLED","Installed");//TODO elsewhere
define("LAN_LAST_UPDATED","Last Updated");
define("LAN_UPDATE_AVAILABLE","Update Available");
@ -320,7 +321,7 @@ define("LAN_LANG","Lang.");
define("LAN_APPROVE","Approve");
define("LAN_OPTIONAL", "optional");
define("LAN_INACTIVE","Inactive");
//define("LAN_ACTIVE","Active");//English.php
define("LAN_ACTIVATE","Activate");
define("LAN_ACCEPT","Accept");
define("LAN_PENDING","Pending");
define("LAN_SUBMITTED","Submitted");
@ -385,7 +386,7 @@ define("LAN_PURCHASE", "Purchase ");
define("LAN_DOWN_THEME", "Downloading ");
define("LAN_ID", "ID");
define("LAN_TEST", "Test");
define("LAN_VISIBILITY", "Visibility");
@ -455,7 +456,7 @@ define("LAN_UI_DELETE_LABEL", "Confirm Delete");
define("LAN_UI_DELETE_WARNING", "You are about to delete [x] records. Please confirm to continue.");
define("LAN_UI_BATCH_CREATELINK", "Create Link");
define("LAN_UI_DELETED", "[x] record(s) successfully deleted!");
define("LAN_UI_DELETED_FAILED", "[x] records not found and not deleted!");\
define("LAN_UI_DELETED_FAILED", "[x] records not found and not deleted!");
define("LAN_UI_BATCH_EXPORT", "Export");
define("LAN_UI_USING_DATABASE_TABLE", "Using [x] database table");
@ -478,7 +479,6 @@ define("LAN_CUSTOM_URL", "Custom URL");
define("LAN_CUSTOM_URL_DISABLED", "Disabled or Enter Custom URL");
define("LAN_GENERAL", "General");
//define("LAN_GENERATE", "Generate"); //moved to English php
define("LAN_GEN_PW", "Generate a password");
define("LAN_DISPL_PW", "Display the password");
define("LAN_WILL_OVERWRITE_SEF", "This will overwrite your existing SEF URL.");
@ -486,6 +486,7 @@ define("LAN_WILL_OVERWRITE_SEF", "This will overwrite your existing SEF URL.");
define("LAN_CAPTION", "Caption");
define("LAN_LIMIT", "Limit");
define("LAN_BASIC", "Basic");
define("LAN_EXTENDED", "Extended");
define("LAN_ADVANCED", "Advanced");
define("LAN_FOLDER", "Folder");
define("LAN_PERSONALIZE_ICONS", "Personalize Icons");
@ -493,21 +494,13 @@ define("LAN_PERSONALIZE_MENUS", "Personalize Menus");
define("LAN_LATEST_COMMENTS", "Latest Comments");
define("LAN_COMMENTS_ALLOWED", "Comments Allowed");
define("LAN_PERSONALIZE", "Personalize");
//define("LAN_SELECT_COLUMNS_TO_DISPLAY", "Select columns to display"); // Moved to lan_form_handler.php
//define("LAN_DISPLAY_COLUMNS", "Display Columns"); // Moved to lan_form_handler.php
define("LAN_SETTINGS_NOT_SAVED_NO_CHANGES_MADE", "Settings not saved as no changes were made.");
define("LAN_DASHBOARD_LAYOUT", "Dashboard Layout");
//define("LAN_AFTER_SUBMIT", "After submit:"); // Moved to lan_form_handler.php
define("LAN_UNAVAILABLE", "Unavailable");
//define("LAN_READY_UP_FOLDER_FIELDS", "Ready to use upload form fields, optional - file list view"); // Not used only debug
define("LAN_NO_LABEL_PROVIDED", "No Label Provided");
define("LAN_NOT_FOUND", "Not Found!");
//define("LAN_QUICK_VIEW", "Quick View"); // Moved to lan_form_handler.php
//define("LAN_GO_TO_USER_PROFILE", "Go to user profile"); // Moved to lan_form_handler.php
//define("LAN_MULTI_LANGUAGE_FIELD", "Multi-language field"); // Moved to lan_form_handler.php
//define("LAN_GO_TO_LIST", "go to list"); // Moved to lan_form_handler.php
//define("LAN_CREATE_ANOTHER", "create another"); // Moved to lan_form_handler.php
//define("LAN_EDIT_CURRENT", "edit current"); // Moved to lan_form_handler.php
define("LAN_MAINTENANCE", "Maintenance");
define("LAN_RETURN_TO_FRONT_PANEL", "Return to Front Panel");
define("LAN_CHANGE_LANGUAGE", "Change Language");

3
e107_languages/English/admin/lan_eurl.php
View File

@ -131,4 +131,5 @@ define("LAN_EURL_SYSTEM_REWRITE_DESCR", "URLs for pages like Not Found, Access d
define("LAN_EURL_CORE_INDEX", "Front Page");
define("LAN_EURL_CORE_INDEX_INFO", "Front Page can't have an alias.");
define("LAN_EURL_REBUILD", "Rebuild");
//define("LAN_EURL_", "");
define("LAN_EURL_REGULAR_EXPRESSION", "Regular Expression");
define("LAN_EURL_KEY", "Key");

2
e107_languages/English/admin/lan_mailout.php
View File

@ -289,6 +289,6 @@ define("LAN_MAILOUT_265", "Pending");
define("LAN_MAILOUT_266", "Max Active");
define("LAN_MAILOUT_267", "Generate Public/Private keys");
define("LAN_MAILOUT_268", "Developer Mode Only");
//define("LAN_SUBMIT", "Do it!"); LAN_RUN
define("LAN_MAILOUT_269", "Send Later");
?>

6
e107_languages/English/admin/lan_newspost.php
View File

@ -234,5 +234,7 @@ define("LAN_NEWS_107", "Checking for Ping Status");
//v2.1.4
define("LAN_NEWS_108", "The SEF URL is unlike the title of your news item.");
?>
define("LAN_NEWS_109", "Trigger an email notification when you submit this form.");
define("LAN_NEWS_110", "News Cache Timeout");
define("LAN_NEWS_111", "Time in minutes. Applies only when system cache is enabled.");
?>