use a single template to handle tiny script inclusion differences

15 files changed, 46 insertions, 80 deletions

diff --git a/assets/js/jstree_events.js b/assets/js/jstree_events.js
index f8899208..dfb3e3ef 100644
--- a/assets/js/jstree_events.js
+++ b/assets/js/jstree_events.js
@@ -25,7 +25,10 @@ if (parent.frames && parent.frames.detail) {
 
 $('#lazy').on('activate_node.jstree', function (e, data) {
   if (window.parent.frames.detail) {
-    window.parent.frames.detail.location.replace(data.node.a_attr.href);
+    let { frameLocation } = window.parent.frames.detail,
+      nextLocation = data.node.a_attr.href;
+    console.log({ nextLocation });
+    (frameLocation || globalThis.location).replace(nextLocation);
   }
 });
 $('#lazy').on('state_ready.jstree', function (e, data) {
diff --git a/assets/sw.dev.js b/assets/sw.dev.js
index 48548faf..3a0e998a 100644
--- a/assets/sw.dev.js
+++ b/assets/sw.dev.js
@@ -11,12 +11,14 @@ registerRoute(
     request.destination === 'image' || url.includes('assets/vendor'),
   new CacheFirst()
 );
-/*registerRoute(
-  ({ request }) =>
-    request.destination === 'script' || request.destination === 'style',
+registerRoute(
+  ({ request }) => request.destination === 'style',
   new StaleWhileRevalidate()
-);*/
-
+);
+registerRoute(
+  ({ request }) => request.destination === 'script',
+  new StaleWhileRevalidate()
+);
 registerRoute(
   ({ url }) =>
     url.origin === 'https://fonts.googleapis.com' ||
diff --git a/assets/templates/components/common_body.twig b/assets/templates/components/common_body.twig
index 81028d83..e88f382b 100644
--- a/assets/templates/components/common_body.twig
+++ b/assets/templates/components/common_body.twig
@@ -20,3 +20,4 @@
             <p>Your browser does not support iframes.</p>
             </iframe>#}
   {% endif %}
+  
\ No newline at end of file
diff --git a/assets/templates/components/common_head.twig b/assets/templates/components/common_head.twig
index 514d3d87..569033dc 100644
--- a/assets/templates/components/common_head.twig
+++ b/assets/templates/components/common_head.twig
@@ -11,6 +11,23 @@
 <script src="{{ subfolder }}/assets/vendor/jquery/jquery-ui.min.js"></script>
 <script src="{{ subfolder }}/assets/vendor/jquery-resizable.js"></script>
   <script src="{{ subfolder }}/assets/vendor/jstree/jstree.min.js"></script>
+      <meta name="header_template" value="{{headertemplate}}"/>
+{% if headertemplate == 'header_datatables.twig' %}
+         <link rel="stylesheet" href="{{subfolder}}/assets/vendor/datatables/datatables.min.css" type="text/css" />
+        <script src="{{subfolder}}/assets/vendor/datatables/datatables.min.js"></script>
+ 
+ 
+  {% endif %}
+  {% if headertemplate == 'header_select2.twig' %}
+     <link rel="stylesheet" href="{{subfolder}}/assets/vendor/select2/css/select2.css" type="text/css" />
+        <script src="{{subfolder}}/assets/vendor/select2/js/select2.full.min.js"></script>
+        <script src="{{subfolder}}/assets/vendor/select2/js/i18n/{{lang.isolang}}.js"></script>
+  {% endif %}
+    {% if headertemplate == 'header_highlight.twig' %}
+
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css" type="text/css" />
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js"></script>
+		  {% endif %}
   <style type="text/css">
     .refreshTree { position: absolute; right: 0; z-index: 1000; }
 	.splitter {
diff --git a/assets/templates/components/trail.twig b/assets/templates/components/trail.twig
index fe8b081b..90530259 100644
--- a/assets/templates/components/trail.twig
+++ b/assets/templates/components/trail.twig
@@ -1,5 +1,6 @@
 <div class="trail" data-controller="{{controller_name}}">
-    <table style="float:left">
+
+    <table style="float:left" class="trail_table">
         <tbody>
             <tr>
                 {% for crumb in crumbs %}
@@ -18,7 +19,7 @@
         </tbody>
     </table>
     {% if search_paths %}
-    <table style="float:right">
+    <table style="float:right" class="search_path">
         <tbody>
             <tr>
                 <td class="crumb" style="    vertical-align: inherit;">
@@ -44,4 +45,5 @@
         </tbody>
     </table>
     {% endif %}
+
 </div>
\ No newline at end of file
diff --git a/assets/templates/footer.twig b/assets/templates/footer.twig
index d5c41e6d..41b4f59f 100644
--- a/assets/templates/footer.twig
+++ b/assets/templates/footer.twig
@@ -1,4 +1,6 @@
-{{script_footer|raw}} {% if print_bottom_link == true %}
+{{script_footer|raw}}
+
+ {% if print_bottom_link == true %}
 <a data-footertemplate="{{footer_template}}" href="#" class="bottom_link">{{lang.strgotoppage}}</a> {% endif %}
 <script src="{{subfolder}}/assets/js/toplinks_behavior.js" type="text/javascript"></script>
 <script src="{{subfolder}}/assets/js/footer_scripts.js" type="text/javascript"></script>
@@ -26,6 +28,8 @@ if('serviceWorker' in navigator) {
 	})
 }
 </script>
+
+ 
 </body>
 
 </html>
\ No newline at end of file
diff --git a/assets/templates/header_datatables.twig b/assets/templates/header_datatables.twig
deleted file mode 100644
index 32eaa73a..00000000
--- a/assets/templates/header_datatables.twig
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html xml:lang="{{lang.applocale}}" lang="{{lang.applocale}}"  dir="{{lang.applangdir}}">
-
-    <head data-headertemplate="{{headertemplate}}">
-        {% include 'components/common_head.twig' %}
-
-        <link rel="stylesheet" href="{{subfolder}}/assets/vendor/datatables/datatables.min.css" type="text/css" />
-        <script src="{{subfolder}}/assets/vendor/datatables/datatables.min.js"></script>
-    </head>
\ No newline at end of file
diff --git a/assets/templates/header_highlight.twig b/assets/templates/header_highlight.twig
deleted file mode 100644
index 7d7e9362..00000000
--- a/assets/templates/header_highlight.twig
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html xml:lang="{{lang.applocale}}" lang="{{lang.applocale}}"  dir="{{lang.applangdir}}">
-
-    <head data-headertemplate="{{headertemplate}}">
-        {% include 'components/common_head.twig' %}
-
-        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css" type="text/css" />
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js"></script>
-    </head>
\ No newline at end of file
diff --git a/assets/templates/header_select2.twig b/assets/templates/header_select2.twig
deleted file mode 100644
index 8749a607..00000000
--- a/assets/templates/header_select2.twig
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html xml:lang="{{lang.applocale}}" lang="{{lang.applocale}}"  dir="{{lang.applangdir}}">
-
-    <head data-headertemplate="{{headertemplate}}">
-        {% include 'components/common_head.twig' %}
-
-        <link rel="stylesheet" href="{{subfolder}}/assets/vendor/select2/css/select2.css" type="text/css" />
-        <script src="{{subfolder}}/assets/vendor/select2/js/select2.full.min.js"></script>
-        <script src="{{subfolder}}/assets/vendor/select2/js/i18n/{{lang.isolang}}.js"></script>
-    </head>
\ No newline at end of file
diff --git a/assets/templates/header_sqledit.twig b/assets/templates/header_sqledit.twig
index e783ee29..5203b56c 100644
--- a/assets/templates/header_sqledit.twig
+++ b/assets/templates/header_sqledit.twig
@@ -10,41 +10,7 @@
         <script src="{{subfolder}}/assets/vendor/codemirror/lib/codemirror.js"></script>
         <script src="{{subfolder}}/assets/vendor/codemirror/addon/mode/loadmode.js"></script>
         <script src="{{subfolder}}/assets/vendor/codemirror/mode/meta.js"></script>
-        
-
-
-        {#
-        <link href="{{subfolder}}/assets/vendor/codemirror/addon/fold/foldgutter.css" type="text/css" rel="stylesheet" />
-        <link href="{{subfolder}}/assets/vendor/codemirror/addon/hint/show-hint.css" type="text/css" rel="stylesheet" />
-        <script src="{{subfolder}}/assets/vendor/codemirror/addon/hint/show-hint.js"></script>
-        <script src="{{subfolder}}/assets/vendor/codemirror/addon/fold/foldgutter.js"></script>
-        <script src="{{subfolder}}/assets/vendor/codemirror/addon/fold/foldcode.js"></script>
-        <script src="{{subfolder}}/assets/vendor/codemirror/addon/fold/indent-fold.js"></script>
-                    <script src="{{subfolder}}/assets/vendor/codemirror/addon/lint/lint.js"></script>
-        <script src="{{subfolder}}/assets/vendor/codemirror/addon/hint/sql-hint.js"></script>
-        <script src="{{subfolder}}/assets/vendor/codemirror/mode/sql/sql.js"></script>
-        <script src="{{subfolder}}/assets/vendor/codemirror/addon/fold/brace-fold.js"></script>
-          <script src="{{subfolder}}/assets/vendor/codemirror/lib/codemirror.js"></script>
-                    <script src="{{subfolder}}/assets/vendor/codemirror/mode/sql/sql.js"></script>
-                    <script src="{{subfolder}}/assets/vendor/codemirror/addon/runmode/runmode.js"></script>
-                            <script src="{{subfolder}}/assets/vendor/codemirror/addon/mode/loadmode.js"></script>
-
-                    <script src="{{subfolder}}/assets/vendor/codemirror/addon/hint/show-hint.js"></script>
-                    <script src="{{subfolder}}/assets/vendor/codemirror/addon/hint/sql-hint.js"></script>
-          <link href="{{subfolder}}/assets/vendor/codemirror/codemirror.css" type="text/css" rel="stylesheet" />
-        <link href="{{subfolder}}/assets/vendor/codemirror/addon/fold/foldgutter.css" type="text/css" rel="stylesheet" />
-        <link href="{{subfolder}}/assets/vendor/codemirror/addon/hint/show-hint.css" type="text/css" rel="stylesheet" />
-        <script src="{{subfolder}}/assets/vendor/codemirror/codemirror.js"></script>
-        <script src="{{subfolder}}/assets/vendor/codemirror/mode/sql/sql.js"></script>
-        
-        <script src="{{subfolder}}/assets/vendor/codemirror/addon/fold/brace-fold.js"></script>
-        <script src="{{subfolder}}/assets/vendor/codemirror/addon/fold/foldgutter.js"></script>
-        
-        <script src="{{subfolder}}/assets/vendor/codemirror/addon/hint/sql-hint.js"></script>
-        
-        
-        #}
-
+  
     </head>
 
 
diff --git a/assets/templates/intro_view.twig b/assets/templates/intro_view.twig
index f6e2c16c..9b69abec 100644
--- a/assets/templates/intro_view.twig
+++ b/assets/templates/intro_view.twig
@@ -1,7 +1,7 @@
 {% include 'header.twig' %}
 
 <body class="flexbox_body {{ lang.applangdir }}">
-
+    
 
   <div class="flexbox_wrapper">
     <div id="masking_overlay"></div>
diff --git a/composer.lock b/composer.lock
index 7259e07b..4967b0c5 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "9bb8bf233306d98032ae2d7008494e2e",
+    "content-hash": "d816e67674915a07938ecd48e0f3c836",
     "packages": [
         {
             "name": "adodb/adodb-php",
diff --git a/src/classes/ViewManager.php b/src/classes/ViewManager.php
index 49d2d7e7..665a9ab5 100644
--- a/src/classes/ViewManager.php
+++ b/src/classes/ViewManager.php
@@ -226,7 +226,7 @@ class ViewManager extends Twig
 
             return $controller->render();
         }
-
+ddd('DEFAULTING TO '.$template);
         $viewVars = [
             'url' => '/src/views/' . $subject . ($query_string ? '?' . $query_string : ''),
             'headertemplate' => 'header.twig',
diff --git a/src/router.php b/src/router.php
index 3b098758..c2409c5d 100644
--- a/src/router.php
+++ b/src/router.php
@@ -131,10 +131,7 @@ $app->get('/{subject:servers|intro|browser}[/{server_id}]', function (
     $className = '\PHPPgAdmin\Controller\\' . \ucfirst($subject) . 'Controller';
     $controller = new $className($this);
     return $controller->render();
-
-    //$query_string = $request->getUri()->getQuery();
-  //return $this->view->maybeRenderIframes($response, $subject, $query_string,'intro_view.twig');
-
+ 
     
 });
 
diff --git a/src/xhtml/HTMLHeaderController.php b/src/xhtml/HTMLHeaderController.php
index ad08b5fc..c6b9900d 100644
--- a/src/xhtml/HTMLHeaderController.php
+++ b/src/xhtml/HTMLHeaderController.php
@@ -50,9 +50,11 @@ class HTMLHeaderController extends HTMLController
 
         $viewVars['dir'] = (0 !== \strcasecmp($lang['applangdir'], 'ltr')) ? ' dir="' . \htmlspecialchars($lang['applangdir']) . '"' : '';
         $viewVars['headertemplate'] = $template;
+        $viewVars['headerFlags'][str_replace('.twig','',basename($template))]=1;
         $viewVars['title'] = ('' !== $title) ? ' - ' . $title : '';
         $viewVars['lang'] = $lang;
         $viewVars['appName'] = \htmlspecialchars($this->appName);
+        
         $reload_param = 'none';
 
         if ($this->view->getReloadBrowser()) {
@@ -62,7 +64,7 @@ class HTMLHeaderController extends HTMLController
         }
         $viewVars['reload'] = $reload_param;
         $viewVars['script'] = $script;
-        $header_html = $this->view->fetch($template, $viewVars);
+        $header_html = $this->view->fetch( 'header.twig'/*$template*/, $viewVars);
 
         /*$plugins_head = [];
         $_params      = ['heads' => &$plugins_head];