Changeset 16234 in main for trunk/ibisph-view/src/main/webapp/xslt/html/indicator/profile/view/Page.xslt

Timestamp:

05/19/18 11:53:16 (4 years ago)

Author:

Garth Braithwaite

Message:

temp admin, view - updated view xslt code with latest cop title and ip view mods. admin jsps updated before refactoring into tag lib templates.

File:

• trunk/ibisph-view/src/main/webapp/xslt/html/indicator/profile/view/Page.xslt (modified) (4 diffs)

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

@@ -25 +25 @@
 
         <xsl:param name="Page.pageTitle" ibis:doc="Page's title text based on the 'INDICATOR/TITLE' element.">
-                Health Indicator Report - <xsl:value-of select="$indicator/TITLE"/>
+                Health Indicator Report - <xsl:value-of select="ibis:getConciseIndicatorTitle($indicator)"/>
         </xsl:param>
         <xsl:param name="Page.sectionsTitle" ibis:doc="Page's content block title text based on the 'INDICATOR/TITLE' element.">
-                Health Indicator Report of <xsl:value-of select="$indicator/TITLE"/>
+                Health Indicator Report of <xsl:value-of select="ibis:getConciseIndicatorTitle($indicator)"/>
         </xsl:param>
 
@@ -147 +147 @@
 
                 <xsl:call-template name="ContentContainer.expandable">
-                        <xsl:with-param name="title" select="'Definitions &amp; Sources'"/>
+                        <xsl:with-param name="title" select="'Data Definitions &amp; Sources'"/>
                         <xsl:with-param name="content">
                                 <xsl:call-template name="Indicator.definition"/>
                                 <xsl:call-template name="Indicator.howCalculated"/>
-                                <xsl:call-template name="Indicator.howCalculated1"/>
-                                <xsl:call-template name="Indicator.numerator"/>
-                                <xsl:call-template name="Indicator.denominator"/>
                                 <xsl:call-template name="Indicator.dataSources"/>
                         </xsl:with-param>
@@ -187 +184 @@
                                 <xsl:call-template name="Indicator.moreResources"/>
                                 <xsl:call-template name="Indicator.otherInformation"/>
+                        </xsl:with-param>
+                        <xsl:with-param name="description" select="'Other related information and resources.'"/>
+                </xsl:call-template>
+
+                <xsl:call-template name="ContentContainer.expandable">
+                        <xsl:with-param name="title" select="'References'"/>
+                        <xsl:with-param name="content">
                                 <xsl:call-template name="Indicator.footnoteReferences"/>
                         </xsl:with-param>
-                        <xsl:with-param name="description" select="'Other related information and resources.'"/>
+                        <xsl:with-param name="description" select="'References that may / might not be cited on this page.'"/>
                 </xsl:call-template>
 
@@ -293 +297 @@
                                 ,<xsl:call-template name="Kendo.requestChartJSON">
                                         <xsl:with-param name="kendoDataSourceJavascriptVariableName" select="'kendoDataSource'"/>
-
-                                        <xsl:with-param name="title"         select="ibis:getCompleteIndicatorViewTitle($indicator, $indicatorView)"/>
+                                        <xsl:with-param name="title"         select="ibis:getChartTitle($indicator, $indicatorView)"/>
                                         <xsl:with-param name="seriesTitle"   select="$recordDimensionFields/RECORD_DIMENSION_FIELD[USAGE='series']/TITLE"/>
                                         <xsl:with-param name="categoryTitle" select="$recordDimensionFields/RECORD_DIMENSION_FIELD[USAGE='category']/TITLE"/>