Update dkan to 1.12.13.0 (#54)

* Update CHANGELOG * Update dkan to 1.12.13
GetDKAN · Jan 4, 2017 · 084f7d0 · 084f7d0
1 parent f4f8478
commit 084f7d0
Show file tree

Hide file tree

Showing 46 changed files with 352 additions and 159 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,12 @@
 # Change log
+## [1.12.13.0]
+- Update dkan version to 7.x-1.12.13 https://github.com/NuCivic/dkan/releases/tag/7.x-1.12.13
+- Recolection of customize dkan docs #47
+- Adds support for private files if available in s3 backup #49
+- Fix ahoy build update. #50
+- Typo in ahoy utils files-link #51
+- Add troubleshooting steps when container doesn't start #52
+- Fix `ahoy build custom libs` not working. #53
 
 ## [1.12.12.0]
 ### Changed

diff --git a/build-dkan.make b/build-dkan.make
@@ -8,8 +8,8 @@ includes[core] = dkan/drupal-org-core.make
 projects[dkan][type] = profile
 projects[dkan][download][type] = git
 projects[dkan][download][url] = https://github.com/NuCivic/dkan.git
-projects[dkan][download][tag] = 7.x-1.12.12
+projects[dkan][download][tag] = 7.x-1.12.13
 
 ; Un-comment if diff is not empty.
-;projects[dkan][patch][1] = https://github.com/NuCivic/dkan/compare/7.x-1.12.12...release-1-12.diff
+;projects[dkan][patch][1] = https://github.com/NuCivic/dkan/compare/7.x-1.12.13...release-1-12.diff
 
diff --git a/config.yml b/config.yml
@@ -1,3 +1,3 @@
 data_starter:
-  version: 1.12.12.0
+  version: 1.12.13.0
 
diff --git a/dkan/dkan.info b/dkan/dkan.info
@@ -1,7 +1,7 @@
 name = DKAN
 core = 7.x
 exclusive = TRUE
-version = 7.x-1.12.12
+version = 7.x-1.12.13
 project = dkan
 
 ; Core

diff --git a/dkan/drupal-org.make b/dkan/drupal-org.make
@@ -2,9 +2,9 @@
 api: '2'
 core: 7.x
 includes:
-- https://raw.githubusercontent.com/NuCivic/dkan_dataset/7.x-1.12.12/dkan_dataset.make
-- https://raw.githubusercontent.com/NuCivic/dkan_datastore/7.x-1.12.12/dkan_datastore.make
-- https://raw.githubusercontent.com/NuCivic/dkan_workflow/7.x-1.12.12/dkan_workflow.make
+- https://raw.githubusercontent.com/NuCivic/dkan_dataset/7.x-1.12.13/dkan_dataset.make
+- https://raw.githubusercontent.com/NuCivic/dkan_datastore/7.x-1.12.13/dkan_datastore.make
+- https://raw.githubusercontent.com/NuCivic/dkan_workflow/7.x-1.12.13/dkan_workflow.make
 - https://raw.githubusercontent.com/NuCivic/visualization_entity/7.x-1.0-beta1/visualization_entity.make
 - modules/dkan/dkan_data_story/dkan_data_story.make
 - modules/dkan/dkan_topics/dkan_topics.make
@@ -39,19 +39,19 @@ projects:
     download:
       type: git
       url: https://github.com/NuCivic/dkan_dataset.git
-      tag: 7.x-1.12.12
+      tag: 7.x-1.12.13
   dkan_datastore:
     subdir: dkan
     download:
       type: git
       url: https://github.com/NuCivic/dkan_datastore.git
-      tag: 7.x-1.12.12
+      tag: 7.x-1.12.13
   dkan_workflow:
     subdir: dkan
     download:
       type: git
       url: https://github.com/NuCivic/dkan_workflow.git
-      tag: 7.x-1.12.12
+      tag: 7.x-1.12.13
   visualization_entity:
     download:
       type: git
@@ -160,7 +160,7 @@ projects:
     download:
       type: git
       url: https://github.com/NuCivic/nuboot_radix.git
-      tag: 7.x-1.12.12
+      tag: 7.x-1.12.13
     type: theme
   radix:
     type: theme

diff --git a/dkan/libraries/recline/dist/recline.js b/dkan/libraries/recline/dist/recline.js
@@ -1161,7 +1161,8 @@ my.Flot = Backbone.View.extend({
           y = item.datapoint[0].toFixed(2);
         }
 
-        var content = _.template('<%= group %> = <%= x %>, <%= series %> = <%= y %>', {
+        var template = _.template('<%= group %> = <%= x %>, <%= series %> = <%= y %>');
+        var content = template({
           group: this.state.attributes.group,
           x: this._xaxisLabel(x),
           series: item.series.label,
@@ -1406,9 +1407,9 @@ my.FlotControls = Backbone.View.extend({
     <form class="form-stacked"> \
       <div class="clearfix"> \
         <div class="form-group"> \
-          <label>Graph Type</label> \
+          <label for ="form-field-type">Graph Type</label> \
           <div class="input editor-type"> \
-            <select class="form-control"> \
+            <select id="form-field-type" class="form-control"> \
               <option value="lines-and-points">Lines and Points</option> \
               <option value="lines">Lines</option> \
               <option value="points">Points</option> \
@@ -1418,9 +1419,9 @@ my.FlotControls = Backbone.View.extend({
           </div> \
         </div> \
         <div class="form-group"> \
-          <label>Group Column (Axis 1)</label> \
+          <label for="field-form-group">Group Column (Axis 1)</label> \
           <div class="input editor-group"> \
-            <select class="form-control"> \
+            <select id="field-form-group" class="form-control"> \
               <option value="">Please choose ...</option> \
                 {{#fields}} \
               <option value="{{id}}">{{label}}</option> \
@@ -1444,11 +1445,11 @@ my.FlotControls = Backbone.View.extend({
   templateSeriesEditor: ' \
     <div class="editor-series js-series-{{seriesIndex}}"> \
       <div class="form-group"> \
-        <label>Series <span>{{seriesName}} (Axis 2)</span> \
+        <label for="form-field-{{seriesName}}">Series <span>{{seriesName}} (Axis 2)</span> \
           [<a href="#remove" class="action-remove-series">Remove</a>] \
         </label> \
         <div class="input"> \
-          <select class="form-control"> \
+          <select id="form-field-{{seriesName}}" class="form-control"> \
           {{#fields}} \
           <option value="{{id}}">{{label}}</option> \
           {{/fields}} \
@@ -1881,6 +1882,7 @@ my.Map = Backbone.View.extend({
 
   initialize: function(options) {
     var self = this;
+    this.options = options;
     this.visible = this.$el.is(':visible');
     this.mapReady = false;
     // this will be the Leaflet L.Map object (setup below)
@@ -2282,16 +2284,27 @@ my.Map = Backbone.View.extend({
 
   // Private: Sets up the Leaflet map control and the features layer.
   //
-  // The map uses a base layer from [OpenStreetMap.org](http://openstreetmap.org) based
-  // on [OpenStreetMap data](http://openstreetmap.org).
+  // The map uses a base layer from [Stamen](http://maps.stamen.com) based
+  // on [OpenStreetMap data](http://openstreetmap.org) by default, but it can
+  // be configured passing the `mapTilesURL` and `mapTilesAttribution` options
+  // (`mapTilesSubdomains` is also supported), eg:
+  //
+  //    view = new recline.View.Map({
+  //        model: dataset,
+  //        mapTilesURL: '//{s}.tiles.mapbox.com/v4/mapbox.mapbox-streets-v7/{z}/{x}/{y}.png?access_token=pk.XXXX',
+  //        mapTilesAttribution: '&copy; MapBox etc..',
+  //        mapTilesSubdomains: 'ab'
+  //    })
+  //
   //
   _setupMap: function(){
     var self = this;
     this.map = new L.Map(this.$map.get(0));
+    var mapUrl = this.options.mapTilesURL || 'https://stamen-tiles-{s}.a.ssl.fastly.net/terrain/{z}/{x}/{y}.png';
+    var attribution = this.options.mapTilesAttribution ||'Map tiles by <a href="http://stamen.com">Stamen Design</a> (<a href="http://creativecommons.org/licenses/by/3.0">CC BY 3.0</a>). Data by <a href="http://openstreetmap.org">OpenStreetMap</a> (<a href="http://creativecommons.org/licenses/by-sa/3.0">CC BY SA</a>)';
+    var subdomains = this.options.mapTilesSubdomains || 'abc';
 
-    var mapUrl = "http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png";
-    var osmAttribution = '©<a href="http://openstreetmap.org" target="_blank">OpenStreetMap</a> contributors';
-    var bg = new L.TileLayer(mapUrl, {maxZoom: 19, attribution: osmAttribution});
+    var bg = new L.TileLayer(mapUrl, {maxZoom: 19, attribution: attribution, subdomains: subdomains});
     this.map.addLayer(bg);
 
     this.markers = new L.MarkerClusterGroup(this._clusterOptions);
@@ -2337,18 +2350,18 @@ my.MapMenu = Backbone.View.extend({
               GeoJSON field</label> \
         </div> \
         <div class="editor-field-type-latlon"> \
-          <label>Latitude field</label> \
+          <label for="form-field-lat-field">Latitude field</label> \
           <div class="input editor-lat-field"> \
-            <select class="form-control"> \
+            <select id="form-field-lat-field" class="form-control"> \
             <option value=""></option> \
             {{#fields}} \
             <option value="{{id}}">{{label}}</option> \
             {{/fields}} \
             </select> \
           </div> \
-          <label>Longitude field</label> \
+          <label for="form-field-lon-field">Longitude field</label> \
           <div class="input editor-lon-field"> \
-            <select class="form-control"> \
+            <select id="form-field-lon-field" class="form-control"> \
             <option value=""></option> \
             {{#fields}} \
             <option value="{{id}}">{{label}}</option> \
@@ -2357,9 +2370,9 @@ my.MapMenu = Backbone.View.extend({
           </div> \
         </div> \
         <div class="editor-field-type-geom" style="display:none"> \
-          <label>Geometry field (GeoJSON)</label> \
+          <label for="form-field-type-geom">Geometry field (GeoJSON)</label> \
           <div class="input editor-geom-field"> \
-            <select class="form-control"> \
+            <select id="form-field-type-geom" class="form-control"> \
             <option value=""></option> \
             {{#fields}} \
             <option value="{{id}}">{{label}}</option> \
@@ -3227,13 +3240,7 @@ my.SlickGrid = Backbone.View.extend({
     }
 
     function sanitizeFieldName(name) {
-      var sanitized;
-      try{
-        sanitized = $(name).text();
-      } catch(e){
-        sanitized = '';
-      }
-      return (name !== sanitized && sanitized !== '') ? sanitized : name;
+      return $('<div>').text(name).html();
     }
 
     _.each(this.model.fields.toJSON(),function(field){
@@ -4045,16 +4052,16 @@ my.FilterEditor = Backbone.View.extend({
       <a href="#" class="js-add-filter">Add filter</a> \
       <form class="form-stacked js-add" style="display: none;"> \
         <div class="form-group"> \
-          <label>Field</label> \
-          <select class="fields form-control"> \
+          <label for="form-field-add-field">Field</label> \
+          <select id="form-field-add-field" class="fields form-control"> \
             {{#fields}} \
             <option value="{{id}}">{{label}}</option> \
             {{/fields}} \
           </select> \
         </div> \
         <div class="form-group"> \
-          <label>Filter type</label> \
-          <select class="filterType form-control"> \
+          <label for="form-field-filter-type">Filter type</label> \
+          <select id="form-field-filter-type" class="filterType form-control"> \
             <option value="term">Value</option> \
             <option value="range">Range</option> \
             <option value="geo_distance">Geo distance</option> \

diff --git a/dkan/libraries/recline/dist/recline.min.js b/dkan/libraries/recline/dist/recline.min.js
diff --git a/dkan/libraries/recline/src/view.flot.js b/dkan/libraries/recline/src/view.flot.js
@@ -123,7 +123,8 @@ my.Flot = Backbone.View.extend({
           y = item.datapoint[0].toFixed(2);
         }
 
-        var content = _.template('<%= group %> = <%= x %>, <%= series %> = <%= y %>', {
+        var template = _.template('<%= group %> = <%= x %>, <%= series %> = <%= y %>');
+        var content = template({
           group: this.state.attributes.group,
           x: this._xaxisLabel(x),
           series: item.series.label,
@@ -368,9 +369,9 @@ my.FlotControls = Backbone.View.extend({
     <form class="form-stacked"> \
       <div class="clearfix"> \
         <div class="form-group"> \
-          <label>Graph Type</label> \
+          <label for ="form-field-type">Graph Type</label> \
           <div class="input editor-type"> \
-            <select class="form-control"> \
+            <select id="form-field-type" class="form-control"> \
               <option value="lines-and-points">Lines and Points</option> \
               <option value="lines">Lines</option> \
               <option value="points">Points</option> \
@@ -380,9 +381,9 @@ my.FlotControls = Backbone.View.extend({
           </div> \
         </div> \
         <div class="form-group"> \
-          <label>Group Column (Axis 1)</label> \
+          <label for="field-form-group">Group Column (Axis 1)</label> \
           <div class="input editor-group"> \
-            <select class="form-control"> \
+            <select id="field-form-group" class="form-control"> \
               <option value="">Please choose ...</option> \
                 {{#fields}} \
               <option value="{{id}}">{{label}}</option> \
@@ -406,11 +407,11 @@ my.FlotControls = Backbone.View.extend({
   templateSeriesEditor: ' \
     <div class="editor-series js-series-{{seriesIndex}}"> \
       <div class="form-group"> \
-        <label>Series <span>{{seriesName}} (Axis 2)</span> \
+        <label for="form-field-{{seriesName}}">Series <span>{{seriesName}} (Axis 2)</span> \
           [<a href="#remove" class="action-remove-series">Remove</a>] \
         </label> \
         <div class="input"> \
-          <select class="form-control"> \
+          <select id="form-field-{{seriesName}}" class="form-control"> \
           {{#fields}} \
           <option value="{{id}}">{{label}}</option> \
           {{/fields}} \

diff --git a/dkan/libraries/recline/src/view.map.js b/dkan/libraries/recline/src/view.map.js
@@ -53,6 +53,7 @@ my.Map = Backbone.View.extend({
 
   initialize: function(options) {
     var self = this;
+    this.options = options;
     this.visible = this.$el.is(':visible');
     this.mapReady = false;
     // this will be the Leaflet L.Map object (setup below)
@@ -454,16 +455,27 @@ my.Map = Backbone.View.extend({
 
   // Private: Sets up the Leaflet map control and the features layer.
   //
-  // The map uses a base layer from [OpenStreetMap.org](http://openstreetmap.org) based
-  // on [OpenStreetMap data](http://openstreetmap.org).
+  // The map uses a base layer from [Stamen](http://maps.stamen.com) based
+  // on [OpenStreetMap data](http://openstreetmap.org) by default, but it can
+  // be configured passing the `mapTilesURL` and `mapTilesAttribution` options
+  // (`mapTilesSubdomains` is also supported), eg:
+  //
+  //    view = new recline.View.Map({
+  //        model: dataset,
+  //        mapTilesURL: '//{s}.tiles.mapbox.com/v4/mapbox.mapbox-streets-v7/{z}/{x}/{y}.png?access_token=pk.XXXX',
+  //        mapTilesAttribution: '&copy; MapBox etc..',
+  //        mapTilesSubdomains: 'ab'
+  //    })
+  //
   //
   _setupMap: function(){
     var self = this;
     this.map = new L.Map(this.$map.get(0));
+    var mapUrl = this.options.mapTilesURL || 'https://stamen-tiles-{s}.a.ssl.fastly.net/terrain/{z}/{x}/{y}.png';
+    var attribution = this.options.mapTilesAttribution ||'Map tiles by <a href="http://stamen.com">Stamen Design</a> (<a href="http://creativecommons.org/licenses/by/3.0">CC BY 3.0</a>). Data by <a href="http://openstreetmap.org">OpenStreetMap</a> (<a href="http://creativecommons.org/licenses/by-sa/3.0">CC BY SA</a>)';
+    var subdomains = this.options.mapTilesSubdomains || 'abc';
 
-    var mapUrl = "http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png";
-    var osmAttribution = '©<a href="http://openstreetmap.org" target="_blank">OpenStreetMap</a> contributors';
-    var bg = new L.TileLayer(mapUrl, {maxZoom: 19, attribution: osmAttribution});
+    var bg = new L.TileLayer(mapUrl, {maxZoom: 19, attribution: attribution, subdomains: subdomains});
     this.map.addLayer(bg);
 
     this.markers = new L.MarkerClusterGroup(this._clusterOptions);
@@ -509,18 +521,18 @@ my.MapMenu = Backbone.View.extend({
               GeoJSON field</label> \
         </div> \
         <div class="editor-field-type-latlon"> \
-          <label>Latitude field</label> \
+          <label for="form-field-lat-field">Latitude field</label> \
           <div class="input editor-lat-field"> \
-            <select class="form-control"> \
+            <select id="form-field-lat-field" class="form-control"> \
             <option value=""></option> \
             {{#fields}} \
             <option value="{{id}}">{{label}}</option> \
             {{/fields}} \
             </select> \
           </div> \
-          <label>Longitude field</label> \
+          <label for="form-field-lon-field">Longitude field</label> \
           <div class="input editor-lon-field"> \
-            <select class="form-control"> \
+            <select id="form-field-lon-field" class="form-control"> \
             <option value=""></option> \
             {{#fields}} \
             <option value="{{id}}">{{label}}</option> \
@@ -529,9 +541,9 @@ my.MapMenu = Backbone.View.extend({
           </div> \
         </div> \
         <div class="editor-field-type-geom" style="display:none"> \
-          <label>Geometry field (GeoJSON)</label> \
+          <label for="form-field-type-geom">Geometry field (GeoJSON)</label> \
           <div class="input editor-geom-field"> \
-            <select class="form-control"> \
+            <select id="form-field-type-geom" class="form-control"> \
             <option value=""></option> \
             {{#fields}} \
             <option value="{{id}}">{{label}}</option> \

diff --git a/dkan/libraries/recline/src/widget.filtereditor.js b/dkan/libraries/recline/src/widget.filtereditor.js
@@ -14,16 +14,16 @@ my.FilterEditor = Backbone.View.extend({
       <a href="#" class="js-add-filter">Add filter</a> \
       <form class="form-stacked js-add" style="display: none;"> \
         <div class="form-group"> \
-          <label>Field</label> \
-          <select class="fields form-control"> \
+          <label for="form-field-add-field">Field</label> \
+          <select id="form-field-add-field" class="fields form-control"> \
             {{#fields}} \
             <option value="{{id}}">{{label}}</option> \
             {{/fields}} \
           </select> \
         </div> \
         <div class="form-group"> \
-          <label>Filter type</label> \
-          <select class="filterType form-control"> \
+          <label for="form-field-filter-type">Filter type</label> \
+          <select id="form-field-filter-type" class="filterType form-control"> \
             <option value="term">Value</option> \
             <option value="range">Range</option> \
             <option value="geo_distance">Geo distance</option> \