From 5d92e6fac7901c9829a759aec539e603dfb66038 Mon Sep 17 00:00:00 2001
From: adityacp
Date: Tue, 26 Apr 2016 19:00:01 +0530
Subject: rebase changes

---
 yaksh/templates/yaksh/addteacher.html    | 57 ++++++++++++++++++++++++++++++++
 yaksh/templates/yaksh/course_detail.html |  2 ++
 yaksh/templates/yaksh/courses.html       |  5 +++
 yaksh/templates/yaksh/user_data.html     |  2 +-
 yaksh/templates/yaksh/viewcourse.html    | 51 ++++++++++++++++++++++++++++
 5 files changed, 116 insertions(+), 1 deletion(-)
 create mode 100644 yaksh/templates/yaksh/addteacher.html
 create mode 100644 yaksh/templates/yaksh/viewcourse.html

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/addteacher.html b/yaksh/templates/yaksh/addteacher.html
new file mode 100644
index 0000000..0ebbbbd
--- /dev/null
+++ b/yaksh/templates/yaksh/addteacher.html
@@ -0,0 +1,57 @@
+{% extends "manage.html" %}
+
+{% block title %} Add teacher {% endblock title %}
+{% 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 manage %}
+<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">
+		<form action="{{ URL_ROOT }}/exam/manage/searchteacher/{{ course.id }}/" method="post">
+		{% csrf_token %}
+		Search Teacher: <input type="text" name="uname" style="height: 25px; padding: 0px"><br><br>
+		<center><button class="btn" type="submit">Search</button>
+		<button class="btn" type="button" name="button" onClick='location.replace("{{URL_ROOT}}/exam/manage/courses");'>Cancel</button> </center></form>
+</div>
+<br><br>
+<form action="{{ URL_ROOT }}/exam/manage/addteacher/{{ course.id }}/" method="post">
+{% csrf_token %}
+{% if success == True %}
+	{% if teachers|length == 1 or teachers|length == 0%}
+		<center><h3>No results found</h3></center>
+	{% else %}
+		<center><b><u>Search Results</u></b></center><br>
+		<table>
+            <th></th>
+			<th>First Name</th>
+			<th>Last Name</th>
+			<th>Email</th>
+			<th>Institute</th>
+			<th>Department</th>
+            <th>Position</th>
+			{% for teacher in teachers %}
+			    {% if teacher != user %}
+				<tr>
+				<td><input type="checkbox" name="check" value="{{ teacher.id }}"></td>
+				<td>{{ teacher.first_name }}</td>
+				<td>{{ teacher.last_name }}</td>
+				<td>{{ teacher.email }}</td>
+				<td>{{ teacher.profile.institute }}</td>
+				<td>{{ teacher.profile.department }}</td>
+				<td>{{ teacher.profile.position }}</td>
+				</tr>
+				{% endif %}
+			{% endfor %}
+		</table>
+		<button class="btn" type="submit">Add</button>
+	{% endif %}
+{% endif %}
+</form>
+{% if status == True %}
+<center><h3>Added Teacher(s) to this course</h3></center>
+{% endif %}
+{% endblock %}
\ No newline at end of file
diff --git a/yaksh/templates/yaksh/course_detail.html b/yaksh/templates/yaksh/course_detail.html
index 7169667..44fab21 100644
--- a/yaksh/templates/yaksh/course_detail.html
+++ b/yaksh/templates/yaksh/course_detail.html
@@ -11,6 +11,7 @@
 <script language="JavaScript" type="text/javascript" src="{{ URL_ROOT }}/static/yaksh/js/course.js"></script>
 {% endblock %}
 {% block manage %}
+{% for course in courses %}
 <div class="row">
     <div class="span6 wrap">
         <center><b><u>Requests</u></b></center><br>
@@ -88,4 +89,5 @@
 <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>
 </div>
+{% endfor %}
 {% endblock %}
