From f20dfc471fb5167399c4fda131ee0d9b0f9094d5 Mon Sep 17 00:00:00 2001
From: prathamesh
Date: Thu, 6 Oct 2016 12:53:52 +0530
Subject: Fixed div collapse inconsistency

It was possible that some collapse have the same href.
So if we click on any one group with the same href then only the
first collapse div would collapse.
---
 yaksh/templates/yaksh/regrade.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/regrade.html b/yaksh/templates/yaksh/regrade.html
index 77d8ec4..5cfc1b0 100644
--- a/yaksh/templates/yaksh/regrade.html
+++ b/yaksh/templates/yaksh/regrade.html
@@ -44,8 +44,8 @@
       </span></h4>
        <div id="questions_quizzes{{ course.id }}" class="collapse">
         {% for quiz in course.quiz_set.all %}
-         <p><a href="#questions_questions{{ quiz.id }}" data-toggle="collapse">Quiz: {{ quiz }}</a></p>
-          <div id="questions_questions{{ quiz.id }}" class="collapse">
+          <p><a href="#questions_questions{{ course.id }}{{ quiz.id }}" data-toggle="collapse">Quiz: {{ quiz }}</a></p>
+          <div id="questions_questions{{ course.id }}{{ quiz.id }}" class="collapse">
            {% with questionpaper=quiz.questionpaper_set.get %}
             <p class="bg-info"> Questions: </p>
             <ol class="list-group">
@@ -80,8 +80,8 @@
      </span></h4>
      <div id="quizzes_quizzes{{ course.id }}" class="collapse">
       {% for quiz in course.quiz_set.all %}
-       <p><a href="#quizzes_papers{{ quiz.id }}" data-toggle="collapse">Quiz: {{ quiz }}</a></p>
-       <div id="quizzes_papers{{ quiz.id }}" class="collapse">
+      <p><a href="#quizzes_papers{{ course.id }}{{ quiz.id }}" data-toggle="collapse">Quiz: {{ quiz }}</a></p>
+       <div id="quizzes_papers{{ course.id }}{{ quiz.id }}" class="collapse">
        <ol class="list-group">
        {% for answerpaper in quiz.questionpaper_set.get.answerpaper_set.all %}
        <li class="list-group">
@@ -114,8 +114,8 @@
       </span></h4>
       <div id="users_users{{ course.id }}" class="collapse">
        {% for user in course.students.all %}
-        <p><a href="#users_papers{{ user.id }}" data-toggle="collapse"> Answer Papers for {{ user.get_full_name }}</a></p>
-         <div id="users_papers{{ user.id }}" class="collapse">
+       <p><a href="#users_papers{{ course.id }}{{ user.id }}" data-toggle="collapse"> Answer Papers for {{ user.get_full_name }}</a></p>
+        <div id="users_papers{{ course.id }}{{ user.id }}" class="collapse">
          <ol class="list-group">
          {% for answerpaper in user.answerpaper_set.all %}
          <li class="list-group"> Quiz: {{answerpaper.question_paper.quiz.description }}; Attempt Number: {{ answerpaper.attempt_number }}
-- 
cgit 


From d231fbd10c087f721f1fd8a576b4c40a84e0a5a0 Mon Sep 17 00:00:00 2001
From: prathamesh
Date: Wed, 26 Oct 2016 18:05:04 +0530
Subject: Migration from bootstrap 1.4 to bootstrap 3.3

Removed css redundancy.
Removed unwanted css.
Included css and js imports in base template.
Upgraded jquery to v1.9 for now.
---
 yaksh/templates/base.html                       |  21 ++--
 yaksh/templates/manage.html                     | 147 ++++------------------
 yaksh/templates/user.html                       |  80 +++---------
 yaksh/templates/yaksh/add_course.html           |   2 +-
 yaksh/templates/yaksh/add_question.html         |   8 +-
 yaksh/templates/yaksh/add_questionpaper.html    |  27 ----
 yaksh/templates/yaksh/add_quiz.html             |   2 +-
 yaksh/templates/yaksh/addteacher.html           |   2 +-
 yaksh/templates/yaksh/complete.html             |   4 +-
 yaksh/templates/yaksh/course_detail.html        |   2 +-
 yaksh/templates/yaksh/courses.html              |   2 +-
 yaksh/templates/yaksh/design_questionpaper.html |   2 +-
 yaksh/templates/yaksh/editprofile.html          |   5 +-
 yaksh/templates/yaksh/grade_user.html           |  34 ++---
 yaksh/templates/yaksh/intro.html                |  42 ++++---
 yaksh/templates/yaksh/login.html                |  17 +--
 yaksh/templates/yaksh/moderator_dashboard.html  |  69 +++++++++++
 yaksh/templates/yaksh/monitor.html              |  16 +--
 yaksh/templates/yaksh/profile_updated.html      |   2 -
 yaksh/templates/yaksh/question.html             | 158 +++++++++++-------------
 yaksh/templates/yaksh/quizzes_user.html         |  38 +++---
 yaksh/templates/yaksh/register.html             |  12 +-
 yaksh/templates/yaksh/regrade.html              |  14 +--
 yaksh/templates/yaksh/results_user.html         |  14 +--
 yaksh/templates/yaksh/showquestions.html        |  29 ++---
 yaksh/templates/yaksh/statistics_question.html  |  16 +--
 yaksh/templates/yaksh/user_data.html            |  12 +-
 yaksh/templates/yaksh/view_answerpaper.html     |  11 +-
 28 files changed, 304 insertions(+), 484 deletions(-)
 delete mode 100644 yaksh/templates/yaksh/add_questionpaper.html
 create mode 100644 yaksh/templates/yaksh/moderator_dashboard.html

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/base.html b/yaksh/templates/base.html
index 7fe2d27..00b0867 100644
--- a/yaksh/templates/base.html
+++ b/yaksh/templates/base.html
@@ -15,8 +15,8 @@
   <link rel="apple-touch-icon" href="apple-touch-icon.png">
 
   <link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/bootstrap.min.css">
