From 3ddd28edaea9174c89a81cc7938f95ce12610fdf Mon Sep 17 00:00:00 2001 From: maheshgudi Date: Wed, 13 Dec 2017 17:28:26 +0530 Subject: Add Mathjax to the repo --- yaksh/templates/yaksh/add_question.html | 2 +- yaksh/templates/yaksh/grade_user.html | 3 +-- yaksh/templates/yaksh/question.html | 3 +-- yaksh/templates/yaksh/user_data.html | 3 ++- yaksh/templates/yaksh/view_answerpaper.html | 3 ++- 5 files changed, 7 insertions(+), 7 deletions(-) (limited to 'yaksh/templates') diff --git a/yaksh/templates/yaksh/add_question.html b/yaksh/templates/yaksh/add_question.html index 6ead019..fb8cb95 100644 --- a/yaksh/templates/yaksh/add_question.html +++ b/yaksh/templates/yaksh/add_question.html @@ -8,7 +8,7 @@ {% block script %} - + {% endblock %} {% block onload %} onload='javascript:textareaformat();' {% endblock %} diff --git a/yaksh/templates/yaksh/grade_user.html b/yaksh/templates/yaksh/grade_user.html index d946647..facb579 100644 --- a/yaksh/templates/yaksh/grade_user.html +++ b/yaksh/templates/yaksh/grade_user.html @@ -9,8 +9,7 @@ {% block script %} - + - - + - + + {% endblock %}
diff --git a/yaksh/templates/yaksh/view_answerpaper.html b/yaksh/templates/yaksh/view_answerpaper.html index 49276bab..5f899e3 100644 --- a/yaksh/templates/yaksh/view_answerpaper.html +++ b/yaksh/templates/yaksh/view_answerpaper.html @@ -4,7 +4,8 @@ {% block pagetitle %} Answer Paper for {{ quiz.description }}{% endblock pagetitle %} {% block script %} - + + {% endblock script %} {% block main %} -- cgit From c3ac7d0e4cb82e10eafd3211e9cd928c5e40f656 Mon Sep 17 00:00:00 2001 From: maheshgudi Date: Wed, 13 Dec 2017 18:23:10 +0530 Subject: Add jquery-ui to repo --- yaksh/templates/yaksh/course_detail.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'yaksh/templates') diff --git a/yaksh/templates/yaksh/course_detail.html b/yaksh/templates/yaksh/course_detail.html index 93a7048..e0731f9 100644 --- a/yaksh/templates/yaksh/course_detail.html +++ b/yaksh/templates/yaksh/course_detail.html @@ -7,10 +7,10 @@ {% block script %} - + {% endblock %} {% block css %} - + {% endblock %} {% block content %}
-- cgit From d496b3c9d2241ba43aa46b709eda2dcac0a9abf5 Mon Sep 17 00:00:00 2001 From: mahesh Date: Tue, 19 Dec 2017 02:55:44 +0530 Subject: Add Yaksh logo to the website --- yaksh/templates/user.html | 6 +++++- yaksh/templates/yaksh/login.html | 6 ++++-- 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'yaksh/templates') diff --git a/yaksh/templates/user.html b/yaksh/templates/user.html index 83aea13..1fb61d6 100644 --- a/yaksh/templates/user.html +++ b/yaksh/templates/user.html @@ -11,7 +11,11 @@ - Yaksh + + + YAKSH + + +
-

Developed by FOSSEE group, IIT Bombay