diff --git a/yaksh/templates/yaksh/courses.html b/yaksh/templates/yaksh/courses.html
index f8f8273..245c3cb 100644
--- a/yaksh/templates/yaksh/courses.html
+++ b/yaksh/templates/yaksh/courses.html
@@ -9,9 +9,11 @@
 {% endblock %}
 
 {% block manage %}
+<a href="{{URL_ROOT}}/exam/manage/viewcourse/">View Allotted Courses</a><br>
 {% if not courses %}
     <center><h5> You have not created any courses </h5></center>
 {% else %}
+<center><h3> Course(s) created by you </h3></center>
     {% for course in courses %}
     <div class="row show-grid">
         <div class="span14">
@@ -28,6 +30,9 @@
                     <a href="{{URL_ROOT}}/exam/manage/course_detail/{{course.id}}/">{{ course.name }}</a>
                     </br>
                 </div>
+                <div class="span6">
+                    <p><b><a href="{{URL_ROOT}}/exam/manage/searchteacher/{{course.id}}/">Add Teacher</a></b></p>
+                </div>
                 <div class="span6">
                     <p><b><u>Quiz(zes)</u></b></p>
                     {% if course.get_quizzes %}
diff --git a/yaksh/templates/yaksh/user_data.html b/yaksh/templates/yaksh/user_data.html
index 3350763..22be3ed 100644
--- a/yaksh/templates/yaksh/user_data.html
+++ b/yaksh/templates/yaksh/user_data.html
@@ -82,7 +82,7 @@ User IP address: {{ paper.user_ip }}
 <a href="{{URL_ROOT}}/exam/manage/monitor/">Monitor quiz</a>
 {% else %}
 {% with data.papers.0 as paper %}
-<a href="{{URL_ROOT}}/exam/manage/monitor/{{paper.quiz.id}}/">Monitor quiz</a>
+<a href="{{URL_ROOT}}/exam/manage/monitor/{{paper.question_paper.id}}/">Monitor quiz</a>
 {% endwith %}
 {% endif %}
 
diff --git a/yaksh/templates/yaksh/viewcourse.html b/yaksh/templates/yaksh/viewcourse.html
new file mode 100644
index 0000000..a3ef3e6
--- /dev/null
+++ b/yaksh/templates/yaksh/viewcourse.html
@@ -0,0 +1,51 @@
+{% 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 manage %}
+<center><h3> Course(s) Allotted </h3></center><br>
+{% if not courses %}
+    <center><h3> You are not added to any course(s) </h3></center>
+{% else %}
+{% for course in courses %}
+<h4>{{ course.creator.get_full_name }} added you to this course</h4>
+<div class="row show-grid">
+        <div class="span14">
+            <div class="row">
+                <div class="span6">
+                    <p>
+                        <b><u>Course</u></b>
+                        {% if course.active %}
+                            <span class="label success">Active</span>
+                        {% else %}
+                            <span class="label important">Closed</span>
+                        {% endif %}
+                    </p>
+                    <a href="{{URL_ROOT}}/exam/manage/course_detail/{{ course.id }}/">{{ course.name }}</a>
+                    </br>
+                </div>
+                <div class="span6">
+                    <p><b><u>Quiz(zes)</u></b></p>
+                    {% if course.get_quizzes %}
+                        {% for quiz in course.get_quizzes %}
+                            <a href="{{URL_ROOT}}/exam/manage/addquiz/{{ quiz.id }}/">{{ quiz.description }}</a><br>
+                    {% endfor %}
+                    {% else %}
+                        <p><b>No quiz </b>
+                    {% endif %}
+                </div>
+            </div>
+        </div>
+    </div>
+    <br><br> 
+{% endfor %}
+<button class="btn primary" type="button" onClick='location.replace("{{URL_ROOT}}/exam/manage/add_course");'>Add New Course</button>
+<button class="btn primary" type="button" onClick='location.replace("{{URL_ROOT}}/exam/manage/addquiz");'>Add New Quiz</button>
+{% endif %}
+{% endblock %}
-- 
cgit 


