Merge branch 'master' of https://github.com/erdc-cm/tethysapp-streamf…

…low_prediction_tool
erdc · Aug 17, 2017 · 97210bd · 97210bd
2 parents 4a9bdd8 + 14ed187
commit 97210bd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/tethysapp/streamflow_prediction_tool/public/js/map.js b/tethysapp/streamflow_prediction_tool/public/js/map.js
@@ -1153,6 +1153,7 @@ var ERFP_MAP = (function() {
     //FUNCTION: Loads Hydrograph from Selected feature
     loadHydrographFromFeature = function(selected_feature, from_units_toggle) {
         $('.intro_message').addClass('hidden');
+        $('#app-content-wrapper #app-content').css('padding-bottom', 0);
         //check if old ajax call still running
         if(!isNotLoadingPastRequest()) {
             //updateInfoAlert
@@ -2237,6 +2238,11 @@ var ERFP_MAP = (function() {
             });
         });
 
+        //remove space at bottom when message dismissed
+        $("#close_map_intro_message").click(function() {
+            $('#app-content-wrapper #app-content').css('padding-bottom', 0);
+        });
+
         //init tooltip
         $('.boot_tooltip').tooltip();
 

diff --git a/tethysapp/streamflow_prediction_tool/templates/streamflow_prediction_tool/map.html b/tethysapp/streamflow_prediction_tool/templates/streamflow_prediction_tool/map.html
@@ -49,7 +49,8 @@
 
 
 {% block app_content %}
-    <div class="alert alert-info intro_message" role="alert">
+    <div class="alert alert-info alert-dismissible intro_message" role="alert">
+        <button id="close_map_intro_message" type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
         <span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span>
         Zoom in and click on a river segment or search by river ID to view predictions.
     </div>