From c457258616084a784cc2900d661dc742a652afb4 Mon Sep 17 00:00:00 2001
From: Nico Vermaas <vermaas@astron.nl>
Date: Mon, 4 Apr 2022 13:32:48 +0200
Subject: [PATCH] move dashboard tree
---
.../{ => taskdatabase}/dashboard/dashboard.html | 4 ++--
.../{ => taskdatabase}/dashboard/toggles.html | 0
.../taskdatabase/failures/failures_page.html | 2 +-
.../templates/taskdatabase/index.html | 4 ++--
.../templates/taskdatabase/monitoring_page.html | 2 +-
.../templates/taskdatabase/no_refresh.html | 16 ++++++++++++++++
.../templates/taskdatabase/postprocessing.html | 2 +-
.../taskdatabase/quality/quality_page.html | 2 +-
.../{localstorage_scripts.html => refresh.html} | 17 -----------------
.../validation/validation_page.html | 2 +-
atdb/taskdatabase/views.py | 2 +-
11 files changed, 26 insertions(+), 27 deletions(-)
rename atdb/taskdatabase/templates/{ => taskdatabase}/dashboard/dashboard.html (87%)
rename atdb/taskdatabase/templates/{ => taskdatabase}/dashboard/toggles.html (100%)
create mode 100644 atdb/taskdatabase/templates/taskdatabase/no_refresh.html
rename atdb/taskdatabase/templates/taskdatabase/{localstorage_scripts.html => refresh.html} (55%)
diff --git a/atdb/taskdatabase/templates/dashboard/dashboard.html b/atdb/taskdatabase/templates/taskdatabase/dashboard/dashboard.html
similarity index 87%
rename from atdb/taskdatabase/templates/dashboard/dashboard.html
rename to atdb/taskdatabase/templates/taskdatabase/dashboard/dashboard.html
index db35bb3c..e6f1394b 100644
--- a/atdb/taskdatabase/templates/dashboard/dashboard.html
+++ b/atdb/taskdatabase/templates/taskdatabase/dashboard/dashboard.html
@@ -13,7 +13,7 @@
<h4>Dashboard</h4>
</div>
<div class="col-4">
- {% include "dashboard/toggles.html" %}
+ {% include "taskdatabase/dashboard/toggles.html" %}
</div>
</div>
</div>
@@ -33,6 +33,6 @@
{% include "taskdatabase/modal/modal_script.html" %}
{% include "taskdatabase/modal/modal.html" %}
-{% include 'taskdatabase/localstorage_scripts.html' %}
+{% include 'taskdatabase/refresh.html' %}
{% endblock %}
\ No newline at end of file
diff --git a/atdb/taskdatabase/templates/dashboard/toggles.html b/atdb/taskdatabase/templates/taskdatabase/dashboard/toggles.html
similarity index 100%
rename from atdb/taskdatabase/templates/dashboard/toggles.html
rename to atdb/taskdatabase/templates/taskdatabase/dashboard/toggles.html
diff --git a/atdb/taskdatabase/templates/taskdatabase/failures/failures_page.html b/atdb/taskdatabase/templates/taskdatabase/failures/failures_page.html
index fa53f4e8..15d5493c 100644
--- a/atdb/taskdatabase/templates/taskdatabase/failures/failures_page.html
+++ b/atdb/taskdatabase/templates/taskdatabase/failures/failures_page.html
@@ -45,7 +45,7 @@
</div>
</div>
-{% include 'taskdatabase/localstorage_scripts.html' %}
+{% include 'taskdatabase/no_refresh.html' %}
{% endblock %}
diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html
index fdbdeee8..7a8652a3 100644
--- a/atdb/taskdatabase/templates/taskdatabase/index.html
+++ b/atdb/taskdatabase/templates/taskdatabase/index.html
@@ -34,11 +34,11 @@
{% include 'taskdatabase/pagination.html' %}
</div>
</div>
- <p class="footer"> Version 1.0.0 (2 apr 2021 - 6:00)
+ <p class="footer"> Version 1.0.0 (4 apr 2021 - 13:00)
</div>
-{% include 'taskdatabase/localstorage_scripts.html' %}
+{% include 'taskdatabase/refresh.html' %}
{% endblock %}
diff --git a/atdb/taskdatabase/templates/taskdatabase/monitoring_page.html b/atdb/taskdatabase/templates/taskdatabase/monitoring_page.html
index 6da4454a..98a438e6 100644
--- a/atdb/taskdatabase/templates/taskdatabase/monitoring_page.html
+++ b/atdb/taskdatabase/templates/taskdatabase/monitoring_page.html
@@ -37,6 +37,6 @@
</div>
</div>
-{% include 'taskdatabase/localstorage_scripts.html' %}
+{% include 'taskdatabase/refresh.html' %}
{% endblock %}
diff --git a/atdb/taskdatabase/templates/taskdatabase/no_refresh.html b/atdb/taskdatabase/templates/taskdatabase/no_refresh.html
new file mode 100644
index 00000000..3d99cd33
--- /dev/null
+++ b/atdb/taskdatabase/templates/taskdatabase/no_refresh.html
@@ -0,0 +1,16 @@
+
+<script type="text/javascript">
+ function readFromLocalStorage(id) {
+ var s = localStorage.getItem(id);
+ if (s !== null) {
+ document.getElementById(id).value = s;
+ }
+ }
+</script>
+
+<script type="text/javascript">
+function writeToLocalStorage(id) {
+ var s = document.getElementById(id).value
+ localStorage.setItem(id, s);
+}
+</script>
\ No newline at end of file
diff --git a/atdb/taskdatabase/templates/taskdatabase/postprocessing.html b/atdb/taskdatabase/templates/taskdatabase/postprocessing.html
index 276050d3..7d22fe92 100644
--- a/atdb/taskdatabase/templates/taskdatabase/postprocessing.html
+++ b/atdb/taskdatabase/templates/taskdatabase/postprocessing.html
@@ -84,7 +84,7 @@
</div>
-{% include 'taskdatabase/localstorage_scripts.html' %}
+{% include 'taskdatabase/refresh.html' %}
{% endblock %}
diff --git a/atdb/taskdatabase/templates/taskdatabase/quality/quality_page.html b/atdb/taskdatabase/templates/taskdatabase/quality/quality_page.html
index 6d3b8881..00d5fdf2 100644
--- a/atdb/taskdatabase/templates/taskdatabase/quality/quality_page.html
+++ b/atdb/taskdatabase/templates/taskdatabase/quality/quality_page.html
@@ -43,7 +43,7 @@
</div>
</div>
-{% include 'taskdatabase/localstorage_scripts.html' %}
+{% include 'taskdatabase/no_refresh.html' %}
{% endblock %}
diff --git a/atdb/taskdatabase/templates/taskdatabase/localstorage_scripts.html b/atdb/taskdatabase/templates/taskdatabase/refresh.html
similarity index 55%
rename from atdb/taskdatabase/templates/taskdatabase/localstorage_scripts.html
rename to atdb/taskdatabase/templates/taskdatabase/refresh.html
index a95e03d8..f0a067e6 100644
--- a/atdb/taskdatabase/templates/taskdatabase/localstorage_scripts.html
+++ b/atdb/taskdatabase/templates/taskdatabase/refresh.html
@@ -14,20 +14,3 @@
}(30));
</script>
-
-
-<script type="text/javascript">
- function readFromLocalStorage(id) {
- var s = localStorage.getItem(id);
- if (s !== null) {
- document.getElementById(id).value = s;
- }
- }
-</script>
-
-<script type="text/javascript">
-function writeToLocalStorage(id) {
- var s = document.getElementById(id).value
- localStorage.setItem(id, s);
-}
-</script>
\ No newline at end of file
diff --git a/atdb/taskdatabase/templates/taskdatabase/validation/validation_page.html b/atdb/taskdatabase/templates/taskdatabase/validation/validation_page.html
index 88a9b12a..76637481 100644
--- a/atdb/taskdatabase/templates/taskdatabase/validation/validation_page.html
+++ b/atdb/taskdatabase/templates/taskdatabase/validation/validation_page.html
@@ -44,7 +44,7 @@
</div>
</div>
-{% include 'taskdatabase/localstorage_scripts.html' %}
+{% include 'taskdatabase/no_refresh.html' %}
{% endblock %}
diff --git a/atdb/taskdatabase/views.py b/atdb/taskdatabase/views.py
index 30cd3763..7f398525 100644
--- a/atdb/taskdatabase/views.py
+++ b/atdb/taskdatabase/views.py
@@ -614,7 +614,7 @@ def ShowConfig(request):
def ShowDashboard(request, selection):
# gather the results
results_tasks, results_logs = algorithms.construct_dashboard_html(request, selection)
- return render(request, "dashboard/dashboard.html",
+ return render(request, "taskdatabase/dashboard/dashboard.html",
{'results_tasks': results_tasks,
'results_logs': results_logs,
'selection': selection})
--
GitLab