RanchiMall/php-mpos
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bootstrap' of github.com:MPOS/php-mpos into bootstrap

Browse Source
This commit is contained in:
nrpatten 2014-03-24 03:17:38 -07:00
commit fec49dbae9
5 changed files with 44 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
public/include/config/admin_settings.inc.php
View File

@ -439,3 +439,18 @@ $aSettings['notifications'][] = array(
'name' => 'notifications_disable_idle_worker', 'value' => $setting->getValue('notifications_disable_idle_worker'),
'tooltip' => 'Enable/Disable IDLE worker notifications globally. Will remove the user option too.'
);
$aSettings['pools'][] = array(
'display' => 'Enable Pool Navigation', 'type' => 'select',
'options' => array( 0 => 'No', 1 => 'Yes' ),
'default' => 0,
'name' => 'poolnav_enabled', 'value' => $setting->getValue('poolnav_enabled'),
'tooltip' => 'Enable or Disable Pool Navigation for multiple Pools in Header.'
);
$aSettings['pools'][] = array(
'display' => 'Pools for Pool Navigation', 'type' => 'textarea',
'size' => 20,
'height' => 12,
'default' => 'Pool Name|Pool URL',
'name' => 'poolnav_pools', 'value' => $setting->getValue('poolnav_pools'),
'tooltip' => '.'
);

2
public/include/smarty_globals.inc.php
View File

@ -65,6 +65,8 @@ $aGlobal = array(
'twofactor' => $config['twofactor'],
'csrf' => $config['csrf'],
'config' => array(
'poolnav_enabled' => $setting->getValue('poolnav_enabled'),
'poolnav_pools' => $setting->getValue('poolnav_pools'),
'recaptcha_enabled' => $setting->getValue('recaptcha_enabled'),
'recaptcha_enabled_logins' => $setting->getValue('recaptcha_enabled_logins'),
'disable_navbar' => $setting->getValue('disable_navbar'),

6
public/site_assets/bootstrap/css/mpos.css
View File

@ -40,7 +40,7 @@
/* Top Right Navigation Dropdown Styles */
.navbar-top-links li {
.navbar-top-links li {
display: inline-block;
}
@ -53,8 +53,8 @@
min-height: 50px;
}
.dropdown-user { min-width:100px;
.dropdown-user {
min-width:100px;
}
.navbar-top-links .dropdown-menu li {

21
public/templates/bootstrap/global/header.tpl Executable file → Normal file
View File

@ -1,12 +1,29 @@
<nav class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0">
<nav class="navbar navbar-default navbar-static-top" role="navigation">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".sidebar-collapse">
<button type="button" class="navbar-toggle" data-toggle="collapse">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
{if $GLOBAL.config.poolnav_enabled}
<ul class="nav navbar-nav navbar-top-links">
<li class="dropdown">
<a href="#" class="navbar-brand dropdown-toggle" data-toggle="dropdown">{$GLOBAL.website.name} <b class="caret"></b></a>
<ul class="dropdown-menu">
{assign var="PoolArray" value="\n"|explode:$GLOBAL.config.poolnav_pools}
{foreach from=$PoolArray item=pooldata}
{assign var="PoolURL" value="|"|explode:$pooldata}
{if $PoolURL|count > 1}
<li class="h4"><a href="{$PoolURL[1]}"><i class="fa fa-angle-double-right fa-fw"></i> {$PoolURL[0]}</a></li>
{/if}
{/foreach}
</ul>
</li>
</ul>
{else}
<a class="navbar-brand" href="{$smarty.server.SCRIPT_NAME}">{$GLOBAL.website.name}</a>
{/if}
</div>
<ul class="nav navbar-top-links navbar-right">

10
public/templates/bootstrap/statistics/pool/general_stats.tpl
View File

@ -16,7 +16,7 @@
</tr>
<tr>
<th>Current Active Workers</th>
<td id="b-workers">{$GLOBAL.workers}</td>
<td id="b-workers">{$GLOBAL.workers|number_format}</td>
</tr>
<tr>
<th>Current Difficulty</th>
@ -44,22 +44,22 @@
</tr>
<tr>
<th>Est. Shares this Round</th>
<td id="b-target">{$ESTIMATES.shares} (done: {$ESTIMATES.percent}%)</td>
<td id="b-target">{$ESTIMATES.shares|number_format} (done: {$ESTIMATES.percent}%)</td>
</tr>
{if ! $GLOBAL.website.blockexplorer.disabled}
<tr>
<th width="50%">Next Network Block</th>
<td colspan="3">{$CURRENTBLOCK + 1} &nbsp;&nbsp;<font size="1"> (Current: <a href="{$GLOBAL.website.blockexplorer.url}{$CURRENTBLOCKHASH}" target="_new">{$CURRENTBLOCK})</a></font></td>
<td colspan="3">{($CURRENTBLOCK + 1)|number_format} &nbsp;&nbsp;<font size="1"> (Current: <a href="{$GLOBAL.website.blockexplorer.url}{$CURRENTBLOCKHASH}" target="_new">{$CURRENTBLOCK|number_format})</a></font></td>
</tr>
{else}
<tr>
<th>Next Network Block</th>
<td colspan="3">{$CURRENTBLOCK + 1} &nbsp;&nbsp; (Current: {$CURRENTBLOCK})</td>
<td colspan="3">{($CURRENTBLOCK + 1)|number_format} &nbsp;&nbsp; (Current: {$CURRENTBLOCK|number_format})</td>
</tr>
{/if}
<tr>
<th>Last Block Found</th>
<td colspan="3"><a href="{$smarty.server.SCRIPT_NAME}?page=statistics&action=round&height={$LASTBLOCK}" target="_new">{$LASTBLOCK|default:"0"}</a></td>
<td colspan="3"><a href="{$smarty.server.SCRIPT_NAME}?page=statistics&action=round&height={$LASTBLOCK}" target="_new">{$LASTBLOCK|default:"0"|number_format}</a></td>
</tr>
<tr>
<th>Time Since Last Block</th>