Code Review / csit.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 7b9208c)
fix(cdash): Templates 52/37352/1
authorpmikus <peter.mikus@protonmail.ch>
Wed, 5 Oct 2022 07:15:54 +0000 (09:15 +0200)
committerpmikus <peter.mikus@protonmail.ch>
Wed, 5 Oct 2022 07:15:54 +0000 (09:15 +0200)
Signed-off-by: pmikus <peter.mikus@protonmail.ch>
Change-Id: I9de91244b096b4ec3366262c4f09bea85d1611e4

csit.infra.dash/app/cdash/templates/base_layout.jinja2 [moved from csit.infra.dash/app/cdash/templates/index_layout.jinja2 with 100% similarity] patch | blob | history
csit.infra.dash/app/cdash/templates/dash_layout.jinja2 patch | blob | history
csit.infra.dash/app/cdash/templates/layout.jinja2 [new file with mode: 0644] patch | blob
csit.infra.dash/app/cdash/utils/constants.py patch | blob | history

diff --git a/csit.infra.dash/app/cdash/templates/dash_layout.jinja2 b/csit.infra.dash/app/cdash/templates/dash_layout.jinja2
index b1f3a60..1275a99 100644 (file)
--- a/csit.infra.dash/app/cdash/templates/dash_layout.jinja2
+++ b/csit.infra.dash/app/cdash/templates/dash_layout.jinja2
@@ -1,24 +1,17 @@
 <!DOCTYPE html>
-<html lang="en" class="h-100">
+<html lang="en">
 <head>
-  <meta charset="utf-8" />
-  <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-  <title>{{ title }}</title>
-  <meta property="og:site_name" content="{{ title }}"/>
-  <meta property="og:type" content="website"/>
-  <meta property="og:title" content="{{ title }}"/>
-  <meta property="og:description" content="{{ description }}"/>
-  <meta property="og:url" content="https://csit.fd.io/"/>
-  <meta name="HandheldFriendly" content="True" />
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover" />
-  <!-- Bootstrap core CSS -->
-{% assets "sass_all" %}
-  <link rel="stylesheet" href="{{ ASSET_URL }}" /></script>
-{% endassets %}
-  <!-- Favicons -->
-  <link rel="shortcut icon" href="{{ url_for('static', filename='dist/img/favicon.svg') }}" type="image/x-icon" />
+  <title>{%title%}</title>
+  {%metas%}
+  {%favicon%}
+  {%css%}
 </head>
-<body class="{{template}}">
-       {% block content %}{% endblock %}
+<body>
+  {%app_entry%}
+  <footer>
+    {%config%}
+    {%scripts%}
+    {%renderer%}
+  </footer>
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/csit.infra.dash/app/cdash/templates/layout.jinja2 b/csit.infra.dash/app/cdash/templates/layout.jinja2
new file mode 100644 (file)
index 0000000..b1f3a60
--- /dev/null
+++ b/csit.infra.dash/app/cdash/templates/layout.jinja2
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html lang="en" class="h-100">
+<head>
+  <meta charset="utf-8" />
+  <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+  <title>{{ title }}</title>
+  <meta property="og:site_name" content="{{ title }}"/>
+  <meta property="og:type" content="website"/>
+  <meta property="og:title" content="{{ title }}"/>
+  <meta property="og:description" content="{{ description }}"/>
+  <meta property="og:url" content="https://csit.fd.io/"/>
+  <meta name="HandheldFriendly" content="True" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover" />
+  <!-- Bootstrap core CSS -->
+{% assets "sass_all" %}
+  <link rel="stylesheet" href="{{ ASSET_URL }}" /></script>
+{% endassets %}
+  <!-- Favicons -->
+  <link rel="shortcut icon" href="{{ url_for('static', filename='dist/img/favicon.svg') }}" type="image/x-icon" />
+</head>
+<body class="{{template}}">
+       {% block content %}{% endblock %}
+</body>
+</html>
diff --git a/csit.infra.dash/app/cdash/utils/constants.py b/csit.infra.dash/app/cdash/utils/constants.py
index 75cd68a..8960c7a 100644 (file)
--- a/csit.infra.dash/app/cdash/utils/constants.py
+++ b/csit.infra.dash/app/cdash/utils/constants.py
@@ -290,10 +290,6 @@ class Constants:
     # The pathname prefix for the application.
     STATS_ROUTES_PATHNAME_PREFIX = "/stats/"
 
-    # Path and name of the file specifying the HTML layout of the dash
-    # application.
-    STATS_HTML_LAYOUT_FILE = "cdash/templates/stats_layout.jinja2"
-
     # Layout of plot.ly graphs.
     STATS_GRAPH_LAYOUT_FILE = "cdash/stats/layout.yaml"
 
@@ -312,10 +308,6 @@ class Constants:
     # The pathname prefix for the application.
     TREND_ROUTES_PATHNAME_PREFIX = "/trending/"
 
-    # Path and name of the file specifying the HTML layout of the dash
-    # application.
-    TREND_HTML_LAYOUT_FILE = "cdash/templates/trending_layout.jinja2"
-
     # Layout of plot.ly graphs.
     TREND_GRAPH_LAYOUT_FILE = "cdash/trending/layout.yaml"
 
Integration tests