Adapt CSS, templates to new version of JS libraries

4 files changed, 25 insertions, 26 deletions

diff --git a/example_project/settings.py b/example_project/settings.py
index 901987905..c669ea954 100644
--- a/example_project/settings.py
+++ b/example_project/settings.py
@@ -2,9 +2,8 @@
 # -*- coding: utf-8 -*-
 # Django settings for ishtar project.
 
-import os, sys
-
-from django.utils.translation import gettext_lazy as _
+import os
+import sys
 
 DEBUG = False
 DEBUG_TOOLBAR = False
@@ -79,7 +78,7 @@ MEDIA_URL = '/media/'
 TEMPLATE_LOADERS = (
     'django.template.loaders.filesystem.Loader',
     'django.template.loaders.app_directories.Loader',
-#     'django.template.loaders.eggs.Loader',
+    # 'django.template.loaders.eggs.Loader',
 )
 
 MIDDLEWARE_CLASSES = [
@@ -122,17 +121,18 @@ INSTALLED_APPS = [
     'django.contrib.formtools',
     'south',
     'registration',
-    #'geodjangofla',
+    # 'geodjangofla',
     'ishtar_common',
-    'archaeological_operations', # mandatory app to run ishtar
-    #'django_extensions',
-    #'debug_toolbar',
+    'archaeological_operations',  # mandatory app to run ishtar
+    # 'django_extensions',
+    # 'debug_toolbar',
 ]
 
 LOGFILE = '/var/log/django/ishtar.log'
 
-LOGGING = {'version': 1,
-     'disable_existing_loggers': False,
+LOGGING = {
+    'version': 1,
+    'disable_existing_loggers': False,
     'handlers': {
         # Include the default Django email handler for errors
         # This is what you'd get without configuring logging at all.
@@ -147,9 +147,9 @@ LOGGING = {'version': 1,
             'class': 'logging.handlers.WatchedFileHandler',
             'filename': '/var/log/django/ishtar.log'
         },
-         'console':{
-             'level': 'DEBUG',
-             'class': 'logging.StreamHandler',
+        'console': {
+            'level': 'DEBUG',
+            'class': 'logging.StreamHandler',
         },
     },
     'loggers': {
@@ -168,8 +168,8 @@ LOGGING = {'version': 1,
         # Your own app - this assumes all your logger names start with "myapp."
         'chimere': {
             'handlers': ['logfile'],
-            'level': 'WARNING', # Or maybe INFO or DEBUG
-                'propogate': False
+            'level': 'WARNING',  # Or maybe INFO or DEBUG
+            'propogate': False
         },
     },
 }
@@ -188,7 +188,7 @@ ISHTAR_OPE_TYPES = {}
 # DB key: txt_idx
 ISHTAR_PERIODS = {}
 ISHTAR_PERMIT_TYPES = {}
-ISHTAR_DOC_TYPES = {u"undefined":u"Undefined"}
+ISHTAR_DOC_TYPES = {u"undefined": u"Undefined"}
 
 ISHTAR_DPTS = []
 
@@ -221,10 +221,8 @@ if LOGFILE:
 
 INTERNAL_IPS = ('127.0.0.1',)
 
-if 'JQUERY_URL' not in globals():
-    JQUERY_URL = BASE_URL + "javascript/jquery/jquery.js"
-if 'JQUERY_UI_URL' not in globals():
-    JQUERY_UI_URL = BASE_URL + "javascript/jquery-ui/"
+JQUERY_URL = STATIC_URL + "js/jquery.min.js"
+JQUERY_UI_URL = STATIC_URL + "js/jquery-ui/"
 
 
 if DEBUG_TOOLBAR:
@@ -243,7 +241,7 @@ if DEBUG_TOOLBAR:
         'debug_toolbar.panels.signals.SignalDebugPanel',
         'debug_toolbar.panels.logger.LoggingPanel',
     )
-    DEBUG_TOOLBAR_CONFIG = {'INTERCEPT_REDIRECTS':False}
+    DEBUG_TOOLBAR_CONFIG = {'INTERCEPT_REDIRECTS': False}
 
 import sys
 if 'test' in sys.argv or 'test_coverage' in sys.argv:
@@ -252,6 +250,6 @@ if 'test' in sys.argv or 'test_coverage' in sys.argv:
 
 if SQL_DEBUG:
     LOGGING['loggers']['django.db.backends'] = {
-            'level': 'DEBUG',
-            'handlers': ['console'],
-        }
+        'level': 'DEBUG',
+        'handlers': ['console'],
+    }
diff --git a/ishtar_common/templates/base.html b/ishtar_common/templates/base.html
index 92e61493b..37b8c4a05 100644
--- a/ishtar_common/templates/base.html
+++ b/ishtar_common/templates/base.html
@@ -16,7 +16,7 @@
     <script language="javascript" type="text/javascript" src="{{JQUERY_UI_URL}}ui/i18n/jquery.ui.datepicker-{{COUNTRY}}.js"></script>
     <script language="javascript" type="text/javascript" src="{{STATIC_URL}}/js/prettyPhoto/js/jquery.prettyPhoto.js"></script>
     <script language="javascript" type="text/javascript" src="{{STATIC_URL}}/js/ishtar.js"></script>
-    <link type="text/css" href="{{JQUERY_UI_URL}}css/smoothness/jquery-ui.css" rel="stylesheet" />
+    <link type="text/css" href="{{JQUERY_UI_URL}}jquery-ui.css" rel="stylesheet" />
     <link rel="stylesheet" href="{{STATIC_URL}}/js/prettyPhoto/css/prettyPhoto.css" />
     <link rel="stylesheet" href="{{STATIC_URL}}/media/style.css" />
     {% include "blocks/extra_head.html" %}
diff --git a/ishtar_common/templates/window.html b/ishtar_common/templates/window.html
index c3d8ccf6a..c8e187728 100644
--- a/ishtar_common/templates/window.html
+++ b/ishtar_common/templates/window.html
@@ -15,7 +15,7 @@
     <script language="javascript" type="text/javascript" src="{{JQUERY_UI_URL}}ui/i18n/jquery.ui.datepicker-{{COUNTRY}}.js"></script>
     <script language="javascript" type="text/javascript" src="{{STATIC_URL}}/js/ishtar.js"></script>
     {{form.media}}
-    <link type="text/css" href="{{JQUERY_UI_URL}}css/smoothness/jquery-ui.css" rel="stylesheet" />
+    <link type="text/css" href="{{JQUERY_UI_URL}}jquery-ui.css" rel="stylesheet" />
     <link rel="stylesheet" href="{{STATIC_URL}}/media/style.css" />
     {% block extra_head %}
     {% endblock %}
diff --git a/ishtar_pdl/static/pdl/styles.css b/ishtar_pdl/static/pdl/styles.css
index f7a73f8eb..0f7980033 100644
--- a/ishtar_pdl/static/pdl/styles.css
+++ b/ishtar_pdl/static/pdl/styles.css
@@ -6,6 +6,7 @@ div#validation-bar{
     left: 0px;
     height: 40px;
     padding: 5px;
+    z-index: 101;
 }
 
 #reset_wizards{