From 1bfa29bbccb3c6ea6bdbd5bca5dfa3b8a173e993 Mon Sep 17 00:00:00 2001 From: James Agnew Date: Fri, 28 Dec 2018 11:42:21 -0500 Subject: [PATCH] Site updates --- examples/pom.xml | 1 - hapi-fhir-base/pom.xml | 1 - hapi-fhir-jacoco/pom.xml | 1 - hapi-fhir-structures-dstu2/pom.xml | 1 - pom.xml | 33 ++- src/checkstyle/checkstyle.xml | 2 + src/site/resources/hapi.css | 445 +++++++++++++++-------------- src/site/site.xml | 32 ++- 8 files changed, 270 insertions(+), 246 deletions(-) diff --git a/examples/pom.xml b/examples/pom.xml index 218c17630a5..15adf39931e 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -106,7 +106,6 @@ org.apache.maven.plugins maven-project-info-reports-plugin - ${maven_project_info_plugin_version} true diff --git a/hapi-fhir-base/pom.xml b/hapi-fhir-base/pom.xml index 04014775ce1..4056f44e884 100644 --- a/hapi-fhir-base/pom.xml +++ b/hapi-fhir-base/pom.xml @@ -189,7 +189,6 @@ org.apache.maven.plugins maven-jxr-plugin - ${maven_jxr_plugin_version} normal diff --git a/hapi-fhir-jacoco/pom.xml b/hapi-fhir-jacoco/pom.xml index b8bde792492..05178957480 100644 --- a/hapi-fhir-jacoco/pom.xml +++ b/hapi-fhir-jacoco/pom.xml @@ -453,7 +453,6 @@ org.apache.maven.plugins maven-project-info-reports-plugin - ${maven_project_info_plugin_version} true diff --git a/hapi-fhir-structures-dstu2/pom.xml b/hapi-fhir-structures-dstu2/pom.xml index 99d2ba65c71..f49770f440f 100644 --- a/hapi-fhir-structures-dstu2/pom.xml +++ b/hapi-fhir-structures-dstu2/pom.xml @@ -446,7 +446,6 @@ org.apache.maven.plugins maven-javadoc-plugin - ${maven_javadoc_plugin_version} diff --git a/pom.xml b/pom.xml index 5d0c3965a8b..9d1bc31b191 100644 --- a/pom.xml +++ b/pom.xml @@ -556,6 +556,9 @@ UTF-8 1.0.1 + + + 5.4.1 @@ -805,9 +808,9 @@ 4.12 - lt.velykis.maven.skins + io.github.devacfr.maven.skins reflow-velocity-tools - 1.1.1 + 2.0.0-beta2 mysql @@ -911,7 +914,7 @@ org.apache.maven.doxia doxia-module-markdown - 1.6 + 1.8 org.apache.maven.scm @@ -1421,7 +1424,7 @@ org.apache.maven.plugins maven-jxr-plugin - 2.5 + 3.0.0 org.apache.maven.plugins @@ -1526,7 +1529,7 @@ maven-site-plugin - 3.4 + 3.7.1 false true @@ -1557,7 +1560,7 @@ doxia-module-markdown - lt.velykis.maven.skins + io.github.devacfr.maven.skins reflow-velocity-tools @@ -1807,8 +1810,7 @@ Welcome]]> - - - - ]]> +
+ ]]> @@ -2004,12 +2006,12 @@ org.apache.maven.doxia doxia-module-markdown - 1.6 + 1.8 - lt.velykis.maven.skins + io.github.devacfr.maven.skins reflow-velocity-tools - 1.1.1 + 2.0.0-beta2 org.apache.velocity @@ -2088,11 +2090,12 @@ - - --> diff --git a/src/checkstyle/checkstyle.xml b/src/checkstyle/checkstyle.xml index 57d4d0d6b59..1c8800c913c 100644 --- a/src/checkstyle/checkstyle.xml +++ b/src/checkstyle/checkstyle.xml @@ -39,9 +39,11 @@ value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/> + diff --git a/src/site/resources/hapi.css b/src/site/resources/hapi.css index 630f51ceca5..63fcf963adf 100644 --- a/src/site/resources/hapi.css +++ b/src/site/resources/hapi.css @@ -1,213 +1,232 @@ -/* -#bodyColumn { - width: 78.5% !important; -} - -#breadcrumbs { - background: white; - padding: 0px; - height: 40px; -} - -#search-form { - width: 140px; -} - -#navcolumn { - background-color: white !important; -} - -#leftColumn { - border: none !important; - width: 19% !important; - margin: 0px; -} - -#navcolumn h5 { - color: #806020; - background-color: #FFF0C0; - border-bottom: 1px solid #E3701A; -} - -#navcolumn li.expanded { - background: url("") !important; -} - -.nobr { - white-space: nowrap; -} - -.section { - padding: 0px; -} - -*/ - -.doc_info_bubble { - border: 1px dashed #808080; - border-radius: 6px; - padding: 8px; - margin: 8px; - background: #EEE; -} - -TABLE.pagenavlinks { - border: 0px; -} -A.pagenavlinks { - background: #CCC; - border-style: solid; - border-width: 1px; - border-color: #888; - border-radius: 7px; - padding: 7px; -} - -.navbar .brand { - color: #FF8; -} - -.well { - padding: 5px; -} - -.nav-list { - padding-right: 0px; - font-size: 12px; -} - -.nav-list LI { - line-height: 15px; -} - -/* -.nav-list .divider { - display: none; -} -*/ - -@media (min-width: 980px) { /* 768 980 */ - body { - padding-top: 40px; - } -} - -body { - padding-bottom: 10px; -} - -pre { - padding: 3px; - margin: 0 0 10px; - font-size: 0.8em; - line-height: 1.0em; -} - -.page-header { - padding-bottom: 2px; - margin: 0px 0 0px; - border-bottom: none; -} -h1[id]:before, -h2[id]:before, -h3[id]:before, -h4[id]:before, -h5[id]:before, -h6[id]:before, -a[name]:before { - height: auto; - margin: auto; -} - -DIV.main-body DIV.row DIV.span8 DIV.body-content { - top: -8px; - position: relative; -} - -.section h2 { - border-bottom: 2px solid #CF4711; - background-color: #FF7741; - color: #FFA; - font-size: 1.5em; - line-height: 1.4em; - border-radius: 6px; - padding-left: 5px; - padding-right: 5px; -} - -.section h3 { - border-bottom-width: 1px; - border-bottom-style: solid; - border-bottom-color: #993300; - width: 66%; - background-image: url('images/littlehapiface.png'); - background-repeat: no-repeat; - padding-left: 25px; - font-size: 1.3em; - line-height: 1.3em; -} - -.syntaxhighlighter { - font-size: 0.85em !important; -} - -.syntaxhighlighter .line.alt1, -.syntaxhighlighter .line.alt2 -{ - background-color: #F8F8F8 !important; -} - -.syntaxhighlighter .code .container:before { - display: block; -} - -.table th, .table td { - padding: 2px; -} - -tt { - white-space: pre; - color: #846; - margin-bottom: 5px; - margin-top: 10px; - padding: 2px; - border: 1px solid #AAA; - background-color: #F0F0F0; -} - -h1,h2,h3,h4,h5 { - color: #E3701A; - font-weight: bold; -} - -h4 { - font-size: 1.2em; - padding: 0px; - margin-bottom: 0px; - margin-top: 20px; -} - -li.expanded ul { - border-left: 2px solid #C0FFC0; - margin: 0px 0px 4px 0px !important; -} - -li.expanded ul li { - padding-left: 2px !important; -} - -dfn { - color: #008000; - background-color: #E0FFE0; - border-bottom: 1px dotted #40A040; -} - -/* -a,a.externalLink,a:active,a:hover,a:link,a:visited { - color: #993300; -} - -DIV.sidebar-nav UL LI UL LI { - font-size: 0.9em; -} -*/ +/* +#bodyColumn { + width: 78.5% !important; +} + +#breadcrumbs { + background: white; + padding: 0px; + height: 40px; +} + +#search-form { + width: 140px; +} + +#navcolumn { + background-color: white !important; +} + +#leftColumn { + border: none !important; + width: 19% !important; + margin: 0px; +} + +#navcolumn h5 { + color: #806020; + background-color: #FFF0C0; + border-bottom: 1px solid #E3701A; +} + +#navcolumn li.expanded { + background: url("") !important; +} + +.nobr { + white-space: nowrap; +} + +.section { + padding: 0px; +} + +*/ + +.doc_info_bubble { + border: 1px dashed #808080; + border-radius: 6px; + padding: 8px; + margin: 8px; + background: #EEE; +} + +TABLE.pagenavlinks { + border: 0px; +} +A.pagenavlinks { + background: #CCC; + border-style: solid; + border-width: 1px; + border-color: #888; + border-radius: 7px; + padding: 7px; +} + +.navbar .brand { + color: #FF8; +} + +.well { + padding: 5px; +} + +.nav-list { + padding-right: 0px; + font-size: 12px; +} + +.nav-list LI { + line-height: 15px; +} + +/* +.nav-list .divider { + display: none; +} +*/ + +@media (min-width: 980px) { /* 768 980 */ + body { + padding-top: 40px; + } +} + +body { + padding-bottom: 10px; +} + +pre { + padding: 3px; + margin: 0 0 10px; + font-size: 0.8em; + line-height: 1.0em; +} + +.page-header { + padding-bottom: 2px; + margin: 0px 0 0px; + border-bottom: none; +} +h1[id]:before, +h2[id]:before, +h3[id]:before, +h4[id]:before, +h5[id]:before, +h6[id]:before, +a[name]:before { + height: auto; + margin: auto; +} + +DIV.main-body DIV.row DIV.span8 DIV.body-content { + top: -8px; + position: relative; +} + +.section h2 { + border-bottom: 2px solid #CF4711; + background-color: #FF7741; + color: #FFA; + font-size: 1.5em; + line-height: 1.4em; + border-radius: 6px; + padding-left: 5px; + padding-right: 5px; +} + +.section h3 { + border-bottom-width: 1px; + border-bottom-style: solid; + border-bottom-color: #993300; + width: 66%; + background-image: url('images/littlehapiface.png'); + background-repeat: no-repeat; + padding-left: 25px; + font-size: 1.3em; + line-height: 1.3em; +} + +.syntaxhighlighter { + font-size: 0.85em !important; +} + +.syntaxhighlighter .line.alt1, +.syntaxhighlighter .line.alt2 +{ + background-color: #F8F8F8 !important; +} + +.syntaxhighlighter .code .container:before { + display: block; +} + +.table th, .table td { + padding: 2px; +} + +tt { + white-space: pre; + color: #846; + margin-bottom: 5px; + margin-top: 10px; + padding: 2px; + border: 1px solid #AAA; + background-color: #F0F0F0; +} + +h1,h2,h3,h4,h5 { + color: #E3701A; + font-weight: bold; +} + +h4 { + font-size: 1.2em; + padding: 0px; + margin-bottom: 0px; + margin-top: 20px; +} + +li.expanded ul { + border-left: 2px solid #C0FFC0; + margin: 0px 0px 4px 0px !important; +} + +li.expanded ul li { + padding-left: 2px !important; +} + +dfn { + color: #008000; + background-color: #E0FFE0; + border-bottom: 1px dotted #40A040; +} + +/* +a,a.externalLink,a:active,a:hover,a:link,a:visited { + color: #993300; +} + +DIV.sidebar-nav UL LI UL LI { + font-size: 0.9em; +} +*/ + +.pull-left { + float: left; + display: inline-block; +} + +.pull-right { + float: right; + display: inline-block; +} + +.span12 { + width: 100%; +} + +.container-fluid { + padding-right: 0px; + padding-left: 0px; +} diff --git a/src/site/site.xml b/src/site/site.xml index d0e75165cc7..5f1a94fac9d 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -24,14 +24,14 @@ - - + + - + @@ -48,8 +48,7 @@ --> - - + ]]> @@ -116,8 +115,8 @@ - - + + @@ -129,7 +128,10 @@ - + + + + @@ -171,13 +173,13 @@ 1.3.1 --> - + - lt.velykis.maven.skins + io.github.devacfr.maven.skins reflow-maven-skin - 1.1.1 + 2.0.0-beta2 - + @@ -200,9 +202,11 @@ - bootswatch-united + bootswatch-lumen sidebar - Documentation|Get Help|Test Server + + HAPI FHIR|Test Server Using HAPI|Contribute