mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-01 20:30:39 +02:00
Code Issues Releases Wiki Activity

Merge pull request #2167 from MikeyGMT/20161218a

Browse Source 
LANS #6 Admin Shortcodes
This commit is contained in:
Cameron
2016-12-20 14:29:56 -08:00
committed by GitHub
parent a3ba724a71 3c81406044
commit 2782dfc157
2 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
e107_core/shortcodes/batch/admin_shortcodes.php
View File

@@ -29,11 +29,11 @@ class admin_shortcodes
if($parm=='alert')
{
$text = 'A new update is ready to install! Click to unzip and install v'.$cacheData.'</a>.
<a class="btn btn-success" href="'.$installUrl.'">Install</a>';
{ //TODO LANVARS
$text = ADLAN_122.' v'.$cacheData.'</a>.
<a class="btn btn-success" href="'.$installUrl.'">'.ADLAN_121.'</a>'; //Install
$mes->addInfo($text);
$mes->addInfo($text);
return; // $mes->render();
}
@@ -41,17 +41,17 @@ class admin_shortcodes
{
return '<ul class="nav navbar pill navbar-nav">
<li class="dropdown">
<a class="dropdown-toggle" title="Messages" role="button" data-toggle="dropdown" href="#">
'.E_16_E107.' <b class="caret"></b>
</a>
<ul class="dropdown-menu" role="menu">
<li class="nav-header dropdown-header navbar-header">Update Available</li>
<li><a href="'.$installUrl.'">e107 v'.$cacheData.'</a></li>
</ul>
</li>
</ul>
';
<li class="dropdown">
<a class="dropdown-toggle" title="'.LAN_MESSAGES.'" role="button" data-toggle="dropdown" href="#">
'.E_16_E107.' <b class="caret"></b>
</a>
<ul class="dropdown-menu" role="menu">
<li class="nav-header dropdown-header navbar-header">'.LAN_UPDATE_AVAILABLE.'</li>
<li><a href="'.$installUrl.'">e107 v'.$cacheData.'</a></li>
</ul>
</li>
</ul>
';
}
@@ -1162,7 +1162,7 @@ class admin_shortcodes
if($emls = $sql->count('mail_recipients', '(*)', "WHERE mail_status = 13"))
{
//$text .= "\n\t\t\t\t\t<div style='padding-bottom: 2px;'>".E_16_FAILEDLOGIN." <a href='".e_ADMIN_ABS."fla.php'>".ADLAN_146.": $flo</a></div>";
$oldconfigs['e-mailout'][0] = array('icon'=>E_16_MAIL, 'title'=>"Pending Mailshots", 'url'=>e_ADMIN_ABS."mailout.php?mode=pending&action=list", 'total'=>$emls);
$oldconfigs['e-mailout'][0] = array('icon'=>E_16_MAIL, 'title'=>ADLAN_167, 'url'=>e_ADMIN_ABS."mailout.php?mode=pending&action=list", 'total'=>$emls);
}

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

@@ -125,7 +125,7 @@ define("ADLAN_119", "Unchecked submitted links");
define("ADLAN_120", "There is a database update available, please click button to install ...");
define("ADLAN_121", "Install");
define("ADLAN_122", "A new update is ready to install! Click to unzip and install v [x]";
//define("ADLAN_123", "Unchecked submitted articles");
//define("ADLAN_124", "Unchecked submitted reviews");
@@ -185,6 +185,7 @@ define("ADLAN_163", "A newer version of an installed plugin is available:");
define("ADLAN_164", "Successfully logged in as [x].");
define("ADLAN_165", "Powered by e107");
define("ADLAN_166", "Return to Website");
define("ADLAN_167", "Pending Mailshots";
// define("ADLAN_CL_1", "Settings");
define("ADLAN_CL_2", "Users");
@@ -226,6 +227,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_UPDATE_AVAILABLE","Update Available";
define("LAN_ADD", "Add");
define("LAN_SAVE","Save");
define("LAN_SAVED","Saved");
@@ -233,6 +235,7 @@ define("LAN_SETSAVED","Your settings have been saved");
define("LAN_NOCHANGE_NOTSAVED", "Nothing changed - not saved");
define("LAN_CONFIRMDEL","Please confirm you wish to delete");
define("LAN_ERRORS", "Errors");
define("LAN_MESSAGES", "Messages");
define("LAN_OPTIONS","Options");
define("LAN_PREFS","Preferences");