Changeset 19927 in main

Timestamp:

03/02/20 11:59:30 (4 weeks ago)

Author:

GarthBraithwaite_STG

Message:

view - added topic bean xml.

Location:

trunk/ibisph-view/src/main/webapp

Files:

• WEB-INF/config/spring/common.xml (modified) (2 diffs)
• WEB-INF/config/spring/topic.xml (added)
• js/L.LayerSets.js (modified) (1 diff)
• js/jquery.leaflet.js (modified) (1 diff)
• xslt/html/community/Page.xslt (modified) (2 diffs)
• xslt/html/topic/HTMLContentPage.xslt (modified) (1 diff)
• xslt/json/LeafletMap.xslt (modified) (1 diff)

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

@@ -311 +311 @@
         <bean id="commonContentBasePathModelMap" class="org.ibisph.modelmap.SimpleGetModelMap">
                 <description>
-                        Used by some XSLT to dynamically access the 2ndardy XML 
-                        files as well as leaflet map and kendo json files.
-                        Injected into the main Page.xslt.
+                        Used by Java code to access remote XML files (like query modules) 
+                        and is passed into the XSLT enviro to dynamically access the 2ndardy 
+                        XML files (like community profile reports that loop a set of IPs)
+                        as well as leaflet map and kendo json files.  This value is injected 
+                        into the common alternate model maps with a handle defined in /Page.xslt.
                 </description>
                 <property name="modelMapKey" value="ContentBasePath"/>
@@ -329 +331 @@
                         If the webappBaseRequestPath is blank then this model map will build
                         the value using the webapp's server path and servlet context.  
+
+                        Why Needed ?:  IBIS tries to be a build once deploy many webapp.  The 
+                        webapp can be deployed into different enviros stand along server or
+                        the recommended reverse proxy.  The request paths can't be root
+                        relative because if app server only with mulitple apps or non dns 
+                        specific mapping proxy the context is needed.  If generic, hard coded 
+                        context is added (ibisph-view) then all deployments would need "that" 
+                        mapping.  The implemented solution for all non relative requests is  
+                        to use a variable requset prefix value.  This is more complex when 
+                        building page UI request URLs but not much more work compared with 
+                        hard coding a context in the request's URL.  
                 </description>
                 <property name="modelMapKey" value="WebAppBaseRequestPath"/>

trunk/ibisph-view/src/main/webapp/js/L.LayerSets.js

@@ -64 +64 @@
         // the work.  It adds/sets the properties then kicks things off via the
         // _addLayer().
+// GARTH TODO: maybe rename: webappContextPath to webappBaseRequestPath???
         ,initialize: function
         (

trunk/ibisph-view/src/main/webapp/js/jquery.leaflet.js

@@ -171 +171 @@
                         options.layerSets.selectionLayerSetSelectionType = options.selectionLayerSetSelectionType;
                 }
+// GARTH TODO: maybe rename: webappContextPath to webappBaseRequestPath???
                 var layerSets = new L.LayerSets(options.layerSets, options.webappContextPath, infoPanelControl.getContainer());
                 layerSets.addTo(leafletMap);

trunk/ibisph-view/src/main/webapp/xslt/html/community/Page.xslt

@@ -19 +19 @@
                 <description>
                         Community profile base XSLT.
+
+                        Since this XSLT is needed for all community pages even though the 
+                        facts page is HTML_CONTENT implemented CSS via XSLT like:
+                        [xsl:param name="Page.htmlClass" select="'Community'"/]
+                        [xsl:template name="Page.specificCSS"]
+                                [link rel="stylesheet" type="text/css" href="{$ibis.baseRequestPath}css/Community.css"/]
+                        [/xsl:template]
+
+                        For facts could have used for the XML elements for Topic CSS but this
+                        only covers the facts and not all community report type requests.
+                        HTML_CLASS]Community[/HTML_CLASS]
+                        [OTHER_HEAD_CONTENT]
+                                [link   ibis:href="css/Community.css" rel="stylesheet" type="text/css"/]
+                        [/OTHER_HEAD_CONTENT]
                 </description>
         </ibis:doc>
@@ -222 +236 @@
                 <script type="text/javascript" src="{$ibis.baseRequestPath}js/InputSelections.js"/>
                 <script type="text/javascript">
-                        var webappContextPath = "<xsl:value-of select="$ibis.baseRequestPath"/>";
-                        var dimensionName     = "<xsl:value-of select="$Page.dimensionName"/>";
+                        var dimensionName = "<xsl:value-of select="$Page.dimensionName"/>";
 
                         var selectionMapDialog;

trunk/ibisph-view/src/main/webapp/xslt/html/topic/HTMLContentPage.xslt

@@ -12 +12 @@
         <ibis:doc>
                 <name>html/topic/HTMLContentPage</name>
-                <summary>
-                </summary>
+                <summary>Provides topic specific IP selection list processing</summary>
                 <description>
+                        Topic CSS NOtes: Since this XSLT is used for all Topic HTML_CONTENT
+                        pages could implement via this XSLT (see below).  Issue with XSLT
+                        is that this overrides the default behavior of the HTML_CONTENT
+                        processing so specific OTHER_HEAD_CONTENT and HTML_CLASS can't be
+                        used as it's all or nothing without adding additional complexity.
+                        So left in the XML files for now for maximum flexibility.
+
+GARTH TODO: If lois wants all pages to scroll then implement XSLT version...
+                        This is currently done via each XML file including:
+                        HTML_CLASS]Topic[/HTML_CLASS]
+                        [OTHER_HEAD_CONTENT]
+                                [link   ibis:href="css/Topic.css" rel="stylesheet" type="text/css"/]
+                        [/OTHER_HEAD_CONTENT]
+
+                        or can be done in XSLT like:
+                        [xsl:param name="Page.htmlClass" select="'Topic'"/]
+                        [xsl:template name="Page.specificCSS"]
+                                [link rel="stylesheet" type="text/css" href="{$ibis.baseRequestPath}css/Topic.css"/]
+                        [/xsl:template]
                 </description>
         </ibis:doc>

trunk/ibisph-view/src/main/webapp/xslt/json/LeafletMap.xslt

@@ -56 +56 @@
                 <xsl:param name="mapTitle" select="'Request JSON'"/>
                 <xsl:param name="mapType"  select="'selection'"/>
+<!-- GARTH TODO: maybe rename webappContextPath to match JS IF changing JS var name???? --> 
                 <xsl:param name="webappContextPath" select="$ibis.baseRequestPath"/>
                 <xsl:param name="selectionLayerSetLayerKeys"/>