From 5b38088e39b6fe81c36640b5cacdf891de0273ed Mon Sep 17 00:00:00 2001
From: Akshen
Date: Fri, 3 Nov 2017 13:53:27 +0530
Subject: Adds DateTimePicker to Add_Course

Adds DatetimePicker to start_enroll_time and end_enroll_time fields
---
 yaksh/templates/yaksh/add_course.html | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'yaksh')

diff --git a/yaksh/templates/yaksh/add_course.html b/yaksh/templates/yaksh/add_course.html
index 55683f4..658e2ff 100644
--- a/yaksh/templates/yaksh/add_course.html
+++ b/yaksh/templates/yaksh/add_course.html
@@ -4,6 +4,12 @@
 
 {% block css %}
 <link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/question_quiz.css" type="text/css" />
+<link rel="stylesheet" href="{{ URL_ROOT }}/static/yaksh/css/jquery.datetimepicker.css" type="text/css" /> 
+{% endblock %}
+
+{% block script %}
+<script src="{{ URL_ROOT }}/static/yaksh/js/jquery-1.9.1.min.js"></script>
+<script src="{{ URL_ROOT }}/static/yaksh/js/jquery.datetimepicker.full.min.js"></script>
 {% endblock %}
 
 {% block content %}
@@ -13,9 +19,14 @@
   <table class=span1>
   {{ form.as_table }}
   </table>
+  <br/>
+  <script type="text/javascript">
+    $("#id_start_enroll_time").datetimepicker({format: 'Y-m-d H:i:s'});
+    $("#id_end_enroll_time").datetimepicker({format: 'Y-m-d H:i:s'});
+  </script>
   </center>
 
-  <center><button class="btn primary" type="submit" id="submit" name="questionpaper">Add Course</button>
-  <button class="btn primary" type="button" name="button" onClick='location.replace("{{URL_ROOT}}/exam/manage/");'>Cancel</button> </center>
+  <center><button class="btn btn-default" type="submit" id="submit" name="questionpaper">Add Course</button>
+  <button class="btn btn-default" type="button" name="button" onClick='location.replace("{{URL_ROOT}}/exam/manage/");'>Cancel</button> </center>
 </form>
 {% endblock %}
-- 
cgit 


From bdeca9c3fb194983348fa90ed1846af8c5c3b3c0 Mon Sep 17 00:00:00 2001
From: Akshen
Date: Sat, 4 Nov 2017 14:35:27 +0530
Subject: Update CHANGELOG

updates change and required fix i.e Add Course to Save Button in add_course.html
---
 yaksh/templates/yaksh/add_course.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'yaksh')

diff --git a/yaksh/templates/yaksh/add_course.html b/yaksh/templates/yaksh/add_course.html
index 658e2ff..27b3a8a 100644
--- a/yaksh/templates/yaksh/add_course.html
+++ b/yaksh/templates/yaksh/add_course.html
@@ -26,7 +26,7 @@
   </script>
   </center>
 
-  <center><button class="btn btn-default" type="submit" id="submit" name="questionpaper">Add Course</button>
+  <center><button class="btn btn-default" type="submit" id="submit" name="questionpaper">Save </button>
   <button class="btn btn-default" type="button" name="button" onClick='location.replace("{{URL_ROOT}}/exam/manage/");'>Cancel</button> </center>
 </form>
 {% endblock %}
-- 
cgit 


From af8507e6e6ada08acf56c6fd1db297fc354fe293 Mon Sep 17 00:00:00 2001
From: Akshen
Date: Mon, 6 Nov 2017 16:41:45 +0530
Subject: Remove extra jQuery file from add_course.html

-Since jquery-1.9.1.min.js is already present in base, it was removed from add_course.html's script tag
---
 yaksh/templates/yaksh/add_course.html | 1 -
 1 file changed, 1 deletion(-)

(limited to 'yaksh')

diff --git a/yaksh/templates/yaksh/add_course.html b/yaksh/templates/yaksh/add_course.html
index 27b3a8a..b8fc11c 100644
--- a/yaksh/templates/yaksh/add_course.html
+++ b/yaksh/templates/yaksh/add_course.html
@@ -8,7 +8,6 @@
 {% endblock %}
 
 {% block script %}
-<script src="{{ URL_ROOT }}/static/yaksh/js/jquery-1.9.1.min.js"></script>
 <script src="{{ URL_ROOT }}/static/yaksh/js/jquery.datetimepicker.full.min.js"></script>
 {% endblock %}
 
-- 
cgit