WIP. Working on moving towards using geonode search page.

MapStory · Nov 27, 2018 · fef4999 · fef4999
1 parent 30c6443
commit fef4999
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 14 deletions.
diff --git a/deps/django-osgeo-importer b/deps/django-osgeo-importer
diff --git a/mapstory/settings/base.py b/mapstory/settings/base.py
@@ -25,8 +25,9 @@
 import os
 import sys
 
-import geonode
 import pyproj
+
+import geonode
 from geonode.settings import *
 
 
@@ -88,7 +89,8 @@ def is_valid(v):
 ENABLE_FORM_LOGIN = str_to_bool(os.environ.get('ENABLE_FORM_LOGIN', 'True'))
 USER_SNAP = str_to_bool(os.environ.get('USER_SNAP', 'False'))
 GOOGLE_ANALYTICS = os.environ.get('GOOGLE_ANALYTICS', '')
-SESSION_EXPIRE_AT_BROWSER_CLOSE = os.environ.get('SESSION_EXPIRE_AT_BROWSER_CLOSE', 'False')
+SESSION_EXPIRE_AT_BROWSER_CLOSE = os.environ.get(
+    'SESSION_EXPIRE_AT_BROWSER_CLOSE', 'False')
 
 #
 # Application Settings
@@ -606,7 +608,7 @@ def is_valid(v):
 #
 # Haystack Settings
 #
-HAYSTACK_SEARCH = True
+HAYSTACK_SEARCH = False
 # Update facet counts from Haystack
 HAYSTACK_FACET_COUNTS = False
 HAYSTACK_URL = "%s://%s:%d" % (os.environ['PRIVATE_PROTOCOL'],

diff --git a/mapstory/static/bower.json b/mapstory/static/bower.json
@@ -2,23 +2,20 @@
   "name": "mapstory",
   "version": "0.0.1",
   "devDependencies": {
-    "angular-mocks": "1.6.5"
+    "angular-mocks": "1.4.0"
   },
   "dependencies": {
     "jquery": ">=1.8.0",
-    "angular": "1.6.5",
+    "angular": "1.4.0",
     "bootstrap": "3.1.1",
     "story-tools": "../../deps/story-tools",
     "fontawesome": "https://github.com/FortAwesome/Font-Awesome.git#~4.6.0",
     "lato-font": "1.1.0",
     "clipboard": "^1.5.12",
-    "angular-material": "1.1.4",
-    "angular-aria": "1.6.5",
-    "angular-animate": "1.6.5",
     "underscore": "1.8.3",
     "OpenLayers" : "https://github.com/openlayers/openlayers/releases/download/v4.6.4/v4.6.4-dist.zip"
   },
   "resolutions": {
-    "angular": "1.6.5"
+    "angular": "1.4.0"
   }
 }
diff --git a/mapstory/templates/_site_scripts.html b/mapstory/templates/_site_scripts.html
@@ -23,8 +23,7 @@
     USER = "{{ user }}";
 </script>
 
-<script src="{{ STATIC_URL }}mapstory/js/dist/vendor-assets-min.js"></script>
-<script src="{{ STATIC_URL }}mapstory/js/dist/mapstory.js"></script>
+<script src="{{ STATIC_URL }}vendor/angular/angular.min.js"></script>
 
 <!-- Script for animating navigation submenus -->
 <script type="text/javascript">

diff --git a/mapstory/templates/site_base.html b/mapstory/templates/site_base.html
@@ -3,7 +3,6 @@
 {% endblock twitter-cards %}
 {% block extra_head %}
     <link rel="stylesheet" href="{{ STATIC_URL }}vendor/bootstrap/dist/css/bootstrap.min.css"/>
-    <link rel="stylesheet" href="{{ STATIC_URL }}vendor/angular-material/angular-material.min.css"/>
     {% include "osgeo_importer/_importer_styles.html" %}
     {% if site.assets.favicon %}
     <link rel="shortcut icon" href="{{ MEDIA_URL }}{{ site.assets.favicon.name }}">

diff --git a/mapstory/urls.py b/mapstory/urls.py
@@ -38,7 +38,7 @@
 
                        url(r'^get(?P<slug>\w+)$',
                            GetPageView.as_view(), name='getpage'),
-                       url(r'^search/$', SearchView.as_view(), name='search'),
+                       #url(r'^search/$', SearchView.as_view(), name='search'),
                        url(r'^about/leadership$', LeaderListView.as_view(
                            template_name='mapstory/leaders.html'), name='about-leaders'),
                        url(r'^icons/', include('icon_commons.urls')),
+1 −1		osgeo_importer/static/osgeo_importer/importer.js
+25 −36		osgeo_importer/static/osgeo_importer/js/angular-cookies.js
+130 −320		osgeo_importer/static/osgeo_importer/js/angular-resource.js
+4,790 −10,488		osgeo_importer/static/osgeo_importer/js/angular.js