summaryrefslogtreecommitdiff
path: root/yaksh/templates
diff options
context:
space:
mode:
authorPrabhu Ramachandran2017-04-06 12:38:33 +0530
committerGitHub2017-04-06 12:38:33 +0530
commitad73f7b938b7620ab4be202dc33c699cf5cb4ac5 (patch)
treeadb65fe68d409206a26e23175c9543c12a47c43a /yaksh/templates
parent969cccf998059e0a800276759535a36d3529b3c6 (diff)
parent1a6653567bdf58b5b70e874822cae6a1116b942f (diff)
downloadonline_test-ad73f7b938b7620ab4be202dc33c699cf5cb4ac5.tar.gz
online_test-ad73f7b938b7620ab4be202dc33c699cf5cb4ac5.tar.bz2
online_test-ad73f7b938b7620ab4be202dc33c699cf5cb4ac5.zip
Merge pull request #267 from ankitjavalkar/course-time-window
Multiple changes to Course:
Diffstat (limited to 'yaksh/templates')
-rw-r--r--yaksh/templates/yaksh/courses.html5
-rw-r--r--yaksh/templates/yaksh/quizzes_user.html4
2 files changed, 7 insertions, 2 deletions
diff --git a/yaksh/templates/yaksh/courses.html b/yaksh/templates/yaksh/courses.html
index 4d19fb9..60e6bf4 100644
--- a/yaksh/templates/yaksh/courses.html
+++ b/yaksh/templates/yaksh/courses.html
@@ -78,8 +78,9 @@
</div>
</div>
<br/>
- <button class="btn btn-primary pull-right"type="button" onClick='location.replace("{{URL_ROOT}}/exam/manage/addquiz/{{course.id}}/");'>Add New Quiz</button>
- <p><a href="{{URL_ROOT}}/exam/manage/courses/download_course_csv/{{course.id}}">Download CSV</a></p>
+ <a class="btn btn-success" href="{{URL_ROOT}}/exam/manage/addquiz/{{course.id}}/">Add New Quiz</a>
+ <a class="btn btn-primary"href="{{URL_ROOT}}/exam/manage/edit_course/{{course.id}}">Edit Course</a>
+ <a class="btn btn-default"href="{{URL_ROOT}}/exam/manage/courses/download_course_csv/{{course.id}}">Download CSV</a>
</div>
</div>
<br><br>
diff --git a/yaksh/templates/yaksh/quizzes_user.html b/yaksh/templates/yaksh/quizzes_user.html
index 72fce30..ce74844 100644
--- a/yaksh/templates/yaksh/quizzes_user.html
+++ b/yaksh/templates/yaksh/quizzes_user.html
@@ -13,11 +13,15 @@
{% elif user in course.rejected.all %}<span class="label label-danger">Request Rejected</span>
{% elif user in course.students.all %}<span class="label label-info">Enrolled</span>
{% else %}
+ {% if course.is_active_enrollment %}
{% if course.is_self_enroll %}
<a class="btn btn-success" href="{{ URL_ROOT }}/exam/self_enroll/{{ course.id }}">Enroll</a>
{% else %}
<a class="btn btn-success" href="{{ URL_ROOT }}/exam/enroll_request/{{ course.id }}">Enroll</a>
{% endif %}
+ {% else %}
+ <span class="label label-danger">Enrollment Closed</span>
+ {% endif %}
{% endif %}
</div>
</div>