Merge branch 'master' of github.com:eoxc/CODE-DE

eoxc · Jan 13, 2017 · 86cf75b · 86cf75b
2 parents d60880a + d3150dc
commit 86cf75b
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 5 deletions.
diff --git a/src/code-de.html b/src/code-de.html
@@ -140,7 +140,8 @@
                 "format": "application\/atom+xml",
                 "method": "GET",
                 "histogramThreshold": 500,
-                "lightweightBuckets": true
+                "lightweightBuckets": true,
+                "searchLimit": 2000
             },
             "download": {
                 "protocol": "OpenSearch",

diff --git a/src/envisat.html b/src/envisat.html
@@ -34,6 +34,7 @@
         "displayInterval": "P1Y",
         "selectableInterval": "P1M",
         "maxTooltips": 1,
+        "timeSliderControls": true,
         "highlightFillColor": "rgba(255, 165, 0, 0.5)",
         "highlightStrokeColor": "rgba(255, 165, 0, 1)",
         "rightPanelOpen": true,
@@ -148,6 +149,7 @@
             "lightweightBuckets": true,
             "histogramThreshold": 200,
             "histogramBinCount": 30,
+            "searchLimit": 1000
         },
     }],
     "overlayLayers": [{

diff --git a/src/fedeo.html b/src/fedeo.html
@@ -34,6 +34,7 @@
         "displayInterval": "P1M",
         "selectableInterval": "P1D",
         "maxTooltips": 10,
+        "timeSliderControls": true,
         "highlightFillColor": "rgba(255, 0, 0, 0.5)",
         "highlightStrokeColor": "rgba(255, 0, 0, 1)",
         "rightPanelOpen": true,
@@ -132,6 +133,7 @@
             "lightweightBuckets": true,
             "histogramThreshold": 200,
             "histogramBinCount": 30,
+            "searchLimit": 1000
         },
     }],
     "overlayLayers": [{

diff --git a/src/index.html b/src/index.html
@@ -34,6 +34,7 @@
         "displayInterval": "P1Y",
         "selectableInterval": "P14D",
         "maxTooltips": 10,
+        "timeSliderControls": true,
         "highlightFillColor": "rgba(255, 0, 0, 0.5)",
         "highlightStrokeColor": "rgba(255, 0, 0, 1)",
         "rightPanelOpen": true,
@@ -134,7 +135,8 @@
             "id": "MER_FRS_RGB",
             "protocol": "OpenSearch",
             "url": "http://ows.eox.at/cite_staging/eoxserver/opensearch/collections/MER_FRS_RGB/",
-            "lightweightBuckets": false
+            "lightweightBuckets": false,
+            "searchLimit": 100
         },
         "download": {
             "protocol": "OpenSearch",

diff --git a/src/landsat.html b/src/landsat.html
@@ -142,7 +142,7 @@
             "lightweightBuckets": false,
             "histogramThreshold": 200,
             "histogramBinCount": 30,
-            "searchLimit": 200,
+            "searchLimit": 500
         },
     }],
     "overlayLayers": [{

diff --git a/src/views/RootLayoutView.js b/src/views/RootLayoutView.js
@@ -10,7 +10,7 @@ export default Marionette.LayoutView.extend({
     <div id="leftPanel" style="margin: 0; left: 0; top: 0;position: absolute; height: 100%"></div>
     <div id="rightPanel" style="margin: 0; right: 0; top: 0; position: absolute; height: 100%"></div>
     <div id="bottomPanel" style="position: absolute; left: 50%; bottom: 20px; display: none;"></div>
-    <div id="topPanel" style="position: absolute; left: 50%; top: 20px; display: none;"></div>
+    <div id="topPanel"></div>
     <div id="modals" style="margin: 0; left: 0; top: 0;position: absolute;"></div>
   `,
   regions: {

diff --git a/src/views/SearchLimitWarningView.css b/src/views/SearchLimitWarningView.css
@@ -0,0 +1,11 @@
+#topPanel {
+  display: none;
+  position: absolute;
+  top: 20px;
+  width: 280px;
+  left: -moz-calc(50% - 140px) !important;
+  left: -webkit-calc(50% - 140px) !important;
+  left: -o-calc(50% - 140px) !important;
+  left: calc(50% - 140px) !important;
+  border-radius: 4px;
+}
diff --git a/src/views/SearchLimitWarningView.js b/src/views/SearchLimitWarningView.js
@@ -1,5 +1,7 @@
 import Marionette from 'backbone.marionette';
 
+require('./SearchLimitWarningView.css');
+
 export default Marionette.ItemView.extend({
-  template: () => '<div class="alert alert-danger">Search hit more records than are actually shown</div>',
+  template: () => '<div class="alert alert-danger">Narrow down search to show all results</div>',
 });