diff options
| author | Prabhu Ramachandran | 2018-01-08 19:13:49 +0530 |
|---|---|---|
| committer | GitHub | 2018-01-08 19:13:49 +0530 |
| commit | d1cc992eb7dc1a23b866ed89baf602579637244a (patch) | |
| tree | fb576bab292844f34d4fc5b5389a9a68d2056e52 /yaksh/templates | |
| parent | f457585ea62ec76240edb9397c7f08a46f25947c (diff) | |
| parent | f0fafed7ba0002369f528a901d9e5590f5bd3bea (diff) | |
| download | online_test-d1cc992eb7dc1a23b866ed89baf602579637244a.tar.gz online_test-d1cc992eb7dc1a23b866ed89baf602579637244a.tar.bz2 online_test-d1cc992eb7dc1a23b866ed89baf602579637244a.zip | |
Merge pull request #415 from maheshgudi/yaksh_ui_changes
See previous questions in exercise and other bug fixes
Diffstat (limited to 'yaksh/templates')
| -rw-r--r-- | yaksh/templates/exam.html | 4 | ||||
| -rw-r--r-- | yaksh/templates/yaksh/question.html | 38 |
2 files changed, 22 insertions, 20 deletions
diff --git a/yaksh/templates/exam.html b/yaksh/templates/exam.html index ce1d3b8..012adbe 100644 --- a/yaksh/templates/exam.html +++ b/yaksh/templates/exam.html @@ -60,6 +60,10 @@ {% else %} {% if qid.id == question.id %} <li class="active"><a style="width:25%" data-toggle="tooltip" title="{{ qid.description|striptags }}">{{ forloop.counter }}</a></li> + {% elif qid in paper.get_questions_answered %} + <li><a style="background-color:#B4B8BA; width:25%" href="#" data-toggle="tooltip" + onclick="call_skip('{{ URL_ROOT }}/exam/{{ question.id }}/skip/{{ qid.id }}/{{ paper.attempt_number }}/{{ module.id }}/{{ paper.question_paper.id }}/{{course.id}}/')" + title="{{ qid.description }}">{{ forloop.counter }}</a></li> {% else %} <li class="disabled"><a style="width:25%" data-toggle="tooltip" title="{{ qid.description|striptags }}">{{ forloop.counter }}</a></li> {% endif %} diff --git a/yaksh/templates/yaksh/question.html b/yaksh/templates/yaksh/question.html index b7251ad..c7e6efb 100644 --- a/yaksh/templates/yaksh/question.html +++ b/yaksh/templates/yaksh/question.html @@ -144,21 +144,6 @@ question_type = "{{ question.type }}" {% endblock %} {% block main %} - <p id="status"></p> - {% if notification %} - {% if question.type == "code" %} - <div id="notification" class="alert alert-success" role="alert"> - <strong>Note:</strong> {{ notification }} - </div> - {% else %} - <div id="notification" class="alert alert-warning" role="alert"> - <strong>Note:</strong> {{ notification }} - </div> - {% endif %} - {% else %} - <div id="notification" role="alert"> - </div> - {% endif %} <form id="code" action="{{URL_ROOT}}/exam/{{ question.id }}/check/{{ paper.attempt_number }}/{{ module.id }}/{{ paper.question_paper.id }}/{{course.id}}/" method="post" enctype="multipart/form-data"> {% csrf_token %} <input type=hidden name="question_id" id="question_id" value={{ question.id }}></input> @@ -197,22 +182,20 @@ question_type = "{{ question.type }}" <h5><a href="{{f_name.file.url}}">{{f_name.file.name}}</a></h5> {% endfor %} {% endif %} - + </div> + <br/> {% if quiz.is_exercise %} {% if can_skip %} - <div id="solution"> + <div class = "well well-sm" id="solution"> {% else %} <div id="solution" style="display:none"> {% endif %} {% if question.solution %} <h4><u> Solution by teacher</u></h4> - {% else %} - <h4><u> No solution provided by teacher </u></h4> {% endif%} <font size=3 face=arial> {{ question.solution|safe }} </font> </div> {% endif %} - </div> <div class="panel-body"> {% if question.type == "mcq" %} {% for test_case in test_cases %} @@ -304,6 +287,21 @@ question_type = "{{ question.type }}" </div> </div> <br/> + <p id="status"></p> + {% if notification %} + {% if question.type == "code" %} + <div id="notification" class="alert alert-success" role="alert"> + <strong>Note:</strong> {{ notification }} + </div> + {% else %} + <div id="notification" class="alert alert-warning" role="alert"> + <strong>Note:</strong> {{ notification }} + </div> + {% endif %} + {% else %} + <div id="notification" role="alert"> + </div> + {% endif %} {% if question.type == 'code' or question.type == 'upload' %} <div class="row" id="error_panel"></div> {% endif %} |