Wizard refactoring

coldfront/core/allocation/templates/secure_dir/secure_dir_request/data_description.html

@@ -1,5 +1,4 @@
 {% extends "common/base.html" %}
-{% load crispy_forms_tags %}
 {% load static %}
 
 
@@ -14,9 +13,6 @@
 
 
 {% block content %}
-  <script type="text/javascript" src="{% static 'common/js/leave_form_alert.js' %}"></script>
-  <script type='text/javascript' src="{% static 'selectize/selectize.min.js' %}"></script>
-  <link rel='stylesheet' type='text/css' href="{% static 'selectize/selectize.bootstrap3.css' %}"/>
 
   <h1>Secure Directory: Data Description</h1><hr>
 
@@ -28,41 +24,6 @@ <h1>Secure Directory: Data Description</h1><hr>
 
   <p>Please respond to the following questions to provide us with more information about your data.</p>
 
-  <form action="" method="post">
-    {% csrf_token %}
-    <table>
-      {{ wizard.management_form }}
-      {% if wizard.form.forms %}
-        {{ wizard.form.management_form }}
-        {% for form in wizard.form.forms %}
-          {{ form|crispy }}
-        {% endfor %}
-      {% else %}
-        {{ wizard.form|crispy }}
-      {% endif %}
-    </table>
-    {% if wizard.steps.prev %}
-      <button
-              class="btn btn-secondary"
-              formnovalidate="formnovalidate"
-              name="wizard_goto_step"
-              type="submit"
-              value="{{ wizard.steps.first }}">
-        First Step
-      </button>
-      <button
-              class="btn btn-secondary"
-              formnovalidate="formnovalidate"
-              name="wizard_goto_step"
-              type="submit"
-              value="{{ wizard.steps.prev }}">
-        Previous Step
-      </button>
-    {% endif %}
-    <input class="btn btn-primary" type="submit" value="Next Step"/>
-  </form>
-  <br>
-
-  <p>Step {{ wizard.steps.step1 }} of {{ wizard.steps.count }}</p>
+  {% include wizard_form.html %}
 
 {% endblock %}

coldfront/core/allocation/templates/secure_dir/secure_dir_request/directory_name.html

@@ -1,5 +1,4 @@
 {% extends "common/base.html" %}
-{% load crispy_forms_tags %}
 {% load static %}
 
 
@@ -14,7 +13,6 @@
 
 
 {% block content %}
-  <script type="text/javascript" src="{% static 'common/js/leave_form_alert.js' %}"></script>
 
   <h1>Secure Directory: Directory Name</h1><hr>
 
@@ -37,41 +35,6 @@ <h1>Secure Directory: Directory Name</h1><hr>
     Both directories will have the same name on the cluster.
   </p>
 
-  <form action="" method="post">
-    {% csrf_token %}
-    <table>
-      {{ wizard.management_form }}
-      {% if wizard.form.forms %}
-        {{ wizard.form.management_form }}
-        {% for form in wizard.form.forms %}
-          {{ form|crispy }}
-        {% endfor %}
-      {% else %}
-        {{ wizard.form|crispy }}
-      {% endif %}
-    </table>
-    {% if wizard.steps.prev %}
-      <button
-              class="btn btn-secondary"
-              formnovalidate="formnovalidate"
-              name="wizard_goto_step"
-              type="submit"
-              value="{{ wizard.steps.first }}">
-        First Step
-      </button>
-      <button
-              class="btn btn-secondary"
-              formnovalidate="formnovalidate"
-              name="wizard_goto_step"
-              type="submit"
-              value="{{ wizard.steps.prev }}">
-        Previous Step
-      </button>
-    {% endif %}
-    <input class="btn btn-primary" type="submit" value="Submit"/>
-  </form>
-  <br>
-
-  <p>Step {{ wizard.steps.step1 }} of {{ wizard.steps.count }}</p>
+  {% include "wizard_form.html" %}
 
 {% endblock %}

coldfront/core/allocation/templates/secure_dir/secure_dir_request/pi_selection.html

@@ -1,5 +1,4 @@
 {% extends "common/base.html" %}
-{% load crispy_forms_tags %}
 {% load static %}
 
 
@@ -14,9 +13,6 @@
 
 
 {% block content %}
-  <script type="text/javascript" src="{% static 'common/js/leave_form_alert.js' %}"></script>
-  <script type='text/javascript' src="{% static 'selectize/selectize.min.js' %}"></script>
-  <link rel='stylesheet' type='text/css' href="{% static 'selectize/selectize.bootstrap3.css' %}"/>
 
   <h1>Secure Directory: PI Selection</h1><hr>
 
@@ -28,23 +24,6 @@ <h1>Secure Directory: PI Selection</h1><hr>
 
   <p>Select a PI of the project. This PI will be asked to sign a Researcher Use Agreement during the approval process.</p>
 
