From c067ad85ff8d51296d632a008d56091422fe9b91 Mon Sep 17 00:00:00 2001 From: Shelsy Date: Thu, 5 Jul 2018 18:35:26 +0530 Subject: Change templates with new UI --- yaksh/templates/404.html | 11 +- yaksh/templates/500.html | 11 + yaksh/templates/base.html | 55 +- yaksh/templates/exam.html | 165 ++-- yaksh/templates/manage.html | 90 ++- .../registration/password_change_done.html | 20 +- .../registration/password_reset_complete.html | 13 +- .../registration/password_reset_confirm.html | 13 +- .../registration/password_reset_done.html | 19 +- .../registration/password_reset_form.html | 17 +- yaksh/templates/user.html | 94 ++- yaksh/templates/yaksh/add_course.html | 8 +- yaksh/templates/yaksh/add_exercise.html | 9 +- yaksh/templates/yaksh/add_lesson.html | 41 +- yaksh/templates/yaksh/add_module.html | 18 +- yaksh/templates/yaksh/add_question.html | 10 +- yaksh/templates/yaksh/add_quiz.html | 15 +- yaksh/templates/yaksh/addteacher.html | 12 +- yaksh/templates/yaksh/complete.html | 70 +- yaksh/templates/yaksh/course_detail.html | 650 ++++++++------- yaksh/templates/yaksh/course_modules.html | 250 +++--- yaksh/templates/yaksh/courses.html | 892 +++++++++++---------- yaksh/templates/yaksh/design_course_session.html | 10 +- yaksh/templates/yaksh/design_questionpaper.html | 16 +- yaksh/templates/yaksh/editprofile.html | 2 +- yaksh/templates/yaksh/editquestionpaper.html | 2 + yaksh/templates/yaksh/error_template.html | 38 +- yaksh/templates/yaksh/grade_user.html | 104 ++- yaksh/templates/yaksh/intro.html | 96 +-- yaksh/templates/yaksh/login.html | 150 +++- yaksh/templates/yaksh/moderator_dashboard.html | 51 +- yaksh/templates/yaksh/monitor.html | 259 +++--- yaksh/templates/yaksh/preview_questionpaper.html | 20 +- yaksh/templates/yaksh/profile_updated.html | 20 +- yaksh/templates/yaksh/question.html | 214 ++--- yaksh/templates/yaksh/quit.html | 33 +- yaksh/templates/yaksh/quizzes_user.html | 258 +++--- yaksh/templates/yaksh/register.html | 56 +- yaksh/templates/yaksh/regrade.html | 148 ++-- yaksh/templates/yaksh/results_user.html | 4 +- yaksh/templates/yaksh/show_video.html | 296 ++++--- yaksh/templates/yaksh/showquestionpapers.html | 4 +- yaksh/templates/yaksh/showquestions.html | 357 +++++---- yaksh/templates/yaksh/statistics_question.html | 6 +- yaksh/templates/yaksh/user_data.html | 18 +- yaksh/templates/yaksh/view_answerpaper.html | 75 +- yaksh/templates/yaksh/view_profile.html | 6 +- 47 files changed, 2765 insertions(+), 1961 deletions(-) (limited to 'yaksh/templates') diff --git a/yaksh/templates/404.html b/yaksh/templates/404.html index d4777f2..f8dc1d0 100644 --- a/yaksh/templates/404.html +++ b/yaksh/templates/404.html @@ -1,6 +1,13 @@ {% extends "base.html" %} -{% block pagetitle %}

Yaksh

{% endblock %} +{% block pagetitle %} +
+ + YAKSH + + +
+{% endblock %} {% block content %}
@@ -8,6 +15,6 @@ It seems that you have encountered an error
Please contact your administrator

-
Error Message:- {{exception}}
+
Error Message:- {{exception}}
{% endblock %} diff --git a/yaksh/templates/500.html b/yaksh/templates/500.html index d02721f..b3bf710 100644 --- a/yaksh/templates/500.html +++ b/yaksh/templates/500.html @@ -1,7 +1,18 @@ {% extends "base.html" %} +{% block pagetitle %} +
+ + YAKSH + + +
+{% endblock %} {% block content %} +

+
Internal Server error.
This event will be reported.
Sorry for the inconvinience. +
{% endblock %} diff --git a/yaksh/templates/base.html b/yaksh/templates/base.html index 08c4f70..7570b05 100644 --- a/yaksh/templates/base.html +++ b/yaksh/templates/base.html @@ -14,11 +14,13 @@ + + + + + - - - @@ -30,40 +32,45 @@ {% block css %} {% endblock %} - - + + + + + + + + + {% block script %} {% endblock %} + - + +
- Checking... -
-
+ Checking... + + + + {% block nav %} {% endblock %} -
+

{% block pagetitle %}{% endblock pagetitle %}

- {% block content %} - {% endblock %} -
-
-
- -
+ + + {% block footer %} + {% endblock %} diff --git a/yaksh/templates/exam.html b/yaksh/templates/exam.html index 012adbe..e6b4154 100644 --- a/yaksh/templates/exam.html +++ b/yaksh/templates/exam.html @@ -1,86 +1,147 @@ {% extends "base.html" %} {% load custom_filters %} -{% block css%} - -{% endblock %} + + + + +{% load custom_filters %} {% block nav %} - + + + + + + + + {% endblock %} {% block content %}
-
-

Question Navigator

- -

Question(s) left: {{ paper.questions_left }}

-


- {% block learning_units %} - {% endblock %} -
-
-
- {% block main %} - {% endblock %} +
+
+

Question(s) left: {{ paper.questions_left }}

+
+
+
+
+
+ {% for types in question_types %} + {% get_questions_by_type paper.get_all_ordered_questions types as questions_by_type %} + {% if types == "mcq" %} Single Correct Choice + {% elif types == "mcc" %} Multiple Correct Choice + {% elif types == "code" %} Programming + {% elif types == "upload" %} Assignment Upload + {% elif types == "integer" %} Integer Blanks + {% elif types == "string" %} String Blanks + {% elif types == "float" %} Float Blanks + {% elif types == "arrange" %} Arranging Options + {% endif %} + ---> + {% for question in questions_by_type %} {{question.id}} {%endfor%} +
+ {%endfor%} +
+
+ + +
+ + +
+
+ + {% block main %} + {% endblock %}
- +
+ + + +{% endblock %} +{% block footer %} + + + {% endblock %} + diff --git a/yaksh/templates/manage.html b/yaksh/templates/manage.html index 2889905..a7eb187 100644 --- a/yaksh/templates/manage.html +++ b/yaksh/templates/manage.html @@ -1,36 +1,44 @@ {% extends "base.html" %} {% block nav %} - +
+ +
+ + +