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/static/yaksh/images/yaksh_crane.png | Bin 0 -> 79030 bytes yaksh/static/yaksh/images/yaksh_logo.png | Bin 0 -> 109398 bytes yaksh/static/yaksh/images/yaksh_text.png | Bin 0 -> 15639 bytes yaksh/templates/user.html | 6 +++++- yaksh/templates/yaksh/login.html | 6 ++++-- 5 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 yaksh/static/yaksh/images/yaksh_crane.png create mode 100644 yaksh/static/yaksh/images/yaksh_logo.png create mode 100644 yaksh/static/yaksh/images/yaksh_text.png (limited to 'yaksh') diff --git a/yaksh/static/yaksh/images/yaksh_crane.png b/yaksh/static/yaksh/images/yaksh_crane.png new file mode 100644 index 0000000..b512784 Binary files /dev/null and b/yaksh/static/yaksh/images/yaksh_crane.png differ diff --git a/yaksh/static/yaksh/images/yaksh_logo.png b/yaksh/static/yaksh/images/yaksh_logo.png new file mode 100644 index 0000000..268911c Binary files /dev/null and b/yaksh/static/yaksh/images/yaksh_logo.png differ diff --git a/yaksh/static/yaksh/images/yaksh_text.png b/yaksh/static/yaksh/images/yaksh_text.png new file mode 100644 index 0000000..9124ee6 Binary files /dev/null and b/yaksh/static/yaksh/images/yaksh_text.png differ 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') 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 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/static/yaksh/images/yaksh_banner.png | Bin 0 -> 1552 bytes yaksh/static/yaksh/images/yaksh_crane.png | Bin 1559 -> 0 bytes yaksh/templates/manage.html | 2 +- yaksh/templates/user.html | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 yaksh/static/yaksh/images/yaksh_banner.png delete mode 100644 yaksh/static/yaksh/images/yaksh_crane.png (limited to 'yaksh') diff --git a/yaksh/static/yaksh/images/yaksh_banner.png b/yaksh/static/yaksh/images/yaksh_banner.png new file mode 100644 index 0000000..d41ba80 Binary files /dev/null and b/yaksh/static/yaksh/images/yaksh_banner.png differ diff --git a/yaksh/static/yaksh/images/yaksh_crane.png b/yaksh/static/yaksh/images/yaksh_crane.png deleted file mode 100644 index 40e886d..0000000 Binary files a/yaksh/static/yaksh/images/yaksh_crane.png and /dev/null differ 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
    Submission Status