From 92719e0399e57642fe9f668f1831f6dd3cbc90d6 Mon Sep 17 00:00:00 2001 From: Nate Date: Thu, 19 Mar 2020 21:11:53 -0600 Subject: [PATCH] Template: Integrate compression on included .js and .css files, fix custom_css template variable. --- .../css/bootstrap-colorpicker.min.css.php | 10 ++++++ .../css/bootstrap-tempusdominus.min.css.php | 10 ++++++ resources/bootstrap/css/bootstrap.min.css.php | 10 ++++++ .../js/bootstrap-colorpicker.min.js.php | 10 ++++++ .../js/bootstrap-pwstrength.min.js.php | 10 ++++++ .../js/bootstrap-tempusdominus.min.js.php | 10 ++++++ resources/bootstrap/js/bootstrap.min.js.php | 10 ++++++ resources/fontawesome/css/all.min.css.php | 10 ++++++ resources/fontawesome/js/solid.min.js.php | 10 ++++++ resources/footer.php | 1 + resources/jquery/jquery.autosize.input.js.php | 10 ++++++ resources/jquery/jquery.min.js.php | 10 ++++++ .../momentjs/moment-with-locales.min.js.php | 10 ++++++ themes/default/css.php | 15 ++++++++- themes/default/template.php | 33 ++++++++----------- 15 files changed, 148 insertions(+), 21 deletions(-) create mode 100644 resources/bootstrap/css/bootstrap-colorpicker.min.css.php create mode 100644 resources/bootstrap/css/bootstrap-tempusdominus.min.css.php create mode 100644 resources/bootstrap/css/bootstrap.min.css.php create mode 100644 resources/bootstrap/js/bootstrap-colorpicker.min.js.php create mode 100644 resources/bootstrap/js/bootstrap-pwstrength.min.js.php create mode 100644 resources/bootstrap/js/bootstrap-tempusdominus.min.js.php create mode 100644 resources/bootstrap/js/bootstrap.min.js.php create mode 100644 resources/fontawesome/css/all.min.css.php create mode 100644 resources/fontawesome/js/solid.min.js.php create mode 100644 resources/jquery/jquery.autosize.input.js.php create mode 100644 resources/jquery/jquery.min.js.php create mode 100644 resources/momentjs/moment-with-locales.min.js.php diff --git a/resources/bootstrap/css/bootstrap-colorpicker.min.css.php b/resources/bootstrap/css/bootstrap-colorpicker.min.css.php new file mode 100644 index 0000000000..151ac0c584 --- /dev/null +++ b/resources/bootstrap/css/bootstrap-colorpicker.min.css.php @@ -0,0 +1,10 @@ + \ No newline at end of file diff --git a/resources/bootstrap/css/bootstrap-tempusdominus.min.css.php b/resources/bootstrap/css/bootstrap-tempusdominus.min.css.php new file mode 100644 index 0000000000..662873d947 --- /dev/null +++ b/resources/bootstrap/css/bootstrap-tempusdominus.min.css.php @@ -0,0 +1,10 @@ + \ No newline at end of file diff --git a/resources/bootstrap/css/bootstrap.min.css.php b/resources/bootstrap/css/bootstrap.min.css.php new file mode 100644 index 0000000000..f1cd9888d0 --- /dev/null +++ b/resources/bootstrap/css/bootstrap.min.css.php @@ -0,0 +1,10 @@ + \ No newline at end of file diff --git a/resources/bootstrap/js/bootstrap-colorpicker.min.js.php b/resources/bootstrap/js/bootstrap-colorpicker.min.js.php new file mode 100644 index 0000000000..40e220c1f2 --- /dev/null +++ b/resources/bootstrap/js/bootstrap-colorpicker.min.js.php @@ -0,0 +1,10 @@ + \ No newline at end of file diff --git a/resources/bootstrap/js/bootstrap-pwstrength.min.js.php b/resources/bootstrap/js/bootstrap-pwstrength.min.js.php new file mode 100644 index 0000000000..08d201fff2 --- /dev/null +++ b/resources/bootstrap/js/bootstrap-pwstrength.min.js.php @@ -0,0 +1,10 @@ + \ No newline at end of file diff --git a/resources/bootstrap/js/bootstrap-tempusdominus.min.js.php b/resources/bootstrap/js/bootstrap-tempusdominus.min.js.php new file mode 100644 index 0000000000..f70b9cc803 --- /dev/null +++ b/resources/bootstrap/js/bootstrap-tempusdominus.min.js.php @@ -0,0 +1,10 @@ + \ No newline at end of file diff --git a/resources/bootstrap/js/bootstrap.min.js.php b/resources/bootstrap/js/bootstrap.min.js.php new file mode 100644 index 0000000000..5a09e7dd6b --- /dev/null +++ b/resources/bootstrap/js/bootstrap.min.js.php @@ -0,0 +1,10 @@ + \ No newline at end of file diff --git a/resources/fontawesome/css/all.min.css.php b/resources/fontawesome/css/all.min.css.php new file mode 100644 index 0000000000..8a62884418 --- /dev/null +++ b/resources/fontawesome/css/all.min.css.php @@ -0,0 +1,10 @@ + \ No newline at end of file diff --git a/resources/fontawesome/js/solid.min.js.php b/resources/fontawesome/js/solid.min.js.php new file mode 100644 index 0000000000..99dc0c45fc --- /dev/null +++ b/resources/fontawesome/js/solid.min.js.php @@ -0,0 +1,10 @@ + \ No newline at end of file diff --git a/resources/footer.php b/resources/footer.php index 74b5d5d439..ea901b80b8 100644 --- a/resources/footer.php +++ b/resources/footer.php @@ -99,6 +99,7 @@ switch($subcategory) { //exceptions case 'favicon': + case 'custom_css': if ($setting['text'] != '') { $tmp_url = parse_url($setting['text']); $tmp_path = pathinfo($setting['text']); diff --git a/resources/jquery/jquery.autosize.input.js.php b/resources/jquery/jquery.autosize.input.js.php new file mode 100644 index 0000000000..abc7d9eac7 --- /dev/null +++ b/resources/jquery/jquery.autosize.input.js.php @@ -0,0 +1,10 @@ + \ No newline at end of file diff --git a/resources/jquery/jquery.min.js.php b/resources/jquery/jquery.min.js.php new file mode 100644 index 0000000000..0ef2371b28 --- /dev/null +++ b/resources/jquery/jquery.min.js.php @@ -0,0 +1,10 @@ + \ No newline at end of file diff --git a/resources/momentjs/moment-with-locales.min.js.php b/resources/momentjs/moment-with-locales.min.js.php new file mode 100644 index 0000000000..dd36dc3eca --- /dev/null +++ b/resources/momentjs/moment-with-locales.min.js.php @@ -0,0 +1,10 @@ + \ No newline at end of file diff --git a/themes/default/css.php b/themes/default/css.php index d5fa265f95..5d8a331e7c 100644 --- a/themes/default/css.php +++ b/themes/default/css.php @@ -3,7 +3,10 @@ require_once "root.php"; require_once "resources/require.php"; -header("Content-type: text/css; charset: UTF-8"); +ob_start('ob_gzhandler'); +header('Content-type: text/css; charset: UTF-8'); +header('Cache-Control: must-revalidate'); +header('Expires: '.gmdate('D, d M Y H:i:s',time()+3600).' GMT'); //parse fonts (add surrounding single quotes to each font name) if (is_array($_SESSION['theme']) && sizeof($_SESSION['theme']) > 0) { @@ -2667,3 +2670,13 @@ header("Content-type: text/css; charset: UTF-8"); text-align: left; margin-bottom: 20px; } + + + \ No newline at end of file diff --git a/themes/default/template.php b/themes/default/template.php index d7aa20382a..ad6b25badf 100644 --- a/themes/default/template.php +++ b/themes/default/template.php @@ -15,22 +15,15 @@ {*//external css files *} - - - - + + + + {*//link to custom css file *} {if $settings.theme.custom_css} - - {/if} - -{*//output custom css *} - {if $settings.theme.custom_css_code} - + {/if} {*//set favorite icon *} @@ -40,15 +33,15 @@ {$document_title} {*//remote javascript *} - - - - - - - + + + + + + + - + {*//web font loader *} {if $settings.theme.font_loader == 'true'}