[UPDATE] some style changes, design switcher for own designs

This commit is contained in:
iAmShorty 2014-03-25 15:54:48 +01:00
parent d51cfc0546
commit 3a7e358fc9
11 changed files with 197 additions and 43 deletions

View File

@ -70,4 +70,4 @@ require_once(CLASS_DIR . '/api.class.php');
require_once(INCLUDE_DIR . '/lib/Michelf/Markdown.php');
require_once(INCLUDE_DIR . '/lib/scrypt.php');
?>
?>

View File

@ -36,4 +36,4 @@ $master_template = 'master.tpl';
// We include all needed files here, even though our templates could load them themself
require_once(INCLUDE_DIR . '/autoloader.inc.php');
?>
?>

View File

@ -31,6 +31,23 @@ class Template extends Base {
return $aThemes;
}
/**
* Get all available designs
* Read css files from css/design folder
*
* @return array - list of available designs
*/
public function getDesigns() {
$this->debug->append("STA " . __METHOD__, 4);
$aTmpDesigns = glob(BASEPATH . 'site_assets/' . THEME . '/css/design/*.css');
$aDesigns = array();
$aDesigns['default'] = 'default';
foreach ($aTmpDesigns as $filename) {
if (basename($filename) != '.' && basename($filename) != '..') $aDesigns[basename($filename, ".css")] = basename($filename, ".css");
}
return $aDesigns;
}
/**
* Cached getActiveTemplates method
*

View File

@ -2,6 +2,7 @@
$defflip = (!cfip()) ? exit(header('HTTP/1.1 401 Unauthorized')) : 1;
$aThemes = $template->getThemes();
$aDesigns = $template->getDesigns();
// Load the settings available in this system
$aSettings['website'][] = array(
@ -53,6 +54,13 @@ $aSettings['website'][] = array(
'name' => 'website_theme', 'value' => $setting->getValue('website_theme'),
'tooltip' => 'The default theme used on your pool.'
);
$aSettings['website'][] = array(
'display' => 'Website Design', 'type' => 'select',
'options' => $aDesigns,
'default' => 'default',
'name' => 'website_design', 'value' => $setting->getValue('website_design'),
'tooltip' => 'The default design used on your pool.'
);
$aSettings['website'][] = array(
'display' => 'Website News Style', 'type' => 'select',
'options' => array( 0 => 'Show all news in one Page', 1 => 'Show Responsive News Table' ),

View File

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

View File

@ -0,0 +1,121 @@
/* overwrite style infos */
/* ------------------------------- */
body {
background-color: #222222;
font-size: 12px;
}
p {
font-size: 12px;
}
#page-wrapper {
background-color: #222222;
}
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;
}
}
.navbar-static-side ul li {
border-bottom: 1px solid #222222;
}
.navbar, .navbar-static-side, .navbar-default {
background-color: #222222;
}
a {
color: #999999;
}
a:hover,
a:focus {
color: #FFFFFF;
}
.panel-body {
color: #333;
background-color: #FFFFFF;
border-color: #222222;
}
.lightblue {
background-color: #222222;
}
.footer {
color: #FFFFFF;
}
.navbar .brand, .navbar .nav > li > a:hover {
color: #FFFFFF;
background-color: #000000;
}
.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 td, .table tbody tr:hover th {
background-color: #999999;
}
.nav > li > a:hover,
.nav > li > a:focus {
background-color: #000000;
color: #FFFFFF;
}
.nav .nav-second-level > li > a:hover,
.nav .nav-second-level > li > a:focus {
background-color: #000000;
color: #FFFFFF;
}
/* Tables */
.panel-footer {
color: #000;
background-color: #BDBFBF;
}
.panel-body {
color: #000;
background-color: #BDBFBF;
}

View File

