[Custom CSS Theme Support] Added support for fetching list of themes from database.
这个提交包含在:
父节点
bad229dd09
当前提交
a512a984aa
共有 4 个文件被更改,包括 32 次插入 和 12 次删除
|
|
@ -42,6 +42,9 @@ class User extends CI_Controller {
|
||||||
$this->form_validation->set_rules('user_locator', 'Locator', 'required');
|
$this->form_validation->set_rules('user_locator', 'Locator', 'required');
|
||||||
$this->form_validation->set_rules('user_timezone', 'Timezone', 'required');
|
$this->form_validation->set_rules('user_timezone', 'Timezone', 'required');
|
||||||
|
|
||||||
|
// Get themes list
|
||||||
|
$data['themes'] = $this->user_model->getThemes();
|
||||||
|
|
||||||
// Get timezones
|
// Get timezones
|
||||||
$data['timezones'] = $this->user_model->timezones();
|
$data['timezones'] = $this->user_model->timezones();
|
||||||
|
|
||||||
|
|
@ -158,6 +161,9 @@ class User extends CI_Controller {
|
||||||
$this->form_validation->set_rules('user_locator', 'Locator', 'required|xss_clean');
|
$this->form_validation->set_rules('user_locator', 'Locator', 'required|xss_clean');
|
||||||
$this->form_validation->set_rules('user_timezone', 'Timezone', 'required');
|
$this->form_validation->set_rules('user_timezone', 'Timezone', 'required');
|
||||||
|
|
||||||
|
// Get themes list
|
||||||
|
$data['themes'] = $this->user_model->getThemes();
|
||||||
|
|
||||||
// Get timezones
|
// Get timezones
|
||||||
$data['timezones'] = $this->user_model->timezones();
|
$data['timezones'] = $this->user_model->timezones();
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -370,6 +370,14 @@ class User_Model extends CI_Model {
|
||||||
return $ts;
|
return $ts;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// FUNCTION: array getThemes()
|
||||||
|
// Returns a list of themes
|
||||||
|
function getThemes() {
|
||||||
|
$result = $this->db->query('SELECT * FROM themes order by name');
|
||||||
|
|
||||||
|
return $result->result();
|
||||||
|
}
|
||||||
|
|
||||||
// FUNCTION: bool _auth($password, $hash)
|
// FUNCTION: bool _auth($password, $hash)
|
||||||
// Checks a password against the stored hash
|
// Checks a password against the stored hash
|
||||||
private function _auth($password, $hash) {
|
private function _auth($password, $hash) {
|
||||||
|
|
|
||||||
|
|
@ -111,12 +111,15 @@
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label for="user_stylesheet">Theme</label>
|
<label for="user_stylesheet">Theme</label>
|
||||||
<select class="custom-select" id="user_stylesheet" name="user_stylesheet" required>
|
<select class="custom-select" id="user_stylesheet" name="user_stylesheet" required>
|
||||||
<option value='default' selected="selected">Default</option>
|
<?php
|
||||||
<option value='blue'>Blue</option>
|
foreach ($themes as $theme) {
|
||||||
<option value='cosmo'>Cosmo</option>
|
echo '<option value="' . $theme->foldername . '"';
|
||||||
<option value='cyborg'>Cyborg (Dark)</option>
|
if( $theme->foldername == 'default') {
|
||||||
<option value='darkly'>Darkly (Dark)</option>
|
echo 'selected="selected"';
|
||||||
<option value='superhero'>Superhero (Dark)</option>
|
}
|
||||||
|
echo '>' . $theme->name . '</option>';
|
||||||
|
}
|
||||||
|
?>
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -94,12 +94,15 @@
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<label>Stylesheet</label>
|
<label>Stylesheet</label>
|
||||||
<select class="custom-select" id="user_stylesheet" name="user_stylesheet" required>
|
<select class="custom-select" id="user_stylesheet" name="user_stylesheet" required>
|
||||||
<option value='default' <?php if($user_stylesheet == "default") { echo "selected=\"selected\""; } ?>>Default</option>
|
<?php
|
||||||
<option value='blue' <?php if($user_stylesheet == "blue") { echo "selected=\"selected\""; } ?>>Blue</option>
|
foreach ($themes as $theme) {
|
||||||
<option value='cosmo' <?php if($user_stylesheet == "cosmo") { echo "selected=\"selected\""; } ?>>Cosmo</option>
|
echo '<option value="' . $theme->foldername . '"';
|
||||||
<option value='cyborg' <?php if($user_stylesheet == "cyborg") { echo "selected=\"selected\""; } ?>>Cyborg (Dark)</option>
|
if( $user_stylesheet == $theme->foldername) {
|
||||||
<option value='darkly' <?php if($user_stylesheet == "darkly") { echo "selected=\"selected\""; } ?>> Darkly (Dark)</option>
|
echo 'selected="selected"';
|
||||||
<option value='superhero' <?php if($user_stylesheet == "superhero") { echo "selected=\"selected\""; } ?>>Superhero (Dark)</option>
|
}
|
||||||
|
echo '>' . $theme->name . '</option>';
|
||||||
|
}
|
||||||
|
?>
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
正在加载…
在新工单中引用