Revert "CSIT-Dash: Improvements in layout"

This reverts commit 287fae853accd3782200c21a08345b7d88a936c8.

Reason for revert: <INSERT REASONING HERE>

Change-Id: I51079c479b4d47343a2eff4366f0c2019ab4626d
Signed-off-by: Peter Mikus <pmikus@cisco.com>

diff --git a/csit.infra.dash/app/pal/news/layout.py b/csit.infra.dash/app/pal/news/layout.py
index f21ea68..e9ff4dc 100644 (file)
--- a/csit.infra.dash/app/pal/news/layout.py
+++ b/csit.infra.dash/app/pal/news/layout.py
@@ -230,8 +230,7 @@ class Layout:
 
         try:
             with open(self._html_layout_file, "r") as file_read:
-                self._html_layout = file_read.read().\
-                    replace("_title_", C.NEWS_TITLE)
+                self._html_layout = file_read.read()
         except IOError as err:
             raise RuntimeError(
                 f"Not possible to open the file {self._html_layout_file}\n{err}"
@@ -325,7 +324,7 @@ class Layout:
             children=[
                 dbc.NavItem(
                     dbc.NavLink(
-                        C.NEWS_TITLE,
+                        "Continuous Performance News",
                         disabled=True,
                         external_link=True,
                         href="#"

diff --git a/csit.infra.dash/app/pal/report/layout.py b/csit.infra.dash/app/pal/report/layout.py
index 143e56b..9397870 100644 (file)
--- a/csit.infra.dash/app/pal/report/layout.py
+++ b/csit.infra.dash/app/pal/report/layout.py
@@ -162,8 +162,7 @@ class Layout:
 
         try:
             with open(self._html_layout_file, "r") as file_read:
-                self._html_layout = file_read.read().\
-                    replace("_title_", C.REPORT_TITLE)
+                self._html_layout = file_read.read()
         except IOError as err:
             raise RuntimeError(
                 f"Not possible to open the file {self._html_layout_file}\n{err}"
@@ -292,7 +291,7 @@ class Layout:
             children=[
                 dbc.NavItem(
                     dbc.NavLink(
-                        C.REPORT_TITLE,
+                        "Iterative Test Runs",
                         disabled=True,
                         external_link=True,
                         href="#"

diff --git a/csit.infra.dash/app/pal/routes.py b/csit.infra.dash/app/pal/routes.py
index 8a47c04..59af748 100644 (file)
--- a/csit.infra.dash/app/pal/routes.py
+++ b/csit.infra.dash/app/pal/routes.py
@@ -28,10 +28,5 @@ def home():
         C.MAIN_HTML_LAYOUT_FILE,
         title=C.TITLE,
         description=C.DESCRIPTION,
-        copyright=C.COPYRIGHT,
-        trending_title=C.TREND_TITLE,
-        report_title=C.REPORT_TITLE,
-        stats_title=C.STATS_TITLE,
-        news_title=C.NEWS_TITLE,
         template=C.TEMPLATE
     )

diff --git a/csit.infra.dash/app/pal/stats/layout.py b/csit.infra.dash/app/pal/stats/layout.py
index c0e1d52..2f1b344 100644 (file)
--- a/csit.infra.dash/app/pal/stats/layout.py
+++ b/csit.infra.dash/app/pal/stats/layout.py
@@ -165,8 +165,7 @@ class Layout:
 
         try:
             with open(self._html_layout_file, "r") as file_read:
-                self._html_layout = file_read.read().\
-                    replace("_title_", C.STATS_TITLE)
+                self._html_layout = file_read.read()
         except IOError as err:
             raise RuntimeError(
                 f"Not possible to open the file {self._html_layout_file}\n{err}"
@@ -302,7 +301,7 @@ class Layout:
             children=[
                 dbc.NavItem(
                     dbc.NavLink(
-                        C.STATS_TITLE,
+                        "Continuous Performance Statistics",
                         disabled=True,
                         external_link=True,
                         href="#"

diff --git a/csit.infra.dash/app/pal/templates/index_layout.jinja2 b/csit.infra.dash/app/pal/templates/index_layout.jinja2
index 17f9471..5a5f876 100644 (file)
--- a/csit.infra.dash/app/pal/templates/index_layout.jinja2
+++ b/csit.infra.dash/app/pal/templates/index_layout.jinja2
@@ -5,7 +5,7 @@
 
   <header class="mb-auto">
     <div>
-      <h3 class="float-md-start mb-0 text-white">CSIT-Dash</h3>
+      <h3 class="float-md-start mb-0 text-white">CDash</h3>
     </div>
   </header>
 
@@ -14,21 +14,21 @@
     <h1 class="text-white">{{ title }}</h1>
     <p class="lead">{{ description }}</p>
     <p class="lead">
-      <a href="/trending/" class="btn btn-primary fw-bold">{{ trending_title }}</a>
+      <a href="/trending/" class="btn btn-primary fw-bold">Performance Trending</a>
     </p>
     <p class="lead">
-      <a href="/report/" class="btn btn-primary fw-bold">{{ report_title }}</a>
+      <a href="/report/" class="btn btn-primary fw-bold">Iterative Test Runs</a>
     </p>
     <p class="lead">
-      <a href="/stats/" class="btn btn-primary fw-bold">{{ stats_title }}</a>
+      <a href="/stats/" class="btn btn-primary fw-bold">Job Statistics</a>
     </p>
     <p class="lead">
-      <a href="/news/" class="btn btn-primary fw-bold">{{ news_title }}</a>
+      <a href="/news/" class="btn btn-primary fw-bold">News</a>
     </p>
   </main>
 
   <footer class="mt-auto text-white-50">
-    <p>{{ copyright }}</p>
+    <p>Copyright © 2016-2022 <a href="https://fd.io" class="text-white">The Fast Data Project</a>, a series of LF Projects, LLC.</p>
   </footer>
 </div>
 {% endblock %}

diff --git a/csit.infra.dash/app/pal/templates/news_layout.jinja2 b/csit.infra.dash/app/pal/templates/news_layout.jinja2
index a86d26d..c3ac89f 100644 (file)
--- a/csit.infra.dash/app/pal/templates/news_layout.jinja2
+++ b/csit.infra.dash/app/pal/templates/news_layout.jinja2
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-  <title>_title_</title>
+  <title>Continuous Performance News</title>
   {%metas%}
   {%favicon%}
   {%css%}

diff --git a/csit.infra.dash/app/pal/templates/report_layout.jinja2 b/csit.infra.dash/app/pal/templates/report_layout.jinja2
index a86d26d..c535d37 100644 (file)
--- a/csit.infra.dash/app/pal/templates/report_layout.jinja2
+++ b/csit.infra.dash/app/pal/templates/report_layout.jinja2
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-  <title>_title_</title>
+  <title>Iterative Test Runs</title>
   {%metas%}
   {%favicon%}
   {%css%}

diff --git a/csit.infra.dash/app/pal/templates/stats_layout.jinja2 b/csit.infra.dash/app/pal/templates/stats_layout.jinja2
index a86d26d..dae6f00 100644 (file)
--- a/csit.infra.dash/app/pal/templates/stats_layout.jinja2
+++ b/csit.infra.dash/app/pal/templates/stats_layout.jinja2
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-  <title>_title_</title>
+  <title>Continuous Performance Statistics</title>
   {%metas%}
   {%favicon%}
   {%css%}

diff --git a/csit.infra.dash/app/pal/templates/trending_layout.jinja2 b/csit.infra.dash/app/pal/templates/trending_layout.jinja2
index a86d26d..4881397 100644 (file)
--- a/csit.infra.dash/app/pal/templates/trending_layout.jinja2
+++ b/csit.infra.dash/app/pal/templates/trending_layout.jinja2
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-  <title>_title_</title>
+  <title>Continuous Performance Trending</title>
   {%metas%}
   {%favicon%}
   {%css%}

diff --git a/csit.infra.dash/app/pal/trending/layout.py b/csit.infra.dash/app/pal/trending/layout.py
index eea9042..9b1965f 100644 (file)
--- a/csit.infra.dash/app/pal/trending/layout.py
+++ b/csit.infra.dash/app/pal/trending/layout.py
@@ -165,8 +165,7 @@ class Layout:
 
         try:
             with open(self._html_layout_file, "r") as file_read:
-                self._html_layout = file_read.read().\
-                    replace("_title_", C.TREND_TITLE)
+                self._html_layout = file_read.read()
         except IOError as err:
             raise RuntimeError(
                 f"Not possible to open the file {self._html_layout_file}\n{err}"
@@ -299,7 +298,7 @@ class Layout:
             children=[
                 dbc.NavItem(
                     dbc.NavLink(
-                        C.TREND_TITLE,
+                        "Continuous Performance Trending",
                         disabled=True,
                         external_link=True,
                         href="#"

diff --git a/csit.infra.dash/app/pal/utils/constants.py b/csit.infra.dash/app/pal/utils/constants.py
index 8807fec..73afb4c 100644 (file)
--- a/csit.infra.dash/app/pal/utils/constants.py
+++ b/csit.infra.dash/app/pal/utils/constants.py
@@ -35,18 +35,11 @@ class Constants:
     LOG_DATE_FORMAT = "%Y/%m/%d %H:%M:%S"
 
     # The application title.
-    TITLE = "FD.io CSIT"
-    BRAND = "CSIT-Dash"
+    TITLE = "FD.io CDash"
+    BRAND = "CDash"
 
     # The application description.
-    DESCRIPTION = 'Performance Dashboard "CSIT-Dash"'
-
-    # Copyright statement.
-    COPYRIGHT = (
-        'Copyright © 2016-2022 '
-        '<a href="https://fd.io" class="text-white">The Fast Data Project</a>, '
-        'a series of LF Projects, LLC.'
-    )
+    DESCRIPTION = "Performance Dashboard"
 
     # External stylesheets.
     EXTERNAL_STYLESHEETS = ["/static/dist/css/bootstrap.css", ]
@@ -80,7 +73,7 @@ class Constants:
     # List of releases used for iterative data processing.
     # The releases MUST be in the order from the current (newest) to the last
     # (oldest).
-    RELEASES = ["csit2210", "csit2206", "csit2202", ]
+    RELEASES = ["csit2206", "csit2202", ]
 
     ############################################################################
     # General, application wide, layout affecting constants.
@@ -255,9 +248,6 @@ class Constants:
     ############################################################################
     # News.
 
-    # The title.
-    NEWS_TITLE = "CI TEST FAILURE AND ANOMALY STATISTICS"
-
     # The pathname prefix for the application.
     NEWS_ROUTES_PATHNAME_PREFIX = "/news/"
 
@@ -276,9 +266,6 @@ class Constants:
     ############################################################################
     # Report.
 
-    # The title.
-    REPORT_TITLE = "PER RELEASE PERFORMANCE RESULTS"
-
     # The pathname prefix for the application.
     REPORT_ROUTES_PATHNAME_PREFIX = "/report/"
 
@@ -295,9 +282,6 @@ class Constants:
     ############################################################################
     # Statistics.
 
-    # The title.
-    STATS_TITLE = "CI JOB EXECUTION STATISTICS"
-
     # The pathname prefix for the application.
     STATS_ROUTES_PATHNAME_PREFIX = "/stats/"
 
@@ -317,9 +301,6 @@ class Constants:
     ############################################################################
     # Trending.
 
-    # The title.
-    TREND_TITLE = "PERFORMANCE TRENDING (DAILY, WEEKLY)"
-
     # The pathname prefix for the application.
     TREND_ROUTES_PATHNAME_PREFIX = "/trending/"