From 674c81d9e1d3499e255e8995701fb65d1358a0ac Mon Sep 17 00:00:00 2001
From: adityacp
Date: Wed, 4 Mar 2020 17:11:20 +0530
Subject: Change settings

- Add messages in grading systems page
- Add password validator in settings
- Fix naming in templates
---
 grades/templates/add_grades.html      | 35 +++++++++++++++++++++++++++++++++--
 grades/templates/grading_systems.html |  2 +-
 2 files changed, 34 insertions(+), 3 deletions(-)

(limited to 'grades/templates')

diff --git a/grades/templates/add_grades.html b/grades/templates/add_grades.html
index 59a344d..f53a337 100644
--- a/grades/templates/add_grades.html
+++ b/grades/templates/add_grades.html
@@ -14,7 +14,7 @@
             </li>
             <li class="nav-item">
                 <a class="nav-link" href="{% url 'yaksh:add_course' %}">
-                    Add New Course
+                    Add/Edit Course
                 </a>
             </li>
             <li class="nav-item dropdown hide">
@@ -46,13 +46,44 @@
     Note: For grade range lower limit is inclusive and upper limit is exclusive
 </div>
 <br>
+{% if messages %}
+    {% for message in messages %}
+      <div class="alert alert-dismissible alert-{{ message.tags }}">
+          <button type="button" class="close" data-dismiss="alert">
+              <i class="fa fa-close"></i>
+          </button>
+          <strong>{{ message }}</strong>
+      </div>
+    {% endfor %}
+    <br>
+{% endif %}
 {% if not system_id  %}
     <form action="{% url 'grades:add_grade' %}" method="POST">
 {% else %}
     <form action="{% url 'grades:edit_grade' system_id %}" method="POST">
 {% endif %}
     {% csrf_token %}
-    <table class="table">
+    <table class="table table-responsive-sm">
+        {% if grade_form.errors %}
+            {% for field in grade_form %}
+                {% for error in field.errors %}
+                    <div class="alert alert-dismissible alert-danger">
+                        <button type="button" class="close" data-dismiss="alert">
+                            <i class="fa fa-close"></i>
+                        </button>
+                        <strong>{{ error|escape }}</strong>
+                    </div>
+                {% endfor %}
+            {% endfor %}
+            {% for error in grade_form.non_field_errors %}
+                <div class="alert alert-dismissible alert-danger">
+                    <button type="button" class="close" data-dismiss="alert">
+                        <i class="fa fa-close"></i>
+                    </button>
+                    <strong>{{ error|escape }}</strong>
+                </div>
+            {% endfor %}
+        {% endif %}
         {% for field in grade_form %}
             {{ field }}
             <hr>
diff --git a/grades/templates/grading_systems.html b/grades/templates/grading_systems.html
index 8102230..88adfa0 100644
--- a/grades/templates/grading_systems.html
+++ b/grades/templates/grading_systems.html
@@ -13,7 +13,7 @@
                 </li>
                 <li class="nav-item">
                     <a class="nav-link" href="{% url 'yaksh:add_course' %}">
-                        Add New Course
+                        Add/Edit Course
                     </a>
                 </li>
                 <li class="nav-item dropdown hide">
-- 
cgit