From 3b333d65b92d1746d0d165d0b2a4b2a98f62d474 Mon Sep 17 00:00:00 2001 From: pmikus Date: Wed, 5 Oct 2022 09:15:54 +0200 Subject: fix(cdash): Templates Signed-off-by: pmikus Change-Id: I9de91244b096b4ec3366262c4f09bea85d1611e4 --- .../app/cdash/templates/base_layout.jinja2 | 34 ++++++++++++++++++++++ .../app/cdash/templates/dash_layout.jinja2 | 33 +++++++++------------ .../app/cdash/templates/index_layout.jinja2 | 34 ---------------------- csit.infra.dash/app/cdash/templates/layout.jinja2 | 24 +++++++++++++++ csit.infra.dash/app/cdash/utils/constants.py | 8 ----- 5 files changed, 71 insertions(+), 62 deletions(-) create mode 100644 csit.infra.dash/app/cdash/templates/base_layout.jinja2 delete mode 100644 csit.infra.dash/app/cdash/templates/index_layout.jinja2 create mode 100644 csit.infra.dash/app/cdash/templates/layout.jinja2 diff --git a/csit.infra.dash/app/cdash/templates/base_layout.jinja2 b/csit.infra.dash/app/cdash/templates/base_layout.jinja2 new file mode 100644 index 0000000000..bf4f812e8a --- /dev/null +++ b/csit.infra.dash/app/cdash/templates/base_layout.jinja2 @@ -0,0 +1,34 @@ +{% extends "base_layout.jinja2" %} + +{% block content %} +
+ +
+
+

CSIT-Dash

+
+
+ +
+ +

{{ title }}

+

{{ description }}

+

+ {{ trending_title }} +

+

+ {{ report_title }} +

+

+ {{ stats_title }} +

+

+ {{ news_title }} +

+
+ + +
+{% endblock %} diff --git a/csit.infra.dash/app/cdash/templates/dash_layout.jinja2 b/csit.infra.dash/app/cdash/templates/dash_layout.jinja2 index b1f3a606b9..1275a99676 100644 --- a/csit.infra.dash/app/cdash/templates/dash_layout.jinja2 +++ b/csit.infra.dash/app/cdash/templates/dash_layout.jinja2 @@ -1,24 +1,17 @@ - + - - - {{ title }} - - - - - - - - -{% assets "sass_all" %} - -{% endassets %} - - + {%title%} + {%metas%} + {%favicon%} + {%css%} - - {% block content %}{% endblock %} + + {%app_entry%} +
+ {%config%} + {%scripts%} + {%renderer%} +
- + \ No newline at end of file diff --git a/csit.infra.dash/app/cdash/templates/index_layout.jinja2 b/csit.infra.dash/app/cdash/templates/index_layout.jinja2 deleted file mode 100644 index bf4f812e8a..0000000000 --- a/csit.infra.dash/app/cdash/templates/index_layout.jinja2 +++ /dev/null @@ -1,34 +0,0 @@ -{% extends "base_layout.jinja2" %} - -{% block content %} -
- -
-
-

CSIT-Dash

-
-
- -
- -

{{ title }}

-

{{ description }}

-

- {{ trending_title }} -

-

- {{ report_title }} -

-

- {{ stats_title }} -

-

- {{ news_title }} -

-
- - -
-{% endblock %} diff --git a/csit.infra.dash/app/cdash/templates/layout.jinja2 b/csit.infra.dash/app/cdash/templates/layout.jinja2 new file mode 100644 index 0000000000..b1f3a606b9 --- /dev/null +++ b/csit.infra.dash/app/cdash/templates/layout.jinja2 @@ -0,0 +1,24 @@ + + + + + + {{ title }} + + + + + + + + +{% assets "sass_all" %} + +{% endassets %} + + + + + {% block content %}{% endblock %} + + diff --git a/csit.infra.dash/app/cdash/utils/constants.py b/csit.infra.dash/app/cdash/utils/constants.py index 75cd68a3a5..8960c7a422 100644 --- 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" -- cgit 1.2.3-korg