From 68d87633e2708b90c07c2d13264221fbb387e2d4 Mon Sep 17 00:00:00 2001 From: iAmShorty Date: Wed, 2 Apr 2014 17:35:56 +0200 Subject: [PATCH 1/5] [FIX] updated styles, typos and colors --- public/include/pages/account/edit.inc.php | 102 ++--- .../site_assets/bootstrap/css/design/dark.css | 4 + public/site_assets/bootstrap/css/mpos.css | 349 ++++++++++-------- .../bootstrap/account/earnings/default.tpl | 17 +- .../account/transactions/default.tpl | 24 +- .../bootstrap/account/workers/default.tpl | 4 +- .../bootstrap/admin/registrations/default.tpl | 6 +- .../bootstrap/admin/transactions/default.tpl | 28 +- .../bootstrap/admin/user/default.tpl | 30 +- .../statistics/blocks/block_overview_time.tpl | 36 +- .../blocks/blocks_found_details.tpl | 8 +- .../statistics/blocks/small_table.tpl | 2 +- 12 files changed, 326 insertions(+), 284 deletions(-) diff --git a/public/include/pages/account/edit.inc.php b/public/include/pages/account/edit.inc.php index 0c50dafd..951face4 100644 --- a/public/include/pages/account/edit.inc.php +++ b/public/include/pages/account/edit.inc.php @@ -12,52 +12,54 @@ $updating = (@$_POST['do']) ? 1 : 0; if ($user->isAuthenticated()) { if ($config['twofactor']['enabled']) { - $popupmsg = 'E-mail confirmations are required for '; - $popuptypes = array(); - if ($config['twofactor']['options']['details'] && $oldtoken_ea !== "") { - $popuptypes[] = 'editing your details'; - $ea_editable = $user->token->isTokenValid($_SESSION['USERDATA']['id'], $oldtoken_ea, 5); - $ea_sent = $user->token->doesTokenExist('account_edit', $_SESSION['USERDATA']['id']); - } - if ($config['twofactor']['options']['changepw'] && $oldtoken_cp !== "") { - $popuptypes[] = 'changing your password'; - $cp_editable = $user->token->isTokenValid($_SESSION['USERDATA']['id'], $oldtoken_cp, 6); - $cp_sent = $user->token->doesTokenExist('change_pw', $_SESSION['USERDATA']['id']); - } - if ($config['twofactor']['options']['withdraw'] && $oldtoken_wf !== "") { - $popuptypes[] = 'withdrawals'; - $wf_editable = $user->token->isTokenValid($_SESSION['USERDATA']['id'], $oldtoken_wf, 7); - $wf_sent = $user->token->doesTokenExist('withdraw_funds', $_SESSION['USERDATA']['id']); - } - - // get the status of a token if set - $message_tokensent_invalid = 'A token was sent to your e-mail that will allow you to '; - $message_tokensent_valid = 'You can currently '; - $messages_tokensent_status = array( - 'ea' => 'edit your account details', - 'wf' => 'withdraw funds', - 'cp' => 'change your password' - ); - // build the message we're going to show them for their token(s) - $eaprep_sent = ($ea_sent) ? $message_tokensent_valid.$messages_tokensent_status['ea'] : ""; - $eaprep_edit = ($ea_editable) ? $message_tokensent_invalid.$messages_tokensent_status['ea'] : ""; - $wfprep_sent = ($wf_sent) ? $message_tokensent_valid.$messages_tokensent_status['wf'] : ""; - $wfprep_edit = ($wf_editable) ? $message_tokensent_invalid.$messages_tokensent_status['wf'] : ""; - $cpprep_sent = ($cp_sent) ? $message_tokensent_valid.$messages_tokensent_status['cp'] : ""; - $cpprep_edit = ($cp_editable) ? $message_tokensent_invalid.$messages_tokensent_status['cp'] : ""; - $ptc = 0; - $ptcn = count($popuptypes); - foreach ($popuptypes as $pt) { - if ($ptcn == 1) { $popupmsg.= $popuptypes[$ptc]; continue; } - if ($ptc !== ($ptcn-1)) { - $popupmsg.= $popuptypes[$ptc].', '; - } else { - $popupmsg.= 'and '.$popuptypes[$ptc]; + if ($config['twofactor']['options']['details'] OR $config['twofactor']['options']['changepw'] OR $config['twofactor']['options']['withdraw']) { + $popupmsg = 'E-mail confirmations are required for '; + $popuptypes = array(); + if ($config['twofactor']['options']['details'] && $oldtoken_ea !== "") { + $popuptypes[] = 'editing your details'; + $ea_editable = $user->token->isTokenValid($_SESSION['USERDATA']['id'], $oldtoken_ea, 5); + $ea_sent = $user->token->doesTokenExist('account_edit', $_SESSION['USERDATA']['id']); } - $ptc++; + if ($config['twofactor']['options']['changepw'] && $oldtoken_cp !== "") { + $popuptypes[] = 'changing your password'; + $cp_editable = $user->token->isTokenValid($_SESSION['USERDATA']['id'], $oldtoken_cp, 6); + $cp_sent = $user->token->doesTokenExist('change_pw', $_SESSION['USERDATA']['id']); + } + if ($config['twofactor']['options']['withdraw'] && $oldtoken_wf !== "") { + $popuptypes[] = 'withdrawals'; + $wf_editable = $user->token->isTokenValid($_SESSION['USERDATA']['id'], $oldtoken_wf, 7); + $wf_sent = $user->token->doesTokenExist('withdraw_funds', $_SESSION['USERDATA']['id']); + } + + // get the status of a token if set + $message_tokensent_invalid = 'A token was sent to your e-mail that will allow you to '; + $message_tokensent_valid = 'You can currently '; + $messages_tokensent_status = array( + 'ea' => 'edit your account details', + 'wf' => 'withdraw funds', + 'cp' => 'change your password' + ); + // build the message we're going to show them for their token(s) + $eaprep_sent = ($ea_sent) ? $message_tokensent_valid.$messages_tokensent_status['ea'] : ""; + $eaprep_edit = ($ea_editable) ? $message_tokensent_invalid.$messages_tokensent_status['ea'] : ""; + $wfprep_sent = ($wf_sent) ? $message_tokensent_valid.$messages_tokensent_status['wf'] : ""; + $wfprep_edit = ($wf_editable) ? $message_tokensent_invalid.$messages_tokensent_status['wf'] : ""; + $cpprep_sent = ($cp_sent) ? $message_tokensent_valid.$messages_tokensent_status['cp'] : ""; + $cpprep_edit = ($cp_editable) ? $message_tokensent_invalid.$messages_tokensent_status['cp'] : ""; + $ptc = 0; + $ptcn = count($popuptypes); + foreach ($popuptypes as $pt) { + if ($ptcn == 1) { $popupmsg.= $popuptypes[$ptc]; continue; } + if ($ptc !== ($ptcn-1)) { + $popupmsg.= $popuptypes[$ptc].', '; + } else { + $popupmsg.= 'and '.$popuptypes[$ptc]; + } + $ptc++; + } + // display global notice about tokens being in use and for which bits they're active + $_SESSION['POPUP'][] = array('CONTENT' => $popupmsg, 'TYPE' => 'alert alert-warning'); } - // display global notice about tokens being in use and for which bits they're active - $_SESSION['POPUP'][] = array('CONTENT' => $popupmsg, 'TYPE' => 'alert alert-warning'); } if (isset($_POST['do']) && $_POST['do'] == 'genPin') { @@ -174,12 +176,12 @@ if ($config['twofactor']['enabled'] && $user->isAuthenticated()) { } // display token info per each - only when sent and editable or just sent, not by default - (!empty($eaprep_sent) && !empty($eaprep_edit)) ? $_SESSION['POPUP'][] = array('CONTENT' => $eaprep_sent, 'TYPE' => 'success'):""; - (!empty($eaprep_sent) && empty($eaprep_edit)) ? $_SESSION['POPUP'][] = array('CONTENT' => $message_tokensent_invalid.$messages_tokensent_status['ea'], 'TYPE' => 'success'):""; - (!empty($wfprep_sent) && !empty($wfprep_edit)) ? $_SESSION['POPUP'][] = array('CONTENT' => $wfprep_sent, 'TYPE' => 'success'):""; - (!empty($wfprep_sent) && empty($wfprep_edit)) ? $_SESSION['POPUP'][] = array('CONTENT' => $message_tokensent_invalid.$messages_tokensent_status['wf'], 'TYPE' => 'success'):""; - (!empty($cpprep_sent) && !empty($cpprep_edit)) ? $_SESSION['POPUP'][] = array('CONTENT' => $cpprep_sent, 'TYPE' => 'success'):""; - (!empty($cpprep_sent) && empty($cpprep_edit)) ? $_SESSION['POPUP'][] = array('CONTENT' => $message_tokensent_invalid.$messages_tokensent_status['cp'], 'TYPE' => 'success'):""; + (!empty($eaprep_sent) && !empty($eaprep_edit)) ? $_SESSION['POPUP'][] = array('CONTENT' => $eaprep_sent, 'TYPE' => 'alert alert-success'):""; + (!empty($eaprep_sent) && empty($eaprep_edit)) ? $_SESSION['POPUP'][] = array('CONTENT' => $message_tokensent_invalid.$messages_tokensent_status['ea'], 'TYPE' => 'alert alert-success'):""; + (!empty($wfprep_sent) && !empty($wfprep_edit)) ? $_SESSION['POPUP'][] = array('CONTENT' => $wfprep_sent, 'TYPE' => 'alert alert-success'):""; + (!empty($wfprep_sent) && empty($wfprep_edit)) ? $_SESSION['POPUP'][] = array('CONTENT' => $message_tokensent_invalid.$messages_tokensent_status['wf'], 'TYPE' => 'alert alert-success'):""; + (!empty($cpprep_sent) && !empty($cpprep_edit)) ? $_SESSION['POPUP'][] = array('CONTENT' => $cpprep_sent, 'TYPE' => 'alert alert-success'):""; + (!empty($cpprep_sent) && empty($cpprep_edit)) ? $_SESSION['POPUP'][] = array('CONTENT' => $message_tokensent_invalid.$messages_tokensent_status['cp'], 'TYPE' => 'alert alert-success'):""; // two-factor stuff $smarty->assign("CHANGEPASSUNLOCKED", $cp_editable); $smarty->assign("WITHDRAWUNLOCKED", $wf_editable); diff --git a/public/site_assets/bootstrap/css/design/dark.css b/public/site_assets/bootstrap/css/design/dark.css index e7202765..82d2a5c1 100644 --- a/public/site_assets/bootstrap/css/design/dark.css +++ b/public/site_assets/bootstrap/css/design/dark.css @@ -134,3 +134,7 @@ a:focus { .dropdown-menu { background-color: #D3D3D3; } + +.confirmations { + color: #F3FF12; +} diff --git a/public/site_assets/bootstrap/css/mpos.css b/public/site_assets/bootstrap/css/mpos.css index 6bec5713..758f2b4e 100644 --- a/public/site_assets/bootstrap/css/mpos.css +++ b/public/site_assets/bootstrap/css/mpos.css @@ -65,37 +65,37 @@ input[type="search"], input[type="tel"], input[type="color"], .uneditable-input { - background-color: #ffffff; - padding: 4px 4px 4px 4px; - font-size: 11px; - color: #555555; - border: 1px solid #ccc; - height: 25px; - line-height: 25px; + background-color: #ffffff; + padding: 4px 4px 4px 4px; + font-size: 11px; + color: #555555; + border: 1px solid #ccc; + height: 25px; + line-height: 25px; } .input-group-sm > .form-control, .input-group-sm > .input-group-addon, .input-group-sm > .input-group-btn > .btn { - height: 25px; - font-size: 12px; + height: 25px; + font-size: 12px; } .form-control { - font-size: 12px; + font-size: 12px; } .input-group .input-group-addon { - line-height: 1!important; + line-height: 1!important; } .glyphicon{ - line-height: 1em; + line-height: 1em; } .select-mini, .input-group { - font-size: 11px; - height: 25px; + font-size: 11px; + height: 25px; } /* Navigation */ @@ -105,145 +105,154 @@ input[type="color"], /* Top Right Navigation Dropdown Styles */ .navbar-top-links li { - display: inline-block; + display: inline-block; } .navbar-top-links li:last-child { - margin-right: 15px; + margin-right: 15px; } .navbar-top-links li a { - padding: 15px; - min-height: 50px; + padding: 15px; + min-height: 50px; } .dropdown-user { - min-width:100px; + min-width:100px; } .navbar-top-links .dropdown-menu li { - display: block; + display: block; } .navbar-top-links .dropdown-menu li:last-child { - margin-right: 0; + margin-right: 0; } .navbar-top-links .dropdown-menu li a { - padding: 3px 20px; - min-height: 0; + padding: 3px 20px; + min-height: 0; } .navbar-top-links .dropdown-menu li a div { - white-space: normal; + white-space: normal; } .navbar-top-links .dropdown-messages, .navbar-top-links .dropdown-tasks, .navbar-top-links .dropdown-alerts { - width: 310px; - min-width: 0; + width: 310px; + min-width: 0; } .navbar-top-links .dropdown-messages { - margin-left: 5px; + margin-left: 5px; } .navbar-top-links .dropdown-tasks { - margin-left: -59px; + margin-left: -59px; } .navbar-top-links .dropdown-alerts { - /*#margin-left: -123px; */ + /*#margin-left: -123px; */ } .navbar-top-links .dropdown-user { - right: 0; - left: auto; + right: 0; + left: auto; } /* Sidebar Menu Styles */ - .sidebar-search { - padding: 15px; +.sidebar-search { + padding: 15px; } .arrow { - float: right; + float: right; } .fa.arrow:before { - content: "\f104"; + content: "\f104"; } .active > a > .fa.arrow:before { - content: "\f107"; + content: "\f107"; } .nav-second-level li, .nav-third-level li { - border-bottom: none !important; + border-bottom: none !important; } .nav-second-level li a { - padding-left: 37px; + padding-left: 37px; } .nav-third-level li a { - padding-left: 52px; + padding-left: 52px; } @media(min-width:768px) { - .navbar-static-side { - z-index: 1; - position: absolute; - width: 250px; - } + .navbar-static-side { + z-index: 1; + position: absolute; + width: 250px; + } - .navbar-top-links .dropdown-messages, - .navbar-top-links .dropdown-tasks, - .navbar-top-links .dropdown-alerts { - margin-left: auto; - } + .navbar-top-links .dropdown-messages, + .navbar-top-links .dropdown-tasks, + .navbar-top-links .dropdown-alerts { + margin-left: auto; + } + .col-md-spark, .col-md-spark-2 { + float: left; + } + .col-md-spark { + width:16.65% + } + .col-md-spark-2 { + width:20% + } } .navbar-default .navbar-nav .open .dropdown-menu > li > a, .navbar-default .navbar-nav .open .dropdown-menu { - font-size: 12px; + font-size: 12px; } .navbar-default .navbar-nav .open .dropdown-menu > li a:hover { - font-size: 12px; + font-size: 12px; } /* Buttons */ /* ------------------------------- */ - .btn-outline { - color: inherit; - background-color: transparent; - transition: all .5s; +.btn-outline { + color: inherit; + background-color: transparent; + transition: all .5s; } .btn-primary.btn-outline { - color: #428bca; + color: #428bca; } .btn-success.btn-outline { - color: #5cb85c; + color: #5cb85c; } .btn-info.btn-outline { - color: #5bc0de; + color: #5bc0de; } .btn-warning.btn-outline { - color: #f0ad4e; + color: #f0ad4e; } .btn-danger.btn-outline { - color: #d9534f; + color: #d9534f; } .btn-primary.btn-outline:hover, @@ -251,7 +260,7 @@ input[type="color"], .btn-info.btn-outline:hover, .btn-warning.btn-outline:hover, .btn-danger.btn-outline:hover { - color: #fff; + color: #fff; } /* Pages */ @@ -260,52 +269,52 @@ input[type="color"], /* Dashboard Chat */ - .chat { - margin: 0; - padding: 0; - list-style: none; +.chat { + margin: 0; + padding: 0; + list-style: none; } .chat li { - margin-bottom: 10px; - padding-bottom: 5px; - border-bottom: 1px dotted #B3A9A9; + margin-bottom: 10px; + padding-bottom: 5px; + border-bottom: 1px dotted #B3A9A9; } .chat li.left .chat-body { - margin-left: 60px; + margin-left: 60px; } .chat li.right .chat-body { - margin-right: 60px; + margin-right: 60px; } .chat li .chat-body p { - margin: 0; - color: #777777; + margin: 0; + color: #777777; } .panel .slidedown .glyphicon, .chat .glyphicon { - margin-right: 5px; + margin-right: 5px; } .chat-panel .panel-body { - height: 350px; - overflow-y: scroll; + height: 350px; + overflow-y: scroll; } /* Login Page */ .login-panel { - margin-top: 25%; + margin-top: 25%; } /* Flot Chart Containers */ .flot-chart { - display: block; - height: 400px; + display: block; + height: 400px; } .flot-chart-content { @@ -342,13 +351,6 @@ table.dataTable thead .sorting:after { color: rgba(50,50,50,.5); } -.table { - width: 100%; - margin-bottom: 20px; - table-layout: fixed; - word-wrap: break-word; -} - div.dataTables_length select { font-size: 11px; height: 25px; @@ -365,7 +367,7 @@ div.dataTables_paginate { div.dataTables_paginate ul.pagination { font-size: 11px; - + } /* Circle Buttons */ @@ -406,7 +408,7 @@ div.dataTables_paginate ul.pagination { } .show-grid { - margin: 15px 0; + margin: 15px 0; } /* No Padding for Tables */ @@ -425,163 +427,196 @@ div.dataTables_paginate ul.pagination { .borderless > tbody > tr > td { border: none; + padding: 5px; } .borderless > thead > tr > th { border: none; } -.footer { - clear: both; - text-align: center; - padding: 4px 0px 0px; - font-size: 11px; - width: 100%; -} - .margin-bottom-sm { - margin-bottom: 5px !important; + margin-bottom: 5px !important; } p.overview { - font-family: 'Open Sans',sans-serif; - font-weight: 600; - font-size: 11px; - text-transform: uppercase; - display: block; - margin-bottom: 4px; + font-family: 'Open Sans',sans-serif; + font-weight: 600; + font-size: 11px; + text-transform: uppercase; + display: block; + margin-bottom: 4px; } span.overview { - font-size: 14px; - font-weight: bold; + font-size: 14px; + font-weight: bold; } div.overview { - margin: 20px 0px 0px; + margin: 20px 0px 0px; } span.bigfont { - font-size: 100%; + font-size: 100%; } th.smallwidth { - width: 250px; + width: 250px; } .col-md-spark, .col-md-spark-2 { - position:relative; - min-height:1px; - padding-left:15px; - padding-right:15px -} - -@media (min-width:992px) { - .col-md-spark, .col-md-spark-2 { - float: left; - } - .col-md-spark { - width:16.65% - } - .col-md-spark-2 { - width:20% - } + position:relative; + min-height:1px; + padding-left:15px; + padding-right:15px } span.overview-mhs { - font-size: 11px; - font-weight: bold; + font-size: 11px; + font-weight: bold; } div.black { - color: black; + color: black; } div.progress-fix { - margin: 0px 0px 5px 0px; + margin: 0px 0px 5px 0px; } span.spark-18 { - margin: -20%; + margin: -20%; } span.spark-25 { - margin: -25%; + margin: -25%; } /* Test Edit */ .circle-tile { - margin-bottom: 30px; + margin-bottom: 30px; } .circle-tile { - margin-bottom: 15px; - text-align: center; + margin-bottom: 15px; + text-align: center; } .circle-tile-content { - padding-top: 50px; - border-radius: 8px; - border: 3px solid rgba(255, 255, 255, 0.3); + padding-top: 50px; + border-radius: 8px; + border: 3px solid rgba(255, 255, 255, 0.3); } .circle-tile-description { - font-weight: bold; - font-size: 16px; + font-weight: bold; + font-size: 16px; } .circle-tile-number { - padding: 0px 1px 4px; + padding: 0px 1px 4px; } .circle-tile-heading { - position: relative; - width: 80px; - height: 80px; - margin: 0px auto -40px; - border: 3px solid rgba(255, 255, 255, 0.3); - border-radius: 100%; - color: #FFF; - transition: all 0.3s ease-in-out 0s; + position: relative; + width: 80px; + height: 80px; + margin: 0px auto -40px; + border: 3px solid rgba(255, 255, 255, 0.3); + border-radius: 100%; + color: #FFF; + transition: all 0.3s ease-in-out 0s; } .circle-tile-heading .fa { - line-height: 80px; + line-height: 80px; } .lightblue { - background-color: #2FAACE; + background-color: #2FAACE; } .text-faded { - color: rgba(255, 255, 255, 0.7); + color: rgba(255, 255, 255, 0.7); } .text-link { - color: #FFFFFF; + color: #FFFFFF; } p.up { - margin: -5px 0px -8px; - font-weight: 600; + margin: -5px 0px -8px; + font-weight: 600; } div.up { - margin: -10px 0px 6px 0px; + margin: -10px 0px 6px 0px; } p.up-more { - margin: -6px 0px 10px; - font-weight: 600; + margin: -6px 0px 10px; + font-weight: 600; } p.up-more2 { - margin: -6px 0px 0px; + margin: -6px 0px 0px; } div.fade { - opacity: 0.8; + opacity: 0.8; } /* End Test */ + +/* Tables */ + +.table>tbody>tr>th +{ + padding-left:3px; + padding-bottom:3px; + border: 1px solid #ddd; + background-color: #f9f9f9; + padding-right:1px; +} + +.table > tbody > tr > td +{ + padding:4px; +} + +.panel > .table, +.panel > .table-responsive > .table { + margin-bottom: 0; +} + +.table-responsive +{ + white-space: nowrap; + width: 100%; + margin-bottom: 15px; + overflow-x: scroll; + overflow-y: hidden; + -webkit-overflow-scrolling: touch; + -ms-overflow-style: -ms-autohiding-scrollbar; +} + +/* End Tables */ + +/* Footer */ + +.footer { + clear: both; + text-align: center; + padding: 4px 0px 0px; + font-size: 11px; + width: 100%; +} + +.confirmations { + color: #F79D00; +} + +/* End Footer */ + + diff --git a/public/templates/bootstrap/account/earnings/default.tpl b/public/templates/bootstrap/account/earnings/default.tpl index 896fedec..cd152992 100644 --- a/public/templates/bootstrap/account/earnings/default.tpl +++ b/public/templates/bootstrap/account/earnings/default.tpl @@ -10,12 +10,13 @@
- All Time + Summary
+ {foreach $SUMMARY as $type=>$total} {/foreach} @@ -23,6 +24,7 @@ + {foreach $SUMMARY as $type=>$total} {/foreach} @@ -44,7 +46,7 @@
{$type}
All Time{$total|number_format:"8"}
- + @@ -57,7 +59,7 @@ - @@ -68,7 +70,7 @@ - @@ -79,7 +81,7 @@ - @@ -90,7 +92,7 @@ - @@ -101,7 +103,7 @@ - @@ -117,7 +119,6 @@ - diff --git a/public/templates/bootstrap/account/transactions/default.tpl b/public/templates/bootstrap/account/transactions/default.tpl index 9cfdff13..5ba392b4 100644 --- a/public/templates/bootstrap/account/transactions/default.tpl +++ b/public/templates/bootstrap/account/transactions/default.tpl @@ -1,5 +1,5 @@
-
+ @@ -31,14 +31,14 @@
-
+
Transaction History
-
Credit Debit AP Debit MP
Last Hour + Last Hour {$BYTIME.1HourCredit|number_format:"8"} {$BYTIME.1HourDebitAP|number_format:"8"} {$BYTIME.1HourDebitMP|number_format:"8"}{$BYTIME.1HourTXFee|number_format:"8"}
Last Day + Last Day {$BYTIME.24HourCredit|number_format:"8"} {$BYTIME.24HourDebitAP|number_format:"8"} {$BYTIME.24HourDebitMP|number_format:"8"}{$BYTIME.24HourTXFee|number_format:"8"}
Last Week + Last Week {$BYTIME.1WeekCredit|number_format:"8"} {$BYTIME.1WeekDebitAP|number_format:"8"} {$BYTIME.1WeekDebitMP|number_format:"8"}{$BYTIME.1WeekTXFee|number_format:"8"}
Last Month + Last Month {$BYTIME.1MonthCredit|number_format:"8"} {$BYTIME.1MonthDebitAP|number_format:"8"} {$BYTIME.1MonthDebitMP|number_format:"8"}{$BYTIME.1MonthTXFee|number_format:"8"}
Last Year + Last Year {$BYTIME.1YearCredit|number_format:"8"} {$BYTIME.1YearDebitAP|number_format:"8"} {$BYTIME.1YearDebitMP|number_format:"8"}
+
@@ -54,10 +54,10 @@ {section transaction $TRANSACTIONS} - - - - + + + - + {if ! $GLOBAL.website.transactionexplorer.disabled} - + {else} - + {/if} - - + + {/section} diff --git a/public/templates/bootstrap/account/workers/default.tpl b/public/templates/bootstrap/account/workers/default.tpl index 8ca7e40a..6a6dbc8b 100644 --- a/public/templates/bootstrap/account/workers/default.tpl +++ b/public/templates/bootstrap/account/workers/default.tpl @@ -42,7 +42,7 @@ - {if $GLOBAL.config.disable_notifications != 1 && $DISABLE_IDLEWORKERNOTIFICATIONS != 1}{/if} + {if $GLOBAL.config.disable_notifications != 1 && $DISABLE_IDLEWORKERNOTIFICATIONS != 1}{/if} @@ -62,7 +62,7 @@ {if $GLOBAL.config.disable_notifications != 1 && $DISABLE_IDLEWORKERNOTIFICATIONS != 1} - diff --git a/public/templates/bootstrap/admin/registrations/default.tpl b/public/templates/bootstrap/admin/registrations/default.tpl index 1bbaba47..93ba2acd 100644 --- a/public/templates/bootstrap/admin/registrations/default.tpl +++ b/public/templates/bootstrap/admin/registrations/default.tpl @@ -3,7 +3,7 @@
- Last registered Users + Last Registered Users
@@ -15,7 +15,7 @@
- + @@ -25,7 +25,7 @@ - + {/section} diff --git a/public/templates/bootstrap/admin/transactions/default.tpl b/public/templates/bootstrap/admin/transactions/default.tpl index cf2cf547..27a159ae 100644 --- a/public/templates/bootstrap/admin/transactions/default.tpl +++ b/public/templates/bootstrap/admin/transactions/default.tpl @@ -7,7 +7,7 @@
-
ID
{$TRANSACTIONS[transaction].id}{$TRANSACTIONS[transaction].timestamp}{$TRANSACTIONS[transaction].type} + {$TRANSACTIONS[transaction].id}{$TRANSACTIONS[transaction].timestamp}{$TRANSACTIONS[transaction].type} {if $TRANSACTIONS[transaction].type == 'Credit_PPS' OR $TRANSACTIONS[transaction].type == 'Fee_PPS' OR $TRANSACTIONS[transaction].type == 'Donation_PPS' OR @@ -73,14 +73,14 @@ Unconfirmed {/if} {$TRANSACTIONS[transaction].coin_address|truncate:20:"...":true:true}{$TRANSACTIONS[transaction].coin_address|truncate:20:"...":true:true}{$TRANSACTIONS[transaction].txid|truncate:20:"...":true:true}{$TRANSACTIONS[transaction].txid|truncate:20:"...":true:true}{$TRANSACTIONS[transaction].txid|truncate:20:"...":true:true}{$TRANSACTIONS[transaction].txid|truncate:20:"...":true:true}{if $TRANSACTIONS[transaction].height == 0}n/a{else}{$TRANSACTIONS[transaction].height}{/if}{$TRANSACTIONS[transaction].amount|number_format:"8"}{if $TRANSACTIONS[transaction].height == 0}n/a{else}{$TRANSACTIONS[transaction].height}{/if}{$TRANSACTIONS[transaction].amount|number_format:"8"}
Worker Login Worker Password ActiveMonitorMonitorKhash/s Difficulty Action + eMail Reg. Date InviteInvited fromInvited From
{$LASTREGISTEREDUSERS[user].mposuser} {$LASTREGISTEREDUSERS[user].email} {$LASTREGISTEREDUSERS[user].signup_timestamp|date_format:"%d/%m %H:%M:%S"}{if !$LASTREGISTEREDUSERS[user].inviter}{else}{/if}{if !$LASTREGISTEREDUSERS[user].inviter}{else}{/if} {$LASTREGISTEREDUSERS[user].inviter}
+
{foreach $SUMMARY as $type=>$total} @@ -31,7 +31,7 @@ {/if}
-
+ @@ -73,14 +73,14 @@ -
+
Transaction History
-
+
@@ -97,11 +97,11 @@ {section transaction $TRANSACTIONS} - - - - - + + + + - + {if ! $GLOBAL.website.transactionexplorer.disabled} - + {else} - + {/if} - - + + {/section} diff --git a/public/templates/bootstrap/admin/user/default.tpl b/public/templates/bootstrap/admin/user/default.tpl index 1abd3eae..8853efc5 100644 --- a/public/templates/bootstrap/admin/user/default.tpl +++ b/public/templates/bootstrap/admin/user/default.tpl @@ -88,7 +88,7 @@ - + {if $GLOBAL.config.payout_system != 'pps'} @@ -109,31 +109,31 @@ {nocache} {section name=user loop=$USERS|default} - - - - - + + + + + {if $GLOBAL.config.payout_system != 'pps'} - - + + {else} - + {/if} - - - - + + + - - - + - - + + - + - + @@ -45,11 +45,11 @@ 0.00% {/if} - + - + @@ -70,11 +70,11 @@ 0.00% {/if} - + - + @@ -95,11 +95,11 @@ 0.00% {/if} - + - + @@ -120,11 +120,11 @@ 0.00% {/if} - + - + @@ -145,11 +145,11 @@ 0.00% {/if} - + - + @@ -170,7 +170,7 @@ 0.00% {/if} - + @@ -178,8 +178,8 @@
-
{if $GLOBAL.config.payout_system != 'pps'}Round earnings are not credited until {$GLOBAL.confirmations} confirms.{/if}
+
{if $GLOBAL.config.payout_system != 'pps'}Round earnings are not credited until {$GLOBAL.confirmations} confirms.{/if}
- + \ No newline at end of file diff --git a/public/templates/bootstrap/statistics/blocks/blocks_found_details.tpl b/public/templates/bootstrap/statistics/blocks/blocks_found_details.tpl index d223ee68..53c0cf72 100644 --- a/public/templates/bootstrap/statistics/blocks/blocks_found_details.tpl +++ b/public/templates/bootstrap/statistics/blocks/blocks_found_details.tpl @@ -9,7 +9,7 @@
ID
{$TRANSACTIONS[transaction].id}{$TRANSACTIONS[transaction].username}{$TRANSACTIONS[transaction].timestamp}{$TRANSACTIONS[transaction].type} + {$TRANSACTIONS[transaction].id}{$TRANSACTIONS[transaction].username}{$TRANSACTIONS[transaction].timestamp}{$TRANSACTIONS[transaction].type} {if $TRANSACTIONS[transaction].type == 'Credit_PPS' OR $TRANSACTIONS[transaction].type == 'Fee_PPS' OR $TRANSACTIONS[transaction].type == 'Donation_PPS' OR @@ -113,14 +113,14 @@ {else if $TRANSACTIONS[transaction].confirmations == -1}Orphaned {else}Unconfirmed{/if} {$TRANSACTIONS[transaction].coin_address|truncate:20:"...":true:true}{$TRANSACTIONS[transaction].coin_address|truncate:20:"...":true:true}{$TRANSACTIONS[transaction].txid|truncate:20:"...":true:true}{$TRANSACTIONS[transaction].txid|truncate:20:"...":true:true}{$TRANSACTIONS[transaction].txid|truncate:20:"...":true:true}{$TRANSACTIONS[transaction].txid|truncate:20:"...":true:true}{if $TRANSACTIONS[transaction].height == 0}n/a{else}{/if}{$TRANSACTIONS[transaction].height}{$TRANSACTIONS[transaction].amount|number_format:"8"}{if $TRANSACTIONS[transaction].height == 0}n/a{else}{/if}{$TRANSACTIONS[transaction].height}{$TRANSACTIONS[transaction].amount|number_format:"8"}
ID UsernameE-MaileMail Shares Hashrate
{$USERS[user].id}{$USERS[user].username|escape}{$USERS[user].email|escape}{$USERS[user].shares.valid}{$USERS[user].hashrate}{$USERS[user].id}{$USERS[user].username|escape}{$USERS[user].email|escape}{$USERS[user].shares.valid}{$USERS[user].hashrate}{$USERS[user].estimates.donation|number_format:"8"}{$USERS[user].estimates.payout|number_format:"8"}{$USERS[user].estimates.donation|number_format:"8"}{$USERS[user].estimates.payout|number_format:"8"}{$USERS[user].estimates.hours24|number_format:"8"}{$USERS[user].estimates.hours24|number_format:"8"}{$USERS[user].balance|number_format:"8"}{$USERS[user].signup_timestamp|date_format:"%d/%m %H:%M:%S"}{$USERS[user].last_login|date_format:"%d/%m %H:%M:%S"} + {$USERS[user].balance|number_format:"8"}{$USERS[user].signup_timestamp|date_format:"%d/%m %H:%M:%S"}{$USERS[user].last_login|date_format:"%d/%m %H:%M:%S"} + + diff --git a/public/templates/bootstrap/statistics/blocks/block_overview_time.tpl b/public/templates/bootstrap/statistics/blocks/block_overview_time.tpl index 2ac6687f..383107d6 100644 --- a/public/templates/bootstrap/statistics/blocks/block_overview_time.tpl +++ b/public/templates/bootstrap/statistics/blocks/block_overview_time.tpl @@ -10,21 +10,21 @@
Gen est.Gen. Est. Found Valid OrphanAvg DiffShares est.Avg. DiffShares Est. Shares Percentage AmountRate est.Rate Est.
all timeAll Time {($FIRSTBLOCKFOUND / $COINGENTIME)|number_format} {$LASTBLOCKSBYTIME.Total|number_format} {$LASTBLOCKSBYTIME.TotalValid|number_format}{$LASTBLOCKSBYTIME.TotalAmount|number_format}{$LASTBLOCKSBYTIME.TotalAmount|number_format:"2"} {($LASTBLOCKSBYTIME.Total|default:"0.00" / ($FIRSTBLOCKFOUND / $COINGENTIME) * 100)|number_format:"2"}%
last hourLast Hour {(3600 / $COINGENTIME)|number_format} {$LASTBLOCKSBYTIME.1HourTotal|number_format} {$LASTBLOCKSBYTIME.1HourValid|number_format}{$LASTBLOCKSBYTIME.1HourAmount|number_format}{$LASTBLOCKSBYTIME.1HourAmount|number_format:"2"} {($LASTBLOCKSBYTIME.1HourTotal|default:"0.00" / (3600 / $COINGENTIME) * 100)|number_format:"2"}%
last 24 hoursLast 24 Hours {(86400 / $COINGENTIME)|number_format} {$LASTBLOCKSBYTIME.24HourTotal|number_format} {$LASTBLOCKSBYTIME.24HourValid|number_format}{$LASTBLOCKSBYTIME.24HourAmount|number_format}{$LASTBLOCKSBYTIME.24HourAmount|number_format:"2"} {($LASTBLOCKSBYTIME.24HourTotal|default:"0.00" / (86400 / $COINGENTIME) * 100)|number_format:"2"}%
last 7 daysLast 7 Days {(604800 / $COINGENTIME)|number_format} {$LASTBLOCKSBYTIME.7DaysTotal|number_format} {$LASTBLOCKSBYTIME.7DaysValid|number_format}{$LASTBLOCKSBYTIME.7DaysAmount}{$LASTBLOCKSBYTIME.7DaysAmount|number_format:"2"} {($LASTBLOCKSBYTIME.7DaysTotal|default:"0.00" / (604800 / $COINGENTIME) * 100)|number_format:"2"}%
last 4 WeeksLast 4 Weeks {(2419200 / $COINGENTIME)|number_format} {$LASTBLOCKSBYTIME.4WeeksTotal|number_format} {$LASTBLOCKSBYTIME.4WeeksValid|number_format}{$LASTBLOCKSBYTIME.4WeeksAmount|number_format}{$LASTBLOCKSBYTIME.4WeeksAmount|number_format:"2"} {($LASTBLOCKSBYTIME.4WeeksTotal|default:"0.00" / (2419200 / $COINGENTIME) * 100)|number_format:"2"}%
last 12 MonthThe Past 12 Months {(29030400 / $COINGENTIME)|number_format} {$LASTBLOCKSBYTIME.12MonthTotal|number_format} {$LASTBLOCKSBYTIME.12MonthValid|number_format}{$LASTBLOCKSBYTIME.12MonthAmount|number_format}{$LASTBLOCKSBYTIME.12MonthAmount|number_format:"2"} {($LASTBLOCKSBYTIME.12MonthTotal|default:"0.00" / (29030400 / $COINGENTIME) * 100)|number_format:"2"}%
- + @@ -32,7 +32,7 @@ {assign var="count" value=$count+1} {if $GLOBAL.config.payout_system == 'pplns'}{assign var="pplnsshares" value=$pplnsshares+$BLOCKSFOUND[block].pplns_shares}{/if} {if ! $GLOBAL.website.blockexplorer.disabled} - + {else} {/if} @@ -46,7 +46,7 @@ {/if} - +
BlockBlock Validity Finder Time{$BLOCKSFOUND[block].height}{$BLOCKSFOUND[block].height}{$BLOCKSFOUND[block].height} {if $BLOCKSFOUND[block].is_anonymous|default:"0" == 1 && $GLOBAL.userdata.is_admin|default:"0" == 0}anonymous{else}{$BLOCKSFOUND[block].finder|default:"unknown"|escape}{/if}{$BLOCKSFOUND[block].time|date_format:"%d/%m %H:%M:%S"}{$BLOCKSFOUND[block].time|date_format:"%d/%m/%Y %H:%M:%S"} {$BLOCKSFOUND[block].difficulty|number_format:"4"} {$BLOCKSFOUND[block].amount|number_format:"2"} @@ -77,7 +77,7 @@
-
{if $GLOBAL.config.payout_system != 'pps'}Round Earnings are not credited until {$GLOBAL.confirmations} confirms.{/if}
+
{if $GLOBAL.config.payout_system != 'pps'}Round Earnings are not credited until {$GLOBAL.confirmations} confirms.{/if}
diff --git a/public/templates/bootstrap/statistics/blocks/small_table.tpl b/public/templates/bootstrap/statistics/blocks/small_table.tpl index 8c7c5919..2c1c4303 100644 --- a/public/templates/bootstrap/statistics/blocks/small_table.tpl +++ b/public/templates/bootstrap/statistics/blocks/small_table.tpl @@ -32,7 +32,7 @@ {if $GLOBAL.config.payout_system != 'pps'}
-
Note: Round Earnings are not credited until {$GLOBAL.confirmations} confirms.
+
Note: Round Earnings are not credited until {$GLOBAL.confirmations} confirms.
{/if} From 88aa40351bd85b944f2eb367988f71b0032dafe5 Mon Sep 17 00:00:00 2001 From: iAmShorty Date: Wed, 2 Apr 2014 17:37:02 +0200 Subject: [PATCH 2/5] [FIX] typo --- public/templates/bootstrap/account/edit/cashout.tpl | 2 +- public/templates/bootstrap/account/edit/detail.tpl | 2 +- public/templates/bootstrap/account/edit/password.tpl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/public/templates/bootstrap/account/edit/cashout.tpl b/public/templates/bootstrap/account/edit/cashout.tpl index 8a853351..1008fda9 100644 --- a/public/templates/bootstrap/account/edit/cashout.tpl +++ b/public/templates/bootstrap/account/edit/cashout.tpl @@ -28,7 +28,7 @@ {nocache}{/nocache}
- +
diff --git a/public/templates/bootstrap/account/edit/detail.tpl b/public/templates/bootstrap/account/edit/detail.tpl index 35049d54..6ca4d131 100644 --- a/public/templates/bootstrap/account/edit/detail.tpl +++ b/public/templates/bootstrap/account/edit/detail.tpl @@ -54,7 +54,7 @@ Hide username on website from others. Admins can still get your user information.
- + The 4 digit PIN you chose when registering
diff --git a/public/templates/bootstrap/account/edit/password.tpl b/public/templates/bootstrap/account/edit/password.tpl index fa3d23e6..6110a543 100644 --- a/public/templates/bootstrap/account/edit/password.tpl +++ b/public/templates/bootstrap/account/edit/password.tpl @@ -31,7 +31,7 @@ {nocache}{/nocache}
- +
From 3b26d455c280afe0b8ffa88ad857f04cdb36a750 Mon Sep 17 00:00:00 2001 From: iAmShorty Date: Fri, 4 Apr 2014 10:25:00 +0200 Subject: [PATCH 3/5] rebase --- public/site_assets/bootstrap/css/mpos.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/public/site_assets/bootstrap/css/mpos.css b/public/site_assets/bootstrap/css/mpos.css index 758f2b4e..d50f08af 100644 --- a/public/site_assets/bootstrap/css/mpos.css +++ b/public/site_assets/bootstrap/css/mpos.css @@ -605,12 +605,14 @@ div.fade { /* Footer */ + .footer { clear: both; text-align: center; padding: 4px 0px 0px; font-size: 11px; width: 100%; + margin-bottom: 5px !important; } .confirmations { From 37cdadbabc4b076bdf0de5f93a034c2ea3ba2e5c Mon Sep 17 00:00:00 2001 From: iAmShorty Date: Fri, 4 Apr 2014 10:28:49 +0200 Subject: [PATCH 4/5] rollback --- public/site_assets/bootstrap/css/mpos.css | 30 +++++++---------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/public/site_assets/bootstrap/css/mpos.css b/public/site_assets/bootstrap/css/mpos.css index d50f08af..64e61275 100644 --- a/public/site_assets/bootstrap/css/mpos.css +++ b/public/site_assets/bootstrap/css/mpos.css @@ -434,6 +434,14 @@ div.dataTables_paginate ul.pagination { border: none; } +.footer { + clear: both; + text-align: center; + padding: 4px 0px 0px; + font-size: 11px; + width: 100%; +} + .margin-bottom-sm { margin-bottom: 5px !important; } @@ -601,24 +609,4 @@ div.fade { -ms-overflow-style: -ms-autohiding-scrollbar; } -/* End Tables */ - -/* Footer */ - - -.footer { - clear: both; - text-align: center; - padding: 4px 0px 0px; - font-size: 11px; - width: 100%; - margin-bottom: 5px !important; -} - -.confirmations { - color: #F79D00; -} - -/* End Footer */ - - +/* End Tables */ \ No newline at end of file From 22e9a62d4e14989ac9dd4eaf2b0c5976be563b3d Mon Sep 17 00:00:00 2001 From: iAmShorty Date: Fri, 4 Apr 2014 10:30:14 +0200 Subject: [PATCH 5/5] [UPDATE] style fixes --- public/site_assets/bootstrap/css/mpos.css | 30 ++++++++++++++++------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/public/site_assets/bootstrap/css/mpos.css b/public/site_assets/bootstrap/css/mpos.css index 64e61275..d50f08af 100644 --- a/public/site_assets/bootstrap/css/mpos.css +++ b/public/site_assets/bootstrap/css/mpos.css @@ -434,14 +434,6 @@ div.dataTables_paginate ul.pagination { border: none; } -.footer { - clear: both; - text-align: center; - padding: 4px 0px 0px; - font-size: 11px; - width: 100%; -} - .margin-bottom-sm { margin-bottom: 5px !important; } @@ -609,4 +601,24 @@ div.fade { -ms-overflow-style: -ms-autohiding-scrollbar; } -/* End Tables */ \ No newline at end of file +/* End Tables */ + +/* Footer */ + + +.footer { + clear: both; + text-align: center; + padding: 4px 0px 0px; + font-size: 11px; + width: 100%; + margin-bottom: 5px !important; +} + +.confirmations { + color: #F79D00; +} + +/* End Footer */ + +