...and comment out the jquery_ui bit

[djsite.git] / djsite / settings_common.py

diff --git a/djsite/settings_common.py b/djsite/settings_common.py
index bf7d3f79e0f97f9b610aa718c246226d691b0259..1bc166c3bde9ef7327ce571cab0b5652283e915d 100644 (file)
--- a/djsite/settings_common.py
+++ b/djsite/settings_common.py
@@ -33,7 +33,9 @@ INSTALLED_APPS = (
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
+    'ajax_select',
     'jquery',
+#    'jquery_ui',
     'tinymce',
     'quotes',
 )
@@ -103,5 +105,11 @@ TINYMCE_DEFAULT_CONFIG = {
     'theme_advanced_buttons2' : '',
     'theme_advanced_buttons3' : "",
     'plugins': 'table',
-    'valid_elements': 'a|b|strong|u|i|em|ul|ol|li|p|br'
+    'valid_elements': 'a[href],b,strong,u,i,em,ul,ol,li,p,br'
 }
+
+# If jQuery or jQuery.ui are not already loaded on the page, then
+# these will be loaded from CDN.
+# If you want to prevent this and load your own then set AJAX_SELECT_BOOTSTRAP
+
+AJAX_SELECT_BOOTSTRAP  = True