From 43f2313d75e24a8c11855fb9718e48c1c06fb26f Mon Sep 17 00:00:00 2001
From: prathamesh
Date: Tue, 3 Jan 2017 10:08:13 +0530
Subject: navbar display was not proper in small devices. modified navabar.

Looks better in small devices as well.
---
 yaksh/templates/user.html | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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

diff --git a/yaksh/templates/user.html b/yaksh/templates/user.html
index c18013b..9745655 100644
--- a/yaksh/templates/user.html
+++ b/yaksh/templates/user.html
@@ -3,9 +3,14 @@
     <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" href="{{ URL_ROOT }}/exam/manage/"> Online Test </a>
         </div>
-        <div id="navbar">
+        <div class= "collapse navbar-collapse" id="navbar">
           <ul class="nav navbar-nav">
 	        <li><a href="{{ URL_ROOT }}/exam/quizzes">Quizzes</a></li>
             <li><a href="{{ URL_ROOT }}/exam/results">Results</a></li>
-- 
cgit 


From 241ca3c2b8ab1b1824813833237435153e08b0e9 Mon Sep 17 00:00:00 2001
From: prathamesh
Date: Wed, 4 Jan 2017 15:54:19 +0530
Subject: Student UI modification.

Added side navigation bar.
Edit and view Profile base template set properly.
Added a tab "Enrolled Courses" for students to only view the courses
they are enrolled in.
---
 yaksh/templates/user.html | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

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

diff --git a/yaksh/templates/user.html b/yaksh/templates/user.html
index 9745655..f79eb29 100644
--- a/yaksh/templates/user.html
+++ b/yaksh/templates/user.html
@@ -1,4 +1,7 @@
 {% extends "base.html" %}
+{% block css%}
+    <link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/dashboard.css" type="text/css" />
+{% endblock %}
 {% block nav %}
     <nav class="navbar navbar-fixed-top navbar-inverse">
       <div class="container">
@@ -11,14 +14,29 @@
           <a class="navbar-brand" href="{{ URL_ROOT }}/exam/manage/"> Online Test </a>
         </div>
         <div class= "collapse navbar-collapse" id="navbar">
-          <ul class="nav navbar-nav">
-	        <li><a href="{{ URL_ROOT }}/exam/quizzes">Quizzes</a></li>
-            <li><a href="{{ URL_ROOT }}/exam/results">Results</a></li>
-            <li><a href="{{ URL_ROOT }}/exam/viewprofile">My Profile</a></li>
-            <li><a href="{{ URL_ROOT }}/exam/changepassword">Change Password</a></li>
-            <li><a style='cursor:pointer' onClick='location.replace("{{URL_ROOT}}/exam/complete/");'>Log out</a></li>
+          <ul class="nav navbar-nav navbar-right">
+              <li><a href="{{ URL_ROOT }}/exam/viewprofile"> {{ user.get_full_name.title }} </a></li>
+              <li><a style='cursor:pointer' onClick='location.replace("{{URL_ROOT}}/exam/complete/");'> <span class="glyphicon glyphicon-log-out">Logout </span></a></li>
           </ul>
         </div><!-- /.navbar -->
       </div><!-- /.container -->
     </nav><!-- /.navbar -->
 {% 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/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 %}
-- 
cgit 


From fe6c5c3b561c514fa328807fb8a571a620e438cf Mon Sep 17 00:00:00 2001
From: prathamesh
Date: Thu, 12 Jan 2017 18:20:38 +0530
Subject: Exam interface improved

---
 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 f79eb29..6f2137d 100644
--- a/yaksh/templates/user.html
+++ b/yaksh/templates/user.html
@@ -11,7 +11,7 @@
                   <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" href="{{ URL_ROOT }}/exam/manage/"> Yaksh </a>
         </div>
         <div class= "collapse navbar-collapse" id="navbar">
           <ul class="nav navbar-nav navbar-right">
-- 
cgit