-
- {{ class.verbose_legend }}
-
-
- {{ class.short_legend }}
-
-
- {{ class.text_color }}
- {# Autocomplete attribute required for FF compatibility 8-( #}
-
- {% for color in available_colors %}
- {% if class.text_color.id == color.id %}
- {{ color }}
- {% else %}
- {{ color }}
- {% endif %}
- {% endfor %}
-
-
-
- {{ class.background_color }}
-
- {% for color in available_colors %}
- {% if class.background_color.id == color.id %}
- {{ color }}
+
+
-
-
+ $(function() {
+ $("#classification-legend-list").on("keyup", ".form-control", function(event) {
+ /* On enter, update the classification */
+ if (event.keyCode == 13) {
+ updateClassification($(this).closest("tr"));
+ }
+ });
+ });
+
{% endblock %}
diff --git a/missions/templates/color_list.html b/missions/templates/color_list.html
index 58dcf9c..56f51eb 100644
--- a/missions/templates/color_list.html
+++ b/missions/templates/color_list.html
@@ -19,47 +19,57 @@
{% endcomment %}
{% load bootstrap3 %}
{% block title %}Color Options Update{% endblock %}
-
{% block extra_nav_bar_content_right %}
-
+
System Settings
-
+
{% endblock %}
-
{% block main_heading %}
-
+
{% endblock %}
{% block content %}
-
-
-
-
- Display Text
- 6-Character Hex Code (RGB)
- Actions
-
-
- {% for color in object_list %}
-
-
- {{ color.display_text }}
-
-
- {{ color.hex_color_code }}
-
-
- {% bootstrap_icon "pencil" %}
- {% bootstrap_icon "trash" %}
+
+
+
+ Display Text
+ 6-Character Hex Code (RGB)
+ Actions
- {% endfor %}
-
-
-
+ $(function() {
+ $("#color-options-list").on("keyup", ".form-control", function(event) {
+ /* On enter, update the color */
+ if (event.keyCode == 13) {
+ updateColor($(this).closest("tr"));
+ }
+ });
+ });
+
{% endblock %}
diff --git a/missions/templates/create_account.html b/missions/templates/create_account.html
index a85b244..38a6f2e 100644
--- a/missions/templates/create_account.html
+++ b/missions/templates/create_account.html
@@ -19,54 +19,60 @@
{% endcomment %}
{% load bootstrap3 %}
{% load static %}
-
-{% block title %}
- Account Creation
-{% endblock %}
-
+{% block title %}Account Creation{% endblock %}
{% block main_heading %}
-
+
{% endblock %}
-
{% block content %}
-{% if any_accounts_configured %}
-
-
Forgotten Credentials Assistance
-
-
If you have forgotten your credentials you will be unable to access the web page until you have
- removed all user accounts (which will allow you to create a new user using this page).
- Don't fret, your mission data will be preserved.
-
Removing All User Accounts
-
- Execute the following command from the DART directory:python manage.py removeallusers
-
-
+ {% if any_accounts_configured %}
+
+
Forgotten Credentials Assistance
+
+
+ If you have forgotten your credentials you will be unable to access the web page until you have
+ removed all user accounts (which will allow you to create a new user using this page).
+ Don't fret, your mission data will be preserved.
+
+
Removing All User Accounts
+
+
+ Execute the following command from the DART directory:
+ python manage.py removeallusers
+
+
+
-
-
-
-{% else %}
+ {% else %}
Create an Account
It looks like you're the first user here, go ahead and enter some credentials to get started!
-{% endif %}
+ {% endif %}
{% endblock %}
diff --git a/missions/templates/delete_mission.html b/missions/templates/delete_mission.html
index 833dae2..45e439e 100644
--- a/missions/templates/delete_mission.html
+++ b/missions/templates/delete_mission.html
@@ -18,26 +18,15 @@
-->
{% endcomment %}
{% load bootstrap3 %}
-{% block title %}
- Confirm Mission Deletion
-{% endblock %}
-
-{% block main_heading %}
-
-{% endblock %}
-
+{% block title %}Confirm Mission Deletion{% endblock %}
+{% block main_heading %}{% endblock %}
{% block content %}
-
Are you sure you want to permanently delete this mission and all the hard work you put into it?
-
{% endblock %}
diff --git a/missions/templates/delete_test.html b/missions/templates/delete_test.html
index 81fea10..69b9cd0 100644
--- a/missions/templates/delete_test.html
+++ b/missions/templates/delete_test.html
@@ -18,27 +18,18 @@
-->
{% endcomment %}
{% load bootstrap3 %}
-{% block title %}
- Confirm Test Deletion
-{% endblock %}
-
-{% block main_heading %}
-
-{% endblock %}
-
+{% block title %}Confirm Test Deletion{% endblock %}
+{% block main_heading %}{% endblock %}
{% block content %}
-
Are you sure you want to permanently delete this test case from this mission and all the hard work you put into it?
-
-
{% endblock %}
diff --git a/missions/templates/delete_test_data.html b/missions/templates/delete_test_data.html
index e584905..7786197 100644
--- a/missions/templates/delete_test_data.html
+++ b/missions/templates/delete_test_data.html
@@ -18,36 +18,23 @@
-->
{% endcomment %}
{% load bootstrap3 %}
-{% block title %}
- Confirm Supporting Data Deletion
-{% endblock %}
-
-{% block main_heading %}
-
-{% endblock %}
-
+{% block title %}Confirm Supporting Data Deletion{% endblock %}
+{% block main_heading %}{% endblock %}
{% block content %}
-
Are you sure you want to permanently delete this supporting data and all the hard work you put into it?
-
-
-
-
- Danger!
- This will remove the supporting data from DART entirely (the copy of the file that DART stores included).
- If you need the supporting data, make sure you still have the original or go back and download it first, then delete.
-
-
-
-
{% endblock %}
diff --git a/missions/templates/edit_mission.html b/missions/templates/edit_mission.html
index 9836754..2ceb3a1 100644
--- a/missions/templates/edit_mission.html
+++ b/missions/templates/edit_mission.html
@@ -26,26 +26,23 @@
{% endif %}
{% endblock %}
{% block main_heading %}
-
+
{% endblock %}
-
{% block content %}
-
{% endblock %}
diff --git a/missions/templates/edit_mission_hosts.html b/missions/templates/edit_mission_hosts.html
index 53097c7..6846a14 100644
--- a/missions/templates/edit_mission_hosts.html
+++ b/missions/templates/edit_mission_hosts.html
@@ -18,76 +18,68 @@
-->
{% endcomment %}
{% load bootstrap3 %}
-
-{% block title %}
-Edit Mission Hosts
-{% endblock %}
-
-{% block main_heading %}
-
-{% endblock %}
-
+{% block title %}Edit Mission Hosts{% endblock %}
+{% block main_heading %}{% endblock %}
{% block content %}
-
-
-{% include 'modals/edit_missionhosts_modal.html' with mission_id=mission.pk%}
-
-{% csrf_token %}
-
-
-
-
- Name
- IP Address
- No-Hit
- Actions
-
- {% for host in mission.host_set.all %}
-
- {{ host.host_name }}
- {{ host.ip_address }}
-
- {% if host.is_no_hit %}
- Yes
- {% else %}
- No
- {% endif %}
-
-
-
- {% bootstrap_icon "pencil" %}
-
- {% bootstrap_icon "trash" %}
-
-
- {% endfor %}
-
+
+ {% include 'modals/edit_missionhosts_modal.html' with mission_id=mission.pk %}
+ {% csrf_token %}
+
+
+
+
+ Name
+ IP Address
+ No-Hit
+ Actions
+
+ {% for host in mission.host_set.all %}
+
+ {{ host.host_name }}
+ {{ host.ip_address }}
+
+ {% if host.is_no_hit %}
+ Yes
+ {% else %}
+ No
+ {% endif %}
+
+
+ {% bootstrap_icon "pencil" %}
+
+ {% bootstrap_icon "trash" %}
+
+
+ {% endfor %}
+
+
-
-
-
-
{% bootstrap_icon "plus" %} Add New
+
+
+
+ {% bootstrap_icon "plus" %} Add New
+
+
-
-
-
+ // addRow
+ // hostAjaxErrorHandler
+
{% endblock %}
diff --git a/missions/templates/edit_mission_test.html b/missions/templates/edit_mission_test.html
index e3f21e9..15a3033 100644
--- a/missions/templates/edit_mission_test.html
+++ b/missions/templates/edit_mission_test.html
@@ -19,7 +19,6 @@
{% endcomment %}
{% load bootstrap3 %}
{% load quickparts %}
-
{% block title %}
{% if this_mission and testdetail.pk > 0 %}
{% if is_read_only %}
@@ -31,33 +30,29 @@
Add Test
{% endif %}
{% endblock %}
-
{% if testdetail.pk > 0 %}
{% block extra_nav_bar_content_right %}
{% if is_read_only %}
-
{% bootstrap_icon "edit" %}
-
-
+
+
{% elif this_mission and testdetail.pk > 0 %}
-
{% bootstrap_icon "eye-open" %}
-
-
+
+
{% endif %}
-
{% if this_mission and testdetail.pk > 0 %}
{% manage_data_button this_mission.id testdetail.pk testdetail.count_of_supporting_data as_button=True %}
@@ -65,104 +60,120 @@
{% endif %}
{% endblock %}
{% endif %}
-
-{% block main_heading %}<< Back to Tests
+
+
+ << Back to Tests
+
{% endblock %}
-
{% block content %}
-{% if this_mission and testdetail.pk > 0 %}
- {% include 'modals/edit_testhosts_modal.html' with mission_id=this_mission.pk test_id=testdetail.pk %}
-{% endif %}
-
-
-
-
-
{% endblock %}
diff --git a/missions/templates/edit_test_data.html b/missions/templates/edit_test_data.html
index 8ab71c6..3b9989d 100644
--- a/missions/templates/edit_test_data.html
+++ b/missions/templates/edit_test_data.html
@@ -27,28 +27,27 @@
{% endblock %}
{% block main_heading %}
+ {% if supportingdata.pk %}
+ Edit
+ {% else %}
+ Add
+ {% endif %}
+ Data for Test {{ this_test.test_objective }}
+
- << Back to Data List
+ << Back to Data List
{% endblock %}
-
{% block content %}
-
{% endblock %}
diff --git a/missions/templates/edit_testhosts_partial.html b/missions/templates/edit_testhosts_partial.html
index 23d6033..cdb9bc8 100644
--- a/missions/templates/edit_testhosts_partial.html
+++ b/missions/templates/edit_testhosts_partial.html
@@ -17,17 +17,16 @@
-->
{% endcomment %}
{# Requires testdetail to be set to a test case record #}
-