Merge branch 'develop'

Indicia-Team · May 29, 2019 · e541939 · e541939
2 parents 06fc475 + 3e50597
commit e541939
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 15 deletions.
diff --git a/css/theme-bootstrap-3.css b/css/theme-bootstrap-3.css
diff --git a/css/theme-bootstrap-3.css.map b/css/theme-bootstrap-3.css.map
diff --git a/css/theme-generic.css b/css/theme-generic.css
diff --git a/css/theme-generic.css.map b/css/theme-generic.css.map
diff --git a/js/indicia.datacomponents/jquery.idc.leafletMap.js b/js/indicia.datacomponents/jquery.idc.leafletMap.js
@@ -213,7 +213,7 @@
           maxZoom: 17,
           attribution: 'Map data: &copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors, ' +
             '<a href="http://viewfinderpanoramas.org">SRTM</a> | Map style: &copy; <a href="https://opentopomap.org">OpenTopoMap</a> ' +
-            '(<a href="https://creativecommons.org/licenses/by-sa/3.0/">CC-BY-SA</a>)'
+            '(<a href="https://creativecommons.org/licenses/by-sa/3.0/">CC BY-SA</a>)'
         })
       };
       // Add the active base layer to the map.

diff --git a/js/jquery.indiciaMapPanel.js b/js/jquery.indiciaMapPanel.js
@@ -2319,7 +2319,13 @@ var destroyAllFeatures;
           }
           div.map.addLayer(lSwitch);
           // Ensure layer inserts at correct position.
-          div.map.setLayerIndex(lSwitch, div.map.getLayerIndex(div.map.baseLayer));
+          if ($.isArray(availableLayers[id])) {
+            //For dynamic layers, search for the default layer - index 0 - and use that
+            //for the insertion position
+            div.map.setLayerIndex(lSwitch, div.map.getLayerIndex(div.map.getLayersBy('layerId', availableLayers[id][0]().layerId)[0]));
+          } else {
+            div.map.setLayerIndex(lSwitch, div.map.getLayerIndex(div.map.baseLayer));
+          }
         }
       }
       if (lSwitch && div.map.getExtent()) {

diff --git a/js/jquery.reportgrid.js b/js/jquery.reportgrid.js
@@ -647,7 +647,8 @@
                         metadata += '<div class="image-caption">' + response[0].caption + '</div>';
                       }
                       if (response[0].licence_title !== null) {
-                        metadata += '<div class="licence"><span class="icon licence-' + response[0].licence_code.toLowerCase() + '"></span>' +
+                        metadata += '<div class="licence">' +
+                          '<span class="icon licence-' + response[0].licence_code.toLowerCase().replace(/ /g, '-') + '"></span>' +
                           response[0].licence_title +
                           '</div>';
                       }

diff --git a/scss/common/_ol2-map.scss b/scss/common/_ol2-map.scss
@@ -1,8 +1,4 @@
 .olMap {
-  .olForeignContainer {
-    top: 0;
-    position: absolute;
-  }
   img {
     border: none !important;
   }

diff --git a/scss/generic/_bootstrapify.scss b/scss/generic/_bootstrapify.scss
@@ -55,4 +55,26 @@ $color-danger: #ff7777;
       background-color: lighten($color-danger, 30%);
     }
   }
+}
+
+/* Data value lists */
+@media (min-width: 768px) {
+  .dl-horizontal {
+    dt, dd {
+      line-height: 1.42;
+    }
+    dt {
+      font-weight: bold;
+      float: left;
+      width: 160px;
+      clear: left;
+      text-align: right;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+    dd {
+      margin: 4px 0 4px 180px;
+    }
+  }
 }