mirror of
https://github.com/wavelog/wavelog.git
synced 2026-03-22 10:24:14 +00:00
Merge branch 'production' into dev
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -18,3 +18,4 @@ sync.sh
|
||||
*.p12
|
||||
*.swp
|
||||
.debug
|
||||
.htaccess
|
||||
|
||||
@@ -50,6 +50,10 @@
|
||||
echo '<link rel="stylesheet" href="' . base_url() . 'assets/css/custom.css">';
|
||||
} ?>
|
||||
|
||||
<script>
|
||||
var userName = '<?php echo $this->session->userdata('user_name'); ?>'
|
||||
</script>
|
||||
|
||||
<?php if (file_exists(APPPATH . '../assets/js/sections/custom.js')) {
|
||||
echo '<script src="' . base_url() . 'assets/js/sections/custom.js"></script>';
|
||||
} ?>
|
||||
|
||||
@@ -31,6 +31,14 @@
|
||||
|
||||
<?php if (file_exists(APPPATH.'../assets/css/custom.css')) { echo '<link rel="stylesheet" href="'.base_url().'assets/css/custom.css">'; } ?>
|
||||
|
||||
<script>
|
||||
var userName = 'visitor'
|
||||
</script>
|
||||
|
||||
<?php if (file_exists(APPPATH . '../assets/js/sections/custom.js')) {
|
||||
echo '<script src="' . base_url() . 'assets/js/sections/custom.js"></script>';
|
||||
} ?>
|
||||
|
||||
<link rel="icon" href="<?php echo base_url(); ?>favicon.ico">
|
||||
|
||||
<title><?php if(isset($page_title)) { echo $page_title; } ?> - Wavelog</title>
|
||||
|
||||
Reference in New Issue
Block a user