From eef2bff4f2b0c66694b2f807849c2d97ba6246a9 Mon Sep 17 00:00:00 2001
From: adityacp
Date: Tue, 26 Apr 2016 19:04:17 +0530
Subject: further rebase changes

---
 yaksh/templates/yaksh/addteacher.html    | 2 +-
 yaksh/templates/yaksh/course_detail.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/addteacher.html b/yaksh/templates/yaksh/addteacher.html
index 0ebbbbd..39535bc 100644
--- a/yaksh/templates/yaksh/addteacher.html
+++ b/yaksh/templates/yaksh/addteacher.html
@@ -21,7 +21,7 @@
 <form action="{{ URL_ROOT }}/exam/manage/addteacher/{{ course.id }}/" method="post">
 {% csrf_token %}
 {% if success == True %}
-	{% if teachers|length == 1 or teachers|length == 0%}
+	{% if teachers|length == 1 or teachers|length == 0 %}
 		<center><h3>No results found</h3></center>
 	{% else %}
 		<center><b><u>Search Results</u></b></center><br>
diff --git a/yaksh/templates/yaksh/course_detail.html b/yaksh/templates/yaksh/course_detail.html
index 44fab21..ccb3a10 100644
--- a/yaksh/templates/yaksh/course_detail.html
+++ b/yaksh/templates/yaksh/course_detail.html
@@ -2,7 +2,7 @@
 
 {% block title %} Course {% endblock title %}
 
-{% block subtitle %} {{ course.name }} {% endblock %}
+{% block subtitle %} {% for course in courses %}{{ course.name }}{% endfor %} {% endblock %}
 
 {% block css %}
 <link rel="stylesheet" media="all" type="text/css" href="{{ URL_ROOT }}/static/yaksh/css/course.css" />
-- 
cgit 


From 42a2b07a88ece67fe4705ac5a114540fd8366aea Mon Sep 17 00:00:00 2001
From: adityacp
Date: Tue, 26 Apr 2016 19:06:16 +0530
Subject: made more rebase changes

---
 yaksh/templates/yaksh/course_detail.html | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/course_detail.html b/yaksh/templates/yaksh/course_detail.html
index ccb3a10..7169667 100644
--- a/yaksh/templates/yaksh/course_detail.html
+++ b/yaksh/templates/yaksh/course_detail.html
@@ -2,7 +2,7 @@
 
 {% block title %} Course {% endblock title %}
 
-{% block subtitle %} {% for course in courses %}{{ course.name }}{% endfor %} {% endblock %}
+{% block subtitle %} {{ course.name }} {% endblock %}
 
 {% block css %}
 <link rel="stylesheet" media="all" type="text/css" href="{{ URL_ROOT }}/static/yaksh/css/course.css" />
@@ -11,7 +11,6 @@
 <script language="JavaScript" type="text/javascript" src="{{ URL_ROOT }}/static/yaksh/js/course.js"></script>
 {% endblock %}
 {% block manage %}
-{% for course in courses %}
 <div class="row">
     <div class="span6 wrap">
         <center><b><u>Requests</u></b></center><br>
@@ -89,5 +88,4 @@
 <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>
 </div>
-{% endfor %}
 {% endblock %}
-- 
cgit 


From fcf57e94ad9e91588c4994ec2594d66275b25e17 Mon Sep 17 00:00:00 2001
From: adityacp
Date: Tue, 12 Apr 2016 12:11:37 +0530
Subject: small template change

---
 yaksh/templates/yaksh/addteacher.html | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/addteacher.html b/yaksh/templates/yaksh/addteacher.html
index 39535bc..bc156a6 100644
--- a/yaksh/templates/yaksh/addteacher.html
+++ b/yaksh/templates/yaksh/addteacher.html
@@ -21,7 +21,7 @@
 <form action="{{ URL_ROOT }}/exam/manage/addteacher/{{ course.id }}/" method="post">
 {% csrf_token %}
 {% if success == True %}
