From 7a393a9af19b11c79e703a996d36b30ae9bdc0ae Mon Sep 17 00:00:00 2001 From: noLeonardo <119075701+noLeonardo@users.noreply.github.com> Date: Thu, 7 Nov 2024 14:09:12 +0100 Subject: [PATCH 1/7] Added header with calculate/back/next buttons to details page --- .gitignore | 2 ++ ui/runs/static/runs/runs.js | 13 ++++++++++++ ui/runs/static/runs/style.css | 22 +++++++++++++++++--- ui/runs/templates/runs/details.html | 31 +++++++++++++++++++++++------ 4 files changed, 59 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 6d9a540ce..2051663b2 100644 --- a/.gitignore +++ b/.gitignore @@ -146,3 +146,5 @@ dmypy.json #custom file everyone has Miniconda3*.sh Miniconda3*.exe +user_data/workflows/workflow_firstTest.yaml +.gitignore diff --git a/ui/runs/static/runs/runs.js b/ui/runs/static/runs/runs.js index 58637bdbd..7cebcacbc 100644 --- a/ui/runs/static/runs/runs.js +++ b/ui/runs/static/runs/runs.js @@ -32,4 +32,17 @@ $(document).ready(function () { let id = $(this).attr("id"); $('#chosen-' + id).text(this.files[0].name); }); + + // control calculate buttons in header + $('#calculate_parameters_submit_plot_form').click(function() { + $("#calc_form").submit(); + }); + $('#calculate_parameters_submit_form').click(function() { + $("#calc_from_method").submit(); + }); + + // control back / next buttons in header + $('#btn_next').click(function() { + $("#runs_next").submit(); + }); }); \ No newline at end of file diff --git a/ui/runs/static/runs/style.css b/ui/runs/static/runs/style.css index 63d66a0b8..381dee01e 100644 --- a/ui/runs/static/runs/style.css +++ b/ui/runs/static/runs/style.css @@ -15,7 +15,7 @@ html, body { #content { order: 1; - padding: 20px; + padding: 0 20px; flex-grow: 1; } @@ -48,8 +48,8 @@ html, body { } #sidebarCollapse { - width: 35px; - height: 35px; + width: 24; + aspect-ratio: 1; } #header_toggle { @@ -75,3 +75,19 @@ html, body { #gsea_enrichment_plot_img { width: 800px; } + +.my-4 { + z-index: 1; +} + +.header { + position: sticky; + top: 49.5px; + padding-left: 8%; + padding-right: 8%; + padding-top: 18.5px; + padding-bottom: 18.5px; + margin-bottom: 10px; + background-color: rgb(255, 255, 255); + z-index: 2; +} \ No newline at end of file diff --git a/ui/runs/templates/runs/details.html b/ui/runs/templates/runs/details.html index 5809d356c..c079f4429 100644 --- a/ui/runs/templates/runs/details.html +++ b/ui/runs/templates/runs/details.html @@ -32,11 +32,30 @@
-
- + +
+
+
+ {% if plot_form %} + + {% else %} + + {% endif %} +
+
+ {% if show_back %} + Back + {% endif %} + + + + +
+
@@ -159,7 +178,7 @@

{{ display_name }}

{% else %}
{% if step != "plot" %} -
{% csrf_token %}
From 5079cb175e0b087c409ef3afc459cd6c628c318c Mon Sep 17 00:00:00 2001 From: noLeonardo <119075701+noLeonardo@users.noreply.github.com> Date: Mon, 11 Nov 2024 23:42:55 +0100 Subject: [PATCH 2/7] header converted to footer --- ui/runs/static/runs/runs.js | 5 -- ui/runs/static/runs/style.css | 24 +++--- ui/runs/templates/runs/details.html | 112 +++++++++++++--------------- 3 files changed, 63 insertions(+), 78 deletions(-) diff --git a/ui/runs/static/runs/runs.js b/ui/runs/static/runs/runs.js index 7cebcacbc..331b5d62e 100644 --- a/ui/runs/static/runs/runs.js +++ b/ui/runs/static/runs/runs.js @@ -40,9 +40,4 @@ $(document).ready(function () { $('#calculate_parameters_submit_form').click(function() { $("#calc_from_method").submit(); }); - - // control back / next buttons in header - $('#btn_next').click(function() { - $("#runs_next").submit(); - }); }); \ No newline at end of file diff --git a/ui/runs/static/runs/style.css b/ui/runs/static/runs/style.css index 381dee01e..369fd396f 100644 --- a/ui/runs/static/runs/style.css +++ b/ui/runs/static/runs/style.css @@ -15,7 +15,8 @@ html, body { #content { order: 1; - padding: 0 20px; + padding: 20px; + padding-bottom: 100px; flex-grow: 1; } @@ -48,8 +49,8 @@ html, body { } #sidebarCollapse { - width: 24; - aspect-ratio: 1; + width: 35px; + height: 35px; } #header_toggle { @@ -76,18 +77,15 @@ html, body { width: 800px; } -.my-4 { - z-index: 1; +.header { + position: sticky; + top: 80px; } -.header { +.footer { position: sticky; - top: 49.5px; - padding-left: 8%; - padding-right: 8%; - padding-top: 18.5px; - padding-bottom: 18.5px; - margin-bottom: 10px; + bottom: 0; + padding: 10px 8%; + margin: 10px 0; background-color: rgb(255, 255, 255); - z-index: 2; } \ No newline at end of file diff --git a/ui/runs/templates/runs/details.html b/ui/runs/templates/runs/details.html index c079f4429..adcb0b023 100644 --- a/ui/runs/templates/runs/details.html +++ b/ui/runs/templates/runs/details.html @@ -32,35 +32,14 @@
- -
-
-
- {% if plot_form %} - - {% else %} - - {% endif %} -
-
- {% if show_back %} - Back - {% endif %} - - - - -
-
+
+
- - {# show history #} {% if displayed_history %}
@@ -159,8 +138,6 @@

{{ display_name }}

{% endfor %}
-
@@ -193,8 +170,6 @@

{{ display_name }}

{% endfor %}
- {% if section == "data_preprocessing" %} Plot {% endif %} @@ -262,44 +237,61 @@

{{ display_name }}

{% endif %}
-
- {# navigation between steps #} + +
+
+ +