summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPrabhu Ramachandran2017-11-07 19:26:52 +0530
committerGitHub2017-11-07 19:26:52 +0530
commita89ddbacb3b3cf48168281cb41ea61b127c9410c (patch)
treea23a6676089d0467e2e55faa47fc4d5cd4cb6f69
parent807a52e45a9b6c6ac64a7a5e4bd8248900fb4367 (diff)
parent0c9c80e6068f3a279ebf0f99f8c121d7e3e55117 (diff)
downloadonline_test-a89ddbacb3b3cf48168281cb41ea61b127c9410c.tar.gz
online_test-a89ddbacb3b3cf48168281cb41ea61b127c9410c.tar.bz2
online_test-a89ddbacb3b3cf48168281cb41ea61b127c9410c.zip
Merge pull request #377 from Akshen/datetime
Adds DateTimePicker to Add_Course
-rw-r--r--CHANGELOG.txt1
-rw-r--r--yaksh/templates/yaksh/add_course.html14
2 files changed, 13 insertions, 2 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 7da93c4..352eb56 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -13,6 +13,7 @@
* UI changes in grade user, view answerpaper and monitor pages.
* Fixed a bug that would require shebang to be put in for Bash assertion based questions.
* Updated Courses Page to show Active Courses on top.
+* Added a Datetime Picker to Add Course Page
=== 0.6.0 (11-05-2017) ===
diff --git a/yaksh/templates/yaksh/add_course.html b/yaksh/templates/yaksh/add_course.html
index 55683f4..b8fc11c 100644
--- a/yaksh/templates/yaksh/add_course.html
+++ b/yaksh/templates/yaksh/add_course.html
@@ -4,6 +4,11 @@
{% 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.datetimepicker.full.min.js"></script>
{% endblock %}
{% block content %}
@@ -13,9 +18,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">Save </button>
+ <button class="btn btn-default" type="button" name="button" onClick='location.replace("{{URL_ROOT}}/exam/manage/");'>Cancel</button> </center>
</form>
{% endblock %}