7 files changed, 15 insertions, 20 deletions
diff --git a/yaksh/static/yaksh/images/yaksh_crane.png b/yaksh/static/yaksh/images/yaksh_crane.png
index b512784..40e886d 100644
--- a/yaksh/static/yaksh/images/yaksh_crane.png
+++ b/yaksh/static/yaksh/images/yaksh_crane.png
diff --git a/yaksh/static/yaksh/images/yaksh_logo.png b/yaksh/static/yaksh/images/yaksh_logo.png
deleted file mode 100644
index 268911c..0000000
--- a/yaksh/static/yaksh/images/yaksh_logo.png
+++ /dev/null
diff --git a/yaksh/static/yaksh/images/yaksh_text.png b/yaksh/static/yaksh/images/yaksh_text.png
index 9124ee6..4fe282d 100644
--- a/yaksh/static/yaksh/images/yaksh_text.png
+++ b/yaksh/static/yaksh/images/yaksh_text.png
diff --git a/yaksh/templates/base.html b/yaksh/templates/base.html
index 3302482..08c4f70 100644
--- a/yaksh/templates/base.html
+++ b/yaksh/templates/base.html
@@ -53,15 +53,17 @@
 	       {% endblock %}
      </div>
      </div>
+     <div class="container">
      <footer class="footer" id="footer_div">
-      <div class="logged_user_info" align="center">
+      <div class="logged_user_info" align="center" >
             {% block info %}
             {% endblock %}
-        </div>
+      </div>
      <div class="container">
          <p align="center">Developed by FOSSEE group, IIT Bombay</p>
      </div>
      </footer>
+   </div>
 
 </body>
 </html>
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 @@
                   <span class="icon-bar"></span>
                   <span class="icon-bar"></span>
               </button>
-          <a class="navbar-brand" href="#"> Yaksh </a>
+          <a class="navbar-brand" href="#">
+            <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">
           <form id="logout" action="{{URL_ROOT}}/exam/quit/{{ paper.attempt_number }}/{{ paper.question_paper.id }}/" method="post" class="pull-right">
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 %}
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 %}<img src="{{ URL_ROOT }}/static/yaksh/images/yaksh_text.png" alt="YAKSH" style="max-width: 10%">
+{% block pagetitle %}<img src="{{ URL_ROOT }}/static/yaksh/images/yaksh_text.png" alt="YAKSH">
 </img>{% endblock %}
 
 {% block content %}