...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 6eed00b5bb133fd6ee78a3a8a47d51314d8087b9..1bc166c3bde9ef7327ce571cab0b5652283e915d 100644 (file)
--- a/djsite/settings_common.py
+++ b/djsite/settings_common.py
@@ -15,7 +15,6 @@ import os
 
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
-
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/1.8/howto/deployment/checklist/
 
@@ -34,7 +33,9 @@ INSTALLED_APPS = (
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
+    'ajax_select',
     'jquery',
+#    'jquery_ui',
     'tinymce',
     'quotes',
 )
@@ -79,7 +80,7 @@ WSGI_APPLICATION = 'djsite.wsgi.application'
 # Internationalization
 # https://docs.djangoproject.com/en/1.8/topics/i18n/
 
-LANGUAGE_CODE = 'en-us'
+LANGUAGE_CODE = 'en-GB'
 
 TIME_ZONE = 'Europe/London'
 
@@ -89,6 +90,11 @@ USE_L10N = True
 
 USE_TZ = True
 
+# DATE_INPUT_FORMATS = [
+#     "%d/%m/%Y",                 # 12/11/2016 for 12th Nov 2016
+#     "%Y-%m-%d",                 # 2016-11-12 for 12th Nov 2016
+# ]
+
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/1.8/howto/static-files/
 # STATIC_URL overridden in settings-{dev,prod}.py
@@ -99,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