From 75e8fb06b42420f21c8571341ef8300a102cd2c7 Mon Sep 17 00:00:00 2001 From: CruiseDevice Date: Thu, 2 Jan 2020 16:18:59 +0530 Subject: Resolve conflicts --- yaksh/templates/base.html | 3 +- yaksh/templates/yaksh/showquestions.html | 268 ++++++++++++++----------------- 2 files changed, 121 insertions(+), 150 deletions(-) (limited to 'yaksh/templates') diff --git a/yaksh/templates/base.html b/yaksh/templates/base.html index 9021e3d..0cfe8a3 100644 --- a/yaksh/templates/base.html +++ b/yaksh/templates/base.html @@ -43,7 +43,6 @@ {% block script %} {% endblock %} - @@ -58,7 +57,7 @@ {% block nav %} {% endblock %} -

+

diff --git a/yaksh/templates/yaksh/showquestions.html b/yaksh/templates/yaksh/showquestions.html index e146878..31312e2 100644 --- a/yaksh/templates/yaksh/showquestions.html +++ b/yaksh/templates/yaksh/showquestions.html @@ -1,39 +1,38 @@ {% extends "manage.html" %} +{% load staticfiles %} {% block title %} Questions {% endblock %} {% block pagetitle %} Questions {% endblock pagetitle %} {% block script %} - - - + + + {% endblock %} {% block content %} -

- - - - -

- -

- -

-

-

You can upload question files the following ways - -

Yaml File +

+ + + +

+
+ +

+

+

You can upload question files the following ways - +

Yaml File

One can upload Yaml file with extensions .yaml or .yml. Please note that you cannot upload files associated to a question. Yaml file can have any name.

-

-

Zip File -

One can also upload zip with the following zip structure - +

+

Zip File +

One can also upload zip with the following zip structure -

               .zip
               |-- .yaml or .yml
@@ -43,87 +42,82 @@
               |-- folder2
               |   |-- Files required by questions

-

-

-

-

-

Download Template

+ +

+

+

+

Download Template

Or

-

- +

+ - -

-

- {% csrf_token %} - {% if message %} - {%if message == "Questions Uploaded Successfully"%} -

- × - {{ message }} -

- {%else %} -

- × + +

+ + {% csrf_token %} + {% if message %} + {%if message == "Questions Uploaded Successfully"%} +

+ × {{ message }} -

- {% endif %} - {% endif %} - {% if msg %} -

+

+ {%else %} +

× - {{ msg }} + {{ message }}

{% endif %} -

- -

-

+ {% endif %} + {% if msg %} +

+ × + {{ msg }} +

+ {% endif %} + +

+

+

-

-

Filters Questions:

-

- {{ form.question_type }} -

-

- {{ form.language }} -

-

- {{ form.marks }} -

-

- +

+

Filters Questions:

+

Or Search using Tags:

{% csrf_token %} -

-

-

-

-

- Search Questions -

- - - - -

+

+

+

+

+

+ Search Questions +

+ + + +

- -

- {% if all_tags %} {% for tag in all_tags %} @@ -134,84 +128,62 @@ {% else %} {% endif %} - -

+

-

-

+

+

+
-

-

- -

+

+

+

{% if questions %} -

-

Select All

-

- +

+
+

Select All

+

+

- - - - - + + + + + {% for question in questions %} - - - - - + + + + + {% endfor %} -

Select	Summary	Language	Type	Marks	Select	Summary	Language	Type	Marks
- -	{{question.summary\|capfirst}}	{{question.language\|capfirst}}	{{question.type\|capfirst}}	{{question.points}}	+ +	{{question.summary\|capfirst}}	{{question.language\|capfirst}}	{{question.type\|capfirst}}	{{question.points}}

-

-

+ +

+

{% endif %} -

-
- - - {% if questions %} - - - {% endif %} - - -

-

- +

+ {% include "yaksh/paginator.html" %} + + + {% if questions %} + + + {% endif %} + + +