-  <form action="" method="post">
-    {% csrf_token %}
-    <table>
-      {{ wizard.management_form }}
-      {% if wizard.form.forms %}
-        {{ wizard.form.management_form }}
-        {% for form in wizard.form.forms %}
-          {{ form|crispy }}
-        {% endfor %}
-      {% else %}
-        {{ wizard.form|crispy }}
-      {% endif %}
-    </table>
-    <input class="btn btn-primary" type="submit" value="Next Step"/>
-  </form>
-  <br>
-
-  <p>Step {{ wizard.steps.step1 }} of {{ wizard.steps.count }}</p>
+  {% include "wizard_form.html" %}
 
 {% endblock %}

coldfront/core/allocation/templates/secure_dir/secure_dir_request/rdm_consultation.html

@@ -1,5 +1,4 @@
 {% extends "common/base.html" %}
-{% load crispy_forms_tags %}
 {% load static %}
 
 
@@ -14,9 +13,6 @@
 
 
 {% block content %}
-  <script type="text/javascript" src="{% static 'common/js/leave_form_alert.js' %}"></script>
-  <script type='text/javascript' src="{% static 'selectize/selectize.min.js' %}"></script>
-  <link rel='stylesheet' type='text/css' href="{% static 'selectize/selectize.bootstrap3.css' %}"/>
 
   <h1>Secure Directory: Research Data Management Team</h1><hr>
 
@@ -26,41 +22,6 @@ <h1>Secure Directory: Research Data Management Team</h1><hr>
     <li>{{ breadcrumb_pi }}</li>
   </ol>
 
-  <form action="" method="post">
-    {% csrf_token %}
-    <table>
-      {{ wizard.management_form }}
-      {% if wizard.form.forms %}
-        {{ wizard.form.management_form }}
-        {% for form in wizard.form.forms %}
-          {{ form|crispy }}
-        {% endfor %}
-      {% else %}
-        {{ wizard.form|crispy }}
-      {% endif %}
-    </table>
-    {% if wizard.steps.prev %}
-      <button
-              class="btn btn-secondary"
-              formnovalidate="formnovalidate"
-              name="wizard_goto_step"
-              type="submit"
-              value="{{ wizard.steps.first }}">
-        First Step
-      </button>
-      <button
-              class="btn btn-secondary"
-              formnovalidate="formnovalidate"
-              name="wizard_goto_step"
-              type="submit"
-              value="{{ wizard.steps.prev }}">
-        Previous Step
-      </button>
-    {% endif %}
-    <input class="btn btn-primary" type="submit" value="Next Step"/>
-  </form>
-  <br>
-
-  <p>Step {{ wizard.steps.step1 }} of {{ wizard.steps.count }}</p>
+  {% include "wizard_form.html" %}
 
 {% endblock %}

coldfront/core/allocation/templates/secure_dir/secure_dir_request/secure_dir_request_edit_department.html

@@ -18,8 +18,6 @@ <h1>Review and Update Allowance Details</h1>
 <hr>
 
 <script type="text/javascript" src="{% static 'common/js/leave_form_alert.js' %}"></script>
-<script type='text/javascript' src="{% static 'selectize/selectize.min.js' %}"></script>
-<link rel='stylesheet' type='text/css' href="{% static 'selectize/selectize.bootstrap3.css' %}"/>
 
 <p>Review allowance details, updating as needed. These are used to generate the Researcher Use Agreement (RUA).{% if notify_pi %}
   Clicking "Submit and Notify" will generate the RUA and send an email notification to the PI.{% endif %}

coldfront/core/project/templates/project/project_allocation_addition/request_edit_extra_fields.html

@@ -18,8 +18,6 @@ <h1>Review and Update Allowance Details</h1>
 <hr>
 
 <script type="text/javascript" src="{% static 'common/js/leave_form_alert.js' %}"></script>
-<script type='text/javascript' src="{% static 'selectize/selectize.min.js' %}"></script>
-<link rel='stylesheet' type='text/css' href="{% static 'selectize/selectize.bootstrap3.css' %}"/>
 
 <p>Review allowance details, updating as needed. These are used to generate the Memorandum of Understanding (MOU).{% if notify_pi %}
   Clicking "Submit and Notify" will generate the MOU and send an email notification to the PI.{% endif %}

coldfront/core/project/templates/project/project_renewal/allocation_period.html

@@ -14,10 +14,6 @@
 
 
 {% block content %}
-<script type="text/javascript" src="{% static 'common/js/leave_form_alert.js' %}"></script>
-<script type='text/javascript' src="{% static 'selectize/selectize.min.js' %}"></script>
-<link rel='stylesheet' type='text/css' href="{% static 'selectize/selectize.bootstrap3.css' %}"/>
-
 <h1>Select an Allocation Period</h1><hr>
 
 <p>