+
diff --git a/yaksh/templates/exam.html b/yaksh/templates/exam.html index 6589bb5..a6766b7 100644 --- a/yaksh/templates/exam.html +++ b/yaksh/templates/exam.html @@ -12,7 +12,10 @@ - Yaksh + + YAKSH + + @@ -28,24 +30,12 @@ {% endblock %} {% block content %}
-
- -
-
-
{% block main %} {% endblock %} -
-
{% endblock %} {% if user %} {% block info %} -
{{user.get_full_name|title}}({{user.profile.roll_number}}) Logged in as {{user.username}}
+
{{user.get_full_name|title}} with Roll no. {{user.profile.roll_number}} is logged in as {{user.username}}
{% endblock %} {% endif %} diff --git a/yaksh/templates/yaksh/login.html b/yaksh/templates/yaksh/login.html index 27faee5..ab6cf45 100644 --- a/yaksh/templates/yaksh/login.html +++ b/yaksh/templates/yaksh/login.html @@ -1,6 +1,6 @@ {% extends "base.html" %} -{% block pagetitle %}YAKSH +{% block pagetitle %}YAKSH {% endblock %} {% block content %} -- cgit From 190e2dad375d0cb320c45cf7243f73df63984004 Mon Sep 17 00:00:00 2001 From: mahesh Date: Sun, 24 Dec 2017 14:16:12 +0530 Subject: Modify Moderator side UI - Add icon to navbar - Adjust links on navbar - Add yaksh_text image on quit and complete page --- yaksh/templates/manage.html | 16 +++++++++------- yaksh/templates/user.html | 2 +- yaksh/templates/yaksh/complete.html | 3 ++- yaksh/templates/yaksh/login.html | 2 +- yaksh/templates/yaksh/quit.html | 3 ++- 5 files changed, 15 insertions(+), 11 deletions(-) (limited to 'yaksh/templates') diff --git a/yaksh/templates/manage.html b/yaksh/templates/manage.html index d87076d..ce92f63 100644 --- a/yaksh/templates/manage.html +++ b/yaksh/templates/manage.html @@ -8,18 +8,20 @@ - Online Test + + YAKSH + diff --git a/yaksh/templates/user.html b/yaksh/templates/user.html index e978438..b1204f0 100644 --- a/yaksh/templates/user.html +++ b/yaksh/templates/user.html @@ -22,7 +22,7 @@
  • Enrolled Courses
  • Change Password
  • {{ user.get_full_name.title }}
    • -
  • Logout
    • +
  • Logout
    • diff --git a/yaksh/templates/yaksh/complete.html b/yaksh/templates/yaksh/complete.html index 45284c4..f0852f3 100644 --- a/yaksh/templates/yaksh/complete.html +++ b/yaksh/templates/yaksh/complete.html @@ -1,6 +1,7 @@ {% extends "base.html" %} -{% block pagetitle %}Online Test{% endblock %} +{% block pagetitle %}YAKSH{% endblock %} {% block content %} {% csrf_token %} {% if paper.questions_answered.all or paper.questions_unanswered.all %} diff --git a/yaksh/templates/yaksh/login.html b/yaksh/templates/yaksh/login.html index ab6cf45..9c377b9 100644 --- a/yaksh/templates/yaksh/login.html +++ b/yaksh/templates/yaksh/login.html @@ -1,6 +1,6 @@ {% extends "base.html" %} -{% block pagetitle %}YAKSH +{% block pagetitle %}YAKSH {% endblock %} {% block content %} diff --git a/yaksh/templates/yaksh/quit.html b/yaksh/templates/yaksh/quit.html index d18b790..ef5e6a4 100644 --- a/yaksh/templates/yaksh/quit.html +++ b/yaksh/templates/yaksh/quit.html @@ -1,6 +1,7 @@ {% extends "base.html" %} -{% block pagetitle %} Yaksh Online Test {% endblock %} +{% block pagetitle %} YAKSH {% endblock %} {% block content %}
    -- cgit From 9c1c80277252fb6b151183bbf4995c96f25e31ff Mon Sep 17 00:00:00 2001 From: maheshgudi Date: Mon, 18 Dec 2017 19:53:59 +0530 Subject: Fix assignment upload to work with new code server --- yaksh/templates/yaksh/question.html | 1 + 1 file changed, 1 insertion(+) (limited to 'yaksh/templates') diff --git a/yaksh/templates/yaksh/question.html b/yaksh/templates/yaksh/question.html index d58c934..749b34a 100644 --- a/yaksh/templates/yaksh/question.html +++ b/yaksh/templates/yaksh/question.html @@ -88,6 +88,7 @@ function call_skip(url) } init_val = '{{ last_attempt|escape_quotes|safe }}'; lang = "{{ question.language }}" +question_type = "{{ question.type }}" -- cgit From 3cf8110efe4a521044cc5581df672e86facfb116 Mon Sep 17 00:00:00 2001 From: maheshgudi Date: Fri, 29 Dec 2017 18:56:25 +0530 Subject: Include updted logo on navbar --- yaksh/templates/manage.html | 2 +- yaksh/templates/user.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'yaksh/templates') diff --git a/yaksh/templates/manage.html b/yaksh/templates/manage.html index ce92f63..ac9b26d 100644 --- a/yaksh/templates/manage.html +++ b/yaksh/templates/manage.html @@ -9,7 +9,7 @@ - YAKSH + YAKSH -- cgit From c525a64c94b9a37631897daa398b523b0f25f405 Mon Sep 17 00:00:00 2001 From: maheshgudi Date: Fri, 29 Dec 2017 19:13:09 +0530 Subject: Add updated logo on exam page --- yaksh/templates/exam.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'yaksh/templates') diff --git a/yaksh/templates/exam.html b/yaksh/templates/exam.html index a6766b7..3113eb4 100644 --- a/yaksh/templates/exam.html +++ b/yaksh/templates/exam.html @@ -13,7 +13,7 @@ - YAKSH + YAKSH -- cgit
    Submission Status