瀏覽代碼

updated template folder from latest justpy fork (using <base> tag)

Rodja Trappe 3 年之前
父節點
當前提交
8068c10723

+ 1 - 1
nicegui/static/templates/highcharts.html

@@ -48,7 +48,7 @@
     {#Must be last#}
     {#Must be last#}
     <script src="https://code.highcharts.com/stock/modules/boost.js"></script>
     <script src="https://code.highcharts.com/stock/modules/boost.js"></script>
 {% else %}
 {% else %}
-    <script src="{{ request.headers.get('X-Forwarded-Prefix','') }}/templates/local/highcharts.js"></script>
+    <script src="templates/local/highcharts.js"></script>
 {% endif %}
 {% endif %}
 
 
 
 

+ 2 - 2
nicegui/static/templates/optional_packages.html

@@ -6,7 +6,7 @@
     {% if not options.no_internet %}
     {% if not options.no_internet %}
         <script src="https://unpkg.com/ag-grid-community/dist/ag-grid-community.min.js"></script>
         <script src="https://unpkg.com/ag-grid-community/dist/ag-grid-community.min.js"></script>
     {% else %}
     {% else %}
-        <script src="{{ request.headers.get('X-Forwarded-Prefix','') }}/templates/local/ag-grid-community.js"></script>
+        <script src="templates/local/ag-grid-community.js"></script>
     {% endif %}
     {% endif %}
 {% endif %}
 {% endif %}
 
 
@@ -14,7 +14,7 @@
     {% if not options.no_internet %}
     {% if not options.no_internet %}
         <script src="https://unpkg.com/ag-grid-enterprise/dist/ag-grid-enterprise.min.js"></script>
         <script src="https://unpkg.com/ag-grid-enterprise/dist/ag-grid-enterprise.min.js"></script>
     {% else %}
     {% else %}
-        <script src="{{ request.headers.get('X-Forwarded-Prefix','') }}/templates/local/ag-grid-enterprise.js"></script>
+        <script src="templates/local/ag-grid-enterprise.js"></script>
     {% endif %}
     {% endif %}
 {% endif %}
 {% endif %}
 
 

+ 105 - 81
nicegui/static/templates/quasar.html

@@ -1,97 +1,121 @@
 <!DOCTYPE html>
 <!DOCTYPE html>
 <html>
 <html>
-<head>
-
-    {% include 'favicon.html' %}
-
-    {% if options.tailwind %}
-            {% if not options.no_internet %}
-                <link rel="stylesheet" href="https://unpkg.com/tailwindcss@^2.0/dist/base.min.css">
-                <link rel="stylesheet" href="https://unpkg.com/tailwindcss@^2.0/dist/components.min.css">
-                <link rel="stylesheet" href="https://unpkg.com/@tailwindcss/typography@0.4.x/dist/typography.min.css">
-                <link rel="stylesheet" href="https://unpkg.com/tailwindcss@^2.0/dist/utilities.min.css">
-            {% else %}
-                <link href="{{ request.headers.get('X-Forwarded-Prefix','') }}/templates/local/tailwind/base.css" rel="stylesheet">
-                <link href="{{ request.headers.get('X-Forwarded-Prefix','') }}/templates/local/tailwind/components.css" rel="stylesheet">
-                <link href="{{ request.headers.get('X-Forwarded-Prefix','') }}/templates/local/tailwind/typography.css" rel="stylesheet">
-                <link href="{{ request.headers.get('X-Forwarded-Prefix','') }}/templates/local/tailwind/utilities.css" rel="stylesheet">
-            {% endif %}
-            <style>
-                {% include 'css/form.css' %}
-            </style>
-        {% endif %}
-
-    {% if not options.no_internet %}
-        <link href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900|Material+Icons"
-              rel="stylesheet" type="text/css">
-        <link href="https://cdn.jsdelivr.net/npm/ionicons@^4.0.0/dist/css/ionicons.min.css" rel="stylesheet">
-        <link href="https://cdn.jsdelivr.net/npm/@mdi/font@^3.0.0/css/materialdesignicons.min.css" rel="stylesheet">
-        <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.9.0/css/all.css"/>
-        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/3.7.0/animate.min.css"/>
-        {% if options.quasar_version %}
-            <link href="https://cdn.jsdelivr.net/npm/quasar@{{ options.quasar_version }}/dist/quasar.min.css"
-                  rel="stylesheet" type="text/css">
-        {% else %}
-            <link href="https://cdn.jsdelivr.net/npm/quasar@^1.0.3/dist/quasar.min.css" rel="stylesheet"
-                  type="text/css">
-        {% endif %}
+  <head>
+    <base
+      href="http://{{request.headers.get('host')}}{{ request.headers.get('X-Forwarded-Prefix','') }}/"
+    />
+
+    {% include 'favicon.html' %} {% if options.tailwind %} {% if not
+    options.no_internet %}
+    <link
+      rel="stylesheet"
+      href="https://unpkg.com/tailwindcss@^2.0/dist/base.min.css"
+    />
+    <link
+      rel="stylesheet"
+      href="https://unpkg.com/tailwindcss@^2.0/dist/components.min.css"
+    />
+    <link
+      rel="stylesheet"
+      href="https://unpkg.com/@tailwindcss/typography@0.4.x/dist/typography.min.css"
+    />
+    <link
+      rel="stylesheet"
+      href="https://unpkg.com/tailwindcss@^2.0/dist/utilities.min.css"
+    />
     {% else %}
     {% else %}
-        <link rel="stylesheet" href="{{ request.headers.get('X-Forwarded-Prefix','') }}/templates/local/robotofont/robotofont.css"/>
-        <link rel="stylesheet" href="{{ request.headers.get('X-Forwarded-Prefix','') }}/templates/local/ionicons/ionicons.css"/>
-        <link rel="stylesheet" href="{{ request.headers.get('X-Forwarded-Prefix','') }}/templates/local/materialdesignicons/iconfont/material-icons.css"/>
-        <link rel="stylesheet" href="{{ request.headers.get('X-Forwarded-Prefix','') }}/templates/local/fontawesome/css/all.min.css"/>
-        <link rel="stylesheet" href="{{ request.headers.get('X-Forwarded-Prefix','') }}/templates/local/animate.css"/>
-        <link rel="stylesheet" href="{{ request.headers.get('X-Forwarded-Prefix','') }}/templates/local/quasar.css"/>
+    <link href="templates/local/tailwind/base.css" rel="stylesheet" />
+    <link href="templates/local/tailwind/components.css" rel="stylesheet" />
+    <link href="templates/local/tailwind/typography.css" rel="stylesheet" />
+    <link href="templates/local/tailwind/utilities.css" rel="stylesheet" />
     {% endif %}
     {% endif %}
-
     <style>
     <style>
-        {{ page_options.css | safe}}
+      {% include 'css/form.css' %}
     </style>
     </style>
+    {% endif %} {% if not options.no_internet %}
+    <link
+      href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900|Material+Icons"
+      rel="stylesheet"
+      type="text/css"
+    />
+    <link
+      href="https://cdn.jsdelivr.net/npm/ionicons@^4.0.0/dist/css/ionicons.min.css"
+      rel="stylesheet"
+    />
+    <link
+      href="https://cdn.jsdelivr.net/npm/@mdi/font@^3.0.0/css/materialdesignicons.min.css"
+      rel="stylesheet"
+    />
+    <link
+      rel="stylesheet"
+      href="https://use.fontawesome.com/releases/v5.9.0/css/all.css"
+    />
+    <link
+      rel="stylesheet"
+      href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/3.7.0/animate.min.css"
+    />
+    {% if options.quasar_version %}
+    <link
+      href="https://cdn.jsdelivr.net/npm/quasar@{{ options.quasar_version }}/dist/quasar.min.css"
+      rel="stylesheet"
+      type="text/css"
+    />
+    {% else %}
+    <link
+      href="https://cdn.jsdelivr.net/npm/quasar@^1.0.3/dist/quasar.min.css"
+      rel="stylesheet"
+      type="text/css"
+    />
+    {% endif %} {% else %}
+    <link rel="stylesheet" href="templates/local/robotofont/robotofont.css" />
+    <link rel="stylesheet" href="templates/local/ionicons/ionicons.css" />
+    <link
+      rel="stylesheet"
+      href="templates/local/materialdesignicons/iconfont/material-icons.css"
+    />
+    <link rel="stylesheet" href="templates/local/fontawesome/css/all.min.css" />
+    <link rel="stylesheet" href="templates/local/animate.css" />
+    <link rel="stylesheet" href="templates/local/quasar.css" />
+    {% endif %}
 
 
-    {{ page_options.head_html | safe }}
-
-    {% include 'optional_packages.html' %}
-
-</head>
-
-
-<body class="" style="{{ page_options.body_style }}" class="{{ page_options.body_classes }}">
-{% if html %}
-    {{ html | safe }}
-{% else %}
-    {{ page_options.body_html | safe }}
-
-    {% if not options.no_internet %}
-        <script src="https://code.jquery.com/jquery-3.3.1.min.js"></script>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/vue/2.6.11/vue.min.js"></script>
-        {% if options.quasar_version %}
-            <script src="https://cdn.jsdelivr.net/npm/quasar@{{ options.quasar_version }}/dist/quasar.umd.min.js"></script>
-        {% else %}
-            <script src="https://cdn.jsdelivr.net/npm/quasar@^1.8.5/dist/quasar.umd.min.js"></script>
-        {% endif %}
+    <style>
+      {{ page_options.css | safe}}
+    </style>
 
 
+    {{ page_options.head_html | safe }} {% include 'optional_packages.html' %}
+  </head>
+
+  <body
+    class=""
+    style="{{ page_options.body_style }}"
+    class="{{ page_options.body_classes }}"
+  >
+    {% if html %} {{ html | safe }} {% else %} {{ page_options.body_html | safe
+    }} {% if not options.no_internet %}
+    <script src="https://code.jquery.com/jquery-3.3.1.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/vue/2.6.11/vue.min.js"></script>
+    {% if options.quasar_version %}
+    <script src="https://cdn.jsdelivr.net/npm/quasar@{{ options.quasar_version }}/dist/quasar.umd.min.js"></script>
     {% else %}
     {% else %}
-        <script src="{{ request.headers.get('X-Forwarded-Prefix','') }}/templates/local/jquery.js"></script>
-        <script src="{{ request.headers.get('X-Forwarded-Prefix','') }}/templates/local/vue.js"></script>
-        <script src="{{ request.headers.get('X-Forwarded-Prefix','') }}/templates/local/quasar.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/quasar@^1.8.5/dist/quasar.umd.min.js"></script>
+    {% endif %} {% else %}
+    <script src="templates/local/jquery.js"></script>
+    <script src="templates/local/vue.js"></script>
+    <script src="templates/local/quasar.js"></script>
     {% endif %}
     {% endif %}
 
 
-    <div id="components">
-
-    </div>
+    <div id="components"></div>
 
 
     <script>
     <script>
-        console.log('Quasar Version ' + Quasar.version);
-        {% if page_options.dark %}
-            Quasar.Dark.set(true);
-        {% endif %}
-        {% if page_options.dark == None %}
-            Quasar.Dark.set("auto");
-        {% endif %}
+      console.log('Quasar Version ' + Quasar.version);
+      {% if page_options.dark %}
+          Quasar.Dark.set(true);
+      {% endif %}
+      {% if page_options.dark == None %}
+          Quasar.Dark.set("auto");
+      {% endif %}
     </script>
     </script>
 
 
-    {% include 'main.html' %}
-
-{% endif %}
-</body>
+    {% include 'main.html' %} {% endif %}
+  </body>
 </html>
 </html>

+ 10 - 8
nicegui/static/templates/tailwind.html

@@ -3,6 +3,8 @@
     <!DOCTYPE html>
     <!DOCTYPE html>
     <html>
     <html>
     <head>
     <head>
+        <base href="http://{{request.headers.get('host')}}{{ request.headers.get('X-Forwarded-Prefix','') }}/"/>
+
         {% include 'favicon.html' %}
         {% include 'favicon.html' %}
 
 
         {% if options.tailwind %}
         {% if options.tailwind %}
@@ -12,10 +14,10 @@
                 <link rel="stylesheet" href="https://unpkg.com/@tailwindcss/typography@0.4.x/dist/typography.min.css">
                 <link rel="stylesheet" href="https://unpkg.com/@tailwindcss/typography@0.4.x/dist/typography.min.css">
                 <link rel="stylesheet" href="https://unpkg.com/tailwindcss@^2.0/dist/utilities.min.css">
                 <link rel="stylesheet" href="https://unpkg.com/tailwindcss@^2.0/dist/utilities.min.css">
             {% else %}
             {% else %}
-                <link href="{{ request.headers.get('X-Forwarded-Prefix','') }}/templates/local/tailwind/base.css" rel="stylesheet">
-                <link href="{{ request.headers.get('X-Forwarded-Prefix','') }}/templates/local/tailwind/components.css" rel="stylesheet">
-                <link href="{{ request.headers.get('X-Forwarded-Prefix','') }}/templates/local/tailwind/typography.css" rel="stylesheet">
-                <link href="{{ request.headers.get('X-Forwarded-Prefix','') }}/templates/local/tailwind/utilities.css" rel="stylesheet">
+                <link href="templates/local/tailwind/base.css" rel="stylesheet">
+                <link href="templates/local/tailwind/components.css" rel="stylesheet">
+                <link href="templates/local/tailwind/typography.css" rel="stylesheet">
+                <link href="templates/local/tailwind/utilities.css" rel="stylesheet">
             {% endif %}
             {% endif %}
             <style>
             <style>
                 {% include 'css/form.css' %}
                 {% include 'css/form.css' %}
@@ -27,8 +29,8 @@
             <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.9.0/css/all.css"/>
             <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.9.0/css/all.css"/>
             <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/3.7.0/animate.min.css"/>
             <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/3.7.0/animate.min.css"/>
         {% else %}
         {% else %}
-            <link rel="stylesheet" href="{{ request.headers.get('X-Forwarded-Prefix','') }}/templates/local/fontawesome/css/all.min.css"/>
-            <link rel="stylesheet" href="{{ request.headers.get('X-Forwarded-Prefix','') }}/templates/local/animate.css"/>
+            <link rel="stylesheet" href="templates/local/fontawesome/css/all.min.css"/>
+            <link rel="stylesheet" href="templates/local/animate.css"/>
         {% endif %}
         {% endif %}
 
 
         <style>
         <style>
@@ -42,8 +44,8 @@
                 <script src="https://code.jquery.com/jquery-3.3.1.min.js"></script>
                 <script src="https://code.jquery.com/jquery-3.3.1.min.js"></script>
                 <script src="https://cdnjs.cloudflare.com/ajax/libs/vue/2.6.11/vue.min.js"></script>
                 <script src="https://cdnjs.cloudflare.com/ajax/libs/vue/2.6.11/vue.min.js"></script>
             {% else %}
             {% else %}
-                <script src="{{ request.headers.get('X-Forwarded-Prefix','') }}/templates/local/jquery.js"></script>
-                <script src="{{ request.headers.get('X-Forwarded-Prefix','') }}/templates/local/vue.js"></script>
+                <script src="templates/local/jquery.js"></script>
+                <script src="templates/local/vue.js"></script>
             {% endif %}
             {% endif %}
         {% endif %}
         {% endif %}
 
 

+ 10 - 8
nicegui/static/templates/tailwindui.html

@@ -3,6 +3,8 @@
     <!DOCTYPE html>
     <!DOCTYPE html>
     <html>
     <html>
     <head>
     <head>
+        <base href="http://{{request.headers.get('host')}}{{ request.headers.get('X-Forwarded-Prefix','') }}/"/>
+
         {% include 'favicon.html' %}
         {% include 'favicon.html' %}
 
 
         {% if options.tailwind %}
         {% if options.tailwind %}
@@ -10,8 +12,8 @@
                 <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@tailwindcss/ui@latest/dist/tailwind-ui.min.css">
                 <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@tailwindcss/ui@latest/dist/tailwind-ui.min.css">
                 <link rel="stylesheet" href="https://unpkg.com/@tailwindcss/typography@/dist/typography.min.css">
                 <link rel="stylesheet" href="https://unpkg.com/@tailwindcss/typography@/dist/typography.min.css">
             {% else %}
             {% else %}
-                <link href="{{ request.headers.get('X-Forwarded-Prefix','') }}/templates/local/tailwindui.css" rel="stylesheet">
-                <link href="{{ request.headers.get('X-Forwarded-Prefix','') }}/templates/local/tailwind/typography.css" rel="stylesheet">
+                <link href="templates/local/tailwindui.css" rel="stylesheet">
+                <link href="templates/local/tailwind/typography.css" rel="stylesheet">
 
 
             {% endif %}
             {% endif %}
             <style>
             <style>
@@ -24,8 +26,8 @@
             <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.9.0/css/all.css"/>
             <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.9.0/css/all.css"/>
             <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/3.7.0/animate.min.css"/>
             <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/animate.css/3.7.0/animate.min.css"/>
         {% else %}
         {% else %}
-            <link rel="stylesheet" href="{{ request.headers.get('X-Forwarded-Prefix','') }}/templates/local/fontawesome/css/all.min.css"/>
-            <link rel="stylesheet" href="{{ request.headers.get('X-Forwarded-Prefix','') }}/templates/local/animate.css"/>
+            <link rel="stylesheet" href="templates/local/fontawesome/css/all.min.css"/>
+            <link rel="stylesheet" href="templates/local/animate.css"/>
         {% endif %}
         {% endif %}
 
 
         <style>
         <style>
@@ -39,8 +41,8 @@
                 <script src="https://code.jquery.com/jquery-3.3.1.min.js"></script>
                 <script src="https://code.jquery.com/jquery-3.3.1.min.js"></script>
                 <script src="https://cdnjs.cloudflare.com/ajax/libs/vue/2.6.11/vue.min.js"></script>
                 <script src="https://cdnjs.cloudflare.com/ajax/libs/vue/2.6.11/vue.min.js"></script>
             {% else %}
             {% else %}
-                <script src="{{ request.headers.get('X-Forwarded-Prefix','') }}/templates/local/jquery.js"></script>
-                <script src="{{ request.headers.get('X-Forwarded-Prefix','') }}/templates/local/vue.js"></script>
+                <script src="templates/local/jquery.js"></script>
+                <script src="templates/local/vue.js"></script>
             {% endif %}
             {% endif %}
         {% endif %}
         {% endif %}
 
 
@@ -52,7 +54,7 @@
             {% if not options.no_internet %}
             {% if not options.no_internet %}
                 <script src="https://unpkg.com/ag-grid-community/dist/ag-grid-community.min.js"></script>
                 <script src="https://unpkg.com/ag-grid-community/dist/ag-grid-community.min.js"></script>
             {% else %}
             {% else %}
-                <script src="{{ request.headers.get('X-Forwarded-Prefix','') }}/templates/local/ag-grid-community.js"></script>
+                <script src="templates/local/ag-grid-community.js"></script>
             {% endif %}
             {% endif %}
         {% endif %}
         {% endif %}
 
 
@@ -60,7 +62,7 @@
             {% if not options.no_internet %}
             {% if not options.no_internet %}
                 <script src="https://unpkg.com/ag-grid-enterprise/dist/ag-grid-enterprise.min.js"></script>
                 <script src="https://unpkg.com/ag-grid-enterprise/dist/ag-grid-enterprise.min.js"></script>
             {% else %}
             {% else %}
-                <script src="{{ request.headers.get('X-Forwarded-Prefix','') }}/templates/local/ag-grid-enterprise.js"></script>
+                <script src="templates/local/ag-grid-enterprise.js"></script>
             {% endif %}
             {% endif %}
         {% endif %}
         {% endif %}
     </head>
     </head>