@@ -27,42 +23,7 @@ <h1>Select an Allocation Period</h1><hr>
   then.
 </p>
 
-<form action="" method="post">
-  {% csrf_token %}
-  <table>
-    {{ wizard.management_form }}
-    {% if wizard.form.forms %}
-      {{ wizard.form.management_form }}
-      {% for form in wizard.form.forms %}
-        {{ form|crispy }}
-      {% endfor %}
-    {% else %}
-      {{ wizard.form|crispy }}
-    {% endif %}
-  </table>
-  {% if wizard.steps.prev %}
-    <button
-        class="btn btn-secondary"
-        formnovalidate="formnovalidate"
-        name="wizard_goto_step"
-        type="submit"
-        value="{{ wizard.steps.first }}">
-      First Step
-    </button>
-    <button
-        class="btn btn-secondary"
-        formnovalidate="formnovalidate"
-        name="wizard_goto_step"
-        type="submit"
-        value="{{ wizard.steps.prev }}">
-      Previous Step
-    </button>
-  {% endif %}
-  <input class="btn btn-primary" type="submit" value="Next Step"/>
-</form>
-<br>
-
-<p>Step {{ wizard.steps.step1 }} of {{ wizard.steps.count }}</p>
+{% include "wizard_form.html" %}
 
 <script>
   $('select').selectize({

coldfront/core/project/templates/project/project_renewal/new_project_details.html

@@ -14,7 +14,7 @@
 
 
 {% block content %}
-<script type="text/javascript" src="{% static 'common/js/leave_form_alert.js' %}"></script>
+
 <h1>New Project Details</h1><hr>
 
 <ol class="breadcrumb">
@@ -27,41 +27,6 @@ <h1>New Project Details</h1><hr>
 
 <p>You are creating a new project. Please provide the following details:</p>
 
-<form action="" method="post">
-  {% csrf_token %}
-  <table>
-    {{ wizard.management_form }}
-    {% if wizard.form.forms %}
-      {{ wizard.form.management_form }}
-      {% for form in wizard.form.forms %}
-        {{ form|crispy }}
-      {% endfor %}
-    {% else %}
-      {{ wizard.form|crispy }}
-    {% endif %}
-  </table>
-  {% if wizard.steps.prev %}
-    <button
-        class="btn btn-secondary"
-        formnovalidate="formnovalidate"
-        name="wizard_goto_step"
-        type="submit"
-        value="{{ wizard.steps.first }}">
-      First Step
-    </button>
-    <button
-        class="btn btn-secondary"
-        formnovalidate="formnovalidate"
-        name="wizard_goto_step"
-        type="submit"
-        value="{{ wizard.steps.prev }}">
-      Previous Step
-    </button>
-  {% endif %}
-  <input class="btn btn-primary" type="submit" value="Next Step"/>
-</form>
-<br>
-
-<p>Step {{ wizard.steps.step1 }} of {{ wizard.steps.count }}</p>
+{% include "wizard_form.html" %}
 
 {% endblock %}

coldfront/core/project/templates/project/project_renewal/new_project_survey.html

@@ -14,9 +14,6 @@
 
 
 {% block content %}
-<script type="text/javascript" src="{% static 'common/js/leave_form_alert.js' %}"></script>
-<script type='text/javascript' src="{% static 'selectize/selectize.min.js' %}"></script>
-<link rel='stylesheet' type='text/css' href="{% static 'selectize/selectize.bootstrap3.css' %}"/>
 
 <h1>New Project Survey</h1><hr>
 
@@ -32,41 +29,6 @@ <h1>New Project Survey</h1><hr>
 
 <p>Please respond to the following questions to provide us with more information about your project and computational needs.</p>
 
-<form action="" method="post">
-  {% csrf_token %}
-  <table>
-    {{ wizard.management_form }}
-    {% if wizard.form.forms %}
-      {{ wizard.form.management_form }}
-      {% for form in wizard.form.forms %}
-        {{ form|crispy }}
-      {% endfor %}
-    {% else %}
-      {{ wizard.form|crispy }}
-    {% endif %}
-  </table>
-  {% if wizard.steps.prev %}
-    <button
-        class="btn btn-secondary"
-        formnovalidate="formnovalidate"
-        name="wizard_goto_step"
-        type="submit"
-        value="{{ wizard.steps.first }}">
-      First Step
-    </button>
-    <button
-        class="btn btn-secondary"
-        formnovalidate="formnovalidate"
-        name="wizard_goto_step"
-        type="submit"
-        value="{{ wizard.steps.prev }}">
-      Previous Step
-    </button>
-  {% endif %}
-  <input class="btn btn-primary" type="submit" value="Next Step"/>
-</form>
-<br>
-
-<p>Step {{ wizard.steps.step1 }} of {{ wizard.steps.count }}</p>
+{% include "wizard_form.html" %}
 
 {% endblock %}