kopia lustrzana https://github.com/magicbug/Cloudlog
[User][Themes] Changed how themes are handled, this resets themes to defaults and will need reselected
This will cause a breaking change to theme selection but will improve the ability to add more so greater good etc.pull/739/head
Peter Goodhall
GitHub
commit
85a1783eb7
|
|
@ -21,7 +21,7 @@ $config['migration_enabled'] = TRUE;
|
|||
| be upgraded / downgraded to.
|
||||
|
|
||||
*/
|
||||
$config['migration_version'] = 56;
|
||||
$config['migration_version'] = 57;
|
||||
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -269,10 +269,10 @@ class User extends CI_Controller {
|
|||
// All okay, return to user screen
|
||||
case OK:
|
||||
if($this->session->userdata('user_id') == $this->input->post('id', true)) {
|
||||
$this->session->set_flashdata('notice', 'User '.$this->input->post('user_name', true).' edited');
|
||||
redirect('user/profile');
|
||||
$this->session->set_flashdata('success', 'User '.$this->input->post('user_name', true).' edited');
|
||||
redirect('user/edit/'.$this->uri->segment(3));
|
||||
} else {
|
||||
$this->session->set_flashdata('notice', 'User '.$this->input->post('user_name', true).' edited');
|
||||
$this->session->set_flashdata('success', 'User '.$this->input->post('user_name', true).' edited');
|
||||
redirect('user');
|
||||
}
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,18 @@
|
|||
<?php
|
||||
|
||||
defined('BASEPATH') OR exit('No direct script access allowed');
|
||||
|
||||
class Migration_new_stylesheet_default extends CI_Migration {
|
||||
|
||||
public function up()
|
||||
{
|
||||
$sql = "UPDATE users SET user_stylesheet = 'default'";
|
||||
$this->db->query($sql);
|
||||
}
|
||||
|
||||
public function down()
|
||||
{
|
||||
$sql = "UPDATE users SET user_stylesheet = 'bootstrap.min.css'";
|
||||
$this->db->query($sql);
|
||||
}
|
||||
}
|
||||
|
|
@ -6,7 +6,7 @@
|
|||
<?php echo $this->lang->line('dashboard_you_have_had'); ?> <strong><?php echo $todays_qsos; ?></strong> <?php echo $this->lang->line('dashboard_qsos_today'); ?>
|
||||
</div>
|
||||
<?php } else { ?>
|
||||
<div class="alert alert-danger" role="alert">
|
||||
<div class="alert alert-warning" role="alert">
|
||||
<span class="badge badge-info"><?php echo $this->lang->line('general_word_important'); ?></span> <i class="fas fa-broadcast-tower"></i> <?php echo $this->lang->line('notice_turn_the_radio_on'); ?>
|
||||
</div>
|
||||
<?php } ?>
|
||||
|
|
|
|||
|
|
@ -7,16 +7,19 @@
|
|||
|
||||
<!-- Bootstrap CSS -->
|
||||
<?php if($this->session->userdata('user_stylesheet')) { ?>
|
||||
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/<?php echo $this->session->userdata('user_stylesheet');?>">
|
||||
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/<?php echo $this->session->userdata('user_stylesheet');?>/bootstrap.min.css">
|
||||
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/general.css">
|
||||
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/<?php echo $this->session->userdata('user_stylesheet');?>/overrides.css">
|
||||
<?php } else { ?>
|
||||
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/bootstrap.min.css">
|
||||
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/default/bootstrap.min.css">
|
||||
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/general.css">
|
||||
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/default/overrides.css">
|
||||
<?php } ?>
|
||||
|
||||
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/fontawesome/css/all.css">
|
||||
|
||||
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/jquery.fancybox.min.css" />
|
||||
|
||||
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/general.css">
|
||||
|
||||
<!-- Maps -->
|
||||
<link rel="stylesheet" type="text/css" href="<?php echo base_url(); ?>assets/js/leaflet/leaflet.css" />
|
||||
|
||||
|
|
|
|||
|
|
@ -7,16 +7,18 @@
|
|||
|
||||
<!-- Bootstrap CSS -->
|
||||
<?php if($this->session->userdata('user_stylesheet')) { ?>
|
||||
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/<?php echo $this->session->userdata('user_stylesheet');?>">
|
||||
<?php } else { ?>
|
||||
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/bootstrap.min.css">
|
||||
<?php } ?>
|
||||
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/<?php echo $this->session->userdata('user_stylesheet');?>/bootstrap.min.css">
|
||||
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/general.css">
|
||||
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/<?php echo $this->session->userdata('user_stylesheet');?>/overrides.css">
|
||||
<?php } else { ?>
|
||||
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/default/bootstrap.min.css">
|
||||
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/general.css">
|
||||
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/default/overrides.css">
|
||||
<?php } ?>
|
||||
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/fontawesome/css/all.css">
|
||||
|
||||
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/jquery.fancybox.min.css" />
|
||||
|
||||
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/general.css">
|
||||
|
||||
<!-- Maps -->
|
||||
<link rel="stylesheet" type="text/css" href="<?php echo base_url(); ?>assets/js/leaflet/leaflet.css" />
|
||||
|
||||
|
|
|
|||
|
|
@ -4,12 +4,19 @@
|
|||
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
|
||||
|
||||
<!-- Bootstrap CSS -->
|
||||
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/<?php echo $this->session->userdata('user_stylesheet');?>">
|
||||
<?php if($this->session->userdata('user_stylesheet')) { ?>
|
||||
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/<?php echo $this->session->userdata('user_stylesheet');?>/bootstrap.min.css">
|
||||
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/general.css">
|
||||
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/<?php echo $this->session->userdata('user_stylesheet');?>/overrides.css">
|
||||
<?php } else { ?>
|
||||
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/default/bootstrap.min.css">
|
||||
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/general.css">
|
||||
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/default/overrides.css">
|
||||
<?php } ?>
|
||||
|
||||
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/fontawesome/css/all.css">
|
||||
|
||||
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/jquery.fancybox.min.css" />
|
||||
|
||||
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/general.css">
|
||||
|
||||
<script src="<?php echo base_url(); ?>assets/js/jquery-3.3.1.min.js"></script>
|
||||
<script src="<?php echo base_url(); ?>assets/js/popper.min.js"></script>
|
||||
|
|
|
|||
|
|
@ -4,12 +4,19 @@
|
|||
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
|
||||
|
||||
<!-- Bootstrap CSS -->
|
||||
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/<?php echo $this->session->userdata('user_stylesheet');?>">
|
||||
<?php if($this->session->userdata('user_stylesheet')) { ?>
|
||||
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/<?php echo $this->session->userdata('user_stylesheet');?>/bootstrap.min.css">
|
||||
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/general.css">
|
||||
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/<?php echo $this->session->userdata('user_stylesheet');?>/overrides.css">
|
||||
<?php } else { ?>
|
||||
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/default/bootstrap.min.css">
|
||||
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/general.css">
|
||||
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/default/overrides.css">
|
||||
<?php } ?>
|
||||
|
||||
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/fontawesome/css/all.css">
|
||||
|
||||
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/jquery.fancybox.min.css" />
|
||||
|
||||
<link rel="stylesheet" href="<?php echo base_url(); ?>assets/css/general.css">
|
||||
|
||||
<script src="<?php echo base_url(); ?>assets/js/jquery-3.3.1.min.js"></script>
|
||||
<script src="<?php echo base_url(); ?>assets/js/popper.min.js"></script>
|
||||
|
|
|
|||
|
|
@ -111,9 +111,12 @@
|
|||
<div class="form-group">
|
||||
<label for="user_stylesheet">Theme</label>
|
||||
<select class="custom-select" id="user_stylesheet" name="user_stylesheet" required>
|
||||
<option value='bootstrap.min.css' selected="selected">Standard theme</option>
|
||||
<option value='bootstrap-dark.css'>Dark theme</option>
|
||||
<option value='bootstrap-blue.css'>Blue theme</option>
|
||||
<option value='default' selected="selected">Default</option>
|
||||
<option value='blue'>Blue</option>
|
||||
<option value='cosmo'>Cosmo</option>
|
||||
<option value='cyborg'>Cyborg (Dark)</option>
|
||||
<option value='darkly'>Darkly (Dark)</option>
|
||||
<option value='superhero'>Superhero (Dark)</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,14 +1,20 @@
|
|||
<div class="container">
|
||||
<br>
|
||||
<h3>
|
||||
Edit Account
|
||||
<small class="text-muted"><?php echo $user_name; ?></small>
|
||||
</h3>
|
||||
|
||||
<?php if($this->session->flashdata('success')) { ?>
|
||||
<!-- Display Success Message -->
|
||||
<div class="alert alert-success">
|
||||
<?php echo $this->session->flashdata('success'); ?>
|
||||
</div>
|
||||
<?php } ?>
|
||||
|
||||
<?php if($this->session->flashdata('message')) { ?>
|
||||
<!-- Display Message -->
|
||||
<div class="alert-message error">
|
||||
<p><?php echo $this->session->flashdata('message'); ?></p>
|
||||
<?php echo $this->session->flashdata('message'); ?>
|
||||
</div>
|
||||
<?php } ?>
|
||||
|
||||
|
|
@ -22,8 +28,6 @@
|
|||
<?php $this->load->helper('form'); ?>
|
||||
|
||||
<form method="post" action="<?php echo site_url('user/edit')."/".$this->uri->segment(3); ?>" name="users" autocomplete="off">
|
||||
|
||||
<br>
|
||||
<div class="row">
|
||||
<div class="col-md">
|
||||
<div class="card">
|
||||
|
|
@ -91,9 +95,12 @@
|
|||
<label>Stylesheet</label>
|
||||
|
||||
<select class="custom-select" id="user_stylesheet" name="user_stylesheet" required>
|
||||
<option value='bootstrap.min.css' <?php if($user_stylesheet == "bootstrap.min.css") { echo "selected=\"selected\""; } ?>>Standard theme</option>
|
||||
<option value='bootstrap-dark.css' <?php if($user_stylesheet == "bootstrap-dark.css") { echo "selected=\"selected\""; } ?>>Dark theme</option>
|
||||
<option value='bootstrap-blue.css' <?php if($user_stylesheet == "bootstrap-blue.css") { echo "selected=\"selected\""; } ?>>Blue theme</option>
|
||||
<option value='default' <?php if($user_stylesheet == "default") { echo "selected=\"selected\""; } ?>>Default</option>
|
||||
<option value='blue' <?php if($user_stylesheet == "blue") { echo "selected=\"selected\""; } ?>>Blue</option>
|
||||
<option value='cosmo' <?php if($user_stylesheet == "cosmo") { echo "selected=\"selected\""; } ?>>Cosmo</option>
|
||||
<option value='cyborg' <?php if($user_stylesheet == "cyborg") { echo "selected=\"selected\""; } ?>>Cyborg (Dark)</option>
|
||||
<option value='darkly' <?php if($user_stylesheet == "darkly") { echo "selected=\"selected\""; } ?>> Darkly (Dark)</option>
|
||||
<option value='superhero' <?php if($user_stylesheet == "superhero") { echo "selected=\"selected\""; } ?>>Superhero (Dark)</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,75 @@
|
|||
thead > tr > td {
|
||||
position: sticky;
|
||||
top: 45px;
|
||||
background-color: aliceblue;
|
||||
}
|
||||
|
||||
.workedGrid {
|
||||
border-color: green;
|
||||
}
|
||||
|
||||
.newGrid {
|
||||
border-color: red;
|
||||
border-width: 2px;
|
||||
}
|
||||
|
||||
.eqsl-green{
|
||||
color: #00A000;
|
||||
font-size: 1.1em;
|
||||
}
|
||||
.eqsl-red{
|
||||
color: #F00;
|
||||
font-size: 1.1em;
|
||||
}
|
||||
.qsl-green{
|
||||
color: #00A000;
|
||||
font-size: 1.1em;
|
||||
}
|
||||
.qsl-red{
|
||||
color: #F00;
|
||||
font-size: 1.1em;
|
||||
}
|
||||
.qsl-yellow{
|
||||
color: #d39e00;
|
||||
font-size: 1.1em;
|
||||
}
|
||||
.qsl-grey{
|
||||
color: #dddddd;
|
||||
font-size: 1.1em;
|
||||
}
|
||||
.lotw-green{
|
||||
color: #00A000;
|
||||
font-size: 1.1em;
|
||||
}
|
||||
.lotw-red{
|
||||
color: #F00;
|
||||
font-size: 1.1em;
|
||||
}
|
||||
|
||||
.settings-nav {
|
||||
margin-bottom: 15px;
|
||||
list-style: none;
|
||||
background-color: #fff;
|
||||
border: 1px solid #d1d5da;
|
||||
border-radius: 3px;
|
||||
}
|
||||
|
||||
.settings-nav .nav-link {
|
||||
list-style: none;
|
||||
background-color: #fff;
|
||||
border: 1px solid #d1d5da;
|
||||
}
|
||||
|
||||
.settings-nav .nav-link:hover {
|
||||
background-color: #e1e4e8;
|
||||
|
||||
}
|
||||
|
||||
/* QSL Card Management CSS */
|
||||
|
||||
.qso-map-new .card-header {
|
||||
background: #0F2027; /* fallback for old browsers */
|
||||
background: -webkit-linear-gradient(to right, #2C5364, #203A43, #0F2027); /* Chrome 10-25, Safari 5.1-6 */
|
||||
background: linear-gradient(to right, #2C5364, #203A43, #0F2027); /* W3C, IE 10+/ Edge, Firefox 16+, Chrome 26+, Opera 12+, Safari 7+ */
|
||||
color: #ffffff;
|
||||
}
|
||||
Plik diff jest za duży
Load Diff
File diff suppressed because one or more lines are too long
|
|
@ -0,0 +1,3 @@
|
|||
/*!
|
||||
* No overrides for the default theme as it aligns with general.css
|
||||
*/
|
||||
Plik diff jest za duży
Load Diff
|
|
@ -0,0 +1,3 @@
|
|||
/*!
|
||||
* No overrides for the default theme as it aligns with general.css
|
||||
*/
|
||||
File diff suppressed because one or more lines are too long
|
|
@ -0,0 +1,3 @@
|
|||
/*!
|
||||
* No overrides for the default theme as it aligns with general.css
|
||||
*/
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
thead > tr > td {
|
||||
background-color: aliceblue !important;
|
||||
}
|
||||
|
|
@ -1,3 +1,9 @@
|
|||
@media (min-width: 992px) {
|
||||
.modal-lg, .modal-xl {
|
||||
max-width: 900px;
|
||||
}
|
||||
}
|
||||
|
||||
.main-nav .container {
|
||||
margin-top: 0px !important;
|
||||
}
|
||||
|
|
@ -11,7 +17,6 @@
|
|||
thead > tr > td {
|
||||
position: sticky;
|
||||
top: 45px;
|
||||
background-color: aliceblue;
|
||||
}
|
||||
|
||||
.dashboard {
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -0,0 +1,3 @@
|
|||
/*!
|
||||
* No overrides for the default theme as it aligns with general.css
|
||||
*/
|
||||
Ładowanie…
Reference in New Issue