diff options
| author | Prabhu Ramachandran | 2016-11-18 16:24:02 +0530 |
|---|---|---|
| committer | GitHub | 2016-11-18 16:24:02 +0530 |
| commit | d88708631a568c37ae56602407a29001d97a982f (patch) | |
| tree | f097d00b3378a7948e6289cdce733a37198bee24 /yaksh/templates | |
| parent | 6f2d4829d15d763177328400d0a1b857b983a770 (diff) | |
| parent | 95c8c368d9f34cb05c5edd90f8697ec5d00c5a92 (diff) | |
| download | online_test-d88708631a568c37ae56602407a29001d97a982f.tar.gz online_test-d88708631a568c37ae56602407a29001d97a982f.tar.bz2 online_test-d88708631a568c37ae56602407a29001d97a982f.zip | |
Merge pull request #158 from adityacp/fix_file_upload_and_tooltip
Fix file upload and tooltip
Diffstat (limited to 'yaksh/templates')
| -rw-r--r-- | yaksh/templates/yaksh/add_question.html | 7 | ||||
| -rw-r--r-- | yaksh/templates/yaksh/question.html | 9 |
2 files changed, 10 insertions, 6 deletions
diff --git a/yaksh/templates/yaksh/add_question.html b/yaksh/templates/yaksh/add_question.html index 9822333..e1b05fe 100644 --- a/yaksh/templates/yaksh/add_question.html +++ b/yaksh/templates/yaksh/add_question.html @@ -27,11 +27,14 @@ <tr><td>Partial Grading: <td>{{ form.partial_grading }} <tr><td> Test Case Type: <td> {{ form.test_case_type }}{{ form.test_case_type.errors }} <tr><td> File: <td> {{ upload_form.file_field }}{{ upload_form.file_field.errors }} - {% if uploaded_files %}<br><b>Uploaded files:</b><br>Check the box to delete or extract files<br> + {% if uploaded_files %}<br><b>Uploaded files:</b><br>Check on delete to delete files, + extract to extract files and hide to hide files from student(if required)<br> {% for file in uploaded_files %} <input type="checkbox" name="clear" value="{{file.id}}"> delete</input> <input type="checkbox" name="extract" value="{{file.id}}" >{% if file.extract %} dont extract{% else %} - extract{% endif %}</input><br> + extract{% endif %}</input> + <input type="checkbox" name="hide" value="{{file.id}}" >{% if file.hide %} show{% else %} + hide{% endif %}</input><br> <a href="{{file.file.url}}">{{ file.file.name }}</a> <br> {% endfor %}{% endif %} diff --git a/yaksh/templates/yaksh/question.html b/yaksh/templates/yaksh/question.html index bfb235b..74ac786 100644 --- a/yaksh/templates/yaksh/question.html +++ b/yaksh/templates/yaksh/question.html @@ -107,9 +107,12 @@ function call_skip(url) {% for qid in paper.questions.all %} {% if qid in paper.questions_unanswered.all %} {% if qid.id == question.id %} - <li class="active"><a href="#"data-toggle="tooltip" title="{{ qid.description }}" onclick="call_skip('{{ URL_ROOT }}/exam/{{ question.id }}/skip/{{ qid.id }}/{{ paper.attempt_number }}/{{ paper.question_paper.id }}/')">{{ forloop.counter }}</a></li> + <li class="active"><a href="#"data-toggle="tooltip" + title="{{ qid.description|striptags }}" + onclick="call_skip('{{ URL_ROOT }}/exam/{{ question.id }}/skip/{{ qid.id }}/{{ paper.attempt_number }}/{{ paper.question_paper.id }}/')">{{ forloop.counter }}</a></li> {% else %} - <li><a href="#" data-toggle="tooltip" title="{{ qid.description }}" onclick="call_skip('{{ URL_ROOT }}/exam/{{ question.id }}/skip/{{ qid.id }}/{{ paper.attempt_number }}/{{ paper.question_paper.id }}/')">{{ forloop.counter }}</a></li> + <li><a href="#" data-toggle="tooltip" title="{{ qid.description|striptags }}" + onclick="call_skip('{{ URL_ROOT }}/exam/{{ question.id }}/skip/{{ qid.id }}/{{ paper.attempt_number }}/{{ paper.question_paper.id }}/')">{{ forloop.counter }}</a></li> {% endif %} {% endif %} {% if qid in paper.questions_answered.all %} @@ -152,9 +155,7 @@ function call_skip(url) {% if files %} <h4>Files to download for this question</h4> {% for f_name in files %} - {% if f_name.question_id == question.id %} <h5><a href="{{f_name.file.url}}">{{f_name.file.name}}</a></h5> - {% endif %} {% endfor %} {% endif %} </div> |