From e1f4ffc3ab43d02115e6c496bf08bea1e52af2ef Mon Sep 17 00:00:00 2001
From: adityacp
Date: Thu, 8 Feb 2018 11:48:34 +0530
Subject: Change in templates

- Show error messages properly in 404.html
- Show Lesson and LearningModule active/deactive status in courses.html
- Disable home button for student
- Add proper redirections and form submissions to edit/view question paper
---
 yaksh/templates/404.html                        |  8 +++++++-
 yaksh/templates/yaksh/complete.html             |  3 ++-
 yaksh/templates/yaksh/courses.html              | 10 ++++++++++
 yaksh/templates/yaksh/design_questionpaper.html |  9 +++++++--
 4 files changed, 26 insertions(+), 4 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/404.html b/yaksh/templates/404.html
index e9d99de..d4777f2 100644
--- a/yaksh/templates/404.html
+++ b/yaksh/templates/404.html
@@ -1,7 +1,13 @@
 {% extends "base.html" %}
 
+{% block pagetitle %} <h2>Yaksh</h2> {% endblock %}
+
 {% block content %}
+<center>
 It seems that you have encountered an error
-Type of Error - {{ exception }}
+<br>
 Please contact your administrator
+<br><br>
+<div class="alert alert-danger">Error Message:- {{exception}}</div>
+</center>
 {% endblock %}
diff --git a/yaksh/templates/yaksh/complete.html b/yaksh/templates/yaksh/complete.html
index e4317fe..39f60c2 100644
--- a/yaksh/templates/yaksh/complete.html
+++ b/yaksh/templates/yaksh/complete.html
@@ -36,7 +36,6 @@ width="80" alt="YAKSH"></img>{% endblock %}
     {% if not module_id %}
         <br><center><h4>You may now close the browser.</h4></center><br>
     {% endif %}
-    <a href="{{URL_ROOT}}/exam/" id="home" class="btn btn-success"> Home </a>
     {% if module_id and not user == "moderator" %}
         {% if first_unit %}
             <a href="{{URL_ROOT}}/exam/next_unit/{{course_id}}/{{module_id}}/{{learning_unit.id}}/1" class="btn btn-info"> Next
@@ -49,6 +48,8 @@ width="80" alt="YAKSH"></img>{% endblock %}
                 </span>
             </a>
         {% endif %}
+    {% else %}
+        <a href="{{URL_ROOT}}/exam/" id="home" class="btn btn-success"> Home </a>
     {% endif %}
     </center>
 {% endblock content %}
diff --git a/yaksh/templates/yaksh/courses.html b/yaksh/templates/yaksh/courses.html
index a1fd48a..bc96bf5 100644
--- a/yaksh/templates/yaksh/courses.html
+++ b/yaksh/templates/yaksh/courses.html
@@ -397,6 +397,11 @@
             <ul class="list-group">
             <a href="{{URL_ROOT}}/exam/manage/courses/edit_lesson/{{lesson.id}}/">
             {{ lesson.name }}</a>
+            {% if lesson.active %}
+                <span class="label label-success">Active</span>
+            {% else %}
+                <span class="label label-danger">Closed</span>
+            {% endif %}
             </ul>
         </td>
         {% endfor %} <!-- end for lessons -->
@@ -431,6 +436,11 @@
         <td>
             <a href="{{URL_ROOT}}/exam/manage/courses/add_module/{{module.id}}/">
             {{ module.name }}</a>
+            {% if module.active %}
+                <span class="label label-success">Active</span>
+            {% else %}
+                <span class="label label-danger">Closed</span>
+            {% endif %}
         </td>
         <td>
             <a href="{{URL_ROOT}}/exam/manage/courses/designmodule/{{module.id}}">
diff --git a/yaksh/templates/yaksh/design_questionpaper.html b/yaksh/templates/yaksh/design_questionpaper.html
index 829e27f..1656e2b 100644
--- a/yaksh/templates/yaksh/design_questionpaper.html
+++ b/yaksh/templates/yaksh/design_questionpaper.html
@@ -23,8 +23,13 @@ select
 
 {% block content %}
 <input type=hidden id="url_root" value={{ URL_ROOT }}>
-<form action="{{ URL_ROOT }}/exam/manage/designquestionpaper/{{ qpaper.quiz.id }}/{{ qpaper.id }}/" method="POST" id="design_q">
-<input class ="btn primary small" type="submit" name="back" id="back" value="Cancel">
+{% if course_id %}
+    <form action="{{ URL_ROOT }}/exam/manage/designquestionpaper/{{ qpaper.quiz.id }}/{{ qpaper.id }}/{{course_id}}/" method="POST" id="design_q">
+    <a href="{{URL_ROOT}}/exam/manage/courses" class="btn btn-danger">Cancel</a>
+{% else %}
+    <form action="{{ URL_ROOT }}/exam/manage/designquestionpaper/{{ qpaper.quiz.id }}/{{ qpaper.id }}/" method="POST" id="design_q">
+    <a href="{{URL_ROOT}}/exam/manage/courses/all_quizzes" class="btn btn-danger">Cancel</a>
+{% endif %}
     {% csrf_token %}
     <input type=hidden name="is_active" id="is_active" value="{{ state }}">
 <center><b>Manual mode to design the {{lang}}  Question Paper</center><br>
-- 
cgit 


From 93c4469db46ca0df19dbcf33eb7e8f6fad4f5b7b Mon Sep 17 00:00:00 2001
From: adityacp
Date: Thu, 8 Feb 2018 12:19:37 +0530
Subject: Change Selenium tests

---
 yaksh/templates/yaksh/complete.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/complete.html b/yaksh/templates/yaksh/complete.html
index 39f60c2..3d6cadc 100644
--- a/yaksh/templates/yaksh/complete.html
+++ b/yaksh/templates/yaksh/complete.html
@@ -38,12 +38,12 @@ width="80" alt="YAKSH"></img>{% endblock %}
     {% endif %}
     {% if module_id and not user == "moderator" %}
         {% if first_unit %}
-            <a href="{{URL_ROOT}}/exam/next_unit/{{course_id}}/{{module_id}}/{{learning_unit.id}}/1" class="btn btn-info"> Next
+            <a href="{{URL_ROOT}}/exam/next_unit/{{course_id}}/{{module_id}}/{{learning_unit.id}}/1" class="btn btn-info" id="Next"> Next
                 <span class="glyphicon glyphicon-chevron-right">
                 </span>
             </a>
         {% else %}
-            <a href="{{URL_ROOT}}/exam/next_unit/{{course_id}}/{{module_id}}/{{learning_unit.id}}" class="btn btn-info"> Next
+            <a href="{{URL_ROOT}}/exam/next_unit/{{course_id}}/{{module_id}}/{{learning_unit.id}}" class="btn btn-info" id="Next"> Next
                 <span class="glyphicon glyphicon-chevron-right">
                 </span>
             </a>
-- 
cgit