Re-jig to only use ajax where required, and not in the tree viewer

OneZoom · Apr 16, 2024 · d22fe08 · d22fe08
1 parent 8c11642
commit d22fe08
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 24 deletions.
diff --git a/views/default/sponsor_leaf.html b/views/default/sponsor_leaf.html
@@ -22,6 +22,7 @@
 response.files.append(URL('static', 'OZSponsor/EOLqueries.js'))
 response.files.append(URL('static','css/content_pages.css'))
 }}
+{{include 'web2py_ajax.html'  # need ajax here}}
 {{import img}}
 {{if is_testing: response.meta.viewfile, response.meta.date_accessed = response.view, request.now}}{{pass}}
 {{extend ('popup.html' if 'popup' in request.vars else 'uikit_layout.html')}}

diff --git a/views/default/sponsor_node.html b/views/default/sponsor_node.html
@@ -2,6 +2,7 @@
 {{if is_testing: response.meta.viewfile, response.meta.date_accessed = response.view, request.now}}{{pass}}
 {{response.files.insert(0,URL('static','js/web2py.js')) #To allow =LOAD(ajax=True) to work}}
 {{response.files.append(URL('static', 'css/content_pages.css'))}}
+{{include 'web2py_ajax.html'}} <!-- We need ajax to load scrolling pictures in the sponsor node page-->
 {{extend ('popup.html' if 'popup' in request.vars else 'uikit_layout.html')}}
 
 {{block masthead}}

diff --git a/views/layout.html b/views/layout.html
@@ -37,8 +37,8 @@
     <!--[if lt IE 9]>
         <script src="{{=URL('static','js/respond-1.4.2.min.js')}}"></script>
         <![endif]-->
-    {{include 'web2py_ajax.html'}} <!-- this includes jquery.js, calendar.js/.css and web2py.js -->
-
+    {{include 'web2py_ajax.html'}} <!--This just includes the web2py ajax stuff-->
+    {{include 'web2py.html'}}
     <!-- Treeviewer code for search / embedded view -->
     {{if is_testing:}}<script>window.is_testing = true;</script>{{pass}}
     <script>var OZstrings={{include 'treeviewer/js_strings.json'}};</script>

diff --git a/views/popup.html b/views/popup.html
@@ -1,18 +1,14 @@
 <!DOCTYPE html>
 <html lang="{{=T.accepted_language or 'en'}}" class="{{='leaf_redirect' if response.view.startswith('default/spl_') else ''}}">
 <head>
-  <script type="text/javascript" src="{{=URL('static','js/jquery.min.js')}}"></script>
   <script src="{{=URL('static','uikit-3/js/uikit.min.js')}}"></script>
   <link rel="stylesheet" href="{{=URL('static','uikit-3/css/uikit.min.css')}}" />
   <link rel="stylesheet" href="{{=URL('static','css/content.css')}}" type="text/css" />
   <link rel="stylesheet" href="{{=URL('static','css/popup.css')}}" type="text/css" />
   <link rel="shortcut icon" href="{{=URL('static', 'favicon.ico')}}" type="image/x-icon" />
   <link rel="apple-touch-icon" href="{{=URL('static','favicon.png')}}">
+  {{include 'web2py.html'}}
   <style>h2 {margin-top: 0}</style>
-{{
-    response.include_meta()
-    response.include_files()
-}}
   <script>
   {{include 'popup.js'}}
   var OZstrings={{include 'treeviewer/js_strings.json'}};

diff --git a/views/treeviewer/layout.html b/views/treeviewer/layout.html
@@ -26,7 +26,7 @@
 }}
   <title>OneZoom Tree of Life Explorer, text page for {{=page_info.get('title_name')}}</title>
   {{if response.canonical:}}<link rel="canonical" href="{{=response.canonical}}" />{{pass}}
-{{include 'web2py_ajax.html' #only really needed for web2py ajax loading in sponsor_node tab (must be above the UIkit lines)}}
+  {{include 'web2py.html' # must be above the UIkit lines}}
   <link rel="stylesheet" href="{{=URL('static','uikit-3/css/uikit.min.css')}}" />
   <script src="{{=URL('static','uikit-3/js/uikit.min.js')}}"></script>
   <script src="{{=URL('static','uikit-3/js/uikit-icons.min.js')}}"></script>
@@ -36,7 +36,6 @@
   <!-- do not change the next line in any way. The exact format is used for partial installs -->
   <div id="OZ_js_modules" data-include="../static/OZTreeModule/dist/OZ_main.html">
   {{include "../static/OZTreeModule/dist/OZ_main.html"}}
-  {{include '../static/OZTreeModule/dist/OZui.html'}}
   </div>
 
   <!-- treeviewer constants -->

diff --git a/views/uikit_layout.html b/views/uikit_layout.html
@@ -21,22 +21,14 @@
     <meta name="google-site-verification" content="">
     {{if response.canonical:}}<link rel="canonical" href="{{=response.canonical}}">{{pass}}
 
-    <script type="text/javascript" src="{{=URL('static','js/jquery.min.js')}}"></script>
     <link rel="stylesheet" href="{{=URL('static','uikit-3/css/uikit.min.css')}}" />
     <script src="{{=URL('static','uikit-3/js/uikit.min.js')}}"></script>
     <script src="{{=URL('static','uikit-3/js/uikit-icons.min.js')}}"></script>
     <link rel="stylesheet" type="text/css" href="{{=URL('static', 'css/content.css')}}" />
-
-    {{
-    response.include_meta()
-    response.include_files()
-    }}
-    <!-- include 'web2py_ajax.html' could be done here, but it performs more than we want so we disect it and keep only the bits we really need -->
-
+    {{include 'web2py.html'}}
 
     {{if is_testing:}}<script>window.is_testing = true;</script>{{pass}}
     {{include '../static/OZTreeModule/dist/OZ_main.html'}}
-    {{include '../static/OZTreeModule/dist/OZui.html'}}
     <script>var OZstrings={{include 'treeviewer/js_strings.json'}}</script>
     {{include 'treeviewer/server_urls.html' }}
   </head>

diff --git a/views/web2py.html b/views/web2py.html
@@ -0,0 +1,6 @@
+<!--A OneZoom-specific slimmed down version of the standard includes, if ajax is not required-->
+{{
+response.files.insert(0,URL('static','js/jquery.min.js'))
+response.include_meta()
+response.include_files()
+}}
diff --git a/views/web2py_ajax.html b/views/web2py_ajax.html
@@ -9,10 +9,6 @@
     )}}
     //--></script>
 {{
-response.files.insert(0,URL('static','js/jquery.min.js'))
-response.files.insert(1,URL('static','css/calendar.css'))
-response.files.insert(2,URL('static','js/calendar.js'))
-response.files.insert(3,URL('static','js/web2py.js'))
-response.include_meta()
-response.include_files()
+# For speed, we only use ajax where we need it
+response.files.insert(1, URL('static','js/web2py.js'))
 }}