summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorankitjavalkar2017-03-06 13:07:46 +0530
committerankitjavalkar2017-03-06 13:39:35 +0530
commit87beec6a0389e35c94fe674627d47e1f3ea1c22e (patch)
tree31b02380fbb4f10b09952d80d07dc2a12e6bf4fa
parentaede1c3736077387d63eacd20c2c39d8875e605d (diff)
downloadonline_test-87beec6a0389e35c94fe674627d47e1f3ea1c22e.tar.gz
online_test-87beec6a0389e35c94fe674627d47e1f3ea1c22e.tar.bz2
online_test-87beec6a0389e35c94fe674627d47e1f3ea1c22e.zip
Display full name of course creator & redirect logout correctly
-rw-r--r--yaksh/templates/user.html2
-rw-r--r--yaksh/templates/yaksh/quizzes_user.html2
2 files changed, 2 insertions, 2 deletions
diff --git a/yaksh/templates/user.html b/yaksh/templates/user.html
index 0d1f980..b068fae 100644
--- a/yaksh/templates/user.html
+++ b/yaksh/templates/user.html
@@ -16,7 +16,7 @@
<div class= "collapse navbar-collapse" id="navbar">
<ul class="nav navbar-nav navbar-right">
<li><a href="{{ URL_ROOT }}/exam/viewprofile"> {{ user.get_full_name.title }} </a></li>
- <li><a style='cursor:pointer' id='logout' onClick='location.replace("{{URL_ROOT}}/exam/complete/");'> <span class="glyphicon glyphicon-log-out">Logout </span></a></li>
+ <li><a style='cursor:pointer' id='logout' onClick='location.replace("{{URL_ROOT}}/exam/logout/");'> <span class="glyphicon glyphicon-log-out">Logout </span></a></li>
</ul>
</div><!-- /.navbar -->
</div><!-- /.container -->
diff --git a/yaksh/templates/yaksh/quizzes_user.html b/yaksh/templates/yaksh/quizzes_user.html
index 63f22a1..72fce30 100644
--- a/yaksh/templates/yaksh/quizzes_user.html
+++ b/yaksh/templates/yaksh/quizzes_user.html
@@ -6,7 +6,7 @@
<div class="col-md-12">
<div class="row">
<div class="col-md-4">
- <h4><b><u> {{ course.name }} by {{ course.creator }}</u></b></h4>
+ <h4><b><u> {{ course.name }} by {{ course.creator.get_full_name }}</u></b></h4>
</div>
<div class="col-md-4">
{% if user in course.requests.all %} <span class="label label-warning">Request Pending </span>