Changeset 21640 in main

Timestamp:

09/23/20 20:48:53 (5 weeks ago)

Author:

GarthBraithwaite_STG

Message:

view - leaflet updates to better support interactive layers. Spring security - added notes on spring auth forcing https and turned on by default.

Location:

trunk/ibisph-view/src/main/webapp

Files:

• WEB-INF/config/spring/security.xml (modified) (1 diff)
• css/DataViz.css (modified) (2 diffs)
• image/icon/leaflet/alcohol.png (moved) (moved from trunk/ibisph-view/src/main/webapp/image/icon/leaflet/alchohol.png)
• js/L.GeoJSON.Interactive.js (modified) (5 diffs)
• xslt/html/SiteSpecific.xslt (modified) (1 diff)
• xslt/html/indicator/profile/summary/Page.xslt (modified) (1 diff)
• xslt/html/query/module/result/Page.xslt (modified) (1 diff)
• xslt/html/user/login/Login.xslt (modified) (2 diffs)

trunk/ibisph-view/src/main/webapp/WEB-INF/config/spring/security.xml

@@ -210 +210 @@
                 </constructor-arg>
                 <property name="useForward" value="false"/>
-                <property name="forceHttps" value="false"/>
+<!-- turns HTTPS on for the login and for all following requests.  This unless
+        the channel is explicitly configured for HTTP and HTTPS.  
+        GOTCHAS:
+        - app server has to be configured to handle the protocol.
+        - If the app uses the default context then first request sets the protocol
+                for all resource requests ie if the first request the app makes is HTTP
+                then all resource requests will be http.  Likewise for HTTPS.
+        - certs are needed with some browsers not wanting to use self signed certs.
+        RECOMMENDED:
+        - If public server have a proxy that does only HTTPS and has a valid cert.
+                Behind the DMZ setup everything else to be HTTP to avoid cert issues.
+        - If mixing HTTP and S then configure the channel filters.  Can have the 
+                force on if wanted but if channels are setup correctly it is not needed.
+-->
+                <property name="forceHttps" value="true"/>
         </bean>
 

trunk/ibisph-view/src/main/webapp/css/DataViz.css

@@ -142 +142 @@
         background-image:       url("../image/icon/leaflet/alcohol.png");
 }
+.DataViz.Map .GeoSuperfundIconMarker
+{
+        background:             red;
+        color:                          white;
+        border-radius:          50%;
+    width:                              20px;
+    height:                     20px; 
+}
 
 
@@ -223 +231 @@
 }
 
+.DataViz.Map .leaflet-popup-content a:hover
+{
+    color: var(--color-hover);
+}
+
 
 /* Leaflet overrides - if these get large might make sense to split out - similar to kendo overrides.css */

trunk/ibisph-view/src/main/webapp/js/L.GeoJSON.Interactive.js

@@ -94 +94 @@
                                 ,"autoPan": true                
                         }
+                        ,"featureDataTitleProperty": ["TITLE", "Title", "title", "Name", "name"]
                 }
 
@@ -213 +214 @@
                         ({
                                 contextmenuInheritItems: this.options.contextmenuInheritItems
-                                ,contextmenuItems: this.options.contextmenuItems
+                                ,contextmenuItems:       this.options.contextmenuItems
                         });
                 }
@@ -393 +394 @@
                 if(!e.target) e = this.contextMenuEvent;
                 var layer = e.target;
+
+                var latLng;
+                if("function" == typeof layer.getCenter) 
+                        latLng = layer.getCenter();
+                else if("function" == typeof layer.getLatLng) 
+                        latLng = layer.getLatLng();
+
                 var popup = L.popup(this.options.interactive.popupOptions, layer)
                         .setContent(this.getSelectionFeatureDataHTML(layer.feature))
-                        .setLatLng(layer.getBounds().getCenter())
+                        .setLatLng(latLng)
                         .openOn(layer._map)
                 ;
@@ -417 +425 @@
                 console.debug(this);
                 if(!e || !e.target) e = this.contextMenuEvent;
