1 files changed, 47 insertions, 38 deletions
diff --git a/yaksh/templates/user.html b/yaksh/templates/user.html
index 090e93d..4e3974b 100644
--- a/yaksh/templates/user.html
+++ b/yaksh/templates/user.html
@@ -1,44 +1,53 @@
 {% extends "base.html" %}
-{% block css%}
-    <link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/dashboard.css" type="text/css" />
-{% endblock %}
+{% load static %}
 {% block nav %}
-    <nav class="navbar navbar-fixed-top navbar-inverse">
-      <div class="container">
-        <div class="navbar-header">
-              <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar">
-                  <span class="icon-bar"></span>
-                  <span class="icon-bar"></span>
-                  <span class="icon-bar"></span>
-              </button>
-          <a class="navbar-brand navbar-left" 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="container-fluid">
+    <nav class="navbar navbar-expand-sm navbar-dark bg-primary fixed-top">
+        <a class="navbar-brand" href="{% url 'yaksh:index' %}">
+        <img src="{% 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 'yaksh:index' %}"><i class="fa fa-home" style="size: 18px"></i>&nbsp;Home</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 'yaksh:edit_profile' %}">
+                    <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 'yaksh:toggle_moderator' %}"><i class="fa fa-exchange"></i>
+                        Switch To Moderator
+                    </a>
+                    <div class="dropdown-divider"></div>
+                {% endif %}
+                <a class="dropdown-item" href="{% url 'password_change' %}">
+                    <i class="fa fa-key"></i> Change Password
+                </a>
+                <div class="dropdown-divider"></div>
+                    <a class="dropdown-item" id="user_logout" href="{% url 'yaksh:logout' %}">
+                        <i class="fa fa-sign-out"></i> Logout
+                    </a>
+                </div>
+            </li>
+        </ul>
         </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 href="{{URL_ROOT}}/exam/logout/" id="logout">Logout</a></li>
-          </ul>
-        </div><!-- /.navbar -->
-      </div><!-- /.container -->
-    </nav><!-- /.navbar -->
-{% endblock %}
-{% block content %}
-<div class="row">
-    <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>
+    </nav>
 </div>
 {% endblock %}
-{% if user %}
-  {% block info %}
-  <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>
+
+
+{% block content %}  
+  {% block main %}
+    {% block navtab %}
+    {% endblock %}
   {% endblock %}
-{% endif %}
+{% endblock %}