projects / pgeu-web.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e044592)
Use new asset system for CSS and JS
authorMagnus Hagander <[email protected]>
Tue, 10 Jan 2023 20:16:11 +0000 (21:16 +0100)
committerMagnus Hagander <[email protected]>
Tue, 10 Jan 2023 20:17:08 +0000 (21:17 +0100)
Use this to make sure we load the assets off assets.postgresql.eu
instead of the global CDNs.

code/skin_settings.py patch | blob | blame | history
template.jinja/base.html patch | blob | blame | history
template/base.html patch | blob | blame | history

diff --git a/code/skin_settings.py b/code/skin_settings.py
index c30e6efe2850cfa5ef2515bbce6dfa6b80c6656c..63edc5e3791c00ddd68d46c3c15c36645105de27 100644 (file)
--- a/code/skin_settings.py
+++ b/code/skin_settings.py
@@ -30,3 +30,15 @@ EU_VAT_VALIDATE = True
 # Invoice
 INVOICE_PDF_BUILDER = 'pgeuinvoices.PGEUInvoice'
 REFUND_PDF_BUILDER = 'pgeuinvoices.PGEURefund'
+
+# Override assets for our CDN
+ASSETS_OVERRIDE = {
+    "bootstrap4": {
+        "css": "https://assets.postgresql.eu/bootstrap/4/css/bootstrap.min.css",
+        "js": "https://assets.postgresql.eu/bootstrap/4/js/bootstrap.min.js",
+    },
+    "xbootstrap4": {
+        "css": "https://maxcdn.bootstrapcdn.com/bootstrap/4.6.0/css/bootstrap.min.css",
+        "js": "https://maxcdn.bootstrapcdn.com/bootstrap/4.6.0/js/bootstrap.min.js",
+    },
+}
diff --git a/template.jinja/base.html b/template.jinja/base.html
index e4cf98c3caf73465a02ac9c9339dcb1d58b5b1de..46b585b09502a573f70f9ae32bcdeab1d4809a01 100644 (file)
--- a/template.jinja/base.html
+++ b/template.jinja/base.html
@@ -4,9 +4,8 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 
-    <!-- Bootstrap CSS -->
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
-    <link rel="stylesheet" href="/media/css/font-awesome.css">
+    {{asset("css", "bootstrap4")}}
+    {{asset("css", "fontawesome6")}}
 
     <link rel="stylesheet" href="/media/css/pgeu.css">
 
@@ -54,8 +53,8 @@
     </footer>
 
 
-    <script src="https://code.jquery.com/jquery-3.2.1.min.js" integrity="sha384-xBuQ/xzmlsLoJpyjoggmTEz8OWUFM0/RC5BsqQBDX2v5cMvDHcMakNTNrHIW2I5f" crossorigin="anonymous"></script>
-    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script>
+    {{asset("js", "jquery3")}}
+    {{asset("js", "bootstrap4")}}
 {%block pagescript%}{%endblock%}
   </body>
 </html>
diff --git a/template/base.html b/template/base.html
index f50bb71b3bbafe71d9ec7ada304f2a86fe25b77c..f3d2d3734ec632024416903827ab23b083ac749f 100644 (file)
--- a/template/base.html
+++ b/template/base.html
@@ -1,12 +1,12 @@
+{%load assets%}
 <!doctype html>
 <html lang="en">
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 
-    <!-- Bootstrap CSS -->
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
-    <link rel="stylesheet" href="/media/css/font-awesome.css">
+    {%asset "css" "bootstrap4" %}
+    {%asset "css" "fontawesome6" %}
 
     <link rel="stylesheet" href="/media/css/pgeu.css">
 
@@ -52,9 +52,9 @@
 
 
 {%block jquery%}
-    <script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
+    {%asset "js" "jquery3" %}
 {%endblock%}
-    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script>
+    {%asset "js" "bootstrap4" %}
 {%block pagescript%}
 {%endblock%}
   </body>
PostgreSQL Europe specific website parts (needs pgeu-system in order to work).