-	{% if teachers|length == 1 or teachers|length == 0 %}
+	{% if teachers|length == 0 %}
 		<center><h3>No results found</h3></center>
 	{% else %}
 		<center><b><u>Search Results</u></b></center><br>
@@ -34,7 +34,6 @@
 			<th>Department</th>
             <th>Position</th>
 			{% for teacher in teachers %}
-			    {% if teacher != user %}
 				<tr>
 				<td><input type="checkbox" name="check" value="{{ teacher.id }}"></td>
 				<td>{{ teacher.first_name }}</td>
@@ -44,7 +43,6 @@
 				<td>{{ teacher.profile.department }}</td>
 				<td>{{ teacher.profile.position }}</td>
 				</tr>
-				{% endif %}
 			{% endfor %}
 		</table>
 		<button class="btn" type="submit">Add</button>
-- 
cgit 


From c2e8c3ff4e07de717f74c0a6d9199c317452bf43 Mon Sep 17 00:00:00 2001
From: adityacp
Date: Fri, 15 Apr 2016 19:00:07 +0530
Subject: Changes after rebase

---
 yaksh/templates/yaksh/addteacher.html | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/addteacher.html b/yaksh/templates/yaksh/addteacher.html
index bc156a6..2cb0625 100644
--- a/yaksh/templates/yaksh/addteacher.html
+++ b/yaksh/templates/yaksh/addteacher.html
@@ -35,7 +35,11 @@
             <th>Position</th>
 			{% for teacher in teachers %}
 				<tr>
-				<td><input type="checkbox" name="check" value="{{ teacher.id }}"></td>
+				<td>
+				{% if teacher != user %}
+				<input type="checkbox" name="check" value="{{ teacher.id }}">
+				{% endif %}
+				</td>
 				<td>{{ teacher.first_name }}</td>
 				<td>{{ teacher.last_name }}</td>
 				<td>{{ teacher.email }}</td>
-- 
cgit 


From fa11260fdbe76f377909483d9c482ecf72ab3364 Mon Sep 17 00:00:00 2001
From: adityacp
Date: Thu, 21 Apr 2016 18:57:28 +0530
Subject: changes in add teachers as per comments

---
 yaksh/templates/yaksh/addteacher.html | 40 ++++++++++++++++++++++++++++-------
 1 file changed, 32 insertions(+), 8 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/addteacher.html b/yaksh/templates/yaksh/addteacher.html
index 2cb0625..b438262 100644
--- a/yaksh/templates/yaksh/addteacher.html
+++ b/yaksh/templates/yaksh/addteacher.html
@@ -35,11 +35,7 @@
             <th>Position</th>
 			{% for teacher in teachers %}
 				<tr>
-				<td>
-				{% if teacher != user %}
-				<input type="checkbox" name="check" value="{{ teacher.id }}">
-				{% endif %}
-				</td>
+				<td><input type="checkbox" name="check" value="{{ teacher.id }}"></td>
 				<td>{{ teacher.first_name }}</td>
 				<td>{{ teacher.last_name }}</td>
 				<td>{{ teacher.email }}</td>
@@ -53,7 +49,35 @@
 	{% endif %}
 {% endif %}
 </form>
