Update to latest changes

4 files changed, 28 insertions, 6 deletions

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 19013ca..0881bfe 100644
--- a/yaksh/templates/yaksh/complete.html
+++ b/yaksh/templates/yaksh/complete.html
@@ -33,19 +33,20 @@ width="80" alt="YAKSH"></img>{% endblock %}
 	<center><h3>{{message}}</h3></center>
     <center>
     <br>
-    <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
+            <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>
         {% 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 afd53d7..9c00957 100644
--- a/yaksh/templates/yaksh/courses.html
+++ b/yaksh/templates/yaksh/courses.html
@@ -412,6 +412,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 -->
@@ -446,6 +451,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>