mirror
/
Cloudlog
kopia lustrzana https://github.com/magicbug/Cloudlog
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Change the way themes are processed 

Place themes in subfolders and use the folder name in the DB instead of the path to a single CSS file
pull/734/head
Paul Beesley 2020-12-06 17:28:47 +00:00
rodzic b18777318d
commit 301483bddf
15 zmienionych plików z 11243 dodań i 11124 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
application/config/migration.php
Wyświetl plik

@ -21,7 +21,7 @@ $config['migration_enabled'] = TRUE;
| be upgraded / downgraded to.
|
*/
$config['migration_version'] = 56;
$config['migration_version'] = 57;
/*
|--------------------------------------------------------------------------

18
application/migrations/057_new_stylesheet_default.php 100644
Wyświetl plik

@ -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);
}
}

11
application/views/interface_assets/header.php
Wyświetl plik

@ -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" />

14
application/views/interface_assets/mini_header.php
Wyświetl plik

@ -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" />

13
application/views/qso/edit.php
Wyświetl plik

@ -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>

13
application/views/qso/edit_ajax.php
Wyświetl plik

@ -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>

6
application/views/user/add.php
Wyświetl plik

@ -111,9 +111,9 @@
<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='blue'>Dark</option>
</select>
</div>

6
application/views/user/edit.php
Wyświetl plik

@ -91,9 +91,9 @@
<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='dark' <?php if($user_stylesheet == "dark") { echo "selected=\"selected\""; } ?>>Dark</option>
</select>
</div>
</div>

0
assets/css/bootstrap-blue.css → assets/css/blue/bootstrap.min.css vendored
Wyświetl plik

75
assets/css/blue/overrides.css 100644
Wyświetl plik

@ -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;
}

11101
assets/css/bootstrap-dark.css
Wyświetl plik

Plik diff jest za duży Load Diff

11102
assets/css/dark/bootstrap.min.css vendored 100644
Wyświetl plik

Plik diff jest za duży Load Diff

3
assets/css/dark/overrides.css 100644
Wyświetl plik

@ -0,0 +1,3 @@
/*!
* No overrides for the default theme as it aligns with general.css
*/

0
assets/css/bootstrap.min.css → assets/css/default/bootstrap.min.css vendored
Wyświetl plik

3
assets/css/default/overrides.css 100644
Wyświetl plik

@ -0,0 +1,3 @@
/*!
* No overrides for the default theme as it aligns with general.css
*/