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

Moved server details to 'credits' page. (to be renamed)

Browse Source
This commit is contained in:
Cameron 2013-02-21 17:38:26 -08:00
parent e7b30285eb
commit 63fcad1d51
5 changed files with 159 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
e107_admin/credits.php
View File

@ -37,7 +37,7 @@ e107::css('inline',$css);
require_once(e_ADMIN."auth.php");
$text ='<div class="wrapper">
$text .='<div class="wrapper">
<div class="wrapper-middle">
<div class="credits-content">
<h1>v2+ Developers</h1>

125
e107_admin/includes/infopanel.php
View File

@ -208,8 +208,129 @@ EOF;
//require_once (e_CORE."shortcodes/batch/admin_shortcodes.php");
e107::getScBatch('admin');
$text .= $ns->tablerender(ADLAN_LAT_1,$tp->parseTemplate("{ADMIN_LATEST=norender}"),"core-infopanel_latest",true);
$text .= $ns->tablerender(LAN_STATUS,$tp->parseTemplate("{ADMIN_STATUS=norender}"),"core-infopanel_latest",true);
/*
$dashboard = '
<div class="tab-header">
<span class="pull-right">
<span class="options">
<div class="btn-group">
<a class="dropdown-toggle" data-toggle="dropdown"><i class="icon-cog"></i></a>
<ul class="dropdown-menu black-box-dropdown dropdown-left">
<li><a href="#">Action</a></li>
<li><a href="#">Another action</a></li>
<li><a href="#">Something else here</a></li>
<li class="divider"></li>
<li><a href="#">Separated link</a></li>
</ul>
</div>
</span>
</span>
</div>
<ul class="nav nav-tabs">
<li class=""><a href="#tab1" data-toggle="tab"><i class="icon-globe"></i> Stats</a></li>
<li class="active"><a href="#tab2" data-toggle="tab"><i class="icon-hdd"></i> Online</a></li>
</ul>
<div class="tab-content">
<div class="tab-pane" id="tab1">
<div class="separator">
<div class="inner-well clearfix">
<div class="pull-left">
Antivirus status
</div>
<div class="pull-right">
<input rel="confirm-check" id="VKZp4" class="checky" checked="checked" type="checkbox">
<label for="VKZp4" class="checky"><span></span></label>
</div>
</div>
<div class="inner-well clearfix">
<div class="pull-left">
Proxy server status
</div>
<div class="pull-right">
<input rel="confirm-check" id="FNNqp" class="checky" type="checkbox">
<label for="FNNqp" class="checky"><span></span></label>
</div>
</div>
</div>
<div class="separator">
<div class="inner-well">
<div id="stats1" style="width: 100%; height: 100px; padding: 0px; position: relative;"><canvas height="100" width="100" class="base"></canvas><canvas style="position: absolute; left: 0px; top: 0px;" height="100" width="100" class="overlay"></canvas><div class="tickLabels" style="font-size:smaller"><div class="xAxis x1Axis" style="color:#fff"><div class="tickLabel" style="position:absolute;text-align:center;left:-5px;top:100px;width:25px">Dec</div><div class="tickLabel" style="position:absolute;text-align:center;left:27px;top:100px;width:25px">Jan</div><div class="tickLabel" style="position:absolute;text-align:center;left:59px;top:100px;width:25px">Feb</div></div><div class="yAxis y1Axis" style="color:#fff"><div class="tickLabel" style="position:absolute;text-align:right;top:88px;right:100px;width:0px">0</div><div class="tickLabel" style="position:absolute;text-align:right;top:67px;right:100px;width:0px">1000</div><div class="tickLabel" style="position:absolute;text-align:right;top:46px;right:100px;width:0px">2000</div><div class="tickLabel" style="position:absolute;text-align:right;top:25px;right:100px;width:0px">3000</div><div class="tickLabel" style="position:absolute;text-align:right;top:4px;right:100px;width:0px">4000</div></div></div></div>
</div>
</div>
</div>
<div class="tab-pane active" id="tab2">
<div class="separator">
<div class="inner-well">
<div id="stats2" style="width: 100%; height: 100px; padding: 0px; position: relative;"><canvas height="100" width="532" class="base"></canvas><canvas style="position: absolute; left: 0px; top: 0px;" height="100" width="532" class="overlay"></canvas><div class="tickLabels" style="font-size:smaller"><div class="xAxis x1Axis" style="color:#fff"><div class="tickLabel" style="position:absolute;text-align:center;left:-7px;top:87px;width:76px">Dec 1</div><div class="tickLabel" style="position:absolute;text-align:center;left:80px;top:87px;width:76px">Dec 16</div><div class="tickLabel" style="position:absolute;text-align:center;left:172px;top:87px;width:76px">Jan 1</div><div class="tickLabel" style="position:absolute;text-align:center;left:259px;top:87px;width:76px">Jan 16</div><div class="tickLabel" style="position:absolute;text-align:center;left:351px;top:87px;width:76px">Feb 1</div><div class="tickLabel" style="position:absolute;text-align:center;left:432px;top:87px;width:76px">Feb 15</div></div><div class="yAxis y1Axis" style="color:#fff"><div class="tickLabel" style="position:absolute;text-align:right;top:69px;right:508px;width:24px">0</div><div class="tickLabel" style="position:absolute;text-align:right;top:51px;right:508px;width:24px">1000</div><div class="tickLabel" style="position:absolute;text-align:right;top:33px;right:508px;width:24px">2000</div><div class="tickLabel" style="position:absolute;text-align:right;top:15px;right:508px;width:24px">3000</div><div class="tickLabel" style="position:absolute;text-align:right;top:-2px;right:508px;width:24px">4000</div></div></div></div>
</div>
</div>
<div class="separator">
<div class="inner-well clearfix">
<div class="pull-left">
Antivirus status
</div>
<div class="pull-right">
<input rel="confirm-check" id="GhVm3" class="checky" checked="checked" type="checkbox">
<label for="GhVm3" class="checky"><span></span></label>
</div>
</div>
<div class="inner-well clearfix">
<div class="pull-left">
Proxy server status
</div>
<div class="pull-right">
<input rel="confirm-check" id="mxaz8" class="checky" type="checkbox">
<label for="mxaz8" class="checky"><span></span></label>
</div>
</div>
</div>
<div class="padded">
<div id="fix-stats2">
<p>
<a rel="action" class="button mini rounded inset light-gray">Delete stats</a>
</p>
<div style="display: none;" rel="confirm-action">
<div class="inner-well clearfix">
<b>Are you sure?</b>
<div class="pull-right">
<input rel="confirm-check" id="gtnDu" class="checky" type="checkbox">
<label for="gtnDu" class="checky green"><span></span></label>
</div>
</div>
<div class="clearfix vpadded">
<div class="pull-left">
<a style="display: none;" href="#" class="button red" rel="confirm-do">Delete</a>
</div>
<div class="pull-right">
<a href="#" class="button gray" rel="confirm-cancel">Cancel</a>
</div>
</div>
</div>
</div>
</div>
</div>
</div>';
$text .= $ns->tablerender("Website Status",$dashboard,"",true);
*/
// $text .= $ns->tablerender(ADLAN_LAT_1,$tp->parseTemplate("{ADMIN_LATEST=norender}"),"core-infopanel_latest",true);
// $text .= $ns->tablerender(LAN_STATUS,$tp->parseTemplate("{ADMIN_STATUS=norender}"),"core-infopanel_latest",true);
/*
$text .= "<li class='span6'>

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

@ -305,6 +305,12 @@ class admin_shortcodes
function sc_admin_latest($parm)
{
if($parm == 'infopanel' && e_PAGE != 'admin.php')
{
return;
}
if (ADMIN) {
if (!function_exists('admin_latest'))
{
@ -853,6 +859,12 @@ class admin_shortcodes
function sc_admin_siteinfo($parm='')
{
if($parm == 'creditsonly' && e_PAGE != "credits.php")
{
return;
}
if (ADMIN)
{
global $ns, $pref, $themename, $themeversion, $themeauthor, $themedate, $themeinfo, $mySQLdefaultdb;
@ -939,6 +951,11 @@ class admin_shortcodes
function sc_admin_status($parm)
{
if($parm == 'infopanel' && e_PAGE != 'admin.php')
{
return;
}
if (getperms('0') || getperms('4'))
{
if (!function_exists('admin_status'))
@ -1001,6 +1018,12 @@ class admin_shortcodes
{
$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>";
}
if($parm == 'list')
{
// $text = str_replace("<div style='padding-bottom: 2px;'>","<li>",$text);;
}
$text .= "\n\t\t\t\t\t</div>";

11
e107_themes/bootstrap/admin_style.css
View File

@ -40,7 +40,7 @@ e-tabs fieldset { padding:0px ; padding-left:3px; border-top:0px;}
td.center, th.center { text-align:center }
.col-label { width:30%; }
.col-label { width:25%; }
.sidebar-nav { padding: 9px 0; font-size:11px; min-width:150px; }
@ -163,7 +163,7 @@ img.S32:hover {}
/*******************************************************************************************************************/
/* Admin List Table */
.adminlist, .adminform { width:100%; border:1px solid #ddd;}
.adminlist, .adminform { width:100%; border:1px solid #ddd; background-color: #F6F6F6}
.adminlist th { border-bottom:1px solid #ddd; }
.adminlist td { border-bottom:1px solid #ddd; border-right: 1px solid #ddd; }
.adminlist th.last,
@ -573,14 +573,15 @@ i.e-seamonkey-32{ background-position: -485px 0; width: 32px; height: 32px; }
/* NEw */
tr.first { background-image: -moz-linear-gradient(center top , rgb(253, 253, 253) 0%, rgb(234, 234, 234) 100%); }
tr.first { font: 12px HelveticaNeue,Helvetica,Arial; color: rgb(102, 102, 102); background-image: -moz-linear-gradient(center top , rgb(253, 253, 253) 0%, rgb(234, 234, 234) 100%); }
tr.first a { color: rgb(102, 102, 102); }
/* Dark Drop-Down Menus */
ul.col-selection { text-align:left; overflow:visible; z-index:101; background-color: rgb(23, 23, 23); }
ul.col-selection { text-align:left; overflow:visible; z-index:101; max-height:600px; overflow:auto; background-color: rgb(23, 23, 23); }
ul.col-selection > li a { border-top: 1px solid rgb(51, 51, 51); border-bottom: 1px solid rgb(32, 32, 32); }
ul.col-selection > li a { padding: 3px 0px 0px 25px; color: rgb(153, 153, 153); }
ul.col-selection > li a label { padding-left:0px; display:block; line-height:25px; }
.nav ul li ul.dropdown-menu { margin-top:-5px; border-left:1px solid rgb(51, 51, 51); background-color: rgb(39, 39, 39); }
.nav ul li ul.dropdown-menu > li a { border-top: 1px solid rgb(51, 51, 51); border-bottom: 1px solid rgb(32, 32, 32); }
.nav ul li ul.dropdown-menu > li a { padding-top:5px; padding-bottom:5px; color: rgb(153, 153, 153); }

11
e107_themes/bootstrap/admin_template.php
View File

@ -216,15 +216,16 @@ $ADMIN_HEADER .= '<div class="container-fluid">
{ADMIN_PWORD}
{ADMIN_HELP}
{ADMIN_STATUS=request}
{ADMIN_LATEST=request}
{ADMIN_SITEINFO=creditsonly}
{SETSTYLE=admin_menu}
{ADMIN_STATUS=infopanel}
{ADMIN_LATEST=infopanel}
{ADMIN_LOG=request}
{ADMIN_MSG}
{ADMIN_MSG=request}
{ADMIN_PLUGINS}
{SETSTYLE=site_info}
{ADMIN_SITEINFO}
{SETSTYLE=none}
</div>