-                e.target._map.fitBounds(e.target.getBounds());
+
+                var bounds = null;
+                if("function" == typeof e.target.getBounds) 
+                        bounds = e.target.getBounds();
+                else if("function" == typeof e.target.getLatLngs) 
+                        bounds = e.target.getLatLngs();
+
+                if(bounds) e.target._map.fitBounds(bounds);
         } //~~~~~~~~~~~~~~~~~~~~~~~~~~~ End of Method  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -444 +459 @@
         ,getSelectionFeatureDataHTML: function(feature)
         {
-                var geoTitle = feature.properties[this.options.dataObject.fieldName.geoTitle];
-                if(!geoTitle) geoTitle = feature.properties["TITLE"];
-                if(!geoTitle) geoTitle = "Unknown Area";
-                var titleHTML = "<h4>" + geoTitle + "</h4>";
+                var geoTitle = null;
+                var titleHTML = null;
                 var dataHTML  = "";
-                for(key in feature.properties) dataHTML = dataHTML + key + ": " + feature.properties[key] + "<br/>";
+                for(key in feature.properties) 
+                {
+                        if(-1 != this.options.interactive.featureDataTitleProperty.indexOf(key))
+                                geoTitle = feature.properties[key];
+                        else if("links" == key) 
+                        {
+                                feature.properties[key].forEach
+                                        (link => 
+                                                (dataHTML = dataHTML + "<a href='" 
+                                                        + link.url 
+                                                        + "'>" 
+                                                        + link.title 
+                                                        + "</a><br/>"
+                                                )
+                                        );
+                        }
+                        else
+                                dataHTML = dataHTML + key + ": " + feature.properties[key] + "<br/>";
+                }
+
+                if(!geoTitle) geoTitle = feature.properties[this.options.dataObject.fieldName.geoTitle];
+                if(geoTitle) titleHTML = "<h4>" + geoTitle + "</h4>";
+
                 return(titleHTML + dataHTML);
         } //~~~~~~~~~~~~~~~~~~~~~~~~~~~ End of Method  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~

trunk/ibisph-view/src/main/webapp/xslt/html/SiteSpecific.xslt

@@ -247 +247 @@
                                 <div class="Block" style="float: right; width: 270px; padding: 0.3em 1rem 1rem 1rem; background-color: #6688aa; margin: 1em 0 0 1em;">
                                         <h3>Help us help you by providing feedback about this site or page:</h3>
-                                        <input type="button" value="Email Us..." style="width: 100%; font-size: 1rem; padding: 1rem; cursor: pointer; margin-top: 0.5em;"/>
+                                        <input type="button" value="Email Us..." 
+                                                onclick="location.href='mailto:ibis@doh.mystate.gov'" 
+                                                style="width: 100%; font-size: 1rem; padding: 1rem; cursor: pointer; margin-top: 0.5em;"
+                                        />
+                                        <!-- a href="mailto:ibis@doh.mystate.gov" style="width: 100%; font-size: 1rem; padding: 1rem; cursor: pointer; margin-top: 0.5em;">
+                                                Email Us
+                                        </a-->
                                 </div>
 

trunk/ibisph-view/src/main/webapp/xslt/html/indicator/profile/summary/Page.xslt

@@ -40 +40 @@
                 </xsl:call-template>
 
+
+
                 <!-- DataViz: loop for all views 
 GARTH TODO: When this is scrutinized/decided upon need to account for external 
 viz's etc.
                 -->
+
+
                 <xsl:if test="exists($indicator/INDICATOR_VIEWS/INDICATOR_VIEW/NAME)">
                         <xsl:call-template name="DataViz.choroplethMapJavaScript"/>

trunk/ibisph-view/src/main/webapp/xslt/html/query/module/result/Page.xslt

@@ -81 +81 @@
         <xsl:param name="Page.pleaseWaitMessageContent">
                 <div class="PleaseWait">
-                        <h2>Please wait.  Processing query.</h2>
+                        <h2>Please wait.  Processing Dataset Request.</h2>
                         The system is processing your data request.  Your browser should
                         be actively trying to load a page.  This is typically indicated by

trunk/ibisph-view/src/main/webapp/xslt/html/user/login/Login.xslt

@@ -67 +67 @@
                                                 <input type="text" id="username" name="username" 
                                                         size="40" maxlength="100" required="required" 
-                                                        value="{$ibis.userProfile/ID}" placeholder="Email or User ID"
+                                                        value="{$ibis.userProfile/ID}" placeholder="Email Address or User ID"
                                                         title="Login account username - typically your email address."
                                                 />
@@ -82 +82 @@
                                                 <input type="password" id="password" name="password" 
                                                         size="40" maxlength="100" required="required" 
-                                                        placeholder="password" 
+                                                        placeholder="Password" 
                                                         title="Your password for this application."
                                                 />