Skip to content
This repository was archived by the owner on Nov 14, 2022. It is now read-only.

Makes the "Back to <instrument>" button always appear #1253

Merged
merged 1 commit into from
Mar 26, 2021
Merged

Makes the "Back to <instrument>" button always appear #1253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion WebApp/autoreduce_webapp/templates/run_summary.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,12 @@ <h2>Reduction Job #{{ run.title }}</h2>
<p class="text-center" id="warning_message">The reduce_vars.py script is missing for this instrument. Please create it before being able to submit re-runs.</p>
</div>
{% endif %}
</div>
</div>
<div class="row col-md-12 my-2">
<div class="text-center">
<a href="{% url 'runs:list' run.instrument.name %}" class="btn btn-primary" id="cancel">Back to {{ run.instrument.name }} runs</a>
</div>
</div>
{% endif %}
<div class="run-history modal fade" tabindex="-1" role="dialog" aria-hidden="true">
<div class="modal-dialog">
Expand Down
26 changes: 10 additions & 16 deletions WebApp/autoreduce_webapp/templates/snippets/run_variables.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
</div>
</div>
<div class="panel-body collapse" id="rerun_form">
<form id="run_variables" method="POST" action="{% url 'run_confirmation' instrument=instrument.name %}"
class="form-horizontal">
<form id="run_variables" method="POST" action="{% url 'run_confirmation' instrument=instrument.name %}" class="form-horizontal">
{% csrf_token %}
<input type="hidden" name="run_range" value="{{ run_number }}">
<input type="hidden" name="run_version" value="{{ run_version }}">
Expand All @@ -25,7 +24,7 @@
</a>
</label>
<div class="col-md-10">
<input type="text" id="run_description" name="run_description" class="form-control"/>
<input type="text" id="run_description" name="run_description" class="form-control" />
</div>
</div>
<div class="js-variables-container">
Expand All @@ -35,23 +34,23 @@
<div class="col-md-3">
<div class="well well-sm">
<div class="row">
<div class="col-md-12"><h4>Additional Actions</h4></div>
<div class="col-md-12">
<h4>Additional Actions</h4>
</div>
</div>
<div class="row">
<ul class="js-form-actions">
<li>
<a href="#resetValues" id="resetValues">Reset variables to initial values used for this run</a>
<a href="#" data-toggle="popover" data-html="true" data-content="Reset the values of the variables to the ones previously used for this run."
data-trigger="hover click focus" data-placement="top" data-container="body">
<i class="fa fa-info-circle"></i>
</a>
<a href="#" data-toggle="popover" data-html="true" data-content="Reset the values of the variables to the ones previously used for this run." data-trigger="hover click focus" data-placement="top" data-container="body">
<i class="fa fa-info-circle"></i>
</a>
</li>
{% if current_standard_variables %}
<li>
<a href="#currentScript" id="currentScript">Reset to values in the current reduce_vars script</a>
<a href="#" data-toggle="popover" data-html="true" data-content="Reset to the values currently contained in the reduce_vars script."
data-trigger="hover click focus" data-placement="top" data-container="body">
<i class="fa fa-info-circle"></i></a>
<a href="#" data-toggle="popover" data-html="true" data-content="Reset to the values currently contained in the reduce_vars script." data-trigger="hover click focus" data-placement="top" data-container="body">
<i class="fa fa-info-circle"></i></a>
</li>
{% endif %}
</ul>
Expand All @@ -69,11 +68,6 @@
</div>
</form>
</div>
<div class="row col-md-12 pt-2">
<div class="text-center">
<a href="{% url 'runs:list' instrument.name %}" class="btn btn-primary" id="cancel">Back to {{ instrument.name }} runs</a>
</div>
</div>
</div>

<div class="hide">
Expand Down