@ -2,12 +2,17 @@
/* ------------------------------- */
body {
body {
background-color: #f8f8f8;
min-width: 350px;
font-size: 12px;
/* Design constraint */
}
p {
font-size: 12px;
}
/* Wrappers */
/* ------------------------------- */
@ -20,6 +25,7 @@
padding: 0 15px;
min-height: 568px;
background-color: #fff;
font-size: 12px;
}
@media(min-width:768px) {
@ -29,6 +35,7 @@
padding: 0 30px;
min-height: 1300px;
border-left: 1px solid #e7e7e7;
font-size: 12px;
}
}
@ -226,13 +233,13 @@
/* Login Page */
.login-panel {
.login-panel {
margin-top: 25%;
}
/* Flot Chart Containers */
.flot-chart {
.flot-chart {
display: block;
height: 400px;
}
@ -244,7 +251,7 @@
/* DataTables Overrides */
table.dataTable thead .sorting,
table.dataTable thead .sorting,
table.dataTable thead .sorting_asc:after,
table.dataTable thead .sorting_desc,
table.dataTable thead .sorting_asc_disabled,

View File

@ -17,7 +17,7 @@
</div>
</div>
</div>
<div class="panel-footer overview">
<div class="panel-footer">
<h6>Refresh interval: {$GLOBAL.config.statistics_ajax_refresh_interval|default:"10"} seconds. Hashrate based on shares submitted in the past {$INTERVAL|default:"5"} minutes.</h6>
</div>
</div>

View File

@ -6,7 +6,7 @@
<h3 class="panel-title">Login with existing account</h3>
</div>
<div class="panel-body">
<fieldset>
<div class="form-group">
<div class="input-group margin-bottom-sm">
<span class="input-group-addon"><i class="fa fa-envelope-o fa-fw"></i></span>
<input class="form-control" placeholder="E-mail" name="username" type="email" autofocus required>
@ -15,10 +15,10 @@
<span class="input-group-addon"><i class="fa fa-key fa-fw"></i></span>
<input class="form-control" placeholder="Password" name="password" type="password" value="" required>
</div>
</fieldset>
</div>
</div>
<center>{nocache}{$RECAPTCHA|default:"" nofilter}{/nocache}</center>
<div class="panel-footer" style="margin-top: 20px;">
<div class="panel-footer">
<input type="submit" class="btn btn-success" value="Login" >
<a href="{$smarty.server.SCRIPT_NAME}?page=password"><font size="1">Forgot your password?</font></a>
</div>

View File

@ -22,6 +22,7 @@
<link href="{$PATH}/css/plugins/dataTables/dataTables.bootstrap.css" rel="stylesheet">
<link href="{$PATH}/css/mpos.css" rel="stylesheet">
<link href="{$PATH}/css/sparklines.css" rel="stylesheet">
<link href="{$PATH}/css/design/{$GLOBAL.config.website_design|default:"default"}.css" rel="stylesheet">
<script src="{$PATH}/js/jquery-2.0.3.min.js"></script>
<script src="{$PATH}/js/jquery.cookie.js"></script>

View File

@ -5,7 +5,7 @@
<div class="row">
<div class="col-lg-6">
<form class="panel panel-info" method="post" role="form">
<form class="panel panel-info form-inline" method="post" role="form">
<input type="hidden" name="page" value="{$smarty.request.page|escape}">
{if $smarty.request.token|default:""}
<input type="hidden" name="token" value="{$smarty.request.token|escape}">
@ -16,41 +16,40 @@
<i class="fa fa-edit fa-fw"></i> Register new account
</div>
<div class="panel-body">
<label>Username</label>
<div class="input-group margin-bottom-sm">
<span class="input-group-addon"><i class="fa fa-user fa-fw"></i></span>
<input type="text" class="form-control" name="username" placeholder="Usermane" value="{$smarty.post.username|escape|default:""}" size="15" maxlength="20" required>
</div>
<label>Password</label> (<span id="pw_strength">Strength</span>)
<div class="input-group">
<span class="input-group-addon"><i class="fa fa-key fa-fw"></i></span>
<input type="password" class="form-control" name="password1" placeholder="Password" value="" size="15" maxlength="100" id="pw_field" required>
</div>
<span id="pw_match"></span>
<div class="input-group margin-bottom-sm">
<span class="input-group-addon" id="pw_match"><i class="fa fa-key fa-fw"></i></span>
<input type="password" class="form-control" name="password2" placeholder="Repeat Password" value="" size="15" maxlength="100" id="pw_field2" required>
</div>
<label>Email</label>
<div class="input-group">
<span class="input-group-addon"><i class="fa fa-envelope-o fa-fw"></i></span>
<input type="text" name="email1" placeholder="Email" class="form-control" value="{$smarty.post.email1|escape|default:""}" size="15" required>
</div>
<div class="input-group margin-bottom-sm">
<span class="input-group-addon"><i class="fa fa-envelope-o fa-fw"></i></span>
<input type="text" class="form-control" name="email2" placeholder="Repeat Email" value="{$smarty.post.email2|escape|default:""}" size="15" required>
</div>
<label>PIN</label>
<font size="1">Four digit number. <b>Remember this pin!</b></font>
<div class="input-group">
<span class="input-group-addon"><i class="fa fa-shield fa-fw"></i></span>
<input type="password" class="form-control" name="pin" placeholder="PIN" value="" size="4" maxlength="4" required>
</div>
<div class="form-group">
<label>Username</label>
<div class="input-group margin-bottom-sm">
<span class="input-group-addon"><i class="fa fa-user fa-fw"></i></span>
<input type="text" class="form-control" name="username" placeholder="Usermane" value="{$smarty.post.username|escape|default:""}" size="15" maxlength="20" required>
</div>
<label>Password</label> (<span id="pw_strength">Strength</span>)
<div class="input-group">
<span class="input-group-addon"><i class="fa fa-key fa-fw"></i></span>
<input type="password" class="form-control" name="password1" placeholder="Password" value="" size="15" maxlength="100" id="pw_field" required>
</div>
<span id="pw_match"></span>
<div class="input-group margin-bottom-sm">
<span class="input-group-addon" id="pw_match"><i class="fa fa-key fa-fw"></i></span>
<input type="password" class="form-control" name="password2" placeholder="Repeat Password" value="" size="15" maxlength="100" id="pw_field2" required>
</div>
<label>Email</label>
<div class="input-group">
<span class="input-group-addon"><i class="fa fa-envelope-o fa-fw"></i></span>
<input type="text" name="email1" placeholder="Email" class="form-control" value="{$smarty.post.email1|escape|default:""}" size="15" required>
</div>
<div class="input-group margin-bottom-sm">
<span class="input-group-addon"><i class="fa fa-envelope-o fa-fw"></i></span>
<input type="text" class="form-control" name="email2" placeholder="Repeat Email" value="{$smarty.post.email2|escape|default:""}" size="15" required>
</div>
<label>PIN</label>
<font size="1">Four digit number. <b>Remember this pin!</b></font>
<div class="input-group">
<span class="input-group-addon"><i class="fa fa-shield fa-fw"></i></span>
<input type="password" class="form-control" name="pin" placeholder="PIN" value="" size="4" maxlength="4" required>
</div>
<div class="checkbox">
<label>
<input type="checkbox" value="1" name="tac" id="tac">
I Accept The <a data-toggle="modal" data-target="#TAC">Terms and Conditions</a>
<input type="checkbox" value="1" name="tac" id="tac"> I Accept The <a data-toggle="modal" data-target="#TAC">Terms and Conditions</a>
</label>
</div>
</div>