Merge branch 'production' into dev

This commit is contained in:
HB9HIL
2024-01-25 17:32:34 +01:00
committed by GitHub
3 changed files with 14 additions and 1 deletions

3
.gitignore vendored
View File

@@ -17,4 +17,5 @@
sync.sh
*.p12
*.swp
.debug
.debug
.htaccess

View File

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

View File

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