From 3f35f7dd0c79f76518a71f597b96c226d08157fb Mon Sep 17 00:00:00 2001
From: ankitjavalkar
Date: Mon, 22 Jun 2015 17:07:13 +0530
Subject: Remove taggit-autocomplete app, make pip compatible

Conflicts:
	testapp/templates/demo_urls.py
---
 testapp/exam/templates/exam/add_question.html            | 2 --
 testapp/exam/templates/exam/add_questionpaper.html       | 3 +--
 testapp/exam/templates/exam/automatic_questionpaper.html | 3 +--
 testapp/exam/templates/exam/design_questionpaper.html    | 4 +---
 testapp/exam/templates/exam/edit_question.html           | 3 +--
 testapp/exam/templates/exam/manual_questionpaper.html    | 3 +--
 testapp/exam/templates/exam/question.html                | 3 +--
 7 files changed, 6 insertions(+), 15 deletions(-)

(limited to 'testapp/exam/templates')

diff --git a/testapp/exam/templates/exam/add_question.html b/testapp/exam/templates/exam/add_question.html
index c744549..2161ba1 100644
--- a/testapp/exam/templates/exam/add_question.html
+++ b/testapp/exam/templates/exam/add_question.html
@@ -10,8 +10,6 @@
 
 {% block script %}
 <script type="text/javascript" src="{{ URL_ROOT }}/static/exam/js/min.js"></script>
-<script src="/static/taggit_autocomplete_modified/jquery.min.js" type="text/javascript"></script>
-<script src="/static/taggit_autocomplete_modified/jquery.autocomplete.js" type="text/javascript"></script>
 <script src="{{ URL_ROOT }}/static/exam/js/add_question.js"></script>
 {% endblock %}
 
diff --git a/testapp/exam/templates/exam/add_questionpaper.html b/testapp/exam/templates/exam/add_questionpaper.html
index 4cce8a9..c339b81 100644
--- a/testapp/exam/templates/exam/add_questionpaper.html
+++ b/testapp/exam/templates/exam/add_questionpaper.html
@@ -8,8 +8,7 @@
 <link rel="stylesheet" media="all" type="text/css" href="{{ URL_ROOT }}/static/exam/css/autotaggit.css" />
 {% endblock %}
 {% block script %}
-<script src="/static/taggit_autocomplete_modified/jquery.min.js" type="text/javascript"></script>
-<script src="/static/taggit_autocomplete_modified/jquery.autocomplete.js" type="text/javascript"></script>
+<script src="/static/exam/js/jquery-1.11.3.min.js" type="text/javascript"></script>
 <script src="{{ URL_ROOT }}/static/exam/js/add_questionpaper.js"></script>
 {% endblock %}
 
diff --git a/testapp/exam/templates/exam/automatic_questionpaper.html b/testapp/exam/templates/exam/automatic_questionpaper.html
index fcd3db5..b3b5ce6 100644
--- a/testapp/exam/templates/exam/automatic_questionpaper.html
+++ b/testapp/exam/templates/exam/automatic_questionpaper.html
@@ -14,8 +14,7 @@ select
 </style>
 {% endblock %}
 {% block script %}
-<script src="/static/taggit_autocomplete_modified/jquery.min.js" type="text/javascript"></script>
-<script src="/static/taggit_autocomplete_modified/jquery.autocomplete.js" type="text/javascript"></script>
+<script src="/static/exam/js/jquery-1.11.3.min.js" type="text/javascript"></script>
 <script src="{{ URL_ROOT }}/static/exam/js/add_questionpaper.js"></script>
 {% endblock %}
 
diff --git a/testapp/exam/templates/exam/design_questionpaper.html b/testapp/exam/templates/exam/design_questionpaper.html
index 33c8b8f..9b3d9cf 100644
--- a/testapp/exam/templates/exam/design_questionpaper.html
+++ b/testapp/exam/templates/exam/design_questionpaper.html
@@ -15,9 +15,7 @@ select
 </style>
 {% endblock %}
 {% block script %}
-<script src="/static/taggit_autocomplete_modified/jquery.min.js" type="text/javascript"></script>
-<script src="/static/taggit_autocomplete_modified/jquery.autocomplete.js" type="text/javascript"></script>
-
+<script src="/static/exam/js/jquery-1.11.3.min.js" type="text/javascript"></script>
 
 <script src="{{ URL_ROOT }}/static/exam/js/bootstrap-tabs.js"></script>
 <script src="{{ URL_ROOT }}/static/exam/js/add_questionpaper.js"></script>
diff --git a/testapp/exam/templates/exam/edit_question.html b/testapp/exam/templates/exam/edit_question.html
index 6deca4a..5463f47 100644
--- a/testapp/exam/templates/exam/edit_question.html
+++ b/testapp/exam/templates/exam/edit_question.html
@@ -8,8 +8,7 @@
 {% endblock %}
 {% block script %}
 <script src="{{ URL_ROOT }}/static/exam/js/edit_question.js"></script>
-<script src="/static/taggit_autocomplete_modified/jquery.min.js" type="text/javascript"></script>
-<script src="/static/taggit_autocomplete_modified/jquery.autocomplete.js" type="text/javascript"></script>
+<script src="/static/exam/js/jquery-1.11.3.min.js" type="text/javascript"></script>
 {% endblock %}
 
 {% block onload %} onload = 'javascript:textareaformat();' {% endblock %}
diff --git a/testapp/exam/templates/exam/manual_questionpaper.html b/testapp/exam/templates/exam/manual_questionpaper.html
index 1a1f95c..0ab5d2b 100644
--- a/testapp/exam/templates/exam/manual_questionpaper.html
+++ b/testapp/exam/templates/exam/manual_questionpaper.html
@@ -14,8 +14,7 @@ select
 </style>
 {% endblock %}
 {% block script %}
-<script src="/static/taggit_autocomplete_modified/jquery.min.js" type="text/javascript"></script>
-<script src="/static/taggit_autocomplete_modified/jquery.autocomplete.js" type="text/javascript"></script>
+<script src="/static/exam/js/jquery-1.11.3.min.js" type="text/javascript"></script>
 
 <script src="{{ URL_ROOT }}/static/exam/js/add_questionpaper.js"></script>
 {% endblock %}
diff --git a/testapp/exam/templates/exam/question.html b/testapp/exam/templates/exam/question.html
index b7a7053..1e8c80a 100644
--- a/testapp/exam/templates/exam/question.html
+++ b/testapp/exam/templates/exam/question.html
@@ -10,8 +10,7 @@
 {% endblock %}
 
 {% block script %}
-<script src="/static/taggit_autocomplete_modified/jquery.min.js" type="text/javascript"></script>
-<script src="/static/taggit_autocomplete_modified/jquery.autocomplete.js" type="text/javascript"></script>
+<script src="/static/exam/js/jquery-1.11.3.min.js" type="text/javascript"></script>
 <script src="{{ URL_ROOT }}/static/exam/js/question.js"></script>
 <script src="{{ URL_ROOT }}/static/exam/js/bootstrap-modal.js"></script>
 
-- 
cgit