-  <link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/base.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/theme.css" type="text/css" />
 
   <style>
     body {
@@ -32,30 +32,31 @@
 
   {% block css %}
   {% endblock %}
-  <script language="JavaScript" type="text/javascript" src="{{ URL_ROOT }}/static/yaksh/js/jquery-1.4.2.min.js"></script>
+  <script language="JavaScript" type="text/javascript" src="{{ URL_ROOT }}/static/yaksh/js/jquery-1.9.1.min.js"></script>
   <script src="{{ URL_ROOT }}/static/yaksh/js/bootstrap.min.js"></script>
   {% block script %}
   {% endblock %}
 </head>
 
-<body 
-  {% block onload %}
-  {% endblock %}>
+<body {% block onload %} {% endblock %}>
+  {% block nav %}
+  {% endblock %}
   <div class="container">
      <div class="content">
          <div class="page-header">
-		    <h1><Strong><center>{% block pagetitle %} {% endblock pagetitle %}</center></strong></h1>
+             <h3><center>{% block pagetitle %}{% endblock pagetitle %}</center></h2>
          </div>
          <div class=row>
-            <div class=span12>
-               <h3><center>{% block formtitle %} {% endblock formtitle %}</center></h3><br>
+            <div class=col-md-12>
 	       {% block content %}
 	       {% endblock %}
             </div>
          </div>
      </div>
-     <footer>
-     <p align="center">&copy; FOSSEE group, IIT Bombay</p>
+     <footer class="footer">
+     <div class="container">
+         <p align="center">Developed by FOSSEE group, IIT Bombay</p>
+     </div>
      </footer>
   </div>
 
diff --git a/yaksh/templates/manage.html b/yaksh/templates/manage.html
index 63c0ea7..eae4dd4 100644
--- a/yaksh/templates/manage.html
+++ b/yaksh/templates/manage.html
@@ -1,127 +1,22 @@
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-   <head>
-     <title>
-       {% block title %}
-       {% endblock %}
-     </title>
-
-   {% block meta %}
-<meta charset="utf-8">
-    <meta name="description" content="">
-<meta name="author" content="">
-   {% endblock %}
-
-   <link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/base.css" type="text/css" />
-   <link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/manage.css" type="text/css" />
-   <link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/font-awesome.css" type="text/css" />
-   {% block css %}
-   {% endblock %}
-<script language="JavaScript" type="text/javascript" src="{{ URL_ROOT }}/static/yaksh/js/jquery-1.4.2.min.js"></script>
-   {% block script %}
-   {% endblock %}
-   </head>
-
-<body {% block onload %}{% endblock %}>
-<div class="topbar">
-  <div class="fill">
-     <div class="container">
-        <a href="{{ URL_ROOT }}/exam/manage/"><h3 class="brand"><strong>Online Test</h3></strong></a>
-<ul>
-<li><a href="{{ URL_ROOT }}/exam/manage/questions">Questions</a></li>
-        <li><a href="{{ URL_ROOT }}/exam/manage/gradeuser">Grade User</a></li>
-<li><a href="{{ URL_ROOT }}/exam/manage/monitor">Monitor</a></li>
-<li><a href="{{ URL_ROOT }}/exam/manage/courses">Courses</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 href="{{ URL_ROOT }}/exam/manage/grader"> Grader </a></li>
-        </ul>
-<ul style="float:right;">
-<li><strong><a style='cursor:pointer' onClick='location.replace("{{URL_ROOT}}/exam/complete/");'>Log out</a></strong></li>
-        </ul>
-     </div>
-   </div>
-</div>
-  <div class="container">
-     <div class="content">
-         <div class="page-header">
-<h3><center>{% block subtitle %}Welcome {{ user.first_name.title }} {{user.last_name.title}} !{% endblock %}</center></h3><br>
-         </div>
-         <div class=row>
-            <div class=span14>
-            {% block manage %}
-                <center><h4>List of quizzes! Click on the given links to have a look at answer papers for a quiz.</h4></center>
-                <hr>
-                <table class="bordered-table zebra-striped">
-                    <th>Quiz</th>
-                    <th>Taken By</th>
-                    <th>No. of users Passed</th>
-                    <th>No. of users Failed</th>
-                    {% for paper, answer_papers, users_passed, users_failed in users_per_paper %}
-                        <tr>
-                            <td>
-                                <a href="{{URL_ROOT}}/exam/manage/monitor/{{paper.id}}/">{{ paper.quiz.description }}</a>
-                            </td>
-                            <td>
-                                {{ answer_papers|length }} user(s)
-                            </td>
-                            <td>
-                                {{ users_passed }}
-                            </td>
-                            <td>
-                                {{ users_failed }}
-                            </td>
-                        </tr>
-                    {% endfor %}
-                </table>
-                <hr>
-                <center>
-                    <h4>Moderator's Dashboard!</h4>
-                    <h5>Click on the button given below to add a new course.</h5>
-                    <button class="btn" type="button" onClick='location.replace("{{URL_ROOT}}/exam/manage/add_course");'>Add New Course</button>
-                    <h5>Click on the button to Create a Demo course.
-                    <a href="" onclick="$('#help').show(); return false;">Help </a></h5>
-                    <button class="btn" type="button" onClick='location.replace("{{URL_ROOT}}/exam/manage/create_demo_course");'>Create Demo Course</button>
-                    <div style="display: none;" id="help">
-                    <ol>
-                    <ul>
-                    <li>A Demo Course and Demo Quiz will be created (Click Courses link on nav bar to view courses).</li>
-                    <li>Some Demo Questions are also created for you (Click Questions link on nav bar to view questions).</li>
-                    <li>In Courses you can view Demo Quiz.</li>
-                    <li>Click on the Demo Quiz and Click on User Mode or God Mode to take the quiz.
-                    </li>
-                    <li>You can also edit the Demo quiz.
-                    </li>
-                    </ul>
-                    </p>
-                    <a href="" onclick="$('#help').hide(); return false"> Close </a>
-                    </div>
-                    {% if msg %}
-                    <h4>{{ msg }}</h4>
-                    {% endif %}
-                </center>
-                {% if trial_paper %}
-                  <h5/> You have trial papers.
-                  <table class="bordered-table zebra-striped">
-                  <form action="" method="post">
-                  {% csrf_token %}
-                   {% for paper in trial_paper %}
-                  <tr>
-                  <td> <input type = "checkbox" name="delete_paper" value = {{paper.id}}></input></td>
-                  <td> <a href="{{URL_ROOT}}/exam/manage/gradeuser/{{paper.question_paper.quiz.id}}">{{paper.question_paper.quiz.description}}</td>
-                  </tr>
-                  {% endfor %}
-                  </table>
-                  <center><button class="btn" type="submit">Delete Selected</button></center>
-                  </form>
-                  {% endif %}
+{% extends "base.html" %}
+{% block nav %}
+<nav class="navbar navbar-fixed-top navbar-inverse">
+      <div class="container">
+        <div class="navbar-header">
+          <a class="navbar-brand" href="{{ URL_ROOT }}/exam/manage/"> Online Test </a>
+        </div>
+        <div id="navbar">
+          <ul class="nav navbar-nav">
+            <li><a href="{{ URL_ROOT }}/exam/manage/questions">Questions</a></li>
+            <li><a href="{{ URL_ROOT }}/exam/manage/gradeuser">Grade User</a></li>
+            <li><a href="{{ URL_ROOT }}/exam/manage/monitor">Monitor</a></li>
+            <li><a href="{{ URL_ROOT }}/exam/manage/courses">Courses</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 href="{{ URL_ROOT }}/exam/manage/grader"> Grader </a></li>
+            <li><a style='cursor:pointer' onClick='location.replace("{{URL_ROOT}}/exam/complete/");'>Log out</a></li>
+          </ul>
+        </div><!-- /.navbar -->
+      </div><!-- /.container -->
+    </nav><!-- /.navbar -->
 {% endblock %}
-            </div>
-         </div>
-     </div>
-     <footer>
-     <p>&copy; FOSSEE group, IIT Bombay</p>
-     </footer>
-  </div>
-
-</body>
-</html>
diff --git a/yaksh/templates/user.html b/yaksh/templates/user.html
index 4805c2d..c18013b 100644
--- a/yaksh/templates/user.html
+++ b/yaksh/templates/user.html
@@ -1,61 +1,19 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-   <head>
-     <title>
-       {% block title %}
-       {% endblock %}
-     </title>
-
-   {% block meta %}
-	<meta charset="utf-8">
-   	<meta name="description" content="">
-	<meta name="author" content="">
-   {% endblock %}
-
-   <link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/base.css" type="text/css" />
-   <link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/font-awesome.css" type="text/css" />
-   {% block css %}
-   {% endblock %}
-
-   {% block script %}
-   {% endblock %}
-   </head>
-
-<body {% block onload %}{% endblock %}>
-<div class="topbar">
-  <div class="fill">
-     <div class="container">
-        <h3 class="brand"><strong>Online Test</h3></strong>
-    	<ul>
-	      <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>
-      </ul>
-	<ul style="float:right;">
-	<li><strong><a style='cursor:pointer' onClick='location.replace("{{URL_ROOT}}/exam/complete/");' id='logout'>Log out</a></strong></li>
-        </ul>
-     </div>
-   </div>
-</div>
-  <div class="container">
-     <div class="content">
-         <div class="page-header">
-		<h3><center>{% block subtitle %}Welcome {{ user.first_name.title }}  {{user.last_name.title}} {% endblock %}</center></h3><br>
-         </div>
-         <div class=row>
-            <div class=span14>
-               {% block manage %}
-	       {% endblock %}
-            </div>
-         </div>
-     </div>
-     <footer>
-     <p>&copy; FOSSEE group, IIT Bombay</p>
-     </footer>
-  </div>
-
-</body>
-</html>
+{% extends "base.html" %}
+{% block nav %}
+    <nav class="navbar navbar-fixed-top navbar-inverse">
+      <div class="container">
+        <div class="navbar-header">
+          <a class="navbar-brand" href="{{ URL_ROOT }}/exam/manage/"> Online Test </a>
+        </div>
+        <div 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>
+        </div><!-- /.navbar -->
+      </div><!-- /.container -->
+    </nav><!-- /.navbar -->
+{% endblock %}
diff --git a/yaksh/templates/yaksh/add_course.html b/yaksh/templates/yaksh/add_course.html
index 0afa27a..55683f4 100644
--- a/yaksh/templates/yaksh/add_course.html
+++ b/yaksh/templates/yaksh/add_course.html
@@ -6,7 +6,7 @@
 <link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/question_quiz.css" type="text/css" />
 {% endblock %}
 
-{% block manage %}
+{% block content %}
 <form name=frm id=frm action="" method="post" >
   {% csrf_token %}
   <center>
diff --git a/yaksh/templates/yaksh/add_question.html b/yaksh/templates/yaksh/add_question.html
index f003256..9142bb7 100644
--- a/yaksh/templates/yaksh/add_question.html
+++ b/yaksh/templates/yaksh/add_question.html
@@ -1,23 +1,21 @@
 {% extends "manage.html" %}
 
-{% block subtitle %}Add Question{% endblock %}
+{% block pagetitle %} Add Question {% endblock pagetitle %}
 
 {% block css %}
-<link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/question_quiz.css" type="text/css" />
 <link rel="stylesheet" media="all" type="text/css" href="{{ URL_ROOT }}/static/yaksh/css/autotaggit.css" />
 {% endblock %}
 
 {% block script %}
-<script type="text/javascript" src="{{ URL_ROOT }}/static/yaksh/js/jquery-1.4.2.min.js"></script>
 <script src="{{ URL_ROOT }}/static/yaksh/js/add_question.js"></script>
 {% endblock %}
 
 {% block onload %} onload='javascript:textareaformat();' {% endblock %}
 
-{% block manage %}
+{% block content %}
 <form action="" method="post" name=frm onSubmit="return autosubmit();" enctype="multipart/form-data">
   {% csrf_token %}
-  <center><table class=span1>
+  <center><table class="table">
   <tr><td>Summary: <td>{{ form.summary }}{{ form.summary.errors }}
   <tr><td> Language: <td> {{form.language}}{{form.language.errors}}
   <tr><td> Active: <td> {{ form.active }}{{form.active.errors}} &nbsp; Type: &nbsp;{{ form.type }}{{form.type.errors}}
diff --git a/yaksh/templates/yaksh/add_questionpaper.html b/yaksh/templates/yaksh/add_questionpaper.html
deleted file mode 100644
index eaa96bc..0000000
--- a/yaksh/templates/yaksh/add_questionpaper.html
+++ /dev/null
@@ -1,27 +0,0 @@
-{% extends "manage.html" %}
-
-
-{% block subtitle %}Design Question Paper{% endblock %}
-
-{% block css %}
-<link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/question_quiz.css" type="text/css" /> 
-<link rel="stylesheet" media="all" type="text/css" href="{{ URL_ROOT }}/static/yaksh/css/autotaggit.css" />
-{% endblock %}
-{% block script %}
-<script src="/static/yaksh/js/jquery-1.4.2.min.js" type="text/javascript"></script>
-<script src="{{ URL_ROOT }}/static/yaksh/js/add_questionpaper.js"></script>
-{% endblock %}
-
-{% block manage %}
-<input type=hidden id="url_root" value={{ URL_ROOT }}>
-<form>
-{% csrf_token %}
-Select mode to design Question Paper: 
-<select name='mode' id='mode' onChange='javascript:load_data();'>
-  <option>---------</option>
-  <option>Automatic</option>
-  <option>Manual</option>
-</select> 
-</form>
-
-{% endblock %}
diff --git a/yaksh/templates/yaksh/add_quiz.html b/yaksh/templates/yaksh/add_quiz.html
index 5a0bee4..c674f4b 100644
--- a/yaksh/templates/yaksh/add_quiz.html
+++ b/yaksh/templates/yaksh/add_quiz.html
@@ -10,7 +10,7 @@
 <script src="{{ URL_ROOT }}/static/yaksh/js/add_quiz.js"></script>
 {% endblock %}
 {% block onload %} onload="javascript:test();"  {% endblock %}
-{% block manage %}
+{% block content %}
 
 <form name=frm id=frm action="" method="post" >
   {% csrf_token %}
diff --git a/yaksh/templates/yaksh/addteacher.html b/yaksh/templates/yaksh/addteacher.html
index 6722a52..755ba20 100644
--- a/yaksh/templates/yaksh/addteacher.html
+++ b/yaksh/templates/yaksh/addteacher.html
@@ -7,7 +7,7 @@
 <link rel="stylesheet" media="all" type="text/css" href="{{ URL_ROOT }}/static/yaksh/css/course.css" />
 {% endblock %}
 
-{% block manage %}
+{% block content %}
 <center><h3>Add Teachers for this course</h3><br></center>
 <center><h3>Search teacher with username, firstname, lastname, email</h3><br></center>
 <div align="center">
diff --git a/yaksh/templates/yaksh/complete.html b/yaksh/templates/yaksh/complete.html
index 98adf9b..4fe9aba 100644
--- a/yaksh/templates/yaksh/complete.html
+++ b/yaksh/templates/yaksh/complete.html
@@ -1,12 +1,10 @@
 {% extends "base.html" %}
 
-{% block title %}Good bye!{% endblock %}
-
 {% block pagetitle %}Online Test{% endblock %}
 {% block content %}
 {% csrf_token %}
     {% if paper.questions_answered.all or paper.questions_unanswered.all %}
-			<br><center><table class="bordered-table zebra-striped span8"
+			<br><center><table class="table table-bordered"
 			 style="text-align:left;">
 				<tr><td><b>Submitted Questions</b></td>
 				<td>
diff --git a/yaksh/templates/yaksh/course_detail.html b/yaksh/templates/yaksh/course_detail.html
index 7169667..94f29a3 100644
--- a/yaksh/templates/yaksh/course_detail.html
+++ b/yaksh/templates/yaksh/course_detail.html
@@ -10,7 +10,7 @@
 {% block script %}
 <script language="JavaScript" type="text/javascript" src="{{ URL_ROOT }}/static/yaksh/js/course.js"></script>
 {% endblock %}
-{% block manage %}
+{% block content %}
 <div class="row">
     <div class="span6 wrap">
         <center><b><u>Requests</u></b></center><br>
diff --git a/yaksh/templates/yaksh/courses.html b/yaksh/templates/yaksh/courses.html
index 43f323b..0a61d72 100644
--- a/yaksh/templates/yaksh/courses.html
+++ b/yaksh/templates/yaksh/courses.html
@@ -8,7 +8,7 @@
 <link rel="stylesheet" media="all" type="text/css" href="{{ URL_ROOT }}/static/yaksh/css/course.css" />
 {% endblock %}
 
-{% block manage %}
+{% block content %}
 
 {% if not courses %}
     <center><h4> No new Courses created </h4></center>
diff --git a/yaksh/templates/yaksh/design_questionpaper.html b/yaksh/templates/yaksh/design_questionpaper.html
index 2aa169b..9c190b7 100644
--- a/yaksh/templates/yaksh/design_questionpaper.html
+++ b/yaksh/templates/yaksh/design_questionpaper.html
@@ -23,7 +23,7 @@ select
 <script src="{{ URL_ROOT }}/static/yaksh/js/bootstrap-modal.js"></script>
 {% endblock %}
 
-{% block manage %}
+{% block content %}
 <input type=hidden id="url_root" value={{ URL_ROOT }}>
 <center><b>Manual mode to design the {{lang}}  Question Paper</center><br>
     <ul class="tabs" data-tabs="tabs">
diff --git a/yaksh/templates/yaksh/editprofile.html b/yaksh/templates/yaksh/editprofile.html
index cdccfc0..fc8539d 100644
--- a/yaksh/templates/yaksh/editprofile.html
+++ b/yaksh/templates/yaksh/editprofile.html
@@ -1,8 +1,5 @@
-{% extends "base.html" %}
+{% extends "manage.html" %}
 
-{% block title %} Edit Profile {% endblock %}
-
-{% block pagetitle %} Online Test {% endblock %}
 {% block formtitle %} Please fill in the following details {% endblock %}
 
 {% block content %}
diff --git a/yaksh/templates/yaksh/grade_user.html b/yaksh/templates/yaksh/grade_user.html
index 0e29512..ced3ca2 100644
--- a/yaksh/templates/yaksh/grade_user.html
+++ b/yaksh/templates/yaksh/grade_user.html
@@ -1,19 +1,11 @@
 {% extends "manage.html" %}
 
-{% block title %} Grade User {% endblock title %}
+{% block pagetitle %} Grade User {% endblock pagetitle %}
 
-{% block subtitle %} Grade User {% endblock %}
- 
-{% block css %}
-     <link rel="stylesheet"
-      href="{{ URL_ROOT }}/static/yaksh/css/view_answerpaper.css"
-      type="text/css" />
-{% endblock %}
-
-{% block manage %}
+{% block content %}
 
 {% if course_details %}
-    <table id = "course-details" class = "zebra-striped">
+    <table id="course-details" class="table table-bordered">
     <tr>
     <th>Courses</th> 
     <th> Quizzes </th>
@@ -21,12 +13,12 @@
 
     {% for course in course_details %}
     <tr>
-    <td><ul>{{course.name}} </td>
+    <td><ul class="list-group">{{course.name}} </td>
 
     {% if course.get_quizzes %}
     <td>
     {% for quiz in course.get_quizzes %}
-     <li><a href = "{{URL_ROOT}}/exam/manage/gradeuser/{{quiz.id}}">
+     <li class="list-group-item"><a href = "{{URL_ROOT}}/exam/manage/gradeuser/{{quiz.id}}">
      {{quiz.description}}
      </a></li>
     {% endfor %}
@@ -41,7 +33,7 @@
 
 <div class="row">
 {%if users %}
-    <div id = "student" class="span2">
+    <div id = "student" class="col-md-2">
     {% for user in users %}
     <p><a href = "{{URL_ROOT}}/exam/manage/gradeuser/{{quiz_id}}/{{user.user__id}}">
     {{user.user__first_name}} {{user.user__last_name}}</a></p>
@@ -51,7 +43,7 @@
 
 
 
-<div id = "paper" class="span12">
+<div id = "paper" class="col-md-10">
 {% if data %}
 
 
@@ -102,7 +94,7 @@ Status : <b style="color: green;"> Passed </b><br/>
 {% if paper.answers.count %}
 
 <h4> Report </h4><br>
-<table class="zebra-striped">
+<table class="table table-bordered">
     <th>Questions</th>
     <th>Marks Obtained</th>
     {% for question, answers in paper.get_question_answers.items %}
@@ -129,7 +121,7 @@ Status : <b style="color: green;"> Passed </b><br/>
 <div class="panel panel-info">
         <div class="panel-heading">
             <strong> Details: {{forloop.counter}}. {{ question.summary }} 
-            <span class="marks"> Mark(s): {{ question.points }} </span>
+            <span class="marks pull-right"> Mark(s): {{ question.points }} </span>
             </strong>
         </div>
         <div class="panel-body">
@@ -183,12 +175,12 @@ Status : <b style="color: green;"> Passed </b><br/>
     {% endwith %}
     <hr/>
     {% endfor %} {# for question, answers ... #}
-
+<div class="form-group">
 <h3>Teacher comments: </h3>
-<textarea id="comments_{{paper.question_paper.id}}" rows="10" cols="80" 
+<textarea id="comments_{{paper.question_paper.id}}" class="form-control"
     name="comments_{{ paper.question_paper.id }}">{{ paper.comments }}</textarea>
-<br>
-<br><button class="btn" type="submit" name="submit_{{paper.quiz.id}}">Save Marks</button>
+</div>
+<br><button class="btn btn-primary" type="submit" name="submit_{{paper.quiz.id}}">Save Marks</button>
 
 </form>
 </div>
diff --git a/yaksh/templates/yaksh/intro.html b/yaksh/templates/yaksh/intro.html
index b4bc6d7..81c460f 100644
--- a/yaksh/templates/yaksh/intro.html
+++ b/yaksh/templates/yaksh/intro.html
@@ -1,8 +1,8 @@
 {% extends "base.html" %}
 
-{% block title %}Instructions and Rules {% endblock %}
-{% block pagetitle %}Online Test {% endblock %}
-{% block formtitle %}Important instructions & rules {% endblock %}
+{% block pagetitle %} OnlineTest Instructions and Rules
+<h3> Important instructions & rules </h3>
+{% endblock pagetitle %}
 {% block content %}
 
          {% if questionpaper.quiz.is_expired %}
@@ -35,22 +35,28 @@
           </li>
           <li> <strong>You are <strong>not allowed</strong> to use any internet resources, i.e. no google etc.</strong> </li>
           <li> Do not copy or share the questions or answers with anyone until the exam is complete <strong>for everyone</strong>.</li>
-          <li> <strong>All</strong> your attempts at the questions are logged. Do not try to outsmart and break the testing system.  If you do, we know who you are and we will expell you from the course.  You have been warned.
+          <li> <strong>All</strong> your attempts at the questions are logged. Do not try to outsmart and break the testing system.  If you do, we know who you are and we will expel you from the course.  You have been warned.
           </li>
          </ul>
-          <p> We hope you enjoy taking this exam !!!</p>
-          {% if user == "moderator" %}
-          <form action="{{URL_ROOT}}/exam/manage/" method="post" align="center">
-          {%else%}
-          <form action="{{URL_ROOT}}/exam/quizzes/" method="post" align="center">
-          {% endif %}
-           {% csrf_token %}
-           <center><button class="btn" name="home">Home</button></center>
+         <p> We hope you enjoy taking this exam !!!</p>
+        <div class="row">
+            <div class="col-md-6">
+              {% if user == "moderator" %}
+              <form action="{{URL_ROOT}}/exam/manage/" method="post" align="center">
+              {%else%}
+              <form action="{{URL_ROOT}}/exam/quizzes/" method="post" align="center">
+              {% endif %}
+              {% csrf_token %}
+              <center><button class="btn btn-primary" name="home">Home</button></center>
           </form>
-          {% if not questionpaper.quiz.is_expired %}
-              <form action="{{URL_ROOT}}/exam/start/{{ attempt_num }}/{{ questionpaper.id }}/" method="post" align="center">
-               {% csrf_token %}
-               <center><button class="btn" type="submit" name="start">Start Exam!</button></center>
-              </form>
-          {% endif %}
+            </div>
+            <div class="col-md-6">
+                  {% if not questionpaper.quiz.is_expired %}
+                      <form action="{{URL_ROOT}}/exam/start/{{ attempt_num }}/{{ questionpaper.id }}/" method="post" align="center">
+                       {% csrf_token %}
+                       <center><button class="btn btn-success" type="submit" name="start"> Start Exam <span class="glyphicon glyphicon-chevron-right"></span></button></center>
+                      </form>
+                  {% endif %}
+            </div>
+        </div>
 {% endblock content %}
diff --git a/yaksh/templates/yaksh/login.html b/yaksh/templates/yaksh/login.html
index 5694f75..8d5e682 100644
--- a/yaksh/templates/yaksh/login.html
+++ b/yaksh/templates/yaksh/login.html
@@ -1,23 +1,18 @@
 {% extends "base.html" %}
 
-{% block title %}Login{% endblock title %}
-{% block pagetitle %} Online Test {% endblock %}
-{% block formtitle %}Login{% endblock %}
-{% block css %}
-<link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/bootstrap-social.css" type="text/css" />
-<link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/login.css" type="text/css" /> 
-{% endblock %}
+{% block pagetitle %}YAKSH Online Test {% endblock %}
+
 {% block content %}
 
         <form action="" method="post">
         {% csrf_token %}
           
-        <center><table class=span1>
+        <center><table class="table">
         {{ form.as_table }}
         </table></center>
-        <center><button class="btn" type="submit">Login</button>&nbsp;&nbsp;&nbsp;&nbsp;<button class="btn" type="reset">Cancel</button></center>
-        <br><center><a href="{{URL_ROOT}}/exam/forgotpassword/">Forgot Password?</a></center><br>
-        <center><a href="{{URL_ROOT}}/exam/register/">New User? Sign-Up </a></center>
+        <button class="btn btn-primary" type="submit">Login</button>&nbsp;&nbsp;&nbsp;&nbsp;<button class="btn btn-primary" type="reset">Cancel</button>
+        <a href="{{URL_ROOT}}/exam/forgotpassword/">Forgot Password?</a>
+        <a href="{{URL_ROOT}}/exam/register/">New User? Sign-Up </a>
         <h3> Login with </h3>
         <a class="btn btn-social-icon btn-google" href="{% url 'social:begin' 'google-oauth2' %}">
             <span class="fa fa-google" style="background-color: #dd4b39;" ></span>
diff --git a/yaksh/templates/yaksh/moderator_dashboard.html b/yaksh/templates/yaksh/moderator_dashboard.html
new file mode 100644
index 0000000..3f3c123
--- /dev/null
+++ b/yaksh/templates/yaksh/moderator_dashboard.html
@@ -0,0 +1,69 @@
+{% extends "manage.html" %}
+{% block pagetitle %} Moderator's Dashboard {% endblock pagetitle %}
+
+{% block content %}
+
+<center><h4>List of quizzes! Click on the given links to have a look at answer papers for a quiz.</h4></center>
+<table class="table table-bordered">
+    <th>Quiz</th>
+    <th>Taken By</th>
+    <th>No. of users Passed</th>
+    <th>No. of users Failed</th>
+    {% for paper, answer_papers, users_passed, users_failed in users_per_paper %}
+        <tr>
+            <td>
+                <a href="{{URL_ROOT}}/exam/manage/monitor/{{paper.id}}/">{{ paper.quiz.description }}</a>
+            </td>
+            <td>
+                {{ answer_papers|length }} user(s)
+            </td>
+            <td>
+                {{ users_passed }}
+            </td>
+            <td>
+                {{ users_failed }}
+            </td>
+        </tr>
+    {% endfor %}
+</table>
+<hr>
+<center>
+    <h5>Click on the button given below to add a new course.</h5>
+    <button class="btn" type="button" onClick='location.replace("{{URL_ROOT}}/exam/manage/add_course");'>Add New Course</button>
+    <h5>Click on the button to Create a Demo course.
+    <a href="" onclick="$('#help').show(); return false;">Help </a></h5>
+    <button class="btn" type="button" onClick='location.replace("{{URL_ROOT}}/exam/manage/create_demo_course");'>Create Demo Course</button>
+    <div style="display: none;" id="help">
+    <ol>
+    <ul>
+    <li>A Demo Course and Demo Quiz will be created (Click Courses link on nav bar to view courses).</li>
+    <li>Some Demo Questions are also created for you (Click Questions link on nav bar to view questions).</li>
+    <li>In Courses you can view Demo Quiz.</li>
+    <li>Click on the Demo Quiz and Click on User Mode or God Mode to take the quiz.
+    </li>
+    <li>You can also edit the Demo quiz.
+    </li>
+    </ul>
+    </p>
+    <a href="" onclick="$('#help').hide(); return false"> Close </a>
+    </div>
+    {% if msg %}
+    <h4>{{ msg }}</h4>
+    {% endif %}
+</center>
+{% if trial_paper %}
+  <h5/> You have trial papers.
+  <table class="table table-bordered">
+  <form action="" method="post">
+  {% csrf_token %}
+   {% for paper in trial_paper %}
+  <tr>
+  <td> <input type = "checkbox" name="delete_paper" value = {{paper.id}}></input></td>
+  <td> <a href="{{URL_ROOT}}/exam/manage/gradeuser/{{paper.question_paper.quiz.id}}">{{paper.question_paper.quiz.description}}</a></td>
+  </tr>
+  {% endfor %}
+  </table>
+  <center><button class="btn" type="submit">Delete Selected</button></center>
+  </form>
+  {% endif %}
+{% endblock %}
diff --git a/yaksh/templates/yaksh/monitor.html b/yaksh/templates/yaksh/monitor.html
index 9554737..7a3297b 100644
--- a/yaksh/templates/yaksh/monitor.html
+++ b/yaksh/templates/yaksh/monitor.html
@@ -1,15 +1,11 @@
 {% extends "manage.html" %}
 
-{% block title %} Quiz results {% endblock title %}
+{% block pagetitle %} Quiz results {% endblock pagetitle %}
 
 {% block meta %} <meta http-equiv="refresh" content="30"/> {% endblock meta %}
 
-{% block css %}
-<link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/question_quiz.css" type="text/css" /> 
-{% endblock %}
 
 {% block script %}
-<script src="{{ URL_ROOT }}/static/yaksh/js/jquery-1.9.1.min.js" type="text/javascript"></script>
 <script src="{{ URL_ROOT }}/static/yaksh/js/jquery.tablesorter.min.js"></script>
 <script type="text/javascript">
 $(document).ready(function() 
@@ -32,7 +28,7 @@ $(document).ready(function()
   {{ quiz.description }} Results
   {% endif %}
 {% endblock %}
-{% block manage %}
+{% block content %}
   {% if not quizzes and not quiz %}
     <center><h5> No quizzes available. </h5></center>
   {% endif %}
@@ -40,9 +36,9 @@ $(document).ready(function()
 {# ############################################################### #}
 {# This is rendered when we are just viewing exam/monitor #}
 {% if quizzes %}
-<ul>
+<ul class="list-group">
 {% for q in quizzes %}
-<li><a href="{{URL_ROOT}}/exam/manage/monitor/{{q.id}}/">{{ q.quiz.description }}</a></li>
+<li class="list-group-item"><a href="{{URL_ROOT}}/exam/manage/monitor/{{q.id}}/">{{ q.quiz.description }}</a></li>
 {% endfor %}
 </ul>
 {% endif %}
@@ -55,7 +51,7 @@ $(document).ready(function()
 <p>Number of papers: {{ papers|length }} </p>
 <p><a href="{{URL_ROOT}}/exam/manage/statistics/question/{{papers.0.question_paper.id}}">Question Statisitics</a></p>
 <p><a href="{{URL_ROOT}}/exam/manage/monitor/download_csv/{{papers.0.question_paper.id}}">Download CSV</a></p>
-<table border="1" cellpadding="3"  id="result-table" class="tablesorter">
+<table id="result-table" class="tablesorter table">
     <thead>
     <tr>
     <th> Name </th>
@@ -87,4 +83,4 @@ $(document).ready(function()
 <p> No answer papers so far. </p>
 {% endif %} {# if papers #}
 {% endif %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/yaksh/templates/yaksh/profile_updated.html b/yaksh/templates/yaksh/profile_updated.html
index 6ccf177..2a2c7c5 100644
--- a/yaksh/templates/yaksh/profile_updated.html
+++ b/yaksh/templates/yaksh/profile_updated.html
@@ -2,8 +2,6 @@
 <!DOCTYPE html>
 {% block title %} Profile {% endblock %}
 
-{% block pagetitle %} Online Test {% endblock %}
-
 {% block script %}
 <script>
     window.setTimeout(function(){ location.href="{{ URL_ROOT }}/exam/" }, 2000);
diff --git a/yaksh/templates/yaksh/question.html b/yaksh/templates/yaksh/question.html
index 9e1f734..a8de448 100644
--- a/yaksh/templates/yaksh/question.html
+++ b/yaksh/templates/yaksh/question.html
@@ -1,9 +1,7 @@
 {% extends "base.html" %}
 {% load custom_filters %}
 
-<!DOCTYPE html>
-
-{% block title %} Answer question {% endblock %}
+{% block pagetitle %} Hi {{ paper.user.first_name.title}} {{ paper.user.last_name.title}}  Answer question {% endblock %}
 
 {% block css %}
 <link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/question.css" type="text/css" />
@@ -12,7 +10,6 @@
 
 {% block script %}
 <script src="{{ URL_ROOT }}/static/yaksh/js/question.js"></script>
-<script src="{{ URL_ROOT }}/static/yaksh/js/bootstrap-modal.js"></script>
 <script src="{{ URL_ROOT }}/static/yaksh/js/codemirror/lib/codemirror.js"></script>
 <script src="{{ URL_ROOT }}/static/yaksh/js/codemirror/mode/python/python.js"></script>
 <script src="{{ URL_ROOT }}/static/yaksh/js/codemirror/mode/clike/clike.js"></script>
@@ -92,25 +89,11 @@ function call_skip(url)
 {% block onload %} onload="updateTime();" {% endblock %}
 
 {% block content %}
-<div class="topbar">
-  <div class="fill">
-     <div class="container">
-        <h3 class="brand"><strong>Online Test</h3></strong>
-        <h5><a> Hi {{ paper.user.first_name.title}} {{ paper.user.last_name.title}} </a></h5>
-        <div class=time-div id="time_left"></div><br>
         <b style="color: white; font-size: 14px;">You have {{ paper.questions_left }} question(s) left in {{ paper.question_paper.quiz.description }}</b>
-     </div>
-   </div>
-</div>
-<form id="logout" action="{{URL_ROOT}}/exam/quit/{{ paper.attempt_number }}/{{ paper.question_paper.id }}/" method="post" class="pull-right">
-        {% csrf_token %}
-        <button class="btn" type="submit" name="quit">Quit Exam</button>
-</form>
-<div class = "container">
-  <div class="sidebar">
-    <p>Question Navigator </p>
-    <div class="pagination">
-        <ul>
+        <div class=time-div id="time_left"></div><br>
+<p>Question Navigator </p>
+    <div class="list-group">
+        <ul class="pagination">
             {% for qid in paper.questions.all %}
                 {% if qid in paper.questions_unanswered.all %}
                 {% if qid.id == question.id %}
@@ -120,85 +103,94 @@ function call_skip(url)
                     {% endif %}
                 {% endif %}
                 {% if qid in paper.questions_answered.all %}
-                    <li class="disabled"><a href="#" data-toggle="tooltip" title="{{ qid.description }}" >{{ forloop.counter }}</a></li>
+                    <li class="disabled"><a style="background-color:#B4B8BA" href="#" data-toggle="tooltip" title="{{ qid.description }}" >{{ forloop.counter }}</a></li>
                 {% endif %}
             {% endfor %}
         </ul>
     </div>
-  </div>
-</div>
-<div class="span13">
-  <h4><u> {{ question.summary }} </u><font class=pull-right>(Marks : {{ question.points }}) </font>
-  </h4>
-  <h4><font size=3 face=arial> {{ question.language|title }} {{ question.type|title }} Question</font></h4><br>
-  <font size=3 face=arial> {{ question.description|safe }} </font>
-  {% if files %}
-  <h4>Files to download for this question</h4>
-  {% for f_name in files %}
-  {% if f_name.question_id == question.id %}
-  <h5><a href="{{f_name.file.url}}">{{f_name.file.name}}</a></h5>
-  {% endif %}
-  {% endfor %}
-  {% endif %}
+<div class="col-md-11">
 <br> 
          <p id="status"></p>
          <form id="code" action="{{URL_ROOT}}/exam/{{ question.id }}/check/{{ paper.attempt_number }}/{{ paper.question_paper.id }}/" method="post" enctype="multipart/form-data">
          {% csrf_token %}
          <input type=hidden name="question_id" id="question_id" value={{ question.id }}></input>
+             <div class="panel panel-default">
+                 <div class="panel-heading">
+                      <h4><u> {{ question.summary }} </u><font class=pull-right>(Marks : {{ question.points }}) </font>
+                      </h4>
+                      <h4><font size=3 face=arial> {{ question.language|title }} {{ question.type|title }} Question</font></h4><br>
+                      <font size=3 face=arial> {{ question.description|safe }} </font>
+                      {% if files %}
+                      <h4>Files to download for this question</h4>
+                      {% for f_name in files %}
+                      {% if f_name.question_id == question.id %}
+                      <h5><a href="{{f_name.file.url}}">{{f_name.file.name}}</a></h5>
+                      {% endif %}
+                      {% endfor %}
+                      {% endif %}
+                 </div>
+                 <div class="panel-body">
+                     {% if question.type == "mcq" %}
+                    {% if error_message %}
+                        <p>{{ error_message }}</p>
+                    {% endif %}
+                     {% for test_case in test_cases %}
+                     <input name="answer" type="radio" value="{{ test_case.options }}" />{{ test_case.options }} <br/>
+                     {% endfor %}
+                     {% endif %}
+                     {% if question.type == "mcc" %}
+                    {% if error_message %}
+                        <p>{{ error_message }}</p>
+                    {% endif %}
+                     {% for test_case in test_cases %}
+                     <input name="answer" type="checkbox" value="{{ test_case.options }}"> {{ test_case.options }}
+                     <br>
+                     {% endfor %}
+                     {% endif %}
+                     {% if question.type == "upload" %}
+                     <p>Upload assignment file for the said question<p>
+                     <input type=file id="assignment" name="assignment">
+                     <hr>
+                     {% endif %}
+                     {% if question.type == "code" %}
+
+                     <h4>Program:</h4>
+                     <textarea name="answer" id="answer"></textarea>
+                     <br>
+
+                     {% endif %}
+                 </div>
+                <div class="panel-footer">
+                     {% if question.type == "code" %}
+                     {% if error_message %}
+                         <p> Output Message</p>
+                         <div class="alert alert-danger" role="alert">
+                         {{ error_message }}
+                         </div>
+                      {% endif %}
+                     {% endif %}
+                </div>
+             </div>
+             <div class="from-group">
 
-         {% if question.type == "mcq" %}
-        {% if error_message %}
-            <p>{{ error_message }}</p>
-        {% endif %}
-         {% for test_case in test_cases %}
-         <input name="answer" type="radio" value="{{ test_case.options }}" />{{ test_case.options }} <br/>
-         {% endfor %}
-         {% endif %}
-         {% if question.type == "mcc" %}
-        {% if error_message %}
-            <p>{{ error_message }}</p>
-        {% endif %}
-         {% for test_case in test_cases %}
-         <input name="answer" type="checkbox" value="{{ test_case.options }}"> {{ test_case.options }}
-         <br>
-         {% endfor %}
-         {% endif %}
-         {% if question.type == "upload" %}
-         <p>Upload assignment file for the said question<p>
-         <input type=file id="assignment" name="assignment">
-         <hr>
-         {% endif %}
-         {% if question.type == "code" %}
-
-         <h4>Program:</h4>
-         <textarea name="answer" id="answer"></textarea>
-         <br>
-
-         {% endif %}
-         {% if question.type == "code" %}
-         <br><h4>Output:</h4><br>
-         {% if error_message %}
-          <div class="alert alert-error">
-          <textarea class="error" readonly="yes">{{ error_message }}</textarea>
-          {% else %}
-           <textarea class="error_msg" readonly="yes"></textarea>
-          {% endif %}
-          </div>
-         {% endif %}
- 
          {% if question.type == "mcq" or question.type == "mcc"%}
-         <br><button class="btn" type="submit" name="check" id="check">Submit Answer</button>&nbsp;&nbsp;
+         <br><button class="btn btn-primary" type="submit" name="check" id="check">Submit Answer</button>&nbsp;&nbsp;
          {% elif question.type == "upload" %}
-         <br><button class="btn" type="submit" name="check" id="check" onClick="return validate();">Upload</button>&nbsp;&nbsp;
+         <br><button class="btn btn-primary" type="submit" name="check" id="check" onClick="return validate();">Upload</button>&nbsp;&nbsp;
          {% else %}
-         <button class="btn" type="submit" name="check" id="check" onClick="submitCode();">Check Answer</button>&nbsp;&nbsp;
-         <button class="btn" type="button" onclick="reset_editor()" name="reset" id="reset">Reset Answer</button>
+         <button class="btn btn-primary" type="submit" name="check" id="check" onClick="submitCode();">Check Answer <span class="glyphicon glyphicon-cog"></span></button>&nbsp;&nbsp;
+         <button class="btn btn-primary" type="button" onclick="reset_editor()" name="reset" id="reset">Reset Answer <span class="glyphicon glyphicon-refresh"></span></button>
 
          {% endif %}
          {% if paper.unanswered.all|length != 1 %}
-             <button class="btn"  onclick="call_skip('{{ URL_ROOT }}/exam/{{ question.id }}/skip/{{ paper.attempt_number }}/{{ paper.question_paper.id }}/')" name="skip" id="skip">Attempt Later</button>&nbsp;&nbsp;
+         <button class="btn btn-primary"  onclick="call_skip('{{ URL_ROOT }}/exam/{{ question.id }}/skip/{{ paper.attempt_number }}/{{ paper.question_paper.id }}/')" name="skip" id="skip">Attempt Later <span class="glyphicon glyphicon-arrow-right"></span></button>
          {% endif %}
+         </div>
          </form>
+<form id="logout" action="{{URL_ROOT}}/exam/quit/{{ paper.attempt_number }}/{{ paper.question_paper.id }}/" method="post" class="pull-right">
+        {% csrf_token %}
+        <button class="btn btn-primary" type="submit" name="quit">Quit Exam <span class="glyphicon glyphicon-off"></span></button>
+</form>
 </div>
     <!-- Modal -->
     <div class="modal fade " id="upload_alert" >
diff --git a/yaksh/templates/yaksh/quizzes_user.html b/yaksh/templates/yaksh/quizzes_user.html
index 98c156b..afed652 100644
--- a/yaksh/templates/yaksh/quizzes_user.html
+++ b/yaksh/templates/yaksh/quizzes_user.html
@@ -3,35 +3,27 @@
 
 {% block subtitle %}Hello {{ user.first_name }}, welcome to your dashboard !{% endblock %}
 
-{% block css %}
-<link rel="stylesheet" media="all" type="text/css" href="{{ URL_ROOT }}/static/yaksh/css/course.css" />
-{% endblock %}
-
-{% block script %}
-<script src="{{ URL_ROOT }}/static/yaksh/js/bootstrap-alert.js"></script>
-<script src="{{ URL_ROOT }}/static/yaksh/js/quizzes_user.js"></script>
-{% endblock %}
-
 
-{% block manage %}
+{% block pagetitle %} Student's Dashboard {% endblock pagetitle %}
+{% block content %}
 
 <center><b><u>Available Courses</u></b></center><br>
 {% for course in courses %}
-<div class="row show-grid">
-    <div class="span14">
+<div class="row well">
+    <div class="col-md-12">
         <div class="row">
-            <div class="span6">
+            <div class="col-md-4">
                 <h4><b><u> {{ course.name }} by {{ course.creator }}</u></b></h4>
             </div>
-             <div class="span6">
-                {% if user in course.requests.all %} <span class="label warning">Request Pending </span>
-                {% elif user in course.rejected.all %}<span class="label important">Request Rejected</span>
-                {% elif user in course.students.all %}<span class="label notice">Enrolled</span>
+             <div class="col-md-4">
+                {% if user in course.requests.all %} <span class="label label-warning">Request Pending </span>
+                {% elif user in course.rejected.all %}<span class="label label-danger">Request Rejected</span>
+                {% elif user in course.students.all %}<span class="label label-info">Enrolled</span>
                 {% else %}
                         {% if course.is_self_enroll %}
-                            <a class="btn success" href="{{ URL_ROOT }}/exam/self_enroll/{{ course.id }}">Enroll</a>
+                            <a class="btn btn-success" href="{{ URL_ROOT }}/exam/self_enroll/{{ course.id }}">Enroll</a>
                         {% else %}
-                            <a class="btn success" href="{{ URL_ROOT }}/exam/enroll_request/{{ course.id }}">Enroll Request</a>
+                            <a class="btn btn-success" href="{{ URL_ROOT }}/exam/enroll_request/{{ course.id }}">Enroll</a>
                         {% endif %}
                 {% endif %}
              </div>
@@ -46,7 +38,7 @@
                 {% if not quizzes %}
                     <h5>No active quizzes for you</h5>
                 {% endif %}
-                <table>
+                <table class="table table-bordered">
                     <th>Quiz</th>
                     <th>View Answer Paper</th>
                     <th>Pre requisite quiz</th>
@@ -60,7 +52,7 @@
                             {% else %}
                                 <td>
                                     <a href="{{ URL_ROOT }}/exam/start/{{quiz.questionpaper_set.get.id}}">{{ quiz.description }}</a><br>
-                                    {{ quiz.description }} <span class="label important">INACTIVE</span><br>
+                                    {{ quiz.description }} <span class="label label-danger">INACTIVE</span><br>
                                 </td>
                             {% endif %}
                             <td>
@@ -84,13 +76,13 @@
             {% endif %}
         </div>
     </div>
-</div><!--/row show-grid-->
+</div><!--/row-->
  </br>
 {% endfor %}
 <hr>
 <h4>List of quizzes taken by you so far</h4>
 {% if quizzes_taken %}
-    <table class="bordered-table zebra-striped">
+    <table class="table table-bordered">
         <th>Quiz</th>
         <th>Result</th>
         <th>Marks Obtained</th>
diff --git a/yaksh/templates/yaksh/register.html b/yaksh/templates/yaksh/register.html
index 5ff79cc..7cf15a6 100644
--- a/yaksh/templates/yaksh/register.html
+++ b/yaksh/templates/yaksh/register.html
@@ -1,20 +1,18 @@
 {% extends "base.html" %}
 
-{% block title %}Registration form {% endblock %}
 
-{% block pagetitle %}Online Test {% endblock %}
-{% block formtitle %}Please fill in the following details {% endblock %}
+{% block pagetitle %} Online Test Registration {% endblock %}
 
 {% block content %}
 
-
-
 <form action="" method="post">
     {% csrf_token %}
-    <center><table class=span1>
+    <h3> Please fill in the following details:</h3>
+    <center>
+        <table class="table">
     {{ form.as_table }}
     </table></center>
-    <center><button class="btn" type="submit">Register</button>&nbsp;&nbsp;<button class="btn" type="reset">Cancel</button></center>
+    <center><button class="btn btn-primary" type="submit">Register</button>&nbsp;&nbsp;<button class="btn btn-primary" type="reset">Cancel</button></center>
 </form>
 
 {% endblock content %}
diff --git a/yaksh/templates/yaksh/regrade.html b/yaksh/templates/yaksh/regrade.html
index 5cfc1b0..844c6ee 100644
--- a/yaksh/templates/yaksh/regrade.html
+++ b/yaksh/templates/yaksh/regrade.html
@@ -1,18 +1,8 @@
 {% extends "manage.html" %}
 
-{% block title %} Grader {% endblock title %}
+{% block pagetitle %} Grader {% endblock pagetitle %}
 
-{% block css %}
-<link rel="stylesheet" media="all" type="text/css" href="{{ URL_ROOT }}/static/yaksh/css/bootstrap.css" />
-{% endblock %}
-{% block subtitle %}
-    Grader
-    {% endblock %}
-    {% block script %}
-    <script src="{{ URL_ROOT }}/static/yaksh/js/jquery-1.9.1.min.js"></script>
-    <script src="{{ URL_ROOT }}/static/yaksh/js/bootstrap.min.js"></script>
-    {% endblock %}
-    {% block manage %}
+{% block content %}
 
 <div class="row">
  <div class="col-md-3">
diff --git a/yaksh/templates/yaksh/results_user.html b/yaksh/templates/yaksh/results_user.html
index 3a6450d..2704da8 100644
--- a/yaksh/templates/yaksh/results_user.html
+++ b/yaksh/templates/yaksh/results_user.html
@@ -1,16 +1,10 @@
 {% extends "user.html" %}
 
-
-{% block subtitle %}Results{% endblock %}
-
-{% block css %}
-<link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/question_quiz.css" type="text/css" />
-{% endblock %}
-
-{% block manage %}
-<form action="" method="post" name=frm>
+{% block pagetitle %} Results {% endblock pagetitle %}
+{% block content %}
+<form>
   {% csrf_token %}
-  <center><table class="span6">
+  <center><table class="table well">
     <th>Quiz Description
     <th>Obtained Marks
     <th>Maximum Marks
diff --git a/yaksh/templates/yaksh/showquestions.html b/yaksh/templates/yaksh/showquestions.html
index 185cbfb..3668c9e 100644
--- a/yaksh/templates/yaksh/showquestions.html
+++ b/yaksh/templates/yaksh/showquestions.html
@@ -1,21 +1,20 @@
 {% extends "manage.html" %}
 
 
-{% block subtitle %}List of Questions {% endblock %}
+{% block pagetitle %} List of Questions {% endblock pagetitle %}
 
 {% block script %}
-<script src="{{ URL_ROOT }}/static/yaksh/js/min.js"></script>
 <script src="{{ URL_ROOT }}/static/yaksh/js/show_question.js"></script>
 <script src="{{ URL_ROOT }}/static/yaksh/js/question_filter.js"></script>
 {% endblock %}
 
-{% block manage %}
+{% block content %}
 
 <h4>Upload ZIP file for adding questions</h4>
 <form action="" method="post"  enctype="multipart/form-data">
 {% csrf_token %}
 {{ upload_form.as_p }}
-<button class="btn" type="submit" name="upload" value="upload">Upload File</button>
+<button class="btn btn-primary" type="submit" name="upload" value="upload">Upload File <span class="glyphicon glyphicon-open"></span></button>
 </form>
 {% if message %}
 <h4>{{ message }}</h4>
@@ -27,38 +26,34 @@
 {% csrf_token %}
 <div class="row" id="selectors">
     <h5 style="padding-left: 20px;">Filters</h5>
-    <div class="span4">
+    <div class="col-md-3">
         {{ form.question_type }}
     </div>
-    <div class="span4">
+    <div class="col-md-3">
         {{ form.language }}
     </div>
-    <div class="span4">
+    <div class="col-md-3">
         {{ form.marks }}
     </div>
 </div>
 <br>
-<div class="row">
-<div class="span16">
-    <button class="btn" type="button" onClick='location.replace("{{URL_ROOT}}");'>Clear Filters</button>
-</div>
-</div>
+    <button class="btn btn-primary" type="button" onClick='location.replace("{{URL_ROOT}}");'>Clear Filters</button>
 <br>
 
 <div id="filtered-questions">
 {% if questions %}
-<h5 class="highlight"><input id="checkall" class="ignore" type="checkbox"> Select All </h5>
+<h5><input id="checkall" type="checkbox"> Select All </h5>
 {% for i in questions %}
 <input type="checkbox" name="question" value="{{ i.id }}">&nbsp;&nbsp;<a href="{{URL_ROOT}}/exam/manage/addquestion/{{ i.id }}">{{ i }}</a><br>
 {% endfor %}
 {% endif %}
 </div>
 <br>
-<button class="btn" type="button" onclick='location.replace("{{URL_ROOT}}/exam/manage/addquestion/");'>Add Question</button>&nbsp;&nbsp;
-<button class="btn" type="submit" onClick="return confirm_delete(frm);" name='delete' value='delete'>Delete Selected</button>&nbsp;&nbsp;
+<button class="btn btn-primary" type="button" onclick='location.replace("{{URL_ROOT}}/exam/manage/addquestion/");'>Add Question <span class="glyphicon glyphicon-plus"></span></button>&nbsp;&nbsp;
 {% if questions %}
-<button class="btn" type="submit" name='download' value='download'>Download Selected</button>&nbsp;&nbsp;
-<button class="btn" type="submit" name="test" value="test">Test Selected</button>
+<button class="btn btn-primary" type="submit" name='download' value='download'>Download Selected <span class="glyphicon glyphicon-save"></span></button>&nbsp;&nbsp;
+<button class="btn btn-primary" type="submit" name="test" value="test">Test Selected</button>&nbsp;&nbsp;
 {% endif %}
+<button class="btn btn-danger" type="submit" onClick="return confirm_delete(frm);" name='delete' value='delete'>Delete Selected <span class="glyphicon glyphicon-minus"></span></button>
 </form>
 {% endblock %}
diff --git a/yaksh/templates/yaksh/statistics_question.html b/yaksh/templates/yaksh/statistics_question.html
index a63844f..31e889b 100644
--- a/yaksh/templates/yaksh/statistics_question.html
+++ b/yaksh/templates/yaksh/statistics_question.html
@@ -1,24 +1,18 @@
 {% extends "manage.html" %}
 
-{% block title %} Statistics {% endblock title %}
+{% block pagetitle %} Statistics for {{ quiz.description }}{% endblock pagetitle %}
 
-{% block css %}
-<link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/question_quiz.css" type="text/css" />
-{% endblock %}
-{% block subtitle %}
-Statistics for {{quiz.description}}
-{% endblock %}
-{% block manage %}
+{% block content %}
 <div class="row">
-    <div class="span2">
+    <div class="col-md-2">
 {% for attempt in attempts %}
     <p><a href="{{URL_ROOT}}/exam/manage/statistics/question/{{questionpaper_id}}/{{attempt}}">Attempt {{ attempt }}</a></p>
     {% endfor %}
 </div>
-<div class="span10">
+<div class="col-md-9">
 {% if question_stats %}
     <p><b>Total number of participants: {{ total }}</b></p>
-    <table class="bordered-table zebra-striped">
+    <table class="table table-bordered">
         <tr><th>Question</th><th>Type</th><th>Total</th><th>Answered</th></tr>
         {% for question, value in question_stats.items  %}
         <tr><td>{{ question.summary }}</td><td>{{ question.type }}</td><td>{{value.1}}</td><td>{{ value.0 }} ({% widthratio value.0 value.1 100 %}%)</td></tr>
diff --git a/yaksh/templates/yaksh/user_data.html b/yaksh/templates/yaksh/user_data.html
index 4d12e99..0a7e4aa 100644
--- a/yaksh/templates/yaksh/user_data.html
+++ b/yaksh/templates/yaksh/user_data.html
@@ -1,14 +1,8 @@
 {% extends "manage.html" %}
 
-{% block title %} Data for user {{ data.user.get_full_name.title }} {% endblock title %}
+{% block pagetitle %} Data for user {{ data.user.get_full_name.title }} {% endblock pagetitle %}
 
-{% block manage %}
-
-{% block subtitle %}Data for user {{ data.user.get_full_name.title }}{% endblock %}
-
-{% block css %}
-     <link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/view_answerpaper.css" type="text/css" /> 
-{% endblock %}
+{% block content %}
 
 {% block script %}
     <script src= "{{ URL_ROOT }}/static/yaksh/js/edit_question.js"></script>
@@ -63,7 +57,7 @@ User IP address: {{ paper.user_ip }}
 
             <strong> Details: {{forloop.counter}}. {{ question.summary }}
             <a href="" onClick="grade_data('show_question{{question.id}}'); return false;"> Show Question </a>
-            <span class="marks"> Mark(s): {{ question.points }} </span>
+            <span class="marks pull-right"> Mark(s): {{ question.points }} </span>
             </strong>
         </div>
         <div class="panel-body" id="show_question{{question.id}}" style="display: none;">
diff --git a/yaksh/templates/yaksh/view_answerpaper.html b/yaksh/templates/yaksh/view_answerpaper.html
index 9227561..9dfbda0 100644
--- a/yaksh/templates/yaksh/view_answerpaper.html
+++ b/yaksh/templates/yaksh/view_answerpaper.html
@@ -1,13 +1,8 @@
 {% extends "user.html" %}
-{% block css %}
-<link rel="stylesheet" media="all" type="text/css" href="{{ URL_ROOT }}/static/yaksh/css/view_answerpaper.css" />
-{% endblock %}
-
-{% block title %} Answer Paper  for {{ quiz.description }}{% endblock title %}
 
-{% block manage %}
+{% block pagetitle %} Answer Paper  for {{ quiz.description }}{% endblock pagetitle %}
 
-{% block subtitle %} Answer Paper for {{ quiz.description }}{% endblock %}
+{% block content %}
 
 {% if not data.papers %}
     <p><b> You have not attempted the quiz {{ quiz.description }} </b></p>
@@ -39,7 +34,7 @@
     <div class="panel panel-info">
         <div class="panel-heading">
             <strong> Details: {{forloop.counter}}. {{ question.summary }} 
-            <span class="marks"> Mark(s): {{ question.points }} </span>
+            <span class="marks pull-right"> Mark(s): {{ question.points }} </span>
             </strong>
         </div>
         <div class="panel-body">
-- 
cgit 


From 3b66e5fb8af12ce756f34966bb684373062551dd Mon Sep 17 00:00:00 2001
From: prathamesh
Date: Tue, 1 Nov 2016 09:24:20 +0530
Subject: modified profile and password reset/change templates

---
 yaksh/templates/register/password_change_done.html    |  5 ++---
 yaksh/templates/register/password_change_form.html    |  4 +---
 yaksh/templates/register/password_reset_complete.html |  3 +--
 yaksh/templates/register/password_reset_confirm.html  |  4 +---
 yaksh/templates/register/password_reset_done.html     |  3 +--
 yaksh/templates/register/password_reset_form.html     |  4 +---
 yaksh/templates/yaksh/view_profile.html               | 19 ++++---------------
 7 files changed, 11 insertions(+), 31 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/register/password_change_done.html b/yaksh/templates/register/password_change_done.html
index fef07d1..14df20c 100644
--- a/yaksh/templates/register/password_change_done.html
+++ b/yaksh/templates/register/password_change_done.html
@@ -1,7 +1,6 @@
 {% extends "base.html" %}
 
-{% block title %}Password change successful{% endblock %}
-{% block pagetitle %}Online Test {% endblock %}
+{% block pagetitle %}Password change successful{% endblock %}
 {% block script %}
 <script type="text/javascript">
 	window.setTimeout(function()
@@ -13,4 +12,4 @@
 {% block content %}
 <h3>Your password has been changed successfully.</h3>
 <h4>Redirecting ...</h4>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/yaksh/templates/register/password_change_form.html b/yaksh/templates/register/password_change_form.html
index 48292f8..b618410 100644
--- a/yaksh/templates/register/password_change_form.html
+++ b/yaksh/templates/register/password_change_form.html
@@ -1,8 +1,6 @@
 {% extends "base.html" %}
 <!DOCTYPE html>
-{% block title %} Change Password {% endblock %}
-
-{% block pagetitle %} Online Test {% endblock %}
+{% block pagetitle %} Change Password {% endblock %}
 
 {% block content %}
 <form action="" method="post" >
diff --git a/yaksh/templates/register/password_reset_complete.html b/yaksh/templates/register/password_reset_complete.html
index 0801d3b..0c1bae2 100644
--- a/yaksh/templates/register/password_reset_complete.html
+++ b/yaksh/templates/register/password_reset_complete.html
@@ -1,6 +1,5 @@
 {% extends "base.html" %}
-{% block title %}Password reset complete{% endblock %}
-{% block pagetitle %} Online Test {% endblock %}
+{% block pagetitle %}Password reset complete{% endblock %}
 {% block content %}
 <p>Your password has been reset. </p>
 <p><a href="{{ login_url }}">Log in</a></p>
diff --git a/yaksh/templates/register/password_reset_confirm.html b/yaksh/templates/register/password_reset_confirm.html
index 5566499..1b0a1b7 100644
--- a/yaksh/templates/register/password_reset_confirm.html
+++ b/yaksh/templates/register/password_reset_confirm.html
@@ -1,7 +1,5 @@
 {% extends "base.html" %}
-{% block title %}Reset Password{% endblock %}
-{% block pagetitle %} Online Test {% endblock %}
-{% block formtitle %} Reset password {% endblock %}
+{% block pagetitle %}Reset Password{% endblock %}
 
 {% block content  %}
     {% if validlink %}
diff --git a/yaksh/templates/register/password_reset_done.html b/yaksh/templates/register/password_reset_done.html
index ace3cc9..1ac7b60 100644
--- a/yaksh/templates/register/password_reset_done.html
+++ b/yaksh/templates/register/password_reset_done.html
@@ -1,4 +1,3 @@
 {% extends "base.html" %}
 {% block title %}Password reset successful{% endblock %}
-{% block pagetitle %} Online Test {% endblock %}
-{% block formtitle %} Instruction for setting new password has been mailed to your registered email address {% endblock %}
+{% block pagetitle %} Instruction for setting new password has been mailed to your registered email address {% endblock %}
diff --git a/yaksh/templates/register/password_reset_form.html b/yaksh/templates/register/password_reset_form.html
index 0dbaf09..0444584 100644
--- a/yaksh/templates/register/password_reset_form.html
+++ b/yaksh/templates/register/password_reset_form.html
@@ -1,7 +1,5 @@
 {% extends "base.html" %}
-{% block title %} Forgot Password {% endblock %}
-{% block pagetitle %} Online Test {% endblock %}
-{% block formtitle %} Email will be send to the registered email address {% endblock %}
+{% block pagetitle %} Email will be send to the registered email address {% endblock %}
 {% block content %}
 <form action="" method="post">
     {% csrf_token %}
diff --git a/yaksh/templates/yaksh/view_profile.html b/yaksh/templates/yaksh/view_profile.html
index be15d14..becd205 100644
--- a/yaksh/templates/yaksh/view_profile.html
+++ b/yaksh/templates/yaksh/view_profile.html
@@ -1,21 +1,12 @@
 {% extends "base.html" %}
 
-{% block title %} View Profile {% endblock %}
-
-{% block pagetitle %} Online Test {% endblock %}
-{% block css %}
-<link rel="stylesheet" media="all" type="text/css" href="{{ URL_ROOT }}/static/yaksh/css/base.css" />
-
-{% endblock %}
+{% block pagetitle %} My Profile {% endblock %}
 {% block content %}
 <ul>
-  <a href="{{ URL_ROOT }}/exam/editprofile/">Edit Profile</a>
-  <a href="{{ URL_ROOT }}/exam/">Back to Home</a>
+  <a class="btn btn-primary" href="{{ URL_ROOT }}/exam/editprofile/">Edit Profile</a>
+  <a class="btn btn-primary" href="{{ URL_ROOT }}/exam/">Back to Home</a>
 </ul>
-<div class="span14">
-  <center>
-  <h2>Your Profile Information</h2>
-  <table class="span1">
+  <table class="table">
   <tr>
     <th><label for="id_first_name"><h5>First name:</h5></label></th>
     <th><label for="id_first_name"><h5>{{ user.first_name }}</h5></label></th>
@@ -45,6 +36,4 @@
     <th><label for="id_position"><h5>{{ user.profile.position }}</h5></label></th>
   </tr>
   </table>
-  </center>
-</div>
 {% endblock %}
-- 
cgit 


From 35c6ec27921137e31382ca1faa2c41d99550722a Mon Sep 17 00:00:00 2001
From: prathamesh
Date: Tue, 1 Nov 2016 10:15:11 +0530
Subject: courses and question paper creation UI modified

---
 yaksh/templates/yaksh/course_detail.html        | 25 +++++------
 yaksh/templates/yaksh/courses.html              | 60 +++++++++++--------------
 yaksh/templates/yaksh/design_questionpaper.html |  3 +-
 yaksh/templates/yaksh/login.html                |  4 +-
 4 files changed, 39 insertions(+), 53 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/course_detail.html b/yaksh/templates/yaksh/course_detail.html
index 94f29a3..c54f153 100644
--- a/yaksh/templates/yaksh/course_detail.html
+++ b/yaksh/templates/yaksh/course_detail.html
@@ -4,15 +4,12 @@
 
 {% block subtitle %} {{ course.name }} {% endblock %}
 
-{% block css %}
-<link rel="stylesheet" media="all" type="text/css" href="{{ URL_ROOT }}/static/yaksh/css/course.css" />
-{% endblock %}
 {% block script %}
 <script language="JavaScript" type="text/javascript" src="{{ URL_ROOT }}/static/yaksh/js/course.js"></script>
 {% endblock %}
 {% block content %}
 <div class="row">
-    <div class="span6 wrap">
+    <div class="col-md-6">
         <center><b><u>Requests</u></b></center><br>
         {% if course.get_requests %}
         <input type="checkbox" class="checkall"/>&nbsp;<font size="2">Select all</font>
@@ -22,7 +19,7 @@
         {% for request in course.get_requests %}
         <div class="well">
             <div class="row">
-                <div class="span3" style="padding-top:10px">
+                <div class="col-md-3" style="padding-top:10px">
                     <input type="checkbox" name="check" value="{{ request.id }}">&nbsp;
                     <a href="#" data-toggle="tooltip" title=" Full Name: {{ request.get_full_name }}&#013;Institute: {{ request.profile.institute }}&#013;Department: {{ request.profile.department}}&#013;Roll Number: {{ request.profile.roll_number }}">&nbsp;{{ request.username }}</a>
                 </div>
@@ -35,7 +32,7 @@
         {% endif %}
         </form>
     </div>
-    <div class="span6 wrap">
+    <div class="col-md-6">
         <center><b><u>Rejected</u></b></center><br>
         {% if course.get_rejected %}
         <input type="checkbox" class="enroll"/>&nbsp;<font size="2">Select all</font>
@@ -45,15 +42,15 @@
         {% csrf_token %}
         <div class="well">
             <div class="row">
-                <div class="span4" style="padding-top:10px">
+                <div class="col-md-4" style="padding-top:10px">
                 <input type="checkbox" name="check" value="{{ rejected.id }}">&nbsp;
                 <a href="#" data-toggle="tooltip" title=" Full Name: {{ rejected.get_full_name }}&#013;Institute: {{ rejected.profile.institute }}&#013;Department: {{ rejected.profile.department}}&#013;Roll Number: {{ rejected.profile.roll_number }}">&nbsp;{{ rejected.username }}</a>
                 </div>
-                <a class="btn success" href="{{URL_ROOT}}/exam/manage/enroll/rejected/{{ course.id }}/{{ rejected.id }}/"> Enroll </a>
+                <a class="btn btn-success" href="{{URL_ROOT}}/exam/manage/enroll/rejected/{{ course.id }}/{{ rejected.id }}/"> Enroll </a>
             </div>
         </div>
         {% endfor %}
-        <button class="btn success" type="submit" name='enroll' value='enroll'>Enroll Selected</button>
+        <button class="btn btn-success" type="submit" name='enroll' value='enroll'>Enroll Selected</button>
         </div>
         {% endif %}
         </form>
@@ -61,7 +58,7 @@
 </div>
 <br>
 <div class="row">
-    <div class="span6 offset4 wrap">
+    <div class="col-md-6">
         <center><b><u>Enrolled</u></b></center><br>
         {% if course.get_enrolled %}
         <input type="checkbox" class="reject"/>&nbsp;<font size="2">Select all</font>
@@ -71,21 +68,21 @@
         {% csrf_token %}
         <div class="well">
             <div class="row">
-                <div class="span4" style="padding-top:10px">
+                <div class="col-md-4" style="padding-top:10px">
                 <input type="checkbox" name="check" value="{{ enrolled.id }}">&nbsp;
                 <a href="#" data-toggle="tooltip" title=" Full Name: {{ enrolled.get_full_name }}&#013;Institute: {{ enrolled.profile.institute }}&#013;Department: {{ enrolled.profile.department}}&#013;Roll Number: {{ enrolled.profile.roll_number }}">&nbsp;{{ enrolled.username }}</a>
                 </div>
-                <a class="btn danger" href="{{URL_ROOT}}/exam/manage/enrolled/reject/{{ course.id }}/{{ enrolled.id }}/"> Reject </a>
+                <a class="btn btn-danger" href="{{URL_ROOT}}/exam/manage/enrolled/reject/{{ course.id }}/{{ enrolled.id }}/"> Reject </a>
             </div>
         </div>
         {% endfor %}
-        <button class="btn danger" type="submit" name='reject' value='reject'>Reject Selected</button>
+        <button class="btn btn-danger" type="submit" name='reject' value='reject'>Reject Selected</button>
 	    </div>
         {% endif %}
         </form>
     </div>
 </div>
 <div class="pull-right">
-            <a class="btn primary" href="{{URL_ROOT}}/exam/manage/toggle_status/{{ course.id }}/">{% if course.active %}Deactivate Course {% else %} Activate Course {% endif %}</a>
+            <a class="btn btn-primary" href="{{URL_ROOT}}/exam/manage/toggle_status/{{ course.id }}/">{% if course.active %}Deactivate Course {% else %} Activate Course {% endif %}</a>
 </div>
 {% endblock %}
diff --git a/yaksh/templates/yaksh/courses.html b/yaksh/templates/yaksh/courses.html
index 24e29af..ecd3a13 100644
--- a/yaksh/templates/yaksh/courses.html
+++ b/yaksh/templates/yaksh/courses.html
@@ -1,15 +1,7 @@
 {% extends "manage.html" %}
 
-{% block title %} Courses {% endblock title %}
-
-{% block subtitle %} Courses {% endblock %}
-
-{% block css %}
-<link rel="stylesheet" media="all" type="text/css" href="{{ URL_ROOT }}/static/yaksh/css/course.css" />
-{% endblock %}
-
+{% block pagetitle %} Courses {% endblock pagetitle %}
 {% block content %}
-
 {% if not courses %}
     <center><h4> No new Courses created </h4></center>
 {% else %}
@@ -18,23 +10,23 @@
     {% if user != course.creator %}
         <h4> {{course.creator.get_full_name}} added you to this course</h4>
     {% endif %}
-    <div class="row show-grid">
-        <div class="span14">
+    <div class="row">
+        <div class="col-md-12">
             <div class="row">
-                <div class="span4">
+                <div class="col-md-6">
                     <p>
                         <b><u>Course</u></b>
                         {% if course.active %}
-                            <span class="label success">Active</span>
+                            <span class="label label-success">Active</span>
                         {% else %}
-                            <span class="label important">Closed</span>
+                            <span class="label label-danger">Closed</span>
                         {% endif %}
                     </p>
                     <a href="{{URL_ROOT}}/exam/manage/course_detail/{{course.id}}/">{{ course.name }}</a>
                     </br></br>
                     {% if user == course.creator %}
                     <div class="row">
-                        <div class="span3 wrap">
+                        <div class="col-md-4 ">
                             <center><b><u>Teacher(s) Added to {{ course }}</u></b></center>
                             {% if course.get_teachers %}
                             <div align="left">
@@ -43,13 +35,13 @@
                             {% for teacher in course.get_teachers %}
                             <div class="well">
                                 <div class="row">
-                                    <div class="span3" style="width: auto;">
+                                    <div class="col-md-333" style="width: auto;">
                                         <input type="checkbox" name="remove" value="{{ teacher.id }}">&nbsp;{{ teacher.get_full_name }}
                                     </div>
                                 </div>
                             </div>
                             {% endfor %}
-                            <button class="btn success" type="submit">Remove Selected</button>
+                            <button class="btn btn-danger" type="submit">Remove Selected</button>
                             </div>
                             {% else %}
                             <center><b>No Teacher(s) Added</b></center>
@@ -60,25 +52,23 @@
                     {% endif %}
                 </div>
                 {% if user == course.creator %}
-                <div class="span6">
                     <p><b><a href="{{URL_ROOT}}/exam/manage/searchteacher/{{course.id}}/">Add Teacher</a></b></p>
-                </div>
                 {% endif %}
-                <div class="span4" style="text-align:left">
+                <div class="col-md-2" style="text-align:left">
                     {% if course.get_quizzes %}
                         <p><b><u>Quiz(zes)</u></b></p>
                             {% for quiz in course.get_quizzes %}
                             <a href="{{URL_ROOT}}/exam/manage/addquiz/{{course.id}}/{{quiz.id}}/">{{ quiz.description }}</a><br>
                     {% endfor %}
                 </div>
-                <div class="span4" style="text-align:left">
+                <div class="col-md-4" style="text-align:left">
                     <p><b><u>Question Paper(s)</u></b></p>
                     {% for quiz in course.get_quizzes %}
                     {% if quiz.questionpaper_set.get %}
                     <a href="{{URL_ROOT}}/exam/manage/designquestionpaper/{{ quiz.id }}/{{quiz.questionpaper_set.get.id}}/">Question Paper for {{ quiz.description }}</a><br>
                     {% else %}
-                    <p><b>No Question Paper </b>
-                    <button class="btn small primary" type="button" onClick='location.replace("{{URL_ROOT}}/exam/manage/quiz/designquestionpaper/{{ quiz.id }}/");'>Add</button>
+                    <p>No Question Paper 
+                    <a href="#" onClick='location.replace("{{URL_ROOT}}/exam/manage/quiz/designquestionpaper/{{ quiz.id }}/");'>Add</a>
                     </p>
                     {% endif %}
                     {% endfor %}
@@ -88,7 +78,7 @@
                 </div>
             </div>
             <br/>
-            <button class="btn primary"type="button" onClick='location.replace("{{URL_ROOT}}/exam/manage/addquiz/{{course.id}}/");'>Add New Quiz</button>
+            <button class="btn btn-primary pull-right"type="button" onClick='location.replace("{{URL_ROOT}}/exam/manage/addquiz/{{course.id}}/");'>Add New Quiz</button>
         </div>
     </div>
     <br><br>
@@ -98,22 +88,22 @@
 {% if allotted_courses %}
     <center><h3> Course(s) Allotted </h3></center>
     {% for course in allotted_courses %}
-        <div class="row show-grid">
-        <div class="span14">
+        <div class="row">
+        <div class="col-md-12">
             <div class="row">
-                <div class="span6">
+                <div class="col-md-6">
                     <p>
                         <b><u>Course</u></b>
                         {% if course.active %}
-                            <span class="label success">Active</span>
+                            <span class="label label-success">Active</span>
                         {% else %}
-                            <span class="label important">Closed</span>
+                            <span class="label label-danger">Closed</span>
                         {% endif %}
                     </p>
                     <a href="{{URL_ROOT}}/exam/manage/course_detail/{{course.id}}/">{{ course.name }}</a>
                     </br></br>
                     <div class="row">
-                        <div class="span6 wrap">
+                        <div class="col-md-4 wrap">
                             <center><b><u> Course Creator</u></b></center>
                             {{course.creator}}
                             <center><b><u>Teacher(s) Added to {{ course }}</u></b></center>
@@ -124,13 +114,13 @@
                             {% for teacher in course.get_teachers %}
                             <div class="well">
                                 <div class="row">
-                                    <div class="span3" style="width: auto;">
+                                    <div class="col-md-3" style="width: auto;">
                                         <input type="checkbox" name="remove" value="{{ teacher.id }}">&nbsp;{{ teacher.get_full_name }}
                                     </div>
                                 </div>
                             </div>
                             {% endfor %}
-                            <button class="btn success" type="submit">Remove Selected</button>
+                            <button class="btn btn-danger" type="submit">Remove Selected</button>
                             </div>
                             {% else %}
                             <center><b>No Teacher(s) Added</b></center>
@@ -139,10 +129,10 @@
                         </div>
                     </div>
                 </div>
-                <div class="span6">
+                <div class="col-md-4">
                     <p><b><a href="{{URL_ROOT}}/exam/manage/searchteacher/{{course.id}}/">Add Teacher</a></b></p>
                 </div>
-                <div class="span6">
+                <div class="col-md-4">
                     <p><b><u>Quiz(zes)</u></b></p>
                     {% if course.get_quizzes %}
                         {% for quiz in course.get_quizzes %}
@@ -154,7 +144,7 @@
                 </div>
             </div>
             <br/>
-            <button class="btn primary"type="button" onClick='location.replace("{{URL_ROOT}}/exam/manage/addquiz/{{course.id}}/");'>Add New Quiz</button>
+            <button class="btn btn-primary pull-right"type="button" onClick='location.replace("{{URL_ROOT}}/exam/manage/addquiz/{{course.id}}/");'>Add New Quiz</button>
         </div>
     </div>
     <br><br>
diff --git a/yaksh/templates/yaksh/design_questionpaper.html b/yaksh/templates/yaksh/design_questionpaper.html
index 387402a..4418c27 100644
--- a/yaksh/templates/yaksh/design_questionpaper.html
+++ b/yaksh/templates/yaksh/design_questionpaper.html
@@ -5,7 +5,6 @@
 {% block subtitle %} Design Question Paper {% endblock %}
 
 {% block css %}
-    <link rel="stylesheet" media="all" type="text/css" href="{{ URL_ROOT }}/static/yaksh/css/bootstrap.css" />
     <link rel="stylesheet" media="all" type="text/css" href="{{ URL_ROOT }}/static/yaksh/css/question_paper_creation.css" />
 <style>
 select
@@ -29,7 +28,7 @@ select
     {% csrf_token %}
     <input type=hidden name="is_active" id="is_active" value="{{ state }}">
 <center><b>Manual mode to design the {{lang}}  Question Paper</center><br>
-    <ul class="tabs" data-tabs="tabs">
+    <ul class="nav nav-tabs tabs" data-tabs="tabs">
     <li class="active" id="fixed-tab">
         <a href="#fixed-questions" id="fixed">
             STEP 1<br>
diff --git a/yaksh/templates/yaksh/login.html b/yaksh/templates/yaksh/login.html
index 8d5e682..e5cfcc4 100644
--- a/yaksh/templates/yaksh/login.html
+++ b/yaksh/templates/yaksh/login.html
@@ -15,10 +15,10 @@
         <a href="{{URL_ROOT}}/exam/register/">New User? Sign-Up </a>
         <h3> Login with </h3>
         <a class="btn btn-social-icon btn-google" href="{% url 'social:begin' 'google-oauth2' %}">
-            <span class="fa fa-google" style="background-color: #dd4b39;" ></span>
+            <span class="fa fa-google" style="font-size:32px;color:red" ></span>
         </a>
         <a class="btn btn-social-icon btn-facebook"  href="{% url 'social:begin' 'facebook' %}">
-            <span class="fa fa-facebook" style="background-color: #3b5998;" ></span>
+            <span class="fa fa-facebook-square" style="font-size:32px"></span>
         </a>
         </form>
       
-- 
cgit