diff --git a/public/include/admin_checks.php b/public/include/admin_checks.php index cdd9ad292..179d873ae 100644 --- a/public/include/admin_checks.php +++ b/public/include/admin_checks.php @@ -101,7 +101,8 @@ $host = @gethostbyname($config['gettingstarted']['stratumurl']); $port = $config['gettingstarted']['stratumport']; - if (isset($port) and + if (isset($host) and + isset($port) and ($socket=socket_create(AF_INET, SOCK_STREAM, SOL_TCP)) and (socket_set_option($socket, SOL_SOCKET, SO_SNDTIMEO, array('sec' => 3, 'usec' => 0))) and (@socket_connect($socket, $host, $port))) diff --git a/public/site_assets/bootstrap/css/design/blue.css b/public/site_assets/bootstrap/css/design/blue.css new file mode 100644 index 000000000..ea0c2532c --- /dev/null +++ b/public/site_assets/bootstrap/css/design/blue.css @@ -0,0 +1,136 @@ +/* overwrite style infos */ + +/* ------------------------------- */ + +body { + background-color: #A2BCF5; + font-size: 12px; +} + +p { + font-size: 12px; +} + +#page-wrapper { + background-color: #A2BCF5; +} + +@media(min-width:768px) { + #page-wrapper { + border-left: 1px solid #A2BCF5; + } +} + +.navbar-static-side ul li { + border-bottom: 1px solid #A2BCF5; +} + +.navbar, .navbar-static-side, .navbar-default { + background-color: #A2BCF5; +} + +a { + color: #0e0af2; +} +a:hover, +a:focus { + color: #FFFFFF; +} + +.panel-body { + color: #000000; + background-color: #8CABED; + border-color: #A2BCF5; +} + +.lightblue { + background-color: #3065D9; +} + +.footer { + color: #FFFFFF; +} + +.navbar .brand, .navbar .nav > li > a { + color: #0e0af2; +} + +.navbar .brand, .navbar .nav > li > a:hover { + color: #8CABED; + background-color: #0e0af2; +} + +.navbar-default .navbar-nav > .active > a, +.navbar-default .navbar-nav > .active > a:hover, +.navbar-default .navbar-nav > .active > a:focus { + background-color: #0e0af2; + color: #FFFFFF; +} + +.table tbody tr:hover a, +.table tbody tr:hover td, +.table tbody tr:hover th { + background-color: #0e0af2; + color: #FFFFFF; +} + +.nav > li > a:hover, +.nav > li > a:focus { + background-color: #0e0af2; + color: #FFFFFF; +} + +.nav .nav-second-level > li > a:hover, +.nav .nav-second-level > li > a:focus { + background-color: #0e0af2; + color: #FFFFFF; +} + +.navbar .nav > li.dropdown.open > .dropdown-toggle, +.navbar .nav > li.dropdown.active > .dropdown-toggle, +.navbar .nav > li.dropdown.open.active > .dropdown-toggle { + color: #FFFFFF; + background-color: #0e0af2; +} + +.navbar-default .navbar-nav .open .dropdown-menu > li > a, +.navbar-default .navbar-nav .open .dropdown-menu { + color: #FFFFFF; + background-color: #0e0af2; + font-size: 12px; +} + +.navbar-default .navbar-nav .open .dropdown-menu > li a:hover { + background-color: #0e0af2; + color: #3E6CCF; + font-size: 12px; +} + +/* Tables */ + +.panel-footer { + color: #000; + background-color: #3065D9; + border-top: 1px solid #3065D9; + border-bottom-right-radius: 3px; + border-bottom-left-radius: 3px; +} + +.panel-body { + color: #000000; + background-color: #3E6CCF; +} + +.panel-info > .panel-heading { + background-color: #6F94E3; + border-color: #2c28ed; + color: #D3D3D3; +} + +.panel-info { + border-color: #2c28ed; +} + +.dropdown-menu { + background-color: #6090F7; +} diff --git a/public/site_assets/bootstrap/css/design/dark.css b/public/site_assets/bootstrap/css/design/dark.css index 57c14dd98..e72027652 100644 --- a/public/site_assets/bootstrap/css/design/dark.css +++ b/public/site_assets/bootstrap/css/design/dark.css @@ -15,30 +15,6 @@ p { background-color: #999999; } -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: 12px; - color: #555555; - border: 1px solid #ccc; -} - @media(min-width:768px) { #page-wrapper { border-left: 1px solid #222222; @@ -75,6 +51,10 @@ a:focus { color: #FFFFFF; } +.navbar .brand, .navbar .nav > li > a { + color: #999999; +} + .navbar .brand, .navbar .nav > li > a:hover { color: #FFFFFF; background-color: #000000; @@ -106,10 +86,30 @@ a:focus { color: #FFFFFF; } +.navbar .nav > li.dropdown.open > .dropdown-toggle, +.navbar .nav > li.dropdown.active > .dropdown-toggle, +.navbar .nav > li.dropdown.open.active > .dropdown-toggle { + color: #FFFFFF; + background-color: #000000; +} + +.navbar-default .navbar-nav .open .dropdown-menu > li > a, +.navbar-default .navbar-nav .open .dropdown-menu { + color: #FFFFFF; + background-color: #000000; + font-size: 12px; +} + +.navbar-default .navbar-nav .open .dropdown-menu > li a:hover { + background-color: #000000; + color: #999999; + font-size: 12px; +} + /* Tables */ .panel-footer { - color: #000; + color: #000000; background-color: #BDBFBF; border-top: 1px solid #808080; border-bottom-right-radius: 3px; @@ -117,7 +117,7 @@ a:focus { } .panel-body { - color: #000; + color: #000000; background-color: #D3D3D3; } diff --git a/public/site_assets/bootstrap/css/design/green.css b/public/site_assets/bootstrap/css/design/green.css new file mode 100644 index 000000000..b79905b4b --- /dev/null +++ b/public/site_assets/bootstrap/css/design/green.css @@ -0,0 +1,136 @@ +/* overwrite style infos */ + +/* ------------------------------- */ + +body { + background-color: #167A1D; + font-size: 12px; +} + +p { + font-size: 12px; +} + +#page-wrapper { + background-color: #00A80B; +} + +@media(min-width:768px) { + #page-wrapper { + border-left: 1px solid #167A1D; + } +} + +.navbar-static-side ul li { + border-bottom: 1px solid #167A1D; +} + +.navbar, .navbar-static-side, .navbar-default { + background-color: #167A1D; +} + +a { + color: #05F215; +} +a:hover, +a:focus { + color: #FFFFFF; +} + +.panel-body { + color: #188518; + background-color: #FFFFFF; + border-color: #167A1D; +} + +.lightblue { + background-color: #167A1D; +} + +.footer { + color: #FFFFFF; +} + +.navbar .brand, .navbar .nav > li > a { + color: #05F215; +} + +.navbar .brand, .navbar .nav > li > a:hover { + color: #FFFFFF; + background-color: #2AAD13; +} + +.navbar-default .navbar-nav > .active > a, +.navbar-default .navbar-nav > .active > a:hover, +.navbar-default .navbar-nav > .active > a:focus { + background-color: #FF0000; + color: #FFFFFF; +} + +.table tbody tr:hover a, +.table tbody tr:hover td, +.table tbody tr:hover th { + background-color: #00A80B; + color: #FFFFFF; +} + +.nav > li > a:hover, +.nav > li > a:focus { + background-color: #2AAD13; + color: #FFFFFF; +} + +.nav .nav-second-level > li > a:hover, +.nav .nav-second-level > li > a:focus { + background-color: #2AAD13; + color: #FFFFFF; +} + +.navbar .nav > li.dropdown.open > .dropdown-toggle, +.navbar .nav > li.dropdown.active > .dropdown-toggle, +.navbar .nav > li.dropdown.open.active > .dropdown-toggle { + color: #FFFFFF; + background-color: #2AAD13; +} + +.navbar-default .navbar-nav .open .dropdown-menu > li > a, +.navbar-default .navbar-nav .open .dropdown-menu { + color: #FFFFFF; + background-color: #2AAD13; + font-size: 12px; +} + +.navbar-default .navbar-nav .open .dropdown-menu > li a:hover { + background-color: #2AAD13; + color: #000000; + font-size: 12px; +} + +/* Tables */ + +.panel-footer { + color: #000000; + background-color: #1EA106; + border-top: 1px solid #04CC11; + border-bottom-right-radius: 3px; + border-bottom-left-radius: 3px; +} + +.panel-body { + color: #000000; + background-color: #65B058; +} + +.panel-info > .panel-heading { + background-color: #65B058; + border-color: #04CC11; + color: #24E002; +} + +.panel-info { + border-color: #FFFFFF; +} + +.dropdown-menu { + background-color: #24E002; +} diff --git a/public/site_assets/bootstrap/css/mpos.css b/public/site_assets/bootstrap/css/mpos.css index 90bc06db3..6bec57133 100644 --- a/public/site_assets/bootstrap/css/mpos.css +++ b/public/site_assets/bootstrap/css/mpos.css @@ -43,6 +43,61 @@ p { 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 */ /* ------------------------------- */ @@ -152,6 +207,15 @@ p { } } +.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 */ /* ------------------------------- */ @@ -285,6 +349,25 @@ table.dataTable thead .sorting:after { word-wrap: break-word; } +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 { diff --git a/public/templates/bootstrap/account/edit/cashout.tpl b/public/templates/bootstrap/account/edit/cashout.tpl index 3f2395deb..8a8533515 100644 --- a/public/templates/bootstrap/account/edit/cashout.tpl +++ b/public/templates/bootstrap/account/edit/cashout.tpl @@ -41,16 +41,16 @@ {if $GLOBAL.twofactor.enabled && $GLOBAL.twofactor.options.withdraw} {if $GLOBAL.userdata.balance.confirmed|escape < $GLOBAL.config.mp_threshold} - + {elseif $WITHDRAWSENT == 1 && $WITHDRAWUNLOCKED == 1} - + {elseif $WITHDRAWSENT == 0 && $WITHDRAWUNLOCKED == 1 || $WITHDRAWSENT == 1 && $WITHDRAWUNLOCKED == 0} - + {elseif $WITHDRAWSENT == 0 && $WITHDRAWUNLOCKED == 0} - + {/if} {else} - + {/if} {/nocache} diff --git a/public/templates/bootstrap/account/edit/detail.tpl b/public/templates/bootstrap/account/edit/detail.tpl index 204a9dfb5..35049d544 100644 --- a/public/templates/bootstrap/account/edit/detail.tpl +++ b/public/templates/bootstrap/account/edit/detail.tpl @@ -69,14 +69,14 @@ {if $GLOBAL.twofactor.enabled && $GLOBAL.twofactor.options.details} {if $DETAILSSENT == 1 && $DETAILSUNLOCKED == 1} - + {elseif $DETAILSSENT == 0 && $DETAILSUNLOCKED == 1 || $DETAILSSENT == 1 && $DETAILSUNLOCKED == 0} - + {elseif $DETAILSSENT == 0 && $DETAILSUNLOCKED == 0} - + {/if} {else} - + {/if} {/nocache} diff --git a/public/templates/bootstrap/account/edit/password.tpl b/public/templates/bootstrap/account/edit/password.tpl index f489037eb..fa3d23e62 100644 --- a/public/templates/bootstrap/account/edit/password.tpl +++ b/public/templates/bootstrap/account/edit/password.tpl @@ -45,14 +45,14 @@ {if $GLOBAL.twofactor.enabled && $GLOBAL.twofactor.options.changepw} {if $CHANGEPASSSENT == 1 && $CHANGEPASSUNLOCKED == 1} - + {elseif $CHANGEPASSSENT == 0 && $CHANGEPASSUNLOCKED == 1 || $CHANGEPASSSENT == 1 && $CHANGEPASSUNLOCKED == 0} - + {elseif $CHANGEPASSSENT == 0 && $CHANGEPASSUNLOCKED == 0} - + {/if} {else} - + {/if} {/nocache} diff --git a/public/templates/bootstrap/account/edit/resetpin.tpl b/public/templates/bootstrap/account/edit/resetpin.tpl index f7b52cdce..36524ee27 100644 --- a/public/templates/bootstrap/account/edit/resetpin.tpl +++ b/public/templates/bootstrap/account/edit/resetpin.tpl @@ -19,7 +19,7 @@
diff --git a/public/templates/bootstrap/account/invitations/default.tpl b/public/templates/bootstrap/account/invitations/default.tpl index 56fc2a632..c256d41e3 100644 --- a/public/templates/bootstrap/account/invitations/default.tpl +++ b/public/templates/bootstrap/account/invitations/default.tpl @@ -19,7 +19,7 @@ diff --git a/public/templates/bootstrap/account/notifications/default.tpl b/public/templates/bootstrap/account/notifications/default.tpl index 96e18a728..ab2fedeab 100644 --- a/public/templates/bootstrap/account/notifications/default.tpl +++ b/public/templates/bootstrap/account/notifications/default.tpl @@ -17,7 +17,7 @@