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 8239764a..7cf1e85b 100644 --- a/public/site_assets/bootstrap/css/design/dark.css +++ b/public/site_assets/bootstrap/css/design/dark.css @@ -138,3 +138,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 27bc3855..321230ad 100644 --- a/public/site_assets/bootstrap/css/mpos.css +++ b/public/site_assets/bootstrap/css/mpos.css @@ -1,612 +1,622 @@ -/* Global Styles */ - -/* ------------------------------- */ - -body { - background-color: #f8f8f8; - min-width: 350px; - font-size: 12px; - /* Design constraint */ -} - -p { - font-size: 12px; -} - -/* Wrappers */ - -/* ------------------------------- */ - - #wrapper { - width: 100%; -} - -#page-wrapper { - padding: 0 15px; - min-height: 568px; - background-color: #fff; - font-size: 12px; -} - -@media(min-width:768px) { - #page-wrapper { - position: inherit; - margin: 0 0 0 250px; - padding: 0 30px; - min-height: 900px; - border-left: 1px solid #e7e7e7; - font-size: 12px; - } -} - -.navbar-static-side ul li { - border-bottom: 1px solid #e7e7e7; -} - - -/* Input fields */ - -/* ------------------------------- */ - -select, -textarea, -input[type="text"], -input[type="password"], -input[type="datetime"], -input[type="datetime-local"], -input[type="date"], -input[type="month"], -input[type="time"], -input[type="week"], -input[type="number"], -input[type="email"], -input[type="url"], -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; -} - -.input-group-sm > .form-control, -.input-group-sm > .input-group-addon, -.input-group-sm > .input-group-btn > .btn { - height: 25px; - font-size: 12px; -} - -.form-control { - font-size: 12px; -} - -.input-group .input-group-addon { - line-height: 1!important; - } - -.glyphicon{ - line-height: 1em; -} - -.select-mini, .input-group { - font-size: 11px; - height: 25px; -} - -/* Navigation */ - -/* ------------------------------- */ - -/* Top Right Navigation Dropdown Styles */ - -.navbar-top-links li { - display: inline-block; -} - -.navbar-top-links li:last-child { - margin-right: 15px; -} - -.navbar-top-links li a { - padding: 15px; - min-height: 50px; -} - -.dropdown-user { - min-width:100px; -} - -.navbar-top-links .dropdown-menu li { - display: block; -} - -.navbar-top-links .dropdown-menu li:last-child { - margin-right: 0; -} - -.navbar-top-links .dropdown-menu li a { - padding: 3px 20px; - min-height: 0; -} - -.navbar-top-links .dropdown-menu li a div { - white-space: normal; -} - -.navbar-top-links .dropdown-messages, -.navbar-top-links .dropdown-tasks, -.navbar-top-links .dropdown-alerts { - width: 310px; - min-width: 0; -} - -.navbar-top-links .dropdown-messages { - margin-left: 5px; -} - -.navbar-top-links .dropdown-tasks { - margin-left: -59px; -} - -.navbar-top-links .dropdown-alerts { - /*#margin-left: -123px; */ -} - -.navbar-top-links .dropdown-user { - right: 0; - left: auto; -} - -/* Sidebar Menu Styles */ - -.sidebar-search { - padding: 15px; -} - -.arrow { - float: right; -} - -.fa.arrow:before { - content: "\f104"; -} - -.active > a > .fa.arrow:before { - content: "\f107"; -} - -.nav-second-level li, -.nav-third-level li { - border-bottom: none !important; -} - -.nav-second-level li a { - padding-left: 37px; -} - -.nav-third-level li a { - padding-left: 52px; -} - -@media(min-width:768px) { - .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; - } - .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; -} - -.navbar-default .navbar-nav .open .dropdown-menu > li a:hover { - font-size: 12px; -} - -/* Buttons */ - -/* ------------------------------- */ - -.btn-outline { - color: inherit; - background-color: transparent; - transition: all .5s; -} - -.btn-primary.btn-outline { - color: #428bca; -} - -.btn-success.btn-outline { - color: #5cb85c; -} - -.btn-info.btn-outline { - color: #5bc0de; -} - -.btn-warning.btn-outline { - color: #f0ad4e; -} - -.btn-danger.btn-outline { - color: #d9534f; -} - -.btn-primary.btn-outline:hover, -.btn-success.btn-outline:hover, -.btn-info.btn-outline:hover, -.btn-warning.btn-outline:hover, -.btn-danger.btn-outline:hover { - color: #fff; -} - -/* Pages */ - -/* ------------------------------- */ - -/* Dashboard Chat */ - -.chat { - margin: 0; - padding: 0; - list-style: none; -} - -.chat li { - margin-bottom: 10px; - padding-bottom: 5px; - border-bottom: 1px dotted #B3A9A9; -} - -.chat li.left .chat-body { - margin-left: 60px; -} - -.chat li.right .chat-body { - margin-right: 60px; -} - -.chat li .chat-body p { - margin: 0; - color: #777777; -} - -.panel .slidedown .glyphicon, -.chat .glyphicon { - margin-right: 5px; -} - -.chat-panel .panel-body { - height: 350px; - overflow-y: scroll; -} - -/* Login Page */ - -.login-panel { - margin-top: 25%; -} - -/* Flot Chart Containers */ - -.flot-chart { - display: block; - height: 400px; -} - -.flot-chart-content { - width: 100%; - height: 100%; -} - -/* DataTables Overrides */ - -table.dataTable thead .sorting, -table.dataTable thead .sorting_asc:after, -table.dataTable thead .sorting_desc, -table.dataTable thead .sorting_asc_disabled, -table.dataTable thead .sorting_desc_disabled { - background: transparent; -} - -table.dataTable thead .sorting_asc:after { - content: "\f0de"; - float: right; - font-family: fontawesome; -} - -table.dataTable thead .sorting_desc:after { - content: "\f0dd"; - float: right; - font-family: fontawesome; -} - -table.dataTable thead .sorting:after { - content: "\f0dc"; - float: right; - font-family: fontawesome; - color: rgba(50,50,50,.5); -} - -div.dataTables_length select { - font-size: 11px; - height: 25px; -} - -div.dataTables_filter input { - font-size: 11px; - height: 25px; -} - -div.dataTables_paginate { - font-size: 11px; -} - -div.dataTables_paginate ul.pagination { - font-size: 11px; - -} - -/* Circle Buttons */ - - .btn-circle { - width: 30px; - height: 30px; - padding: 6px 0; - border-radius: 15px; - text-align: center; - font-size: 12px; - line-height: 1.428571429; -} - -.btn-circle.btn-lg { - width: 50px; - height: 50px; - padding: 10px 16px; - border-radius: 25px; - font-size: 18px; - line-height: 1.33; -} - -.btn-circle.btn-xl { - width: 70px; - height: 70px; - padding: 10px 16px; - border-radius: 35px; - font-size: 24px; - line-height: 1.33; -} - -.show-grid [class^="col-"] { - padding-top: 10px; - padding-bottom: 10px; - border: 1px solid #ddd; - background-color: #eee !important; -} - -.show-grid { - margin: 15px 0; -} - -/* No Padding for Tables */ - -.no-padding { - padding:0 -} - -.no-padding table { - margin: 0 -} - -.no-padding .table-bordered { - border: 0; -} - -.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; -} - -p.overview { - 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; -} - -div.overview { - margin: 20px 0px 0px; -} - -span.bigfont { - font-size: 100%; -} - -th.smallwidth { - width: 250px; -} - -.col-md-spark, .col-md-spark-2 { - position:relative; - min-height:1px; - padding-left:15px; - padding-right:15px -} - -span.overview-mhs { - font-size: 11px; - font-weight: bold; -} - -div.black { - color: black; -} - -div.progress-fix { - margin: 0px 0px 5px 0px; -} - -span.spark-18 { - margin: -20%; -} - -span.spark-25 { - margin: -25%; -} - -/* Test Edit */ - -.circle-tile { - margin-bottom: 30px; -} - -.circle-tile { - margin-bottom: 15px; - text-align: center; -} - -.circle-tile-content { - padding-top: 50px; - border-radius: 8px; - border: 3px solid rgba(255, 255, 255, 0.3); -} - -.circle-tile-description { - font-weight: bold; - font-size: 16px; -} - -.circle-tile-number { - 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; -} - -.circle-tile-heading .fa { - line-height: 80px; -} - -.lightblue { - background-color: #2FAACE; -} - -.text-faded { - color: rgba(255, 255, 255, 0.7); -} - -.text-link { - color: #FFFFFF; -} - -p.up { - margin: -5px 0px -8px; - font-weight: 600; -} - -div.up { - margin: -10px 0px 6px 0px; -} - -p.up-more { - margin: -6px 0px 10px; - font-weight: 600; -} - -p.up-more2 { - margin: -6px 0px 0px; -} - -div.fade { - 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 */ +/* Global Styles */ + +/* ------------------------------- */ + +body { + background-color: #f8f8f8; + min-width: 350px; + font-size: 12px; + /* Design constraint */ +} + +p { + font-size: 12px; +} + +/* Wrappers */ + +/* ------------------------------- */ + + #wrapper { + width: 100%; +} + +#page-wrapper { + padding: 0 15px; + min-height: 568px; + background-color: #fff; + font-size: 12px; +} + +@media(min-width:768px) { + #page-wrapper { + position: inherit; + margin: 0 0 0 250px; + padding: 0 30px; + min-height: 900px; + border-left: 1px solid #e7e7e7; + font-size: 12px; + } +} + +.navbar-static-side ul li { + border-bottom: 1px solid #e7e7e7; +} + + +/* Input fields */ + +/* ------------------------------- */ + +select, +textarea, +input[type="text"], +input[type="password"], +input[type="datetime"], +input[type="datetime-local"], +input[type="date"], +input[type="month"], +input[type="time"], +input[type="week"], +input[type="number"], +input[type="email"], +input[type="url"], +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; +} + +.input-group-sm > .form-control, +.input-group-sm > .input-group-addon, +.input-group-sm > .input-group-btn > .btn { + height: 25px; + font-size: 12px; +} + +.form-control { + font-size: 12px; +} + +.input-group .input-group-addon { + line-height: 1!important; + } + +.glyphicon{ + line-height: 1em; +} + +.select-mini, .input-group { + font-size: 11px; + height: 25px; +} + +/* Navigation */ + +/* ------------------------------- */ + +/* Top Right Navigation Dropdown Styles */ + +.navbar-top-links li { + display: inline-block; +} + +.navbar-top-links li:last-child { + margin-right: 15px; +} + +.navbar-top-links li a { + padding: 15px; + min-height: 50px; +} + +.dropdown-user { + min-width:100px; +} + +.navbar-top-links .dropdown-menu li { + display: block; +} + +.navbar-top-links .dropdown-menu li:last-child { + margin-right: 0; +} + +.navbar-top-links .dropdown-menu li a { + padding: 3px 20px; + min-height: 0; +} + +.navbar-top-links .dropdown-menu li a div { + white-space: normal; +} + +.navbar-top-links .dropdown-messages, +.navbar-top-links .dropdown-tasks, +.navbar-top-links .dropdown-alerts { + width: 310px; + min-width: 0; +} + +.navbar-top-links .dropdown-messages { + margin-left: 5px; +} + +.navbar-top-links .dropdown-tasks { + margin-left: -59px; +} + +.navbar-top-links .dropdown-alerts { + /*#margin-left: -123px; */ +} + +.navbar-top-links .dropdown-user { + right: 0; + left: auto; +} + +/* Sidebar Menu Styles */ + +.sidebar-search { + padding: 15px; +} + +.arrow { + float: right; +} + +.fa.arrow:before { + content: "\f104"; +} + +.active > a > .fa.arrow:before { + content: "\f107"; +} + +.nav-second-level li, +.nav-third-level li { + border-bottom: none !important; +} + +.nav-second-level li a { + padding-left: 37px; +} + +.nav-third-level li a { + padding-left: 52px; +} + +@media(min-width:768px) { + .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; + } + .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; +} + +.navbar-default .navbar-nav .open .dropdown-menu > li a:hover { + font-size: 12px; +} + +/* Buttons */ + +/* ------------------------------- */ + +.btn-outline { + color: inherit; + background-color: transparent; + transition: all .5s; +} + +.btn-primary.btn-outline { + color: #428bca; +} + +.btn-success.btn-outline { + color: #5cb85c; +} + +.btn-info.btn-outline { + color: #5bc0de; +} + +.btn-warning.btn-outline { + color: #f0ad4e; +} + +.btn-danger.btn-outline { + color: #d9534f; +} + +.btn-primary.btn-outline:hover, +.btn-success.btn-outline:hover, +.btn-info.btn-outline:hover, +.btn-warning.btn-outline:hover, +.btn-danger.btn-outline:hover { + color: #fff; +} + +/* Pages */ + +/* ------------------------------- */ + +/* Dashboard Chat */ + +.chat { + margin: 0; + padding: 0; + list-style: none; +} + +.chat li { + margin-bottom: 10px; + padding-bottom: 5px; + border-bottom: 1px dotted #B3A9A9; +} + +.chat li.left .chat-body { + margin-left: 60px; +} + +.chat li.right .chat-body { + margin-right: 60px; +} + +.chat li .chat-body p { + margin: 0; + color: #777777; +} + +.panel .slidedown .glyphicon, +.chat .glyphicon { + margin-right: 5px; +} + +.chat-panel .panel-body { + height: 350px; + overflow-y: scroll; +} + +/* Login Page */ + +.login-panel { + margin-top: 25%; +} + +/* Flot Chart Containers */ + +.flot-chart { + display: block; + height: 400px; +} + +.flot-chart-content { + width: 100%; + height: 100%; +} + +/* DataTables Overrides */ + +table.dataTable thead .sorting, +table.dataTable thead .sorting_asc:after, +table.dataTable thead .sorting_desc, +table.dataTable thead .sorting_asc_disabled, +table.dataTable thead .sorting_desc_disabled { + background: transparent; +} + +table.dataTable thead .sorting_asc:after { + content: "\f0de"; + float: right; + font-family: fontawesome; +} + +table.dataTable thead .sorting_desc:after { + content: "\f0dd"; + float: right; + font-family: fontawesome; +} + +table.dataTable thead .sorting:after { + content: "\f0dc"; + float: right; + font-family: fontawesome; + color: rgba(50,50,50,.5); +} + +div.dataTables_length select { + font-size: 11px; + height: 25px; +} + +div.dataTables_filter input { + font-size: 11px; + height: 25px; +} + +div.dataTables_paginate { + font-size: 11px; +} + +div.dataTables_paginate ul.pagination { + font-size: 11px; + +} + +/* Circle Buttons */ + + .btn-circle { + width: 30px; + height: 30px; + padding: 6px 0; + border-radius: 15px; + text-align: center; + font-size: 12px; + line-height: 1.428571429; +} + +.btn-circle.btn-lg { + width: 50px; + height: 50px; + padding: 10px 16px; + border-radius: 25px; + font-size: 18px; + line-height: 1.33; +} + +.btn-circle.btn-xl { + width: 70px; + height: 70px; + padding: 10px 16px; + border-radius: 35px; + font-size: 24px; + line-height: 1.33; +} + +.show-grid [class^="col-"] { + padding-top: 10px; + padding-bottom: 10px; + border: 1px solid #ddd; + background-color: #eee !important; +} + +.show-grid { + margin: 15px 0; +} + +/* No Padding for Tables */ + +.no-padding { + padding:0 +} + +.no-padding table { + margin: 0 +} + +.no-padding .table-bordered { + border: 0; +} + +.borderless > tbody > tr > td { + border: none; + padding: 5px; +} + +.borderless > thead > tr > th { + border: none; +} + +.margin-bottom-sm { + 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; +} + +span.overview { + font-size: 14px; + font-weight: bold; +} + +div.overview { + margin: 20px 0px 0px; +} + +span.bigfont { + font-size: 100%; +} + +th.smallwidth { + width: 250px; +} + +.col-md-spark, .col-md-spark-2 { + position:relative; + min-height:1px; + padding-left:15px; + padding-right:15px +} + +span.overview-mhs { + font-size: 11px; + font-weight: bold; +} + +div.black { + color: black; +} + +div.progress-fix { + margin: 0px 0px 5px 0px; +} + +span.spark-18 { + margin: -20%; +} + +span.spark-25 { + margin: -25%; +} + +/* Test Edit */ + +.circle-tile { + margin-bottom: 30px; +} + +.circle-tile { + margin-bottom: 15px; + text-align: center; +} + +.circle-tile-content { + padding-top: 50px; + border-radius: 8px; + border: 3px solid rgba(255, 255, 255, 0.3); +} + +.circle-tile-description { + font-weight: bold; + font-size: 16px; +} + +.circle-tile-number { + 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; +} + +.circle-tile-heading .fa { + line-height: 80px; +} + +.lightblue { + background-color: #2FAACE; +} + +.text-faded { + color: rgba(255, 255, 255, 0.7); +} + +.text-link { + color: #FFFFFF; +} + +p.up { + margin: -5px 0px -8px; + font-weight: 600; +} + +div.up { + margin: -10px 0px 6px 0px; +} + +p.up-more { + margin: -6px 0px 10px; + font-weight: 600; +} + +p.up-more2 { + margin: -6px 0px 0px; +} + +div.fade { + 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%; + margin-bottom: 5px !important; +} + +.confirmations { + color: #F79D00; +} + +/* End Footer */ diff --git a/public/templates/bootstrap/account/earnings/default.tpl b/public/templates/bootstrap/account/earnings/default.tpl index f783d452..dab7af0e 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"}
- + @@ -58,7 +60,7 @@ - @@ -70,7 +72,7 @@ - @@ -82,7 +84,7 @@ - @@ -94,7 +96,7 @@ - @@ -106,7 +108,7 @@ - @@ -123,7 +125,6 @@ - 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}
- +
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 Bonus Debit AP
Last Hour + Last Hour {$BYTIME.1HourCredit|number_format:"8"} {$BYTIME.1HourBonus|number_format:"8"} {$BYTIME.1HourDebitAP|number_format:"8"}{$BYTIME.1HourTXFee|number_format:"8"}
Last Day + Last Day {$BYTIME.24HourCredit|number_format:"8"} {$BYTIME.24HourBonus|number_format:"8"} {$BYTIME.24HourDebitAP|number_format:"8"}{$BYTIME.24HourTXFee|number_format:"8"}
Last Week + Last Week {$BYTIME.1WeekCredit|number_format:"8"} {$BYTIME.1WeekBonus|number_format:"8"} {$BYTIME.1WeekDebitAP|number_format:"8"}{$BYTIME.1WeekTXFee|number_format:"8"}
Last Month + Last Month {$BYTIME.1MonthCredit|number_format:"8"} {$BYTIME.1MonthBonus|number_format:"8"} {$BYTIME.1MonthDebitAP|number_format:"8"}{$BYTIME.1MonthTXFee|number_format:"8"}
Last Year + Last Year {$BYTIME.1YearCredit|number_format:"8"} {$BYTIME.1YearBonus|number_format:"8"} {$BYTIME.1YearDebitAP|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 f031d03f..7c2e62bc 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} - - - - + + + - - - + - - + + - + @@ -178,7 +178,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/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 94ac0d92..ea93b47f 100644 --- a/public/templates/bootstrap/statistics/blocks/block_overview_time.tpl +++ b/public/templates/bootstrap/statistics/blocks/block_overview_time.tpl @@ -10,16 +10,16 @@
Gen est.Gen. Est. Found Valid OrphanAvg DiffShares est.Avg. DiffShares Est. Shares Percentage AmountRate est.Rate Est.
- + @@ -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}