Change base templates for moderator side pages

2 files changed, 39 insertions, 53 deletions

diff --git a/yaksh/templates/base.html b/yaksh/templates/base.html
index 5fd53a1..e300a76 100644
--- a/yaksh/templates/base.html
+++ b/yaksh/templates/base.html
@@ -16,7 +16,7 @@
 
   <link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/bootstrap.min.css">
 
-  <link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/yakshcustom.css" type="text/css" />
+  <link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/custom.css" type="text/css" />
   <link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/animate.min.css" type="text/css" />
   <link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/font-awesome.css" type="text/css" />
   <link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/ontop.css" type="text/css" />
diff --git a/yaksh/templates/manage.html b/yaksh/templates/manage.html
index 1dee595..3b0f82c 100644
--- a/yaksh/templates/manage.html
+++ b/yaksh/templates/manage.html
@@ -1,44 +1,49 @@
 {% extends "base.html" %}
+
 {% block nav %}
-<div class="container-fluid yakshnav">
-<nav class="navbar fixed-top navbar-expand-lg yakshheading yakshnav">
-  <div class="container">
-    <button class="navbar-toggler navbar-dark" type="button" data-toggle="collapse" data-target="#myNavbar" aria-controls="myNavbar" aria-expanded="false" aria-label="Toggle navigation">
-    <span class="navbar-toggler-icon" style="color: white"></span>
-    </button>
+<nav class="navbar navbar-expand-sm navbar-dark bg-primary fixed-top">
     <a class="navbar-brand" href="{{ URL_ROOT }}/exam/">
-    <img src="{{ URL_ROOT }}/static/yaksh/images/yaksh_banner.png" alt="YAKSH" style="margin-top: -3px; margin-left:-15px">
-    </img>
-    </a>    
-    <div class="collapse navbar-collapse" id="myNavbar">
-        <ul class="nav nav-pills ml-auto">
-            <li class="nav-item"><a class="nav-link" href="{{ URL_ROOT }}/exam/manage/questions">Questions</a></li>
-            <li class="nav-item"><a class="nav-link" href="{{ URL_ROOT }}/exam/manage/courses">Courses</a></li>
-            <li class="nav-item"><a class="nav-link" href="{{ URL_ROOT }}/exam/manage/monitor">Monitor</a></li>
-            <li class="nav-item"><a class="nav-link" href="{{ URL_ROOT }}/exam/manage/gradeuser">Grade User</a></li>
-            <li class="nav-item"><a class="nav-link" href="{{ url_root }}/exam/manage/grader"> Regrade </a></li>
-            <li class="nav-item dropdown">
-              <a class="dropdown-toggle nav-link" id="user_dropdown" data-toggle="dropdown" href="#"> {{user.get_full_name|title}}</a>
-              <div class="dropdown-menu">
-                <a class="dropdown-item" href="{{ URL_ROOT }}/exam/viewprofile/"><i class="fa fa-user"></i>  My Profile</a>
-                <div class="dropdown-divider"></div>
-                {% if user.profile.is_moderator %}
+    <img src="{{ URL_ROOT }}/static/yaksh/images/yaksh_banner.png" alt="YAKSH">
+    </a>
+    <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarColor01" aria-controls="navbarColor01" aria-expanded="false" aria-label="Toggle navigation">
+    <span class="navbar-toggler-icon"></span>
+    </button>
+
+    <div class="collapse navbar-collapse" id="navbarColor01">
+    <ul class="navbar-nav mr-auto">
+        <li class="nav-item"><a class="nav-link" href="{{ URL_ROOT }}/exam/manage/questions">Questions</a></li>
+        <li class="nav-item"><a class="nav-link" href="{{ URL_ROOT }}/exam/manage/courses">Courses</a></li>
+        <li class="nav-item"><a class="nav-link" href="{{ URL_ROOT }}/exam/manage/monitor">Monitor</a></li>
+        <li class="nav-item"><a class="nav-link" href="{{ URL_ROOT }}/exam/manage/gradeuser">Grade User</a></li>
+        <li class="nav-item"><a class="nav-link" href="{{ url_root }}/exam/manage/grader"> Regrade </a></li>
+    </ul>
+    <ul class="navbar-nav ml-auto">
+        <li class="nav-item dropdown my-lg-0" style="font-size: 1.2rem">
+            <a class="dropdown-toggle nav-link" id="user_dropdown" data-toggle="dropdown" href="#">{{user.get_full_name|title}}
+            </a>
+            <div class="dropdown-menu dropdown-menu-right">
+            <a class="dropdown-item" href="{{ URL_ROOT }}/exam/editprofile/">
+                <i class="fa fa-user"></i>  My Profile
+            </a>
+            <div class="dropdown-divider"></div>
+            {% if user.profile.is_moderator %}
                 <a class="dropdown-item" href="{{URL_ROOT}}/exam/toggle_moderator/"><i class="fa fa-exchange"></i>
-                  Switch To Student
+                    Switch To Student
                 </a>
                 <div class="dropdown-divider"></div>
-                {% endif %}
-                <a class="dropdown-item" href="{{ URL_ROOT }}/exam/reset/changepassword/"><i class="fa fa-key"></i> Change Password</a>
-                <div class="dropdown-divider"></div>
-                <a class="dropdown-item" id="user_logout" href="{{URL_ROOT}}/exam/logout/"><i class="fa fa-sign-out"></i> Logout</a>
-              </div>
-            </li>
-        </ul>
+            {% endif %}
+            <a class="dropdown-item" href="{{ URL_ROOT }}/exam/reset/changepassword/">
+                <i class="fa fa-key"></i> Change Password
+            </a>
+            <div class="dropdown-divider"></div>
+                <a class="dropdown-item" id="user_logout" href="{{URL_ROOT}}/exam/logout/">
+                    <i class="fa fa-sign-out"></i> Logout
+                </a>
+            </div>
+        </li>
+    </ul>
     </div>
-  </div>
 </nav>
-</div>
-
 
 
 
@@ -82,23 +87,4 @@
 {% endblock %}
 
 {% block footer %}
-  <!--footer-->   
-  <footer class="container-fluid yakshfooter text-center ">
-    <div class="row justify-content-center">
-    <div class="col-sm-5 ">
-      {% if user %}
-         {% block info %}
-         <b>{{user.get_full_name|title}}</b> with Roll no. <b>{{user.profile.roll_number}}</b> is logged in as <b>{{user.username}}</b>
-         {% endblock %}
-         {% endif %}
-    </div>
-    <div class="col-sm-2">
-      |
-    </div>
-    <div class="col-sm-4 text-left">
-     <b>Any Queries?</b> Email : info@fossee.in
-    </div>
-  </div>
-  </footer>
-  <!--footer end-->
 {% endblock %}