-{% if status == True %}
-<center><h3>Added Teacher(s) to this course</h3></center>
+{% if status == True and teachers_added or teachers_rejected %}
+<center>
+<h4>Note: Teacher(s) without profile are rejected</h4>
+<div class="row">
+    <div class="span6 wrap">
+        <center><b><u>Teacher(s) Added</u></b></center><br>
+        {% for teacher in teachers_added %}
+        <div class="well">
+            <div class="row">
+                <div class="span3" style="padding-top:10px">
+                    <h5>{{ teacher.get_full_name }}</h5>
+                </div>
+            </div>
+        </div>
+        {% endfor %}
+    </div>
+    <div class="span6 wrap">
+        <center><b><u>Teacher(s) Rejected</u></b></center><br>
+        {% for teacher in teachers_rejected %}
+        <div class="well">
+            <div class="row">
+                <div class="span4" style="padding-top:10px">
+                    <h5>{{ teacher.get_full_name }}</h5>
+                </div>
+            </div>
+        </div>
+        {% endfor %}
+    </div>
+</div>
+</center>
 {% endif %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
-- 
cgit 


From 6b09383890b8367628124a854810326d7bbac7c4 Mon Sep 17 00:00:00 2001
From: adityacp
Date: Wed, 27 Apr 2016 16:42:32 +0530
Subject: changes after comments

---
 yaksh/templates/yaksh/addteacher.html | 23 +++++++++++-----
 yaksh/templates/yaksh/courses.html    | 38 +++++++++++++++++++++++---
 yaksh/templates/yaksh/viewcourse.html | 51 -----------------------------------
 3 files changed, 50 insertions(+), 62 deletions(-)
 delete mode 100644 yaksh/templates/yaksh/viewcourse.html

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/addteacher.html b/yaksh/templates/yaksh/addteacher.html
index b438262..790c06c 100644
--- a/yaksh/templates/yaksh/addteacher.html
+++ b/yaksh/templates/yaksh/addteacher.html
@@ -25,8 +25,10 @@
 		<center><h3>No results found</h3></center>
 	{% else %}
 		<center><b><u>Search Results</u></b></center><br>
+		<center><b>Search results does not include teachers already added</b></center><br>
 		<table>
             <th></th>
+            <th>Username</th>
 			<th>First Name</th>
 			<th>Last Name</th>
 			<th>Email</th>
@@ -34,8 +36,10 @@
 			<th>Department</th>
             <th>Position</th>
 			{% for teacher in teachers %}
+				{% if teacher not in course.get_teachers %}
 				<tr>
 				<td><input type="checkbox" name="check" value="{{ teacher.id }}"></td>
+				<td>{{ teacher.username }}</td>
 				<td>{{ teacher.first_name }}</td>
 				<td>{{ teacher.last_name }}</td>
 				<td>{{ teacher.email }}</td>
@@ -43,6 +47,7 @@
 				<td>{{ teacher.profile.department }}</td>
 				<td>{{ teacher.profile.position }}</td>
 				</tr>
+				{% endif %}
 			{% endfor %}
 		</table>
 		<button class="btn" type="submit">Add</button>
@@ -51,31 +56,35 @@
 </form>
 {% if status == True and teachers_added or teachers_rejected %}
 <center>
-<h4>Note: Teacher(s) without profile are rejected</h4>
+<h4>Teacher(s) without profile are rejected</h4>
 <div class="row">
     <div class="span6 wrap">
         <center><b><u>Teacher(s) Added</u></b></center><br>
+        {% if teachers_added %}
         {% for teacher in teachers_added %}
         <div class="well">
             <div class="row">
-                <div class="span3" style="padding-top:10px">
-                    <h5>{{ teacher.get_full_name }}</h5>
-                </div>
+				<h5>{{ teacher.get_full_name }}</h5>
             </div>
         </div>
         {% endfor %}
+        {% else %}
+        <center><b>No Teacher(s) Added</b></center>
+        {% endif %}
     </div>
     <div class="span6 wrap">
         <center><b><u>Teacher(s) Rejected</u></b></center><br>
+        {% if teachers_rejected %}
         {% for teacher in teachers_rejected %}
         <div class="well">
             <div class="row">
-                <div class="span4" style="padding-top:10px">
-                    <h5>{{ teacher.get_full_name }}</h5>
-                </div>
+                <h5>{{ teacher.get_full_name }}</h5>
             </div>
         </div>
         {% endfor %}
+        {% else %}
+        <center><b>No Teacher(s) Rejected</b></center>
+        {% endif %}
     </div>
 </div>
 </center>
diff --git a/yaksh/templates/yaksh/courses.html b/yaksh/templates/yaksh/courses.html
index 245c3cb..43a9535 100644
--- a/yaksh/templates/yaksh/courses.html
+++ b/yaksh/templates/yaksh/courses.html
@@ -11,10 +11,13 @@
 {% block manage %}
 <a href="{{URL_ROOT}}/exam/manage/viewcourse/">View Allotted Courses</a><br>
 {% if not courses %}
-    <center><h5> You have not created any courses </h5></center>
+    <center><h4> No new Courses added </h4></center>
 {% else %}
-<center><h3> Course(s) created by you </h3></center>
+<center><h3> Course(s) Added</h3></center>
     {% for course in courses %}
+    {% 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">
@@ -28,11 +31,39 @@
                         {% endif %}
                     </p>
                     <a href="{{URL_ROOT}}/exam/manage/course_detail/{{course.id}}/">{{ course.name }}</a>
-                    </br>
+                    </br></br>
+                    {% if user == course.creator %}
+                    <div class="row">
+                        <div class="span6 wrap">
+                            <center><b><u>Teacher(s) Added to {{ course }}</u></b></center>
+                            {% if course.get_teachers %}
+                            <div align="left">
+                            <form action="{{URL_ROOT}}/exam/manage/remove_teachers/{{ course.id }}/" method="post">
+                            {% csrf_token %}
+                            {% for teacher in course.get_teachers %}
+                            <div class="well">
+                                <div class="row">
+                                    <div class="span3" 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>
+                            </div>
+                            {% else %}
+                            <center><b>No Teacher(s) Added</b></center>
+                            {% endif %}
+                            </form>
+                        </div>
+                    </div>
+                    {% 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="span6">
                     <p><b><u>Quiz(zes)</u></b></p>
                     {% if course.get_quizzes %}
@@ -48,7 +79,6 @@
     </div>
     <br><br>
     {% endfor %}
-
     <button class="btn primary" type="button" onClick='location.replace("{{URL_ROOT}}/exam/manage/add_course");'>Add New Course</button>
     <button class="btn primary" type="button" onClick='location.replace("{{URL_ROOT}}/exam/manage/addquiz");'>Add New Quiz</button>
 {% endif %}
diff --git a/yaksh/templates/yaksh/viewcourse.html b/yaksh/templates/yaksh/viewcourse.html
deleted file mode 100644
index a3ef3e6..0000000
--- a/yaksh/templates/yaksh/viewcourse.html
+++ /dev/null
@@ -1,51 +0,0 @@
-{% 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 manage %}
-<center><h3> Course(s) Allotted </h3></center><br>
-{% if not courses %}
-    <center><h3> You are not added to any course(s) </h3></center>
-{% else %}
-{% for course in courses %}
-<h4>{{ course.creator.get_full_name }} added you to this course</h4>
-<div class="row show-grid">
-        <div class="span14">
-            <div class="row">
-                <div class="span6">
-                    <p>
-                        <b><u>Course</u></b>
-                        {% if course.active %}
-                            <span class="label success">Active</span>
-                        {% else %}
-                            <span class="label important">Closed</span>
-                        {% endif %}
-                    </p>
-                    <a href="{{URL_ROOT}}/exam/manage/course_detail/{{ course.id }}/">{{ course.name }}</a>
-                    </br>
-                </div>
-                <div class="span6">
-                    <p><b><u>Quiz(zes)</u></b></p>
-                    {% if course.get_quizzes %}
-                        {% for quiz in course.get_quizzes %}
-                            <a href="{{URL_ROOT}}/exam/manage/addquiz/{{ quiz.id }}/">{{ quiz.description }}</a><br>
-                    {% endfor %}
-                    {% else %}
-                        <p><b>No quiz </b>
-                    {% endif %}
-                </div>
-            </div>
-        </div>
-    </div>
-    <br><br> 
-{% endfor %}
-<button class="btn primary" type="button" onClick='location.replace("{{URL_ROOT}}/exam/manage/add_course");'>Add New Course</button>
-<button class="btn primary" type="button" onClick='location.replace("{{URL_ROOT}}/exam/manage/addquiz");'>Add New Quiz</button>
-{% endif %}
-{% endblock %}
-- 
cgit 


From 3438ca95172897b594c216967d51cf5771d75f73 Mon Sep 17 00:00:00 2001
From: adityacp
Date: Thu, 28 Apr 2016 12:22:30 +0530
Subject: further commented changes

---
 yaksh/templates/yaksh/addteacher.html | 2 +-
 yaksh/templates/yaksh/courses.html    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/addteacher.html b/yaksh/templates/yaksh/addteacher.html
index 790c06c..6bb5c9a 100644
--- a/yaksh/templates/yaksh/addteacher.html
+++ b/yaksh/templates/yaksh/addteacher.html
@@ -50,7 +50,7 @@
 				{% endif %}
 			{% endfor %}
 		</table>
-		<button class="btn" type="submit">Add</button>
+		<button class="btn" type="submit">Add Selected</button>
 	{% endif %}
 {% endif %}
 </form>
diff --git a/yaksh/templates/yaksh/courses.html b/yaksh/templates/yaksh/courses.html
index 43a9535..06c848c 100644
--- a/yaksh/templates/yaksh/courses.html
+++ b/yaksh/templates/yaksh/courses.html
@@ -9,7 +9,7 @@
 {% endblock %}
 
 {% block manage %}
-<a href="{{URL_ROOT}}/exam/manage/viewcourse/">View Allotted Courses</a><br>
+<a href="{{URL_ROOT}}/exam/manage/allotted_course/">View Allotted Courses</a><br>
 {% if not courses %}
     <center><h4> No new Courses added </h4></center>
 {% else %}
-- 
cgit 


From d2affe68e84da54dc99d9876ab359ad448aa6828 Mon Sep 17 00:00:00 2001
From: adityacp
Date: Fri, 29 Apr 2016 14:40:50 +0530
Subject: changes for adding teachers

---
 yaksh/templates/yaksh/addteacher.html | 25 +++++--------------------
 1 file changed, 5 insertions(+), 20 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/addteacher.html b/yaksh/templates/yaksh/addteacher.html
index 6bb5c9a..7e04f71 100644
--- a/yaksh/templates/yaksh/addteacher.html
+++ b/yaksh/templates/yaksh/addteacher.html
@@ -54,17 +54,17 @@
 	{% endif %}
 {% endif %}
 </form>
-{% if status == True and teachers_added or teachers_rejected %}
-<center>
-<h4>Teacher(s) without profile are rejected</h4>
+{% if status == True %}
 <div class="row">
-    <div class="span6 wrap">
+    <div class="span6 offset4 wrap">
         <center><b><u>Teacher(s) Added</u></b></center><br>
         {% if teachers_added %}
         {% for teacher in teachers_added %}
         <div class="well">
             <div class="row">
-				<h5>{{ teacher.get_full_name }}</h5>
+				<div class="span3" style="width: auto;">
+					<h5>{{ teacher.get_full_name }}</h5>
+				</div>
             </div>
         </div>
         {% endfor %}
@@ -72,21 +72,6 @@
         <center><b>No Teacher(s) Added</b></center>
         {% endif %}
     </div>
-    <div class="span6 wrap">
-        <center><b><u>Teacher(s) Rejected</u></b></center><br>
-        {% if teachers_rejected %}
-        {% for teacher in teachers_rejected %}
-        <div class="well">
-            <div class="row">
-                <h5>{{ teacher.get_full_name }}</h5>
-            </div>
-        </div>
-        {% endfor %}
-        {% else %}
-        <center><b>No Teacher(s) Rejected</b></center>
-        {% endif %}
-    </div>
 </div>
-</center>
 {% endif %}
 {% endblock %}
-- 
cgit