summaryrefslogtreecommitdiff
path: root/public/app/views
diff options
context:
space:
mode:
authorGeorge Halkiadakis <gchalkiadakis@sklavenitis.co.gr>2023-06-12 04:13:30 +0300
committerGeorge Halkiadakis <gchalkiadakis@sklavenitis.co.gr>2023-06-12 04:13:30 +0300
commit7f37ac9bc171ff3609e49f46466d1cd778e234c1 (patch)
tree44ba8b56d1986451759552e774c44d8863b1a63e /public/app/views
parent07494fb1f4a6c5bbbb5aee8c9347517effd4556c (diff)
downloadgyraf1gov-7f37ac9bc171ff3609e49f46466d1cd778e234c1.tar.gz
gyraf1gov-7f37ac9bc171ff3609e49f46466d1cd778e234c1.tar.bz2
gyraf1gov-7f37ac9bc171ff3609e49f46466d1cd778e234c1.zip
addressing issues with content-type, compressing, cache-header, expires
Diffstat (limited to 'public/app/views')
-rw-r--r--public/app/views/components/header_includes.php10
-rw-r--r--public/app/views/user/login.php2
-rw-r--r--public/app/views/user/update_properties.php2
3 files changed, 10 insertions, 4 deletions
diff --git a/public/app/views/components/header_includes.php b/public/app/views/components/header_includes.php
index c096bd5..9e1d239 100644
--- a/public/app/views/components/header_includes.php
+++ b/public/app/views/components/header_includes.php
@@ -6,6 +6,10 @@
if (!isset($no_dataTables)) {
$no_dataTables = false;
}
+
+ if (!isset($no_pdfmake)) {
+ $no_pdfmake = false;
+ }
?>
<!-- FONTS and LIBRARY CSS (self-hosted)
@@ -20,8 +24,10 @@
<!-- bootstrap -->
<link rel="stylesheet" href="/assets/css/bootstrap-5.3.0/css/bootstrap.min.css">
+<?php if (!$no_dataTables) : ?>
<!-- datatables css -->
-<link rel="stylesheet" href="/assets/js/DataTables/datatables.min.css">
+ <link rel="stylesheet" href="/assets/js/DataTables/datatables.min.css">
+<?php endif; ?>
<!-- select2 css -->
<link rel="stylesheet" href="/assets/js/select2-4.1.0-rc0/css/select2.min.css">
@@ -58,7 +64,7 @@
<?php if (!$no_dataTables) : ?>
<!-- DataTables js -->
-<script src="/assets/js/DataTables/datatables.min.js"></script>
+ <script src="/assets/js/DataTables/datatables.min.js"></script>
<?php endif; ?>
<!-- select2-4.1.0-rc.0 js -->
diff --git a/public/app/views/user/login.php b/public/app/views/user/login.php
index a9517c6..169a72b 100644
--- a/public/app/views/user/login.php
+++ b/public/app/views/user/login.php
@@ -6,7 +6,7 @@
<?php // header includes
////////////////////////////////////////////////////////////////////////
- Render::view('components/header_includes');
+ Render::view('components/header_includes', [ 'no_dataTables' => true ]);
?>
<style>
:root { /* login-form overides */
diff --git a/public/app/views/user/update_properties.php b/public/app/views/user/update_properties.php
index 7da976d..363016a 100644
--- a/public/app/views/user/update_properties.php
+++ b/public/app/views/user/update_properties.php
@@ -46,7 +46,7 @@
<?php // include select2 supplementary functions
////////////////////////////////////////////////////////////////////////////
- Render::view('js/select2-supplementary');
+ Render::view('js/select2-supplementary', [ 'no_dataTables' => true ]);
?>
<script>