MapStory · Coop56 · Dec 10, 2018 · Oct 23, 2018 · Oct 24, 2018 · Oct 24, 2018
diff --git a/.travis.yml b/.travis.yml
@@ -29,6 +29,7 @@ addons:
     tunnel_domains: docker
 
 before_install:
+  - python -c "import fcntl; fcntl.fcntl(1, fcntl.F_SETFL, 0)"
   - echo "Travis PR repo $TRAVIS_PULL_REQUEST_SLUG";
     echo "Travis PR branch $TRAVIS_PULL_REQUEST_BRANCH";
     echo "Travis target repo $TRAVIS_REPO_SLUG";

diff --git a/deps/story-tools-composer b/deps/story-tools-composer
diff --git a/mapstory/static/gruntfile.js b/mapstory/static/gruntfile.js
@@ -56,8 +56,6 @@ module.exports = function(grunt) {
       vendor:{
         files: {
            'mapstory/js/dist/vendor-assets-min.js':[
-            'vendor/jquery/dist/jquery.min.js',
-            'vendor/bootstrap/dist/js/bootstrap.min.js',
             'vendor/angular/angular.min.js',
             'vendor/angular-animate/angular-animate.min.js',
             'vendor/angular-aria/angular-aria.min.js',

diff --git a/mapstory/static/karma.conf.js b/mapstory/static/karma.conf.js
@@ -7,7 +7,6 @@ module.exports = function(config) {
     browsers: ['PhantomJS'],
     files: [
       // angular source
-      'vendor/jquery/dist/jquery.min.js',
       'vendor/angular/angular.js',
       'vendor/angular-animate/angular-animate.min.js',
       'vendor/angular-aria/angular-aria.min.js',

diff --git a/mapstory/static/style/site/base.less b/mapstory/static/style/site/base.less
@@ -365,3 +365,10 @@ form {
 .inbox-avatar img {
   max-height: 30px;
 }
+
+div#user_messages {
+  position: relative;
+  width: inherit;
+  margin-top: inherit;
+  right: inherit;
+}
diff --git a/mapstory/static/style/themes/orange/site.less b/mapstory/static/style/themes/orange/site.less
@@ -4,4 +4,13 @@
 // overwrite / customize any of the site/variables.less rules you'd like to only change for this theme here:
 //
 //
+.btn {
+    background-color: #f5f5f5;
+    border-color: #f5f5f5;
+    color: #999
+}
+
+.btn:hover {
+    background-color: @primary
+}
 @import '../../site/site.less';
diff --git a/mapstory/templates/403.html b/mapstory/templates/403.html
@@ -1,4 +1,4 @@
-{% extends "site_base.html" %}
+{% extends "geonode_base.html" %}
 
 {% load i18n %}
 

diff --git a/mapstory/templates/404.html b/mapstory/templates/404.html
@@ -1,4 +1,4 @@
-{% extends "site_base.html" %}
+{% extends "geonode_base.html" %}
 
 {% load i18n %}
 

diff --git a/mapstory/templates/500.html b/mapstory/templates/500.html
@@ -1,4 +1,4 @@
-{% extends "site_base.html" %}
+{% extends "geonode_base.html" %}
 
 {% load i18n %}
 

diff --git a/...emplates/layers/_geogig_layer_detail.html → mapstory/templates/_geogig_layer_detail.html b/...emplates/layers/_geogig_layer_detail.html → mapstory/templates/_geogig_layer_detail.html
@@ -37,4 +37,4 @@ <h4>Pulling latest GeoGig data.</h4>
     </div>
   </div>
 </div>
-{% endverbatim %}
+{% endverbatim %}
diff --git a/...ory/templates/layers/_geogig_scripts.html → mapstory/templates/_geogig_scripts.html b/...ory/templates/layers/_geogig_scripts.html → mapstory/templates/_geogig_scripts.html
@@ -13,7 +13,6 @@
         repoURL: '{% geogig_repo_url resource %}'
     });
     module.requires.push('geogig');
-
     moment.locale('en', {
         calendar: {
             lastDay: '[yesterday at] LT',

diff --git a/mapstory/templates/_site_scripts.html b/mapstory/templates/_site_scripts.html
@@ -24,8 +24,6 @@
 </script>
 
 <script src="{{ STATIC_URL }}mapstory/js/dist/vendor-assets-min.js"></script>
-<script src="{{ STATIC_URL }}lib/js/moment-with-locales.min.js"></script>
-
 <script src="{{ STATIC_URL }}mapstory/js/dist/mapstory.js"></script>
 
 <!-- Script for animating navigation submenus -->
@@ -80,7 +78,6 @@
 </script>
 
 {% include "osgeo_importer/_importer_scripts.html" %}
-{% include 'autocomplete_light/static.html' %}
 {% include "favorite/_favorite_js.html" %}
 
 <script src="{% url 'django.views.i18n.javascript_catalog' %}"></script>

diff --git a/mapstory/templates/geonode_base.html b/mapstory/templates/geonode_base.html
@@ -1 +1,4 @@
-{% extends "site_base.html" %}
+{% extends "site_base.html" %}
+
+{% load i18n %}
+{% load staticfiles %}
diff --git a/mapstory/templates/icons/icon_upload.html b/mapstory/templates/icons/icon_upload.html
@@ -1,7 +1,4 @@
-{% extends "site_base.html" %}
-
-{% block extra_head %}
-{% endblock %}
+{% extends "geonode_base.html" %}
 
 {% block middle %}
     <div class="container">

diff --git a/mapstory/templates/index.html b/mapstory/templates/index.html
@@ -1,4 +1,4 @@
-{% extends "site_base.html" %}
+{% extends "geonode_base.html" %}
 {% load i18n %}
 
 {% block middle %}

diff --git a/mapstory/templates/layers/_details.html b/mapstory/templates/layers/_details.html
diff --git a/mapstory/templates/layers/_download_modal.html b/mapstory/templates/layers/_download_modal.html
+7 −27		app/layers/addLayerDirective.js
+6 −6		app/state/spec/stateSvc.spec.js
+7 −13		app/state/stateSvc.js
+0 −14		app/ui/locationSvc.js
+6 −16		app/ui/navigationSvc.js
+18 −17		app/ui/spec/navigationSvc.spec.js
+11 −2		karma.config.js
+0 −1		package.json
+1,577 −77		yarn.lock
-Original file line number
+Diff line change
@@ Expand Up / @@ -37,4 +37,4 @@ <h4>Pulling latest GeoGig data.</h4> @@
         </div>
       </div>
     </div>
-    {% endverbatim %}
+    {% endverbatim %}