-

+ +

{% endblock %} -{% block footer %} - - - -{% endblock %} \ No newline at end of file -- cgit From 925d616c4137f014f2f55a979b2350ef0409a5b9 Mon Sep 17 00:00:00 2001 From: CruiseDevice Date: Mon, 23 Dec 2019 13:06:48 +0530 Subject: Resolve comments - Fix PEP8 - Change the url as per django urlpattern - Replace all the buttons by tag - Use get_queryset() for filtering data for pagination - Make buttons large - Add Pagination in ajax_question_filter.html - Hide Pagination when there is no question object --- yaksh/templates/yaksh/ajax_question_filter.html | 5 ++++- yaksh/templates/yaksh/showquestions.html | 30 +++++++++++++------------ 2 files changed, 20 insertions(+), 15 deletions(-) (limited to 'yaksh/templates') diff --git a/yaksh/templates/yaksh/ajax_question_filter.html b/yaksh/templates/yaksh/ajax_question_filter.html index ea0d0b5..7dba6df 100644 --- a/yaksh/templates/yaksh/ajax_question_filter.html +++ b/yaksh/templates/yaksh/ajax_question_filter.html @@ -16,6 +16,8 @@ }); {% if questions %} + {% include "yaksh/paginator.html" %} +

Select All

@@ -36,7 +38,7 @@ - {{question.summary|capfirst}} + {{question.summary|capfirst}} {{question.language|capfirst}} {{question.type|capfirst}} {{question.points}} @@ -45,5 +47,6 @@ + {% include "yaksh/paginator.html" %} {% endif %}

diff --git a/yaksh/templates/yaksh/showquestions.html b/yaksh/templates/yaksh/showquestions.html index 31312e2..3353e4a 100644 --- a/yaksh/templates/yaksh/showquestions.html +++ b/yaksh/templates/yaksh/showquestions.html @@ -46,7 +46,7 @@

-

Download Template

+

Download Template

Or

And

- + Upload File @@ -72,19 +72,19 @@ {% if message %} {%if message == "Questions Uploaded Successfully"%}

- × + {{ message }}

{%else %}

- × + {{ message }}

{% endif %} {% endif %} {% if msg %}

- × + {{ msg }}

{% endif %} @@ -112,7 +112,7 @@ - + @@ -133,13 +133,14 @@
- + + Clear Filters

{% if questions %}

+ {% include "yaksh/paginator.html" %}

Select All

@@ -159,7 +160,7 @@ - {{question.summary|capfirst}} + {{question.summary|capfirst}} {{question.language|capfirst}} {{question.type|capfirst}} {{question.points}} @@ -169,16 +170,17 @@

+ {% include "yaksh/paginator.html" %} {% endif %}

- {% include "yaksh/paginator.html" %} - + Add Question + {% if questions %} - - + Download Selected + Test Selected {% endif %} - + Delete Selected -- cgit From 122e841eecd8d322eba1c24dadde392617a5c231 Mon Sep 17 00:00:00 2001 From: CruiseDevice Date: Thu, 26 Dec 2019 15:10:29 +0530 Subject: Resolve comments --- yaksh/templates/yaksh/showquestions.html | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'yaksh/templates') diff --git a/yaksh/templates/yaksh/showquestions.html b/yaksh/templates/yaksh/showquestions.html index 3353e4a..d0c33dd 100644 --- a/yaksh/templates/yaksh/showquestions.html +++ b/yaksh/templates/yaksh/showquestions.html @@ -59,7 +59,7 @@

And

- Upload File + @@ -133,13 +133,14 @@
- + Clear Filters

{% if questions %}

+
{% include "yaksh/paginator.html" %}

Select All

@@ -174,13 +175,13 @@ {% endif %}

- Add Question + Add Question {% if questions %} - Download Selected - Test Selected + + {% endif %} - Delete Selected +

-- cgit