update for django 2 python 3 in preperation for major release.

ODM2 · Oct 17, 2018 · d511ead · d511ead · miguelcleon · Oct 17, 2018
1 parent 35a41b4
commit d511ead
Show file tree

Hide file tree

Showing 12 changed files with 42 additions and 345 deletions.
diff --git a/odm2admin/templatetags/admin_shortcuts_mod.py b/odm2admin/templatetags/admin_shortcuts_mod.py
diff --git a/requirements.txt b/requirements.txt
@@ -5,7 +5,8 @@ django-daterange-filter
 django-import-export
 django-jquery
 # django-kronos
-django==2.1.2
+#django-ajax-selects is not working with django 2.1.2 or 2.1.1
+django==2.0.8
 # Pinned to 0.2.7 to preserve page style.
 djangocms-admin-style==0.2.7
 psycopg2

diff --git a/templatesAndSettings/settings/base.py b/templatesAndSettings/settings/base.py
@@ -174,13 +174,13 @@
     '{}'.format(APP_NAME),
     'import_export',
     'social_django',
-    'admin_shortcuts',
     'daterange_filter',
     'captcha',
     'fixture_magic',
     # 'dal',
     # 'dal_select2',
     'ajax_select',
+    'admin_shortcuts',
     'django.contrib.admin',
     'django.contrib.gis',
     'django.contrib.auth',
@@ -203,44 +203,45 @@
                 'url': CUSTOM_TEMPLATE_PATH,
                 'app_name': '{}'.format(APP_NAME),
                 'title': '{}'.format(VERBOSE_NAME),
-                'class': 'config',
+                'icon': 'cogs',
             },
             {
                 'url': '/' + 'AddSensor',
                 'app_name': '{}'.format(APP_NAME),
                 'title': 'Add Sensor Data',
-                'class': 'tool',
+                'icon': 'wrench', # tool
             },
             {
                 'url': '/' + 'AddProfile',
                 'app_name': '{}'.format(APP_NAME),
                 'title': 'Add Soil Profile Data',
-                'class': 'flag',
+                'icon': 'flag',
             },
             {
                 'url': '/' + 'RecordAction',
                 'app_name': '{}'.format(APP_NAME),
                 'title': 'Record an Action',
-                'class': 'notepad',
+                'icon': 'sticky-note',
             },
             {
                 'url': '/' + 'ManageCitations',
                 'app_name': '{}'.format(APP_NAME),
                 'title': 'Manage Citations',
-                'class': 'pencil',
+                'icon': 'edit',
             },
             {
                 'url': '/' + 'chartIndex',
                 'app_name': '{}'.format(APP_NAME),
-                'title': 'Graph My Data',
-                'class': 'monitor',
+                'title': 'Map My Data',
+                'icon': 'map-marked-alt',
             },
         ]
     },
 ]
 ADMIN_SHORTCUTS_SETTINGS = {
     'hide_app_list': False,
     'open_new_window': False,
+    'show_on_all_pages': True,
 }
 """ END ADMIN SHORTCUTS CONFIGURATION """
 

diff --git a/templatesAndSettings/templates/admin/app_index.html b/templatesAndSettings/templates/admin/app_index.html
@@ -1,7 +1,6 @@
 {% extends "admin/app_index.html" %}
 
 {% load admin_extras %}
-{% load admin_shortcuts_mod %}
 {% load static %}
 {% load i18n admin_static admin_shortcuts_tags %}
 {# django-admin-shortcuts changes these blocks #}
@@ -19,7 +18,7 @@
             </div>
         {% else %}
             <div class="admin_shortcuts">
-                {% admin_shortcuts_filter %}
+                {% admin_shortcuts %}
             </div>
         {% endif %}
         {% endfor %}

diff --git a/templatesAndSettings/templates/admin/base_site.html b/templatesAndSettings/templates/admin/base_site.html
@@ -1,18 +1,19 @@
 {% extends "admin/base.html" %}
 {% load i18n staticfiles admin_shortcuts_tags %}
-
 {% block extrastyle %}
+    <style type="text/css">{% admin_shortcuts_css %}</style>
+    {{ block.super }}
+    <link rel="stylesheet" type="text/css" href="{% static "admin/css/dashboard.css" %}"/>{% endblock %}
 
-{% endblock %}
 
-{% block extrahead %}
+{% block extrahead %}{{ block.super }}{% admin_shortcuts_js %}
 
 <link rel="stylesheet" type="text/css" href="{% static 'djangocms_admin_style/css/djangocms-admin.css' %}" />
 <meta name="viewport" content="width=device-width,initial-scale=1" />
 <script type="text/javascript">
 if (window.self!==window.top) { document.write('<link rel="stylesheet" type="text/css" href="{% static 'djangocms_admin_style/css/djangocms-admin-frontend.css' %}" />'); }
 </script>
-<script src="https://use.fontawesome.com/eb9894ac79.js"></script>
+
 <link rel="stylesheet" href="{% static "css/target_href_style.css" %}" />
 {% include 'admin/inc/extrahead.html' %}{% endblock %}
 

diff --git a/templatesAndSettings/templates/admin/inc/extrahead.html b/templatesAndSettings/templates/admin/inc/extrahead.html
@@ -1,3 +1,4 @@
 {% load admin_shortcuts_tags %}
+<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.4.1/css/all.css" integrity="sha384-5sAR7xN1Nv6T6+dT2mhtzEpVJvfS3NScPQTrOxhwjIuvcA67KV2R5Jz6kr4abQsz" crossorigin="anonymous">
 {% block extrahead %}{% admin_shortcuts_js %}
 {% endblock %}