diff --git a/.gitignore b/.gitignore index 6d9a540c..4168fb3d 100644 --- a/.gitignore +++ b/.gitignore @@ -145,4 +145,4 @@ dmypy.json #custom file everyone has Miniconda3*.sh -Miniconda3*.exe +Miniconda3*.exe \ No newline at end of file diff --git a/ui/runs/static/runs/runs.js b/ui/runs/static/runs/runs.js index 4944769e..51d0df34 100644 --- a/ui/runs/static/runs/runs.js +++ b/ui/runs/static/runs/runs.js @@ -34,6 +34,14 @@ $(document).ready(function () { }); + // control calculate buttons in footer + $('#calculate_parameters_submit_form_plot').click(function() { + $("#calc_form_plot").submit(); + }); + $('#calculate_parameters_submit_form').click(function() { + $("#calc_form_method").submit(); + }); + // calculate button spinner $('.calculateSpinner').on('click', function() { // Change button content to show 'Calculating...' with a spinner diff --git a/ui/runs/static/runs/style.css b/ui/runs/static/runs/style.css index 63d66a0b..ff1335d8 100644 --- a/ui/runs/static/runs/style.css +++ b/ui/runs/static/runs/style.css @@ -16,6 +16,7 @@ html, body { #content { order: 1; padding: 20px; + padding-bottom: 0px; flex-grow: 1; } @@ -28,7 +29,7 @@ html, body { order: 2; flex-basis: 300px; max-width: 400px; - min-height: 100vh; + min-height: calc(100vh - 60px); flex-grow: 1; transition: 100ms; } @@ -75,3 +76,16 @@ html, body { #gsea_enrichment_plot_img { width: 800px; } + +.header { + position: sticky; + top: 80px; +} + +.footer { + position: sticky; + bottom: 0; + padding: 10px 8%; + margin-top: 10px; + background-color: rgb(255, 255, 255); +} \ No newline at end of file diff --git a/ui/runs/templates/runs/details.html b/ui/runs/templates/runs/details.html index 70b76bf6..3f945952 100644 --- a/ui/runs/templates/runs/details.html +++ b/ui/runs/templates/runs/details.html @@ -40,8 +40,6 @@
- - {# show history #} {% if displayed_history %}
@@ -126,7 +124,7 @@

{{ display_name }}

{# if there are plot parameters, display method and plot parameters next to each other #} {% if plot_form %}
-
{% csrf_token %}
@@ -140,10 +138,6 @@

{{ display_name }}

{% endfor %}
-
@@ -161,7 +155,7 @@

{{ display_name }}

{% else %}
{% if step != "plot" %} -
{% csrf_token %}
@@ -176,10 +170,6 @@

{{ display_name }}

{% endfor %}
- {% if section == "data_preprocessing" %} Plot {% endif %} @@ -247,45 +237,68 @@

{{ display_name }}

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