webpack.config.js: OZ_main.html -> OZentry.html

Having one include contain both entrypoints and the other only
including one is confusing. Replace OZ_main with explicit OZentry/OZui
include files.

Add support for multiple includes to partial_install, so we can add
both includes to minlife.html.

OZprivate/ServerScripts/Utilities/partial_install.py

@@ -29,10 +29,11 @@
     # the local version, in static/
     m = re.match('\s*<div id="OZ_js_modules" data-include="([^>]+)">', line)
     if m:
-        include_path = os.path.join(os.path.dirname(fileinput.filename()), m.group(1))
-        with open(include_path) as include_file:
-            for inc_line in include_file:
-                line += inc_line
+        for include_path in m.group(1).split(" "):
+            include_path = os.path.join(os.path.dirname(fileinput.filename()), include_path)
+            with open(include_path) as include_file:
+                for inc_line in include_file:
+                    line += inc_line
         skip_lines = True
     elif line.strip() == '</div>':
         skip_lines = False

views/layout.html

@@ -42,7 +42,8 @@
     <!-- 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>
-    {{include '../static/OZTreeModule/dist/OZ_main.html'}} <!--includes OZui-->
+    {{include '../static/OZTreeModule/dist/OZentry.html'}}
+    {{include '../static/OZTreeModule/dist/OZui.html'}}
     {{include 'treeviewer/server_urls.html' }}
 
     {{block head}}{{end}}

views/popup.html

@@ -32,7 +32,7 @@
     <!-- All JavaScript at the bottom, except for Modernizr which enables
          HTML5 elements & feature detects -->
     <script src="{{=URL('static','js/modernizr-2.8.3.min.js')}}"></script>
-    {{include '../static/OZTreeModule/dist/OZui.html'  # Don't need the full OZ_main (tree view) capability in a popup}}
+    {{include '../static/OZTreeModule/dist/OZui.html'  # NB: Not including OZentry.html }}
     {{include 'treeviewer/server_urls.html' }}
     {{block head}}{{end}}
   </head>

views/treeviewer/layout.html

@@ -34,8 +34,9 @@
   <link rel="stylesheet" type="text/css" href="{{=URL('static', 'css/OZ_shared.css')}}" />
   {{if is_testing:}}<script>window.is_testing = true;</script>{{pass}}
   <!-- 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"}}
+  <div id="OZ_js_modules" data-include="../static/OZTreeModule/dist/OZentry.html ../static/OZTreeModule/dist/OZui.html">
+    {{include '../static/OZTreeModule/dist/OZentry.html'}}
+    {{include '../static/OZTreeModule/dist/OZui.html'}}
   </div>
 
   <!-- treeviewer constants -->

views/uikit_layout.html

@@ -28,7 +28,8 @@
     {{include 'web2py.html'}}
 
     {{if is_testing:}}<script>window.is_testing = true;</script>{{pass}}
-    {{include '../static/OZTreeModule/dist/OZ_main.html'  # Include the tree viewer for use on the front page}}
+    {{include '../static/OZTreeModule/dist/OZentry.html'}}
+    {{include '../static/OZTreeModule/dist/OZui.html'}}
     <script>var OZstrings={{include 'treeviewer/js_strings.json'}}</script>
     {{include 'treeviewer/server_urls.html' }}
   </head>

webpack.config.js

@@ -61,7 +61,8 @@ var config = {
   plugins: [
     new HtmlWebpackPlugin({
       scriptLoading: 'blocking',
-      filename: 'OZ_main.html',
+      filename: 'OZentry.html',
+      chunks: ['OZentry'],
       // This template contains the script tags refering to the js files generated by
       // the webpack compile command
       template: OZTreeModule_src('OZ_script_template.html')