mirror of
https://github.com/e107inc/e107.git
synced 2025-04-21 21:21:54 +02:00
Merge pull request #1816 from MikeyGMT/master
#6 Info Panel + User Admin Text to LANS
This commit is contained in:
Cameron
GitHub
commit
82b1415424
@ -209,11 +209,11 @@ class adminstyle_infopanel
|
||||
// ------------------------------- e107 News --------------------------------
|
||||
|
||||
$newsTabs = array();
|
||||
$newsTabs['coreFeed'] = array('caption'=>'General','text'=>"<div id='e-adminfeed' style='min-height:300px'></div><div class='right'><a rel='external' href='".ADMINFEEDMORE."'>".LAN_MORE."</a></div>");
|
||||
$newsTabs['pluginFeed'] = array('caption'=>'Plugins','text'=>"<div id='e-adminfeed-plugin'></div>");
|
||||
$newsTabs['themeFeed'] = array('caption'=>'Themes','text'=>"<div id='e-adminfeed-theme'></div>");
|
||||
$newsTabs['coreFeed'] = array('caption'=>LAN_GENERAL,'text'=>"<div id='e-adminfeed' style='min-height:300px'></div><div class='right'><a rel='external' href='".ADMINFEEDMORE."'>".LAN_MORE."</a></div>");
|
||||
$newsTabs['pluginFeed'] = array('caption'=>LAN_PLUGIN,'text'=>"<div id='e-adminfeed-plugin'></div>");
|
||||
$newsTabs['themeFeed'] = array('caption'=>LAN_THEMES,'text'=>"<div id='e-adminfeed-theme'></div>");
|
||||
|
||||
$text2 = $ns->tablerender("Latest e107 News",e107::getForm()->tabs($newsTabs, array('active'=>'coreFeed')),"core-infopanel_news",true);
|
||||
$text2 = $ns->tablerender(LAN_LATEST_e107_NEWS,e107::getForm()->tabs($newsTabs, array('active'=>'coreFeed')),"core-infopanel_news",true);
|
||||
|
||||
|
||||
|
||||
@ -226,7 +226,7 @@ class adminstyle_infopanel
|
||||
|
||||
|
||||
|
||||
$text2 .= $ns->tablerender("Website Status", $this->renderWebsiteStatus(),"",true);
|
||||
$text2 .= $ns->tablerender(LAN_WEBSITE_STATUS, $this->renderWebsiteStatus(),"",true);
|
||||
|
||||
|
||||
// $text .= $ns->tablerender(ADLAN_LAT_1,$tp->parseTemplate("{ADMIN_LATEST=norender}"),"core-infopanel_latest",true);
|
||||
@ -352,8 +352,8 @@ class adminstyle_infopanel
|
||||
*/
|
||||
|
||||
$tab = array();
|
||||
$tab['e-stats'] = array('caption'=>$tp->toGlyph('fa-signal').' Stats', 'text'=>$this->renderChart());
|
||||
$tab['e-online'] = array('caption'=>$tp->toGlyph('fa-user').' Online ('.$this->renderOnlineUsers('count').')', 'text'=>$this->renderOnlineUsers());
|
||||
$tab['e-stats'] = array('caption'=>$tp->toGlyph('fa-signal').' '.LAN_STATS, 'text'=>$this->renderChart());
|
||||
$tab['e-online'] = array('caption'=>$tp->toGlyph('fa-user').' '.LAN_ONLINE.' ('.$this->renderOnlineUsers('count').')', 'text'=>$this->renderOnlineUsers());
|
||||
|
||||
|
||||
|
||||
@ -401,19 +401,18 @@ class adminstyle_infopanel
|
||||
$panelOnline .= (!empty($multilan)) ? "<col style='width: auto' />" : "";
|
||||
|
||||
|
||||
// TODO LAN
|
||||
$panelOnline .= "
|
||||
|
||||
</colgroup>
|
||||
<thead>
|
||||
<tr class='first'>
|
||||
<th>Timestamp</th>
|
||||
<th>Username</th>
|
||||
<th>IP</th>
|
||||
<th>Page</th>
|
||||
<th class='center'>Agent</th>";
|
||||
<th>".LAN_TIMESTAMP."</th>
|
||||
<th>".LAN_USER."</th>
|
||||
<th>".LAN_IP."</th>
|
||||
<th>".LAN_PAGE."</th>
|
||||
<th class='center'>".LAN_AGENT."</th>";
|
||||
|
||||
$panelOnline .= (!empty($multilan)) ? "<th class='center'>Lang.</th>" : "";
|
||||
$panelOnline .= (!empty($multilan)) ? "<th class='center'>".LAN_LANG."</th>" : "";
|
||||
|
||||
$panelOnline .= "
|
||||
</tr>
|
||||
@ -531,15 +530,14 @@ class adminstyle_infopanel
|
||||
<li id='comment-".$row['comment_id']."' class='media".$hide."'>
|
||||
<span class='media-object pull-left'>{USER_AVATAR=".$row['comment_author_id']."}</span>
|
||||
<div class='btn-group pull-right'>
|
||||
<button data-target='".e_BASE."comment.php' data-comment-id='".$row['comment_id']."' data-comment-action='delete' class='btn btn-sm btn-mini btn-danger'><i class='icon-remove'></i> Delete</button>
|
||||
<button data-target='".e_BASE."comment.php' data-comment-id='".$row['comment_id']."' data-comment-action='approve' class='btn btn-sm btn-mini btn-success'><i class='icon-ok'></i> Approve</button>
|
||||
<button data-target='".e_BASE."comment.php' data-comment-id='".$row['comment_id']."' data-comment-action='delete' class='btn btn-sm btn-mini btn-danger'><i class='icon-remove'></i> ".LAN_DELETE."</button>
|
||||
<button data-target='".e_BASE."comment.php' data-comment-id='".$row['comment_id']."' data-comment-action='approve' class='btn btn-sm btn-mini btn-success'><i class='icon-ok'></i> ".LAN_APPROVE."</button>
|
||||
</div>
|
||||
<div class='media-body'><small class='muted smalltext'>Posted by {USERNAME} {TIMEDATE=relative}</small><br />
|
||||
<div class='media-body'>
|
||||
<small class='muted smalltext'>".LAN_POSTED_BY_X."</small><br />
|
||||
<p>{COMMENT}</p>
|
||||
</div>
|
||||
</li>";
|
||||
|
||||
//TODO LAN for 'Posted by [x] ';
|
||||
|
||||
$sc->setVars($row);
|
||||
$text .= $tp->parseTemplate($TEMPLATE,true,$sc);
|
||||
@ -550,7 +548,7 @@ class adminstyle_infopanel
|
||||
$text .= '
|
||||
</ul>
|
||||
<div class="right">
|
||||
<a class="btn btn-xs btn-mini btn-primary text-right" href="'.e_ADMIN.'comment.php?searchquery=&filter_options=comment_blocked__2">View all</a>
|
||||
<a class="btn btn-xs btn-mini btn-primary text-right" href="'.e_ADMIN.'comment.php?searchquery=&filter_options=comment_blocked__2">'.LAN_VIEW_ALL.'</a>
|
||||
</div>
|
||||
';
|
||||
// $text .= "<small class='text-center text-warning'>Note: Not fully functional at the moment.</small>";
|
||||
|
||||
@ -533,11 +533,12 @@ class users_admin_ui extends e_admin_ui
|
||||
$update['data']['user_extended_id'] = intval($new_data['submit_value']);
|
||||
if(e107::getDb()->insert('user_extended', $update))
|
||||
{
|
||||
e107::getMessage()->addSuccess('Extended Fields Updated'); //TODO Replace with Generic or existing LAN.
|
||||
// e107::getMessage()->addSuccess(LAN_UPDATED.': '.ADLAN_78); // not needed see pull/1816
|
||||
e107::getMessage()->addDebug(LAN_UPDATED.': '.ADLAN_78); // let's put it in debug instead
|
||||
}
|
||||
else
|
||||
{
|
||||
e107::getMessage()->addError('Extended Fields Insert Failed'); //TODO Replace with Generic or existing LAN.
|
||||
e107::getMessage()->addError(LAN_UPDATED_FAILED.': '.ADLAN_78);
|
||||
$error = e107::getDb()->getLastErrorText();
|
||||
e107::getMessage()->addDebug($error);
|
||||
e107::getMessage()->addDebug(print_a($update,true));
|
||||
@ -552,7 +553,7 @@ class users_admin_ui extends e_admin_ui
|
||||
|
||||
if(e107::getDb()->update('user_extended',$update)===false)
|
||||
{
|
||||
e107::getMessage()->addError('Extended Fields Update Failed'); //TODO Replace with Generic or existing LAN.
|
||||
e107::getMessage()->addError(LAN_UPDATED_FAILED.': '.ADLAN_78);
|
||||
$error = e107::getDb()->getLastErrorText();
|
||||
e107::getMessage()->addDebug($error);
|
||||
e107::getMessage()->addDebug(print_a($update,true));
|
||||
@ -560,7 +561,8 @@ class users_admin_ui extends e_admin_ui
|
||||
}
|
||||
else
|
||||
{
|
||||
// e107::getMessage()->addSuccess('Extended Fields Updated'); //TODO Replace with Generic or existing LAN.
|
||||
// e107::getMessage()->addSuccess(LAN_UPDATED.': '.ADLAN_78); // not needed pull/1816
|
||||
e107::getMessage()->addDebug(LAN_UPDATED.': '.ADLAN_78); // let's put it in debug instead
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -780,8 +782,8 @@ class users_admin_ui extends e_admin_ui
|
||||
$this->redirect('list', 'main', true);
|
||||
}
|
||||
|
||||
// TODO - lan
|
||||
if(!$sysuser->getId()) e107::getMessage()->addError('User not found.');
|
||||
|
||||
if(!$sysuser->getId()) e107::getMessage()->addError(LAN_USER_NOT_FOUND);
|
||||
}
|
||||
|
||||
public function LogoutasPage()
|
||||
@ -1717,7 +1719,7 @@ class users_admin_ui extends e_admin_ui
|
||||
e107::getDb()->insert('generic', $tmp);
|
||||
}
|
||||
|
||||
e107::getMessage()->addSuccess(LAN_UPDATED);
|
||||
e107::getMessage()->addSuccess(LAN_UPDATED); //XXX maybe not needed see pull/1816
|
||||
e107::getCache()->clear_sys('nomd5_user_ranks');
|
||||
}
|
||||
|
||||
|
||||
@ -263,9 +263,13 @@ define("LAN_TIME","Time");
|
||||
define("LAN_EMPTY","There are no entries in the database yet");
|
||||
define("LAN_EXISTING","Existing Entries");
|
||||
|
||||
|
||||
define("LAN_CONFDELETE","Confirm Delete");
|
||||
define("LAN_PLUGIN","Plugin");
|
||||
define("LAN_THEMES","Themes");
|
||||
define("LAN_LATEST_e107_NEWS","Latest e107 News");
|
||||
define("LAN_WEBSITE_STATUS","Website Status");
|
||||
define("LAN_STATS","Stats");
|
||||
define("LAN_ONLINE","Online");
|
||||
define("LAN_ORDER","Order");
|
||||
|
||||
define("LAN_SELECT","Select ...");
|
||||
@ -273,12 +277,20 @@ define("LAN_ADMIN","Admin");
|
||||
define("LAN_DISPLAYOPT", "Edit Display Options");
|
||||
// define("LAN_GOPAGE", "Go to page:");
|
||||
define("LAN_DATESTAMP","Date stamp");
|
||||
define("LAN_TIMESTAMP","Timestamp");
|
||||
define("LAN_IP","IP");
|
||||
define("LAN_PAGE","PAGE");
|
||||
define("LAN_AGENT","AGENT");
|
||||
define("LAN_LANG","Lang.");
|
||||
define("LAN_APPROVE","Approve");
|
||||
define("LAN_OPTIONAL", "optional");
|
||||
define("LAN_INACTIVE","Inactive");
|
||||
define("LAN_ACTIVE","Active");
|
||||
define("LAN_ACCEPT","Accept");
|
||||
define("LAN_PENDING","Pending");
|
||||
define("LAN_SUBMITTED","Submitted");
|
||||
define("LAN_POSTED_BY_X","Posted by {USERNAME} {TIMEDATE=relative}");
|
||||
define("LAN_VIEW_ALL","View All");
|
||||
|
||||
define("LAN_BAN","Ban");
|
||||
|
||||
@ -408,6 +420,7 @@ define("LAN_UI_TOTAL_RECORDS", "Total Records: [x]");
|
||||
define("LAN_USER_MANAGEALL", "Manage all User, Userclass and Extended User-Field settings");
|
||||
define("LAN_USER_LIST", "User List");
|
||||
define("LAN_USER_QUICKADD","Quick Add User");
|
||||
define("LAN_USER_NOT_FOUND","User Not Found.");
|
||||
define("LAN_USER_PRUNE", "Prune Users");
|
||||
define("LAN_USER_OPTIONS", "User Options");
|
||||
define("LAN_USER_RANKS", "User Ranks");
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user