- fixed layout for training customization page

- removed unnecessary default values in context_processors.py
usnistgov · Jun 3, 2024 · 2d52da6 · 2d52da6
1 parent 7679793
commit 2d52da6
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/NEMO/context_processors.py b/NEMO/context_processors.py
@@ -85,12 +85,12 @@ def base_context(request):
         "date_input_js_format": date_input_js_format,
         "datetime_input_js_format": datetime_input_js_format,
         "no_header": request.session.get("no_header", False),
-        "safety_menu_item": customization_values.get("safety_main_menu", "enabled") == "enabled",
-        "calendar_page_title": customization_values.get("calendar_page_title", "Calendar"),
-        "tool_control_page_title": customization_values.get("tool_control_page_title", "Tool control"),
-        "status_dashboard_page_title": customization_values.get("status_dashboard_page_title", "Status dashboard"),
-        "requests_page_title": customization_values.get("requests_page_title", "Requests"),
-        "safety_page_title": customization_values.get("safety_page_title", "Safety"),
+        "safety_menu_item": customization_values.get("safety_main_menu") == "enabled",
+        "calendar_page_title": customization_values.get("calendar_page_title"),
+        "tool_control_page_title": customization_values.get("tool_control_page_title"),
+        "status_dashboard_page_title": customization_values.get("status_dashboard_page_title"),
+        "requests_page_title": customization_values.get("requests_page_title"),
+        "safety_page_title": customization_values.get("safety_page_title"),
         "calendar_first_day_of_week": customization_values.get("calendar_first_day_of_week"),
         "allow_profile_view": customization_values.get("user_allow_profile_view", "") == "enabled",
     }
diff --git a/NEMO/templates/customizations/customizations_training.html b/NEMO/templates/customizations/customizations_training.html
@@ -37,20 +37,25 @@ <h3 class="customization-section-title">Training</h3>
             </div>
         </div>
         <div class="form-group {% if errors.training_included_hidden_tools %}has-error{% endif %}">
-            <label class="control-label col-md-3" for="include_hidden_tool">Included hidden tools</label>
-            <div class="col-md-7">
+            <label class="control-label col-lg-3 col-md-4 col-sm-5" for="include_hidden_tool">Included hidden tools</label>
+            <div class="col-lg-9 col-md-8 col-sm-7">
                 <input id="include_hidden_tool"
                        type="text"
                        autocomplete="off"
                        class="form-control"
                        placeholder="Search for a non-visible tool to include">
             </div>
             {% if errors.training_included_hidden_tools %}
-                <div class="col-md-offset-3 col-md-9 help-block light-grey">{{ errors.training_included_hidden_tools.error }}</div>
+                <div class="col-lg-offset-3 col-md-offset-4 col-sm-offset-5 col-lg-9 col-md-8 col-sm-7 help-block light-grey">
+                    {{ errors.training_included_hidden_tools.error }}
+                </div>
             {% endif %}
         </div>
         <div class="form-group">
-            <div id="include-hidden-list" class="col-md-offset-3 col-md-4">No hidden tools are included.</div>
+            <div id="include-hidden-list"
+                 class="col-lg-offset-3 col-md-offset-4 col-sm-offset-5 col-lg-9 col-md-8 col-sm-7">
+                No hidden tools are included.
+            </div>
         </div>
         <div class="customization-separation" style="margin-bottom: 15px"></div>
         <div class="text-center">{% button type="save" value="Save settings" %}</div>