honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Site updates

This commit is contained in:
James Agnew 2018-12-28 11:42:21 -05:00
parent c462b5ba3e
commit 1bfa29bbcc
8 changed files with 270 additions and 246 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/pom.xml
View File

@ -106,7 +106,6 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId> <artifactId>maven-project-info-reports-plugin</artifactId>
<version>${maven_project_info_plugin_version}</version>
<configuration> <configuration>
<skip>true</skip> <skip>true</skip>
</configuration> </configuration>

1
hapi-fhir-base/pom.xml
View File

@ -189,7 +189,6 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId> <artifactId>maven-jxr-plugin</artifactId>
<version>${maven_jxr_plugin_version}</version>
<reportSets> <reportSets>
<reportSet> <reportSet>
<id>normal</id> <id>normal</id>

1
hapi-fhir-jacoco/pom.xml
View File

@ -453,7 +453,6 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId> <artifactId>maven-project-info-reports-plugin</artifactId>
<version>${maven_project_info_plugin_version}</version>
<configuration> <configuration>
<skip>true</skip> <skip>true</skip>
</configuration> </configuration>

1
hapi-fhir-structures-dstu2/pom.xml
View File

@ -446,7 +446,6 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>${maven_javadoc_plugin_version}</version>
<configuration> <configuration>
</configuration> </configuration>
</plugin> </plugin>

33
pom.xml
View File

@ -556,6 +556,9 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<ebay_cors_filter_version>1.0.1</ebay_cors_filter_version> <ebay_cors_filter_version>1.0.1</ebay_cors_filter_version>
<!-- Site properties -->
<fontawesomeVersion>5.4.1</fontawesomeVersion>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
@ -805,9 +808,9 @@
<version>4.12</version> <version>4.12</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>lt.velykis.maven.skins</groupId> <groupId>io.github.devacfr.maven.skins</groupId>
<artifactId>reflow-velocity-tools</artifactId> <artifactId>reflow-velocity-tools</artifactId>
<version>1.1.1</version> <version>2.0.0-beta2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
@ -911,7 +914,7 @@
<dependency> <dependency>
<groupId>org.apache.maven.doxia</groupId> <groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-module-markdown</artifactId> <artifactId>doxia-module-markdown</artifactId>
<version>1.6</version> <version>1.8</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.maven.scm</groupId> <groupId>org.apache.maven.scm</groupId>
@ -1421,7 +1424,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId> <artifactId>maven-jxr-plugin</artifactId>
<version>2.5</version> <version>3.0.0</version>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@ -1526,7 +1529,7 @@
<artifactId>maven-site-plugin</artifactId> <artifactId>maven-site-plugin</artifactId>
<!-- Be careful upgrading the version of this plugin- 3.5 breaks the relow-maven-skin that we use currently. Also once we move to 3.5 the site.xml <head> tag needs to have its contents put in a CDATA <!-- Be careful upgrading the version of this plugin- 3.5 breaks the relow-maven-skin that we use currently. Also once we move to 3.5 the site.xml <head> tag needs to have its contents put in a CDATA
block. What an unpleasant misadventure to figure that all out...... --> block. What an unpleasant misadventure to figure that all out...... -->
<version>3.4</version> <version>3.7.1</version>
<configuration> <configuration>
<skip>false</skip> <skip>false</skip>
<skipDeploy>true</skipDeploy> <skipDeploy>true</skipDeploy>
@ -1557,7 +1560,7 @@
<artifactId>doxia-module-markdown</artifactId> <artifactId>doxia-module-markdown</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>lt.velykis.maven.skins</groupId> <groupId>io.github.devacfr.maven.skins</groupId>
<artifactId>reflow-velocity-tools</artifactId> <artifactId>reflow-velocity-tools</artifactId>
</dependency> </dependency>
<dependency> <dependency>
@ -1807,8 +1810,7 @@
<replace dir="target/site" summary="true"> <replace dir="target/site" summary="true">
<include name="index.html"/> <include name="index.html"/>
<replacetoken><![CDATA[<h2 id="Welcome">Welcome</h2>]]></replacetoken> <replacetoken><![CDATA[<h2 id="Welcome">Welcome</h2>]]></replacetoken>
<replacevalue><![CDATA[<div class="jumbotron subhead"> <replacevalue><![CDATA[
<div class="row" id="banner">
<div class="span12"> <div class="span12">
<div class="pull-left"> <div class="pull-left">
<a href="./" id="bannerLeft"><img src="images/hapi_fhir_banner.png" alt='"'HAPI'"' /></a> <a href="./" id="bannerLeft"><img src="images/hapi_fhir_banner.png" alt='"'HAPI'"' /></a>
@ -1817,8 +1819,8 @@
<a href="./" id="bannerRight"><img src="images/hapi_fhir_banner_right.png" alt='"'FHIR'"' /></a> <a href="./" id="bannerRight"><img src="images/hapi_fhir_banner_right.png" alt='"'FHIR'"' /></a>
</div> </div>
</div> </div>
</div> <br clear="both"/>
</div>]]></replacevalue> ]]></replacevalue>
</replace> </replace>
<!--<replaceregexp file="target/site/checkstyle.html" byline="false" match="&lt;ul class=&quot;breadcrumb.*?&lt;/ul&gt;" replace="" flags="s"/> --> <!--<replaceregexp file="target/site/checkstyle.html" byline="false" match="&lt;ul class=&quot;breadcrumb.*?&lt;/ul&gt;" replace="" flags="s"/> -->
</target> </target>
@ -2004,12 +2006,12 @@
<dependency> <dependency>
<groupId>org.apache.maven.doxia</groupId> <groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-module-markdown</artifactId> <artifactId>doxia-module-markdown</artifactId>
<version>1.6</version> <version>1.8</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>lt.velykis.maven.skins</groupId> <groupId>io.github.devacfr.maven.skins</groupId>
<artifactId>reflow-velocity-tools</artifactId> <artifactId>reflow-velocity-tools</artifactId>
<version>1.1.1</version> <version>2.0.0-beta2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.velocity</groupId> <groupId>org.apache.velocity</groupId>
@ -2088,11 +2090,12 @@
</reportsDirectories> </reportsDirectories>
</configuration> </configuration>
</plugin> </plugin>
<!-- <plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId> <artifactId>maven-project-info-reports-plugin</artifactId>
<version>3.0.0</version> <version>3.0.0</version>
<inherited>false</inherited> <inherited>false</inherited>
<!--
<reportSets> <reportSets>
<reportSet> <reportSet>
<reports> <reports>
@ -2103,8 +2106,8 @@
</reports> </reports>
</reportSet> </reportSet>
</reportSets> </reportSets>
-->
</plugin> </plugin>
-->
<!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-linkcheck-plugin</artifactId> <version>1.1</version> </plugin> --> <!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-linkcheck-plugin</artifactId> <version>1.1</version> </plugin> -->
</plugins> </plugins>
</reporting> </reporting>

2
src/checkstyle/checkstyle.xml
View File

@ -39,9 +39,11 @@
value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/> value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/>
</module> </module>
<module name="NeedBraces"/> <module name="NeedBraces"/>
<!--
<module name="LeftCurly"> <module name="LeftCurly">
<property name="maxLineLength" value="300"/> <property name="maxLineLength" value="300"/>
</module> </module>
-->
<module name="RightCurly"/> <module name="RightCurly"/>
<module name="RightCurly"> <module name="RightCurly">
<property name="option" value="alone"/> <property name="option" value="alone"/>

445
src/site/resources/hapi.css
View File

@ -1,213 +1,232 @@
/* /*
#bodyColumn { #bodyColumn {
width: 78.5% !important; width: 78.5% !important;
} }
#breadcrumbs { #breadcrumbs {
background: white; background: white;
padding: 0px; padding: 0px;
height: 40px; height: 40px;
} }
#search-form { #search-form {
width: 140px; width: 140px;
} }
#navcolumn { #navcolumn {
background-color: white !important; background-color: white !important;
} }
#leftColumn { #leftColumn {
border: none !important; border: none !important;
width: 19% !important; width: 19% !important;
margin: 0px; margin: 0px;
} }
#navcolumn h5 { #navcolumn h5 {
color: #806020; color: #806020;
background-color: #FFF0C0; background-color: #FFF0C0;
border-bottom: 1px solid #E3701A; border-bottom: 1px solid #E3701A;
} }
#navcolumn li.expanded { #navcolumn li.expanded {
background: url("") !important; background: url("") !important;
} }
.nobr { .nobr {
white-space: nowrap; white-space: nowrap;
} }
.section { .section {
padding: 0px; padding: 0px;
} }
*/ */
.doc_info_bubble { .doc_info_bubble {
border: 1px dashed #808080; border: 1px dashed #808080;
border-radius: 6px; border-radius: 6px;
padding: 8px; padding: 8px;
margin: 8px; margin: 8px;
background: #EEE; background: #EEE;
} }
TABLE.pagenavlinks { TABLE.pagenavlinks {
border: 0px; border: 0px;
} }
A.pagenavlinks { A.pagenavlinks {
background: #CCC; background: #CCC;
border-style: solid; border-style: solid;
border-width: 1px; border-width: 1px;
border-color: #888; border-color: #888;
border-radius: 7px; border-radius: 7px;
padding: 7px; padding: 7px;
} }
.navbar .brand { .navbar .brand {
color: #FF8; color: #FF8;
} }
.well { .well {
padding: 5px; padding: 5px;
} }
.nav-list { .nav-list {
padding-right: 0px; padding-right: 0px;
font-size: 12px; font-size: 12px;
} }
.nav-list LI { .nav-list LI {
line-height: 15px; line-height: 15px;
} }
/* /*
.nav-list .divider { .nav-list .divider {
display: none; display: none;
} }
*/ */
@media (min-width: 980px) { /* 768 980 */ @media (min-width: 980px) { /* 768 980 */
body { body {
padding-top: 40px; padding-top: 40px;
} }
} }
body { body {
padding-bottom: 10px; padding-bottom: 10px;
} }
pre { pre {
padding: 3px; padding: 3px;
margin: 0 0 10px; margin: 0 0 10px;
font-size: 0.8em; font-size: 0.8em;
line-height: 1.0em; line-height: 1.0em;
} }
.page-header { .page-header {
padding-bottom: 2px; padding-bottom: 2px;
margin: 0px 0 0px; margin: 0px 0 0px;
border-bottom: none; border-bottom: none;
} }
h1[id]:before, h1[id]:before,
h2[id]:before, h2[id]:before,
h3[id]:before, h3[id]:before,
h4[id]:before, h4[id]:before,
h5[id]:before, h5[id]:before,
h6[id]:before, h6[id]:before,
a[name]:before { a[name]:before {
height: auto; height: auto;
margin: auto; margin: auto;
} }
DIV.main-body DIV.row DIV.span8 DIV.body-content { DIV.main-body DIV.row DIV.span8 DIV.body-content {
top: -8px; top: -8px;
position: relative; position: relative;
} }
.section h2 { .section h2 {
border-bottom: 2px solid #CF4711; border-bottom: 2px solid #CF4711;
background-color: #FF7741; background-color: #FF7741;
color: #FFA; color: #FFA;
font-size: 1.5em; font-size: 1.5em;
line-height: 1.4em; line-height: 1.4em;
border-radius: 6px; border-radius: 6px;
padding-left: 5px; padding-left: 5px;
padding-right: 5px; padding-right: 5px;
} }
.section h3 { .section h3 {
border-bottom-width: 1px; border-bottom-width: 1px;
border-bottom-style: solid; border-bottom-style: solid;
border-bottom-color: #993300; border-bottom-color: #993300;
width: 66%; width: 66%;
background-image: url('images/littlehapiface.png'); background-image: url('images/littlehapiface.png');
background-repeat: no-repeat; background-repeat: no-repeat;
padding-left: 25px; padding-left: 25px;
font-size: 1.3em; font-size: 1.3em;
line-height: 1.3em; line-height: 1.3em;
} }
.syntaxhighlighter { .syntaxhighlighter {
font-size: 0.85em !important; font-size: 0.85em !important;
} }
.syntaxhighlighter .line.alt1, .syntaxhighlighter .line.alt1,
.syntaxhighlighter .line.alt2 .syntaxhighlighter .line.alt2
{ {
background-color: #F8F8F8 !important; background-color: #F8F8F8 !important;
} }
.syntaxhighlighter .code .container:before { .syntaxhighlighter .code .container:before {
display: block; display: block;
} }
.table th, .table td { .table th, .table td {
padding: 2px; padding: 2px;
} }
tt { tt {
white-space: pre; white-space: pre;
color: #846; color: #846;
margin-bottom: 5px; margin-bottom: 5px;
margin-top: 10px; margin-top: 10px;
padding: 2px; padding: 2px;
border: 1px solid #AAA; border: 1px solid #AAA;
background-color: #F0F0F0; background-color: #F0F0F0;
} }
h1,h2,h3,h4,h5 { h1,h2,h3,h4,h5 {
color: #E3701A; color: #E3701A;
font-weight: bold; font-weight: bold;
} }
h4 { h4 {
font-size: 1.2em; font-size: 1.2em;
padding: 0px; padding: 0px;
margin-bottom: 0px; margin-bottom: 0px;
margin-top: 20px; margin-top: 20px;
} }
li.expanded ul { li.expanded ul {
border-left: 2px solid #C0FFC0; border-left: 2px solid #C0FFC0;
margin: 0px 0px 4px 0px !important; margin: 0px 0px 4px 0px !important;
} }
li.expanded ul li { li.expanded ul li {
padding-left: 2px !important; padding-left: 2px !important;
} }
dfn { dfn {
color: #008000; color: #008000;
background-color: #E0FFE0; background-color: #E0FFE0;
border-bottom: 1px dotted #40A040; border-bottom: 1px dotted #40A040;
} }
/* /*
a,a.externalLink,a:active,a:hover,a:link,a:visited { a,a.externalLink,a:active,a:hover,a:link,a:visited {
color: #993300; color: #993300;
} }
DIV.sidebar-nav UL LI UL LI { DIV.sidebar-nav UL LI UL LI {
font-size: 0.9em; 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;
}

32
src/site/site.xml
View File

@ -24,14 +24,14 @@
<logo name="Built with Maven 3" href="http://maven.apache.org" img="./images/maven-logo-mini.png" /> <logo name="Built with Maven 3" href="http://maven.apache.org" img="./images/maven-logo-mini.png" />
</poweredBy> </poweredBy>
<publishDate position="right" format="yyyy-MM-dd" /> <publishDate position="bottom" format="yyyy-MM-dd" />
<version position="right" /> <version position="bottom" />
<!-- <version position="left" /> --> <!-- <version position="left" /> -->
<body> <body>
<head> <head><![CDATA[
<!-- Syntax Highlighter --> <!-- Syntax Highlighter -->
<script type="text/javascript" src="syntaxhighlighter/shCore.js"></script> <script type="text/javascript" src="syntaxhighlighter/shCore.js"></script>
<script type="text/javascript" src="syntaxhighlighter/shBrushJScript.js"></script> <script type="text/javascript" src="syntaxhighlighter/shBrushJScript.js"></script>
@ -48,8 +48,7 @@
--> -->
<link rel="shortcut icon" href="http://hapifhir.io/favicon.png" /> <link rel="shortcut icon" href="http://hapifhir.io/favicon.png" />
<link rel="stylesheet" type="text/css" href="hapi.css" /> <link rel="stylesheet" type="text/css" href="hapi.css" />
]]>
<link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" />
</head> </head>
<breadcrumbs> <breadcrumbs>
@ -116,8 +115,8 @@
<item name="Model API (DSTU3)" href="./apidocs-dstu3/index.html" /> <item name="Model API (DSTU3)" href="./apidocs-dstu3/index.html" />
<item name="Model API (R4)" href="./apidocs-r4/index.html" /> <item name="Model API (R4)" href="./apidocs-r4/index.html" />
<item name="Client API" href="./apidocs-client/index.html" /> <item name="Client API" href="./apidocs-client/index.html" />
<item name="Server API" href="./apidocs-server/index.html" /> <item name="Server API (Plain)" href="./apidocs-server/index.html" />
<item name="JPA Server API" href="./apidocs-jpaserver/index.html" /> <item name="Server API (JPA)" href="./apidocs-jpaserver/index.html" />
</item> </item>
<item name="Command Line Tool (hapi-fhir-cli)" href="./doc_cli.html" /> <item name="Command Line Tool (hapi-fhir-cli)" href="./doc_cli.html" />
<item name="Maven Plugin (hapi-tinder-plugin)" href="./doc_tinder.html" /> <item name="Maven Plugin (hapi-tinder-plugin)" href="./doc_tinder.html" />
@ -129,7 +128,10 @@
<item name="Model API (DSTU1)" href="./apidocs-dstu/index.html" /> <item name="Model API (DSTU1)" href="./apidocs-dstu/index.html" />
<item name="Model API (DSTU2)" href="./apidocs-dstu2/index.html" /> <item name="Model API (DSTU2)" href="./apidocs-dstu2/index.html" />
<item name="Model API (DSTU3)" href="./apidocs-dstu3/index.html" /> <item name="Model API (DSTU3)" href="./apidocs-dstu3/index.html" />
<item name="JPA Server API" href="./apidocs-jpaserver/index.html" /> <item name="Model API (R4)" href="./apidocs-r4/index.html" />
<item name="Client API" href="./apidocs-client/index.html" />
<item name="Server API (Plain)" href="./apidocs-server/index.html" />
<item name="Server API (JPA)" href="./apidocs-jpaserver/index.html" />
</menu> </menu>
<menu name="JXR" inherit="top"> <menu name="JXR" inherit="top">
<item name="Core" href="./xref-base/index.html" /> <item name="Core" href="./xref-base/index.html" />
@ -171,13 +173,13 @@
<version>1.3.1</version> <version>1.3.1</version>
</skin> </skin>
--> -->
<skin> <skin>
<groupId>lt.velykis.maven.skins</groupId> <groupId>io.github.devacfr.maven.skins</groupId>
<artifactId>reflow-maven-skin</artifactId> <artifactId>reflow-maven-skin</artifactId>
<version>1.1.1</version> <version>2.0.0-beta2</version>
</skin> </skin>
<custom> <custom>
<reflowSkin> <reflowSkin>
<pages> <pages>
@ -200,9 +202,11 @@
</sections> </sections>
</docindex> </docindex>
</pages> </pages>
<theme>bootswatch-united</theme> <theme>bootswatch-lumen</theme>
<toc>sidebar</toc> <toc>sidebar</toc>
<topNav>Documentation|Get Help|Test Server</topNav> <navbar filterMenu="Documentation|Get Help|Test Server"
cssClass="navbar-dark bg-primary border-bottom">
</navbar>
<bottomNav maxSpan="9" > <bottomNav maxSpan="9" >
<column>HAPI FHIR|Test Server</column> <column>HAPI FHIR|Test Server</column>
<column>Using HAPI|Contribute</column> <column>Using HAPI|Contribute</column>