diff options
| author | adityacp | 2017-04-27 18:37:19 +0530 |
|---|---|---|
| committer | adityacp | 2017-04-27 18:37:19 +0530 |
| commit | 624e752684125aa525d9b3643cbd7c9b7ba61682 (patch) | |
| tree | 726da35ba55acacfde255e31bdc2233600f75395 /yaksh/templates | |
| parent | b191455c7d9b0f6c3548da174a68c8ab8052abf0 (diff) | |
| parent | 2694fd6dd4d37a1a6570792e234998feef21edca (diff) | |
| download | online_test-624e752684125aa525d9b3643cbd7c9b7ba61682.tar.gz online_test-624e752684125aa525d9b3643cbd7c9b7ba61682.tar.bz2 online_test-624e752684125aa525d9b3643cbd7c9b7ba61682.zip | |
Remove conflicts from views after rebase
Diffstat (limited to 'yaksh/templates')
| -rw-r--r-- | yaksh/templates/yaksh/quizzes_user.html | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/yaksh/templates/yaksh/quizzes_user.html b/yaksh/templates/yaksh/quizzes_user.html index ce74844..90d7f8e 100644 --- a/yaksh/templates/yaksh/quizzes_user.html +++ b/yaksh/templates/yaksh/quizzes_user.html @@ -1,6 +1,26 @@ {% extends "user.html" %} {% block pagetitle %} {{ title }} {% endblock %} {% block main %} + {% if 'Enrolled Courses' not in title%} + <div class="row well"> + <form action="{{ URL_ROOT }}/exam/quizzes/" method="post" id="custom-search-form" class="form-search form-horizontal pull-right"> + {% csrf_token %} + <div class="col-md-12"> + <div class="input-group"> + <span class="input-group-addon" id="basic-addon1">Search Course</span> + <input type="text" name="course_code" class="form-control" placeholder="Course Code"> + <span class="input-group-btn"> + <button class="btn btn-default" type="submit">Search</button> + <button class="btn btn-default" type="button" name="button" onClick='location.replace("{{URL_ROOT}}/exam/quizzes/");'>Cancel</button> + </span> + </div> + </div> + </form> + </div> + {% endif %} +{% if not courses %} +No Courses to display +{% endif %} {% for course in courses %} <div class="row well"> <div class="col-md-12"> @@ -9,6 +29,8 @@ <h4><b><u> {{ course.name }} by {{ course.creator.get_full_name }}</u></b></h4> </div> <div class="col-md-4"> + {% if course.hidden %}<span class="label label-info">Open Course</span> + {% endif %} {% if user in course.requests.all %} <span class="label label-warning">Request Pending </span> {% 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> @@ -41,7 +63,7 @@ </td> {% else %} <td> - {{ quiz.description }} <span class="label label-danger">INACTIVE</span><br> + {{ quiz.description }} <span class="label label-danger">Inactive</span><br> </td> {% endif %} <td> @@ -83,7 +105,7 @@ {% endif %} </div> </div><!--/row--> - </br> +</br> {% endfor %} {% endblock %} |