From 8c2a35c7ca1f0a3bed709ec30084cf9cd063a386 Mon Sep 17 00:00:00 2001 From: Montana Date: Fri, 14 Dec 2018 13:53:04 -0500 Subject: [PATCH 1/3] Add v-cloak to all tables and charts --- templates/audit_log/audit_log.html | 2 +- templates/requests/index.html | 4 ++-- templates/workspaces/index.html | 2 +- templates/workspaces/projects/index.html | 2 +- templates/workspaces/reports/index.html | 3 ++- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/templates/audit_log/audit_log.html b/templates/audit_log/audit_log.html index 3b505135..e080f448 100644 --- a/templates/audit_log/audit_log.html +++ b/templates/audit_log/audit_log.html @@ -4,7 +4,7 @@ {% block content %} -
+

Activity History

diff --git a/templates/requests/index.html b/templates/requests/index.html index ce185a34..8dc49eab 100644 --- a/templates/requests/index.html +++ b/templates/requests/index.html @@ -82,7 +82,7 @@ {% endif %} -
+
{% if extended_view %} {% endif %} -
+
diff --git a/templates/workspaces/index.html b/templates/workspaces/index.html index 14d4600c..ac388453 100644 --- a/templates/workspaces/index.html +++ b/templates/workspaces/index.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% block content %} -
+
diff --git a/templates/workspaces/projects/index.html b/templates/workspaces/projects/index.html index fc907b90..104210f7 100644 --- a/templates/workspaces/projects/index.html +++ b/templates/workspaces/projects/index.html @@ -22,7 +22,7 @@ {% else %} {% for project in workspace.projects %} -
+

{{ project.name }} ({{ project.environments|length }} environments)

{% if user_can(permissions.RENAME_APPLICATION_IN_WORKSPACE) %} diff --git a/templates/workspaces/reports/index.html b/templates/workspaces/reports/index.html index 7ba48018..963fc469 100644 --- a/templates/workspaces/reports/index.html +++ b/templates/workspaces/reports/index.html @@ -13,7 +13,7 @@ {"label": "Learn More", "href": url_for('atst.helpdocs'), "icon": "info"} ] ) }} -
+
@@ -131,6 +131,7 @@ {% else %} Date: Fri, 14 Dec 2018 14:04:19 -0500 Subject: [PATCH 2/3] Add pagination to v-cloaked section --- templates/audit_log/audit_log.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/audit_log/audit_log.html b/templates/audit_log/audit_log.html index e080f448..222eca87 100644 --- a/templates/audit_log/audit_log.html +++ b/templates/audit_log/audit_log.html @@ -19,7 +19,7 @@ {% endfor %} - + {{ Pagination(audit_events, 'atst.activity_history') }} - {{ Pagination(audit_events, 'atst.activity_history') }} + {% endblock %} From 59d2f2299894710a398f1f3130b31f2ea91dda55 Mon Sep 17 00:00:00 2001 From: Montana Date: Thu, 20 Dec 2018 09:53:16 -0500 Subject: [PATCH 3/3] change location of v-cloak on audit log without changing the position of the pagination component --- templates/audit_log/audit_log.html | 32 +++++++++++++++--------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/templates/audit_log/audit_log.html b/templates/audit_log/audit_log.html index 222eca87..9290ba21 100644 --- a/templates/audit_log/audit_log.html +++ b/templates/audit_log/audit_log.html @@ -3,23 +3,23 @@ {% block content %} +
+
+
+

Activity History

+
-
-
-

Activity History

-
- -
    - {% for event in audit_events %} -
  • - {% autoescape false %} - {{ event | renderAuditEvent }} - {% endautoescape %} -
  • - {% endfor %} -
+
    + {% for event in audit_events %} +
  • + {% autoescape false %} + {{ event | renderAuditEvent }} + {% endautoescape %} +
  • + {% endfor %} +
+
{{ Pagination(audit_events, 'atst.activity_history') }} - -
+
{% endblock %}