diff options
| author | Prabhu Ramachandran | 2017-03-08 15:59:42 +0530 |
|---|---|---|
| committer | GitHub | 2017-03-08 15:59:42 +0530 |
| commit | 63d2febfdf37c538e3503338409fba050667c126 (patch) | |
| tree | 2cf3de05b36aebbb96cb349b84eb6cf5782ce09a | |
| parent | 0a8000387b3edd463cc58b7fb85f76639f10b150 (diff) | |
| parent | e231c13eade3afaa8f03a56fb69923b78c7a02d8 (diff) | |
| download | online_test-63d2febfdf37c538e3503338409fba050667c126.tar.gz online_test-63d2febfdf37c538e3503338409fba050667c126.tar.bz2 online_test-63d2febfdf37c538e3503338409fba050667c126.zip | |
Merge pull request #233 from ankitjavalkar/fix-course-creator-display
Display full name of course creator & redirect logout correctly
| -rw-r--r-- | yaksh/templates/user.html | 2 | ||||
| -rw-r--r-- | yaksh/templates/yaksh/course_detail.html | 6 | ||||
| -rw-r--r-- | yaksh/templates/yaksh/quizzes_user.html | 2 |
3 files changed, 8 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/course_detail.html b/yaksh/templates/yaksh/course_detail.html index dc85080..4b7efaf 100644 --- a/yaksh/templates/yaksh/course_detail.html +++ b/yaksh/templates/yaksh/course_detail.html @@ -32,6 +32,7 @@ <div id="enroll-all"> <table class="table table-striped"> <th></th> + <th></th> <th>Full Name</th> <th>Email</th> <th>Roll Number</th> @@ -43,6 +44,7 @@ {% for request in course.get_requests %} <tr> <td><input type="checkbox" name="check" value="{{ request.id }}"></td> + <td>{{ forloop.counter }}.</td> <td>{{request.get_full_name}}</td> <td> {{request.email}}</td> <td> {{request.profile.roll_number}}</td> @@ -72,6 +74,7 @@ <div id="reject"> <table class="table table-striped"> <th></th> + <th></th> <th>Full Name</th> <th>Email</th> <th>Roll Number</th> @@ -83,6 +86,7 @@ {% csrf_token %} <tr> <td><input type="checkbox" name="check" value="{{ enrolled.id }}"></td> + <td>{{ forloop.counter }}.</td> <td> {{ enrolled.get_full_name|title }} </td> <td> {{enrolled.email}}</td> <td> {{enrolled.profile.roll_number}}</td> @@ -108,6 +112,7 @@ <div id="enroll"> <table class="table table-striped"> <th></th> + <th></th> <th>Full Name</th> <th>Email</th> <th>Roll Number</th> @@ -119,6 +124,7 @@ {% csrf_token %} <tr> <td><input type="checkbox" name="check" value="{{ rejected.id }}"></td> + <td>{{ forloop.counter }}.</td> <td>{{rejected.get_full_name|title}}</td> <td> {{rejected.email}}</td> <td> {{rejected.profile.roll_number}}</td> 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> |