![(please configure the [header_logo] section in trac.ini)](/trac/chrome/site/trac_banner.jpg)
Changeset 19902 in main
- Timestamp:
- 02/25/20 00:49:22 (2 years ago)
- Location:
- trunk
- Files:
-
- 1 added
- 12 edited
-
db/src/main/scripts/mysql/update_cleanup.sql (modified) (1 diff)
-
ibisph-view/src/main/webapp/css/ContentOptions.css (modified) (4 diffs)
-
ibisph-view/src/main/webapp/css/MegaMenu.css (modified) (1 diff)
-
ibisph-view/src/main/webapp/css/Topic.css (added)
-
ibisph-view/src/main/webapp/css/_general.css (modified) (1 diff)
-
ibisph-view/src/main/webapp/css/_layout.css (modified) (2 diffs)
-
ibisph-view/src/main/webapp/js/jquery.scrollBlockListItems.js (modified) (4 diffs)
-
ibisph-view/src/main/webapp/xslt/html/ContentContainer.xslt (modified) (2 diffs)
-
ibisph-view/src/main/webapp/xslt/html/Page.xslt (modified) (1 diff)
-
ibisph-view/src/main/webapp/xslt/html/community/facts/Page.xslt (modified) (5 diffs)
-
ibisph-view/src/main/webapp/xslt/html/community/indicators/Page.xslt (modified) (3 diffs)
-
ibisph-view/src/main/webapp/xslt/html/indicator/profile/Page.xslt (modified) (4 diffs)
-
ibisph-view/src/main/webapp/xslt/html/indicator/profile/summary/Page.xslt (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/db/src/main/scripts/mysql/update_cleanup.sql
r19336 r19902 40 40 41 41 drop table if exists INDICATOR_VIEW_VALUE; 42 drop table if exists INDICATOR_VIEW_VALUE_QUERY; 42 43 43 44 drop table if exists TMP_DATASET_RECORD; -
trunk/ibisph-view/src/main/webapp/css/ContentOptions.css
r19890 r19902 9 9 .ContentOptions 10 10 { 11 padding: 0.5em 1rem 1em 1rem;11 padding: 0.5em 1rem 0.7em 1rem; 12 12 background-color: #ebebeb; 13 } 14 15 16 .ContentOptions label 17 { 18 font-weight: bold; 13 19 } 14 20 … … 16 22 { 17 23 padding: 2px; 18 vertical-align: bottom; 24 line-height: 1.5rem; 25 vertical-align: middle; 19 26 } 20 27 .ContentOptions .ListTable tr td select 21 28 { 22 margin-top: 5px;23 29 padding: 3px; 24 30 } … … 34 40 35 41 42 .ContentOptions .Container 43 { 44 display: -ms-grid; /* IE 10 */ 45 display: grid; 46 grid-auto-columns: auto; 47 grid-auto-flow: column; 48 } 49 36 50 .ContentOptions .Container.Buttons 37 51 { 38 margin: 0.3em auto 0 auto;52 margin: 0.3em auto 0.5em auto; 39 53 text-align: center; 40 54 } 41 .ContentOptions .Container h4 55 .xContentOptions .Container.Buttons 56 { 57 grid-template-columns: repeat(auto-fit, minmax(140px, 1fr)); 58 margin: 0.3em auto 0.5em auto; 59 text-align: center; 60 } 61 .ContentOptions .Container .Block label 42 62 { 43 63 text-align: left; 44 64 } 45 65 46 .ContentOptions .Container > div66 .ContentOptions .Container .Block 47 67 { 48 68 display: inline-block; 49 69 padding-right: 2rem; 50 70 } 51 .ContentOptions .Container select71 .ContentOptions .Container .Block select 52 72 { 53 73 min-width: 150px; … … 135 155 .ContentOptions .Help.Popup 136 156 { 137 margin-top: 5px;138 157 } 139 158 .ContentOptions button .Help.Popup -
trunk/ibisph-view/src/main/webapp/css/MegaMenu.css
r19893 r19902 63 63 nav .MegaMenu .Body 64 64 { 65 /* grid in IE: https://medium.com/@elad/supporting-css-grid-in-internet-explorer-b38669e75d66 65 66 /* setup grid with equal columns */ 66 67 display: -ms-grid; /* IE 10 */ -
trunk/ibisph-view/src/main/webapp/css/_general.css
r19893 r19902 93 93 font-weight: bold; 94 94 } 95 h5 96 { 97 margin-top: 1em; 98 font-weight: bold; 99 } 95 100 96 101 -
trunk/ibisph-view/src/main/webapp/css/_layout.css
r19890 r19902 167 167 } 168 168 169 170 .Topic #content #contentSections171 {172 width: calc(100% - 425px);173 max-width: 50%;174 }175 .Topic #content figure176 {177 display: block;178 width: 100%;179 margin: 0 0 2em 0;180 }181 .Topic #content figure img182 {183 display: block;184 width: 100%;185 max-width: 100%;186 max-height: 300px;187 }188 .Topic #content figure figcaption189 {190 display: block;191 width: 100%;192 background-color: #eee;193 padding: 1em 1rem;194 /*195 display: inline-block;196 max-width: 45%;197 float: none;198 float: right;199 */200 }201 202 169 #content #contentSections section 203 170 { … … 291 258 292 259 293 294 295 296 297 298 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~299 * GARTH TODO: remove - Topic Detail page IP and QM block styles. Redo these300 *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/301 302 303 /* topic intro page IP, Q, Links selections */304 #contextNavigation305 {306 position: relative; /* needed for menu to be able get local relative position info */307 margin: 0 0rem 0 2rem;308 vertical-align: top;309 }310 .Topic #contextNavigation311 {312 float: right;313 width: 425px;314 max-width: 45%;315 }316 317 #contextNavigation .Container318 {319 padding: 0;320 }321 #contextNavigation section322 {323 display: inline-block;324 margin: 1em 0 1em 0;325 width: 100%;326 background-color: #eee;327 vertical-align: top;328 }329 #contextNavigation section:first-of-type330 {331 margin-top: 0;332 }333 334 #contextNavigation section h3335 {336 background: #114477 url("../image/icon/chart-white.png") 8px 10px no-repeat;337 background-size: 35px 35px;338 color: white;339 margin: 0;340 padding: 1.2rem 1rem 1rem 50px;341 min-height: 40px;342 border-radius: 5px 5px 0 0;343 }344 #contextNavigation #querySelections h3345 {346 background-image: url("../image/icon/chart_find-white.png");347 }348 #contextNavigation #linkSelections h3349 {350 background-image: url("../image/icon/link-white.png");351 }352 353 #contextNavigation section > *:not(h3)354 {355 margin: 1rem 1rem 1rem 1rem;356 }357 #contextNavigation section > h4358 {359 margin-bottom: 0;360 }361 #contextNavigation section > h4 + ul362 {363 margin-top: 0;364 }365 366 367 #contextNavigation section .Scroll368 {369 background-color: #eee;370 overflow: auto;371 max-height: 250px;372 padding-left: 0.5rem;373 }374 #contextNavigation section .Scroll + button375 {376 display: inline-block;377 margin-top: 0;378 padding: 0.4rem 1rem;379 height: 3rem;380 vertical-align: middle;381 }382 #contextNavigation section button383 {384 display: none;385 }386 #contextNavigation section button.MoreDetails387 {388 display: block;389 padding: 0.4rem 1rem;390 height: 3rem;391 margin: 0.5rem 0 0.5rem 0;392 }393 394 /*395 .TopicSelections .Block div396 {397 text-overflow: ellipsis;398 max-height: 300px;399 overflow: hidden;400 }401 */402 403 #contextNavigation ul li a404 {405 display: block;406 padding: 0.25em;407 }408 #contextNavigation .VerticalMenu li409 {410 padding-right: 5px;411 }412 413 414 415 416 417 418 419 260 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ F O O T E R 420 261 -- see _layout-footer.css -
trunk/ibisph-view/src/main/webapp/js/jquery.scrollBlockListItems.js
r17938 r19902 4 4 var options = $.extend( 5 5 { 6 maxSelectionsContainerHeight: 2506 maxSelectionsContainerHeight: 300 7 7 ,scrollCSSClass: "Scroll" 8 8 ,buttonTemplateText: "Show all [LIST_ITEM_COUNT] Selections" … … 12 12 this.each(function() 13 13 { 14 var selectionsContainer = 14 var selectionsContainer = $(this); 15 15 console.log("selectionsContainer height: " + selectionsContainer.height() ); 16 16 console.log("selectionsContainer css: " + selectionsContainer.css("max-height") ); … … 24 24 { 25 25 selectionsContainer.addClass(options.scrollCSSClass); 26 selectionsContainer.css("max-height", options.maxSelectionsContainerHeight); 26 27 27 28 var selections = $(selectionsContainer).find("li"); … … 30 31 selectionsContainer.removeClass(options.scrollCSSClass); 31 32 selectionsContainer.css("max-height", "none"); 33 button.hide(); 32 34 }); 33 35 } -
trunk/ibisph-view/src/main/webapp/xslt/html/ContentContainer.xslt
r19798 r19902 186 186 <xsl:param name="contentContinerElementName" select="if(0 != string-length($title)) then 'section' else 'div'"/> 187 187 188 <!-- xsl:message select="concat('xxxxxxxxxxxxxx length: ', string-length($title), ', title: ', $title)"/ --> 188 <!-- 189 <xsl:message select="concat('~~~~~~~~~~ conent contain fixed element, title:', $title, ', content element count: ', count($content/*))"/> 190 <xsl:message select="$content"/> 191 --> 189 192 <xsl:if test="exists($content/*) or (0 != string-length($content))"> 190 193 <xsl:element name="{$contentContinerElementName}"> … … 194 197 <xsl:if test="0 != string-length($containerID)"><xsl:attribute name="id" select="$containerID"/></xsl:if> 195 198 <xsl:if test="$addWikiAttribute = true()"><xsl:attribute name="wiki" select="'true'"/></xsl:if> 196 197 199 <xsl:call-template name="ContentContainer.title"> 198 200 <xsl:with-param name="title" select="$title"/> -
trunk/ibisph-view/src/main/webapp/xslt/html/Page.xslt
r19891 r19902 250 250 <title><xsl:value-of select="if(contains($Page.pageTitle, $Page.applicationTitle))then $Page.pageTitle else concat($Page.applicationTitle, ' - ', $Page.pageTitle)"/></title> 251 251 252 <link rel=" shortcut icon" href="{$ibis.baseRequestPath}image/application.ico" type="image/vnd.microsoft.icon"/>253 <link rel="icon" href="{$ibis.baseRequestPath}image/application.ico" type="image/vnd.microsoft.icon"/>254 <link rel="home" 255 <link rel="help" 256 <link rel="toc" 257 <link rel="make" 252 <link rel="icon" href="{$ibis.baseRequestPath}image/application.ico" type="image/x-icon"/> 253 <link rel="icon" href="{$ibis.baseRequestPath}image/application.png" type="image/png"/> 254 <link rel="home" href="{$ibis.baseRequestPath}"/> 255 <link rel="help" href="{$ibis.baseRequestPath}about/Help.html"/> 256 <link rel="toc" href="{$ibis.baseRequestPath}about/SiteMap.html"/> 257 <link rel="make" href="http://www.ibisph.org"/> 258 258 259 259 <xsl:call-template name="Page.standardCSS"/> -
trunk/ibisph-view/src/main/webapp/xslt/html/community/facts/Page.xslt
r19882 r19902 32 32 33 33 <xsl:param name="Page.pageTitle" ibis:doc="Page's browser title text." 34 select="concat(Page.communityTitle, ' Facts')"34 select="concat(Page.communityTitle, ' Quick Facts')" 35 35 /> 36 36 <xsl:param name="Page.contentTitle" ibis:doc="Page's content title text." 37 select="concat(' Facts for ', $Page.communityTitle)"37 select="concat('Quick Facts for ', $Page.communityTitle)" 38 38 /> 39 39 … … 59 59 .Overview 60 60 { 61 margin-top: 2em; 62 vertical-align: top; 61 63 max-width: 60%; 62 64 min-width: 300px; … … 72 74 .GoogleMap 73 75 { 74 max-width: 3 5%;75 min-width: 3 50px;76 padding: 02rem 0 2rem;76 max-width: 30%; 77 min-width: 300px; 78 padding: 1em 2rem 0 2rem; 77 79 } 78 80 … … 86 88 } 87 89 </style> 90 91 <div class="ContentOptions"> 92 <h3>Quick Facts Report Options</h3> 93 94 <table class="ListTable"> 95 <tr> 96 <td><label for="dimensionValue"><xsl:value-of select="$Page.communityDimensionTitle"/>:</label></td> 97 <td> 98 <!-- 99 <xsl:if test="0 != string-length($Page.previousDimensionValue/TITLE)"> 100 <a href="javascript:requestSamePageDifferentDimensionValue('{normalize-space($Page.previousDimensionValue/text()[1])}')" 101 title="show previous community value" 102 ><< Show <xsl:value-of select="$Page.previousDimensionValue/TITLE"/></a> 103 </xsl:if> 104 --> 105 <select name="dimensionValue" id="dimensionValue" onchange="requestSamePageDifferentDimensionValue()" style="width: 200px;"> 106 <xsl:for-each select="$Page.communityDimension/VALUES/VALUE[not(NOT_SELECTABLE_FLAG)]"> 107 <xsl:sort select="SORT_ORDER" data-type="number" order="ascending"/> 108 <xsl:sort select="TITLE" order="ascending"/> 109 <xsl:variable name="value" select="normalize-space(text()[1])"/> 110 <option value="{$value}"> 111 <xsl:if test="$value = $Page.dimensionValue"> 112 <xsl:attribute name="selected">selected</xsl:attribute> 113 </xsl:if> 114 <xsl:value-of select="TITLE"/> 115 </option> 116 </xsl:for-each> 117 </select> 118 <!-- 119 <xsl:if test="0 != string-length($Page.nextDimensionValue/TITLE)"> 120 <a href="javascript:requestSamePageDifferentDimensionValue('{normalize-space($Page.nextDimensionValue/text()[1])}')" 121 title="show next community value" 122 >Show <xsl:value-of select="$Page.nextDimensionValue/TITLE"/> >></a> 123 </xsl:if> 124 --> 125 </td> 126 </tr> 127 </table> 128 </div> 88 129 89 130 <!-- The content file contains elements that control demographic and … … 155 196 --> 156 197 <tr class="Value"> 157 <th><xsl:value-of select="$indicator/TITLE"/> (<xsl:value-of select="$indicatorComparisonValues/PERIOD_DIMENSION/VALUE/TITLE"/>) </th> 198 <th><a href="{ibis:getRequestURL(concat('community/indicator/', $indicator/NAME, '/', $Page.communityDimension/NAME, '/', normalize-space($Page.communityDimensionValue/text()[1]),'.html'))}"> 199 <xsl:value-of select="ibis:getIndicatorTitle($indicator)"/> (<xsl:value-of select="$indicatorComparisonValues/PERIOD_DIMENSION/VALUE/TITLE"/>) 200 </a> </th> 158 201 <td><xsl:value-of select="$indicatorComparisonValues/COMMUNITY/VALUE/TITLE"/></td> 159 202 <td><xsl:value-of select="$indicatorComparisonValues/STATE/VALUE/TITLE"/></td> -
trunk/ibisph-view/src/main/webapp/xslt/html/community/indicators/Page.xslt
r19890 r19902 61 61 <table class="ListTable"> 62 62 <tr> 63 <td><label for="dimensionValue">< h4><xsl:value-of select="$Page.communityDimensionTitle"/>:</h4></label></td>63 <td><label for="dimensionValue"><xsl:value-of select="$Page.communityDimensionTitle"/>:</label></td> 64 64 <td> 65 65 <!-- … … 94 94 <tr> 95 95 <td> 96 <label for="indicatorSetName"> <h4>Set of Health Indicators:</h4></label>96 <label for="indicatorSetName">Set of Health Indicators:</label> 97 97 </td> 98 98 <td> … … 139 139 <td><h4>About <xsl:value-of select="$Page.communityDimensionValue/TITLE"/>:</h4></td> 140 140 --> 141 <td>< h4><xsl:value-of select="$Page.communityDimensionTitle"/> Information:</h4></td>141 <td><label><xsl:value-of select="$Page.communityDimensionTitle"/> Information:</label></td> 142 142 <td> 143 143 <a title="Show this communities quick facts page." -
trunk/ibisph-view/src/main/webapp/xslt/html/indicator/profile/Page.xslt
r19891 r19902 74 74 75 75 <div class="Container"> 76 <div >77 <label for="indicatorViews"> <h4>Data Views:</h4></label>76 <div class="Block"> 77 <label for="indicatorViews">Data Views:</label> 78 78 <xsl:variable name="currentIndicatorViewName" select="$indicatorView/NAME"/> 79 79 <select name="indicatorViews" id="indicatorViews" onchange="location=this.value; this.value='';"> … … 98 98 </div> 99 99 100 <div >101 <label for="moreInformation"> <h4>More Information:</h4></label>100 <div class="Block"> 101 <label for="moreInformation">More Information:</label> 102 102 <select name="moreInformation" id="moreInformation" onchange="location=this.value; this.value='';"> 103 103 <xsl:if test="('services' != $pageType) and ('facts' != $pageType) and ('resources' != $pageType)"> … … 128 128 129 129 <xsl:if test="0 != count($indicator/RELATIONS/RELATION/RELATED_INDICATORS/RELATED_INDICATOR)"> 130 <div >131 <label for="relatedIndicators"> <h4>Related Indicator Reports:</h4></label>130 <div class="Block"> 131 <label for="relatedIndicators">Related Indicator Reports:</label> 132 132 <select name="relatedIndicators" id="relatedIndicators" onchange="location=this.value; this.value='';"> 133 133 <option value="javascript:location"></option> … … 141 141 142 142 <xsl:if test="0 != count($indicator/TOPICS/TOPIC)"> 143 <div >144 <label for="relatedIndicators"> <h4>Associated Health Topics:</h4></label>143 <div class="Block"> 144 <label for="relatedIndicators">Associated Health Topics:</label> 145 145 <select name="associatedHealthTopics" id="associatedHealthTopics" onchange="location=this.value; this.value='';"> 146 146 <option value="javascript:location"></option> -
trunk/ibisph-view/src/main/webapp/xslt/html/indicator/profile/summary/Page.xslt
r19896 r19902 90 90 </xsl:call-template> 91 91 </xsl:if> 92 <xsl:if test=" $showChart">92 <xsl:if test="not($showMap) and $showChart"> 93 93 <xsl:call-template name="DataViz.chartContainer"> 94 94 <xsl:with-param name="containerID" select="concat('chart', position())"/>
Note: See TracChangeset
for help on using the changeset viewer.
