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 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'yaksh/templates/user.html')

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 @@
                   <span class="icon-bar"></span>
                   <span class="icon-bar"></span>
               </button>
-          <a class="navbar-brand" href="{{ URL_ROOT }}/exam/manage/"> Yaksh </a>
+
+          <a class="navbar-brand" href="{{ URL_ROOT }}/exam/manage/">
+            <img src="{{ URL_ROOT }}/static/yaksh/images/yaksh_crane.png" alt="YAKSH" style="max-width: 5%">
+          </img>
+          </a>
         </div>
         <div class= "collapse navbar-collapse" id="navbar">
           <ul class="nav navbar-nav navbar-right">
-- 
cgit 


From c2f96478a019796f6ce451775a233176418b6718 Mon Sep 17 00:00:00 2001
From: mahesh
Date: Sun, 24 Dec 2017 13:30:52 +0530
Subject: Modify Student side UI

- Add yaksh_logo to navbar
- Add yaksh_text image on login page
- Modify footer bar
- Remove fron sidebar and add on navbar
---
 yaksh/templates/user.html | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

(limited to 'yaksh/templates/user.html')

diff --git a/yaksh/templates/user.html b/yaksh/templates/user.html
index 1fb61d6..e978438 100644
--- a/yaksh/templates/user.html
+++ b/yaksh/templates/user.html
@@ -12,15 +12,17 @@
                   <span class="icon-bar"></span>
               </button>
 
-          <a class="navbar-brand" href="{{ URL_ROOT }}/exam/manage/">
-            <img src="{{ URL_ROOT }}/static/yaksh/images/yaksh_crane.png" alt="YAKSH" style="max-width: 5%">
+          <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 class= "collapse navbar-collapse" id="navbar">
           <ul class="nav navbar-nav navbar-right">
+              <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 style='cursor:pointer' id='logout' onClick='location.replace("{{URL_ROOT}}/exam/logout/");'> <span class="glyphicon glyphicon-log-out">Logout </span></a></li>
+              <li><a href="{{URL_ROOT}}/exam/logout/">Logout</a></li>
           </ul>
         </div><!-- /.navbar -->
       </div><!-- /.container -->
@@ -28,24 +30,12 @@
 {% endblock %}
 {% block content %}
 <div class="row">
-    <div class="col-sm-3 col-md-2 sidebar">
-      <ul class="nav nav-sidebar">
-        <li><a href="{{ URL_ROOT }}/exam/quizzes"> Home </a></li>
-        <li><a href="{{ URL_ROOT }}/exam/quizzes/enrolled/"> Enrolled Courses </a></li>
-        <li><a href="{{ URL_ROOT }}/exam/viewprofile"> Profile </a></li>
-        <li><a href="{{ URL_ROOT }}/exam/reset/changepassword"> Change Password </a></li>
-      </ul>
-    </div>
-    <div class="col-sm-8 col-sm-offset-3 col-md-9 col-md-offset-2 main">
-    <div class="row">
         {% block main %}
         {% endblock %}
-    </div>
-    </div>
 </div>
 {% endblock %}
 {% if user %}
   {% block info %}
-  <h5>{{user.get_full_name|title}}({{user.profile.roll_number}}) Logged in as {{user.username}}</h5>
+  <h5><b>{{user.get_full_name|title}}</b> with Roll no. <b>{{user.profile.roll_number}}</b> is logged in as <b>{{user.username}}</b></h5>
   {% endblock %}
 {% endif %}
-- 
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/user.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'yaksh/templates/user.html')

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 -->
-- 
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/user.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'yaksh/templates/user.html')

diff --git a/yaksh/templates/user.html b/yaksh/templates/user.html
index b1204f0..e1b129f 100644
--- a/yaksh/templates/user.html
+++ b/yaksh/templates/user.html
@@ -13,7 +13,7 @@
               </button>
 
           <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 src="{{ URL_ROOT }}/static/yaksh/images/yaksh_banner.png" alt="YAKSH" style="margin-top: -3px; margin-left:-15px">
           </img>
           </a>
         </div>
-- 
cgit