Compare commits
No commits in common. "451bd55559ea5b75f79dac3fec3784a1e4649377" and "62e01bd9b1b29700d313e454acd0ade92045af28" have entirely different histories.
451bd55559
...
62e01bd9b1
@ -238,13 +238,6 @@ $aSettings['statistics'][] = array(
|
||||
'name' => 'statistics_analytics_code', 'value' => $setting->getValue('statistics_analytics_code'),
|
||||
'tooltip' => '.'
|
||||
);
|
||||
$aSettings['acl'][] = array(
|
||||
'display' => 'Show Menu for logged in users only', 'type' => 'select',
|
||||
'options' => array( 0 => 'No', 1 => 'Yes' ),
|
||||
'default' => 0,
|
||||
'name' => 'acl_show_menu_loggedin', 'value' => $setting->getValue('acl_show_menu_loggedin'),
|
||||
'tooltip' => 'Should Menu be visible for logged in users only.'
|
||||
);
|
||||
$aSettings['acl'][] = array(
|
||||
'display' => 'Show Stats for logged in users only', 'type' => 'select',
|
||||
'options' => array( 0 => 'No', 1 => 'Yes' ),
|
||||
|
||||
@ -84,9 +84,6 @@ $dEstNextDifficulty = $statistics->getExpectedNextDifficulty();
|
||||
$iBlocksUntilDiffChange = $statistics->getBlocksUntilDiffChange();
|
||||
|
||||
// Block statistics
|
||||
$now = new DateTime( "now" );
|
||||
$aLastBlock = $block->getLast();
|
||||
$dTimeSinceLast = ($now->getTimestamp() - $aLastBlock['time']);
|
||||
$aLastBlocks = $statistics->getBlocksFound(5);
|
||||
if (!$user->isAdmin(@$_SESSION['USERDATA']['id'])) {
|
||||
foreach ($aLastBlocks as $key => $data) {
|
||||
@ -110,7 +107,6 @@ $data = array(
|
||||
'currency' => $config['currency']
|
||||
),
|
||||
'esttimeperblock' => round($dPoolExpectedTimePerBlock, 2),
|
||||
'timesincelastblock' => round($dTimeSinceLast, 2),
|
||||
'blocks' => $aLastBlocks,
|
||||
'workers' => $worker->getCountAllActiveWorkers(), 'hashrate' => $dPoolHashrateAdjusted,
|
||||
'shares' => array( 'valid' => $aRoundShares['valid'], 'invalid' => $aRoundShares['invalid'], 'invalid_percent' => $dPoolInvalidPercent, 'estimated' => $iEstShares, 'progress' => $dEstPercent ),
|
||||
|
||||
@ -38,9 +38,6 @@ if ($user->isAuthenticated()) {
|
||||
$iBlocksUntilDiffChange = $statistics->getBlocksUntilDiffChange();
|
||||
|
||||
// Block statistics
|
||||
$now = new DateTime( "now" );
|
||||
$aLastBlock = $block->getLast();
|
||||
$dTimeSinceLast = ($now->getTimestamp() - $aLastBlock['time']);
|
||||
$aLastBlocks = $statistics->getBlocksFound(5);
|
||||
if (!$user->isAdmin(@$_SESSION['USERDATA']['id'])) {
|
||||
foreach ($aLastBlocks as $key => $data) {
|
||||
@ -53,7 +50,6 @@ if ($user->isAuthenticated()) {
|
||||
|
||||
// Make it available in Smarty
|
||||
$smarty->assign('PRECISION', $coin->getCoinValuePrevision());
|
||||
$smarty->assign('LASTBLOCKTIME', $dTimeSinceLast);
|
||||
$smarty->assign('BLOCKSFOUND', $aLastBlocks);
|
||||
$smarty->assign('DISABLED_DASHBOARD', $setting->getValue('disable_dashboard'));
|
||||
$smarty->assign('DISABLED_DASHBOARD_API', $setting->getValue('disable_dashboard_api'));
|
||||
|
||||
@ -129,7 +129,6 @@ $aGlobal['statistics']['analytics']['enabled'] = $setting->getValue('statistics_
|
||||
$aGlobal['statistics']['analytics']['code'] = $setting->getValue('statistics_analytics_code');
|
||||
|
||||
// ACLs
|
||||
$aGlobal['acl']['menu']['loggedin'] = $setting->getValue('acl_show_menu_loggedin');
|
||||
$aGlobal['acl']['statistics']['loggedin'] = $setting->getValue('acl_show_stats_loggedin');
|
||||
$aGlobal['acl']['help']['loggedin'] = $setting->getValue('acl_show_help_loggedin');
|
||||
$aGlobal['acl']['pool']['statistics'] = $setting->getValue('acl_pool_statistics');
|
||||
|
||||
@ -1 +0,0 @@
|
||||
/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}h1{font-size:2em;margin:.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0}input[type="number"]::-webkit-inner-spin-button,input[type="number"]::-webkit-outer-spin-button{height:auto}input[type="search"]{-webkit-appearance:textfield;box-sizing:content-box}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:bold}table{border-collapse:collapse;border-spacing:0}td,th{padding:0}
|
||||
@ -1,2 +0,0 @@
|
||||
/*! UIkit 2.26.3 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
|
||||
.uk-notify{position:fixed;top:10px;left:10px;z-index:1040;box-sizing:border-box;width:350px}.uk-notify-bottom-right,.uk-notify-top-right{left:auto;right:10px}.uk-notify-bottom-center,.uk-notify-top-center{left:50%;margin-left:-175px}.uk-notify-bottom-center,.uk-notify-bottom-left,.uk-notify-bottom-right{top:auto;bottom:10px}@media (max-width:479px){.uk-notify{left:10px;right:10px;width:auto;margin:0}}.uk-notify-message{position:relative;margin-bottom:10px;padding:15px;background:#444;color:#fff;font-size:16px;line-height:22px;cursor:pointer}.uk-notify-message>.uk-close{visibility:hidden;float:right}.uk-notify-message:hover>.uk-close{visibility:visible}.uk-notify-message-primary{background:#ebf7fd;color:#2d7091}.uk-notify-message-success{background:#f2fae3;color:#659f13}.uk-notify-message-warning{background:#fffceb;color:#e28327}.uk-notify-message-danger{background:#fff1f0;color:#d85030}
|
||||
|
Before Width: | Height: | Size: 355 B |
|
Before Width: | Height: | Size: 387 B |
|
Before Width: | Height: | Size: 381 B |
|
Before Width: | Height: | Size: 250 B |
|
Before Width: | Height: | Size: 3.2 KiB |
|
Before Width: | Height: | Size: 685 B |
|
Before Width: | Height: | Size: 1.0 KiB |
|
Before Width: | Height: | Size: 504 B |
|
Before Width: | Height: | Size: 375 B |
|
Before Width: | Height: | Size: 700 B |
|
Before Width: | Height: | Size: 727 B |
|
Before Width: | Height: | Size: 588 B |
@ -1,10 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Generator: Adobe Illustrator 18.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
||||
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
width="20px" height="20px" viewBox="0 0 20 20" style="enable-background:new 0 0 20 20;" xml:space="preserve">
|
||||
<style type="text/css">
|
||||
.st0{fill:#FFFFFF;}
|
||||
</style>
|
||||
<polygon class="st0" points="7.1,1.9 5,4.1 10.9,10 5,15.9 7.1,18.1 15,10 "/>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 609 B |
|
Before Width: | Height: | Size: 239 B |
|
Before Width: | Height: | Size: 509 B |
|
Before Width: | Height: | Size: 280 B |
|
Before Width: | Height: | Size: 655 B |
|
Before Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 655 B |
|
Before Width: | Height: | Size: 620 B |
|
Before Width: | Height: | Size: 62 B |
|
Before Width: | Height: | Size: 670 B |
|
Before Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 372 B |
|
Before Width: | Height: | Size: 668 B |
|
Before Width: | Height: | Size: 666 B |
|
Before Width: | Height: | Size: 733 B |
|
Before Width: | Height: | Size: 376 B |
|
Before Width: | Height: | Size: 911 B |
|
Before Width: | Height: | Size: 939 B |
|
Before Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 882 B |
|
Before Width: | Height: | Size: 8.6 KiB |
|
Before Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 96 B |
|
Before Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 752 B |
|
Before Width: | Height: | Size: 2.9 KiB |
|
Before Width: | Height: | Size: 808 B |
|
Before Width: | Height: | Size: 622 B |
|
Before Width: | Height: | Size: 69 B |
|
Before Width: | Height: | Size: 66 B |
|
Before Width: | Height: | Size: 615 B |
|
Before Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 66 B |
|
Before Width: | Height: | Size: 93 B |
|
Before Width: | Height: | Size: 251 B |
|
Before Width: | Height: | Size: 235 B |
|
Before Width: | Height: | Size: 3.7 KiB |
|
Before Width: | Height: | Size: 3.6 KiB |
|
Before Width: | Height: | Size: 3.7 KiB |
|
Before Width: | Height: | Size: 3.7 KiB |
|
Before Width: | Height: | Size: 3.7 KiB |
|
Before Width: | Height: | Size: 2.6 KiB |
|
Before Width: | Height: | Size: 1.8 KiB |
|
Before Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 616 B |
|
Before Width: | Height: | Size: 680 B |
|
Before Width: | Height: | Size: 86 B |
|
Before Width: | Height: | Size: 85 B |
|
Before Width: | Height: | Size: 633 B |
|
Before Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 861 B |
|
Before Width: | Height: | Size: 870 B |
|
Before Width: | Height: | Size: 582 B |
|
Before Width: | Height: | Size: 739 B |
|
Before Width: | Height: | Size: 740 B |
|
Before Width: | Height: | Size: 807 B |
|
Before Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 89 B |
|
Before Width: | Height: | Size: 88 B |
|
Before Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 22 KiB |
|
Before Width: | Height: | Size: 1.0 KiB |
|
Before Width: | Height: | Size: 1004 B |
|
Before Width: | Height: | Size: 3.8 KiB |
|
Before Width: | Height: | Size: 199 B |
|
Before Width: | Height: | Size: 817 B |
|
Before Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 160 B |
|
Before Width: | Height: | Size: 148 B |
|
Before Width: | Height: | Size: 201 B |
|
Before Width: | Height: | Size: 158 B |
|
Before Width: | Height: | Size: 146 B |
|
Before Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 1.0 KiB |
|
Before Width: | Height: | Size: 177 B |
|
Before Width: | Height: | Size: 43 B |
|
Before Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 1.0 KiB |
|
Before Width: | Height: | Size: 197 B |