diff options
| author |   pmikus <peter.mikus@protonmail.ch> | 2022-10-05 09:15:54 +0200 |
|---|---|---|
| committer | pmikus <peter.mikus@protonmail.ch> | 2022-10-05 09:15:54 +0200 |
| commit | 3b333d65b92d1746d0d165d0b2a4b2a98f62d474 (patch) | |
| tree | e7bfbbdd0d2f88f07c51b4fb4b27a4cdabf4881d | |
| parent | 7b9208caf1cf3d1b4c345855777e41d8ff4f8638 (diff) | |
fix(cdash): Templates
Signed-off-by: pmikus <peter.mikus@protonmail.ch>
Change-Id: I9de91244b096b4ec3366262c4f09bea85d1611e4
| -rw-r--r-- | csit.infra.dash/app/cdash/templates/base_layout.jinja2 (renamed from csit.infra.dash/app/cdash/templates/index_layout.jinja2) | 0 | ||||
| -rw-r--r-- | csit.infra.dash/app/cdash/templates/dash_layout.jinja2 | 33 | ||||
| -rw-r--r-- | csit.infra.dash/app/cdash/templates/layout.jinja2 | 24 | ||||
| -rw-r--r-- | csit.infra.dash/app/cdash/utils/constants.py | 8 |
4 files changed, 37 insertions, 28 deletions
diff --git a/csit.infra.dash/app/cdash/templates/index_layout.jinja2 b/csit.infra.dash/app/cdash/templates/base_layout.jinja2 index bf4f812e8a..bf4f812e8a 100644 --- a/csit.infra.dash/app/cdash/templates/index_layout.jinja2 +++ b/csit.infra.dash/app/cdash/templates/base_layout.jinja2 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 @@ <!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 index 0000000000..b1f3a606b9 --- /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 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" |