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 @@
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
               </button>
-          <a class="navbar-brand" href="{{ URL_ROOT }}/exam/manage/"> Online Test </a>
+            <a class="navbar-brand navbar-left" href="{{ URL_ROOT }}/exam/manage/">
+            <img src="{{ URL_ROOT }}/static/yaksh/images/yaksh_crane.png" alt="YAKSH" style="margin-top: -3px; margin-left:-15px"></img>
+            </a>
         </div>
         <div id="navbar" class="collapse navbar-collapse">
-          <ul class="nav navbar-nav">
+          <ul class="nav navbar-nav navbar-right">
             <li><a href="{{ URL_ROOT }}/exam/manage/questions">Questions</a></li>
-            <li><a href="{{ URL_ROOT }}/exam/manage/gradeuser">Grade User</a></li>
-            <li><a href="{{ URL_ROOT }}/exam/manage/monitor">Monitor</a></li>
             <li><a href="{{ URL_ROOT }}/exam/manage/courses">Courses</a></li>
-            <li><a href="{{ URL_ROOT }}/exam/viewprofile">My Profile</a></li>
-            <li><a href="{{ URL_ROOT }}/exam/reset/changepassword">Change Password</a></li>
+            <li><a href="{{ URL_ROOT }}/exam/manage/monitor">Monitor</a></li>
+            <li><a href="{{ URL_ROOT }}/exam/manage/gradeuser">Grade User</a></li>
             <li><a href="{{ URL_ROOT }}/exam/manage/grader"> Grader </a></li>
-            <li><a style='cursor:pointer' onClick='location.replace("{{URL_ROOT}}/exam/logout/");'>Log out</a></li>
+            <li><a href="{{ URL_ROOT }}/exam/reset/changepassword">Change Password</a></li>
+            <li><a href="{{ URL_ROOT }}/exam/viewprofile"> {{ user.get_full_name.title }} </a></li>
+            <li><a href="{{URL_ROOT}}/exam/logout/" id="logout">Logout</a></li>
           </ul>
         </div><!-- /.navbar -->
       </div><!-- /.container -->
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 @@
               <li><a href="{{ URL_ROOT }}/exam/quizzes/enrolled/"> Enrolled Courses </a></li>
               <li><a href="{{ URL_ROOT }}/exam/reset/changepassword"> Change Password </a></li>
               <li><a href="{{ URL_ROOT }}/exam/viewprofile"> {{ user.get_full_name.title }} </a></li>
-              <li><a href="{{URL_ROOT}}/exam/logout/">Logout</a></li>
+              <li><a href="{{URL_ROOT}}/exam/logout/" id="logout">Logout</a></li>
           </ul>
         </div><!-- /.navbar -->
       </div><!-- /.container -->
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 %}<img src="{{ URL_ROOT }}/static/yaksh/images/yaksh_text.png"
+width="80" alt="YAKSH"></img>{% 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 %}<img src="{{ URL_ROOT }}/static/yaksh/images/yaksh_text.png" alt="YAKSH">
+{% block pagetitle %}<img src="{{ URL_ROOT }}/static/yaksh/images/yaksh_text.png" width="100" alt="YAKSH">
 </img>{% 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 %} <img src="{{ URL_ROOT }}/static/yaksh/images/yaksh_text.png"
+width="80" alt="YAKSH"></img> {% endblock %}
 {% block content %}
 <center><table class="table table-bordered" >
         <caption> Submission Status </caption>
-- 
cgit