diff --git a/server/web/bottom.html b/server/web/bottom.html
index 8a265ff94..cadc2faee 100644
--- a/server/web/bottom.html
+++ b/server/web/bottom.html
@@ -12,7 +12,7 @@
- Server Home . | FHIR © HL7.org 2011+. | This server based on version [%ver%]
+ Server Home . | FHIR © HL7.org 2011+. | Server v[%server-ver%] on [%os%] | This server based on version [%ver%]
diff --git a/server/web/coverage.html b/server/web/coverage.html
index e71b141e0..6f42bbb4d 100644
--- a/server/web/coverage.html
+++ b/server/web/coverage.html
@@ -2,78 +2,12 @@
-
Coverage Entry: FHIR Server [%id%] Version [%ver%]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
Coverage (FHIR Server [%id%] Version [%ver%])
+ [%include head.html%]
-
-
-
-
-
-
-
-
-
-
+[%include top.html%]
Coverage Entry
@@ -213,49 +147,7 @@ Coverage Entry
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+[%include bottom.html%]
diff --git a/server/web/covid-patient-error.html b/server/web/covid-patient-error.html
index b03ab9950..7fc221e7a 100644
--- a/server/web/covid-patient-error.html
+++ b/server/web/covid-patient-error.html
@@ -2,78 +2,12 @@
-
Covid-19 Communication Application
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
COVID (FHIR Server [%id%] Version [%ver%])
+ [%include head.html%]
-
-
-
-
-
-
-
-
-
-
+[%include top.html%]
Page for Patient
@@ -97,50 +31,7 @@ Page for Patient
[%covid.newpatient covid-patient-form.liquid%]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+[%include bottom.html%]
diff --git a/server/web/covid-patient.secure.html b/server/web/covid-patient.secure.html
index cabbf01ce..06b873f15 100644
--- a/server/web/covid-patient.secure.html
+++ b/server/web/covid-patient.secure.html
@@ -2,70 +2,13 @@
-
Covid-19 Edit Patient
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
COVID (FHIR Server [%id%] Version [%ver%])
+ [%include head.html%]
+[%include top.html%]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
COVID (FHIR Server [%id%] Version [%ver%])
+ [%include head.html%]
-
-
+[%include top.html%]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
COVID (FHIR Server [%id%] Version [%ver%])
+ [%include head.html%]
-
-
-
-
-
-
-
-
-
-
+[%include top.html%]
COVID-19 Maintenance System
@@ -97,50 +31,7 @@ COVID-19 Maintenance System
[%covid.newpatient covid-patient-form.liquid%]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+[%include bottom.html%]
diff --git a/server/web/create-coverage.html b/server/web/create-coverage.html
index 8449c66fd..78d59fc6a 100644
--- a/server/web/create-coverage.html
+++ b/server/web/create-coverage.html
@@ -2,78 +2,12 @@
-
Coverage Entry: FHIR Server [%id%] Version [%ver%]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
Coverage Entry (FHIR Server [%id%] Version [%ver%])
+ [%include head.html%]
-
-
-
-
-
-
-
-
-
-
+[%include top.html%]
Coverage Entry Created
@@ -81,49 +15,7 @@
Coverage Entry Created
See the coverage resource at
[%path%]/Coverage/[%rid%] .
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+[%include bottom.html%]
diff --git a/server/web/diagnostics.html b/server/web/diagnostics.html
index dbf3277de..f952b91c8 100644
--- a/server/web/diagnostics.html
+++ b/server/web/diagnostics.html
@@ -1,82 +1,14 @@
-
-
-
+
-
Diagnostics - FHIR Server [%id%] Version [%ver%]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
Diagnostics (FHIR Server [%id%] Version [%ver%])
+ [%include head.html%]
+[%include top.html%]
-
-
-
-
-
-
-
-
-
FHIR Server Internal Diagnostics
Current Activity
@@ -106,50 +38,8 @@ Locks
[%status.locks%]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+[%include bottom.html%]
+
diff --git a/server/web/encounter.html b/server/web/encounter.html
index 87dce7ab3..64188258b 100644
--- a/server/web/encounter.html
+++ b/server/web/encounter.html
@@ -2,78 +2,12 @@
-
FHIR Server [%id%] Version [%ver%]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
Patient Page (FHIR Server [%id%] Version [%ver%])
+ [%include head.html%]
-
-
-
-
-
-
-
-
-
-
+[%include top.html%]
Page for Patient
@@ -108,50 +42,7 @@
CDS Hooks:
Load FitBit Data: this app loads summary data from FitBit into this patient's record. You will have to provide you own fitbit data-->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+[%include bottom.html%]
diff --git a/server/web/fitbit-start.html b/server/web/fitbit-start.html
index b3ca68e0f..5b8119b33 100644
--- a/server/web/fitbit-start.html
+++ b/server/web/fitbit-start.html
@@ -1,81 +1,13 @@
-
-
+
-
FHIR Server [%id%] Version [%ver%]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
FitBit (FHIR Server [%id%] Version [%ver%])
+ [%include head.html%]
-
-
-
-
-
-
-
-
-
-
+[%include top.html%]
FitBit Application Starter
@@ -85,50 +17,8 @@ FitBit Application Starter
[%fitbit-redirect%]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+[%include bottom.html%]
+
diff --git a/server/web/homepage.html b/server/web/homepage.html
index e079683a4..e176c6bd3 100644
--- a/server/web/homepage.html
+++ b/server/web/homepage.html
@@ -1,82 +1,14 @@
-
-
-
+
-
FHIR Server [%id%]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
HOME (FHIR Server [%id%] Version [%ver%])
+ [%include head.html%]
+[%include top.html%]
-
-
-
-
-
-
-
-
-
Welcome to the FHIR Server
@@ -91,50 +23,9 @@
Welcome to the FHIR Server
(and logged in user, if one exists). Also, your IP address is logged with Google Analytics for building geomaps
of server usage. Your continued use of the API constitutes agreement to these terms. See [link] for erasure requests.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+[%include bottom.html%]
+
diff --git a/server/web/local.html b/server/web/local.html
index a231bfbd1..6936d4fc4 100644
--- a/server/web/local.html
+++ b/server/web/local.html
@@ -1,81 +1,14 @@
-
-
+
-
FHIR Server [%id%] Version [%ver%]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
Extensions (FHIR Server [%id%] Version [%ver%])
+ [%include head.html%]
+[%include top.html%]
-
-
-
-
-
-
-
-
-
Extensions to the FHIR API Supported by this server
@@ -200,50 +133,8 @@
Step 3: Getting information about the token
The last 3 are only provided if the user approved this. Email address may not be known at all.
-->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+[%include bottom.html%]
+
diff --git a/server/web/oauth_choice.html b/server/web/oauth_choice.html
index 768fdd1fd..eb6bacf9e 100644
--- a/server/web/oauth_choice.html
+++ b/server/web/oauth_choice.html
@@ -1,82 +1,14 @@
-
-
-
+
-
FHIR Server [%id%] Version [%ver%]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
Authorization (FHIR Server [%id%] Version [%ver%])
+ [%include head.html%]
+[%include top.html%]
-
-
-
-
-
-
-
-
-
FHIR Server Authorization
@@ -208,50 +140,8 @@
FHIR Server Authorization
-->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+[%include bottom.html%]
+
diff --git a/server/web/oauth_login.html b/server/web/oauth_login.html
index 8fe8d5fa1..04132ce71 100644
--- a/server/web/oauth_login.html
+++ b/server/web/oauth_login.html
@@ -1,82 +1,14 @@
-
-
-
+
-
FHIR Server [%id%] Version [%ver%]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
Login (FHIR Server [%id%] Version [%ver%])
+ [%include head.html%]
+[%include top.html%]
-
-
-
-
-
-
-
-
-
FHIR Server Login
@@ -94,50 +26,10 @@
FHIR Server Login
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+[%include bottom.html%]
+
+
diff --git a/server/web/oauth_login_denied.html b/server/web/oauth_login_denied.html
index b335ccd31..8d58d8015 100644
--- a/server/web/oauth_login_denied.html
+++ b/server/web/oauth_login_denied.html
@@ -1,82 +1,14 @@
-
-
-
+
-
FHIR Server [%id%] Version [%ver%]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
Login (FHIR Server [%id%] Version [%ver%])
+ [%include head.html%]
+[%include top.html%]
-
-
-
-
-
-
-
-
-
FHIR Server Login
@@ -85,50 +17,10 @@
FHIR Server Login
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+[%include bottom.html%]
+
+
diff --git a/server/web/oauth_skype.html b/server/web/oauth_skype.html
index ac29d8c0e..5e4f0923b 100644
--- a/server/web/oauth_skype.html
+++ b/server/web/oauth_skype.html
@@ -1,82 +1,13 @@
-
-
-
+
-
FHIR Server [%id%] Version [%ver%]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
Skype Login (FHIR Server [%id%] Version [%ver%])
+ [%include head.html%]
-
-
-
-
-
-
-
-
-
-
+[%include top.html%]
FHIR Server Skype based Login handler
@@ -89,50 +20,8 @@ FHIR Server Skype based Login handler
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+[%include bottom.html%]
+
diff --git a/server/web/oauth_userdetails.html b/server/web/oauth_userdetails.html
index 1fc37d63d..5a155ffef 100644
--- a/server/web/oauth_userdetails.html
+++ b/server/web/oauth_userdetails.html
@@ -1,82 +1,14 @@
-
-
-
+
-
[%username%] - FHIR Server [%id%] Version [%ver%]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
User Details (FHIR Server [%id%] Version [%ver%])
+ [%include head.html%]
+[%include top.html%]
-
-
-
-
-
-
-
-
-
[%username%] Account Details
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+[%include bottom.html%]
+
diff --git a/server/web/package-client.html b/server/web/package-client.html
index 1ea6f703a..ddf271b9e 100644
--- a/server/web/package-client.html
+++ b/server/web/package-client.html
@@ -1,83 +1,14 @@
-
-
+
-
Package Client
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
Package Client (FHIR Server [%id%] Version [%ver%])
+ [%include head.html%]
+[%include top.html%]
-
-
-
-
-
-
-
-
-
Package Client
Packages for FHIR Version [%ver%]:
@@ -85,78 +16,8 @@
Package Client
[%package-list%]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+[%include bottom.html%]
+
diff --git a/server/web/packages-home.html b/server/web/packages-home.html
index 6e9533d1b..8c11408bc 100644
--- a/server/web/packages-home.html
+++ b/server/web/packages-home.html
@@ -1,83 +1,14 @@
-
-
+
-
Package Server - FHIR Server [%id%] Version [%ver%]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
Package Server (FHIR Server [%id%] Version [%ver%])
+ [%include head.html%]
+[%include top.html%]
-
-
-
-
-
-
-
-
-
FHIR Package Server
Search the Packages:
@@ -112,78 +43,8 @@
FHIR Package Server
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+[%include bottom.html%]
+
diff --git a/server/web/packages-protect.html b/server/web/packages-protect.html
index 26a1a6c60..f2f4c6b99 100644
--- a/server/web/packages-protect.html
+++ b/server/web/packages-protect.html
@@ -1,83 +1,13 @@
-
-
+
-
Package Server - FHIR Server [%id%] Version [%ver%]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
Package Server (FHIR Server [%id%] Version [%ver%])
+ [%include head.html%]
-
-
-
-
-
-
-
-
-
-
+[%include top.html%]
FHIR Package Server - Protect #current for Package [%pid%]
Provide the System password, and the server will return a new token that must
@@ -94,77 +24,8 @@
FHIR Package Server - Protect #current for Package [%pid%]
can get the password from the
FHIR product director .
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+[%include bottom.html%]
+
diff --git a/server/web/packages-protected.html b/server/web/packages-protected.html
index f98b897b4..db7317ac3 100644
--- a/server/web/packages-protected.html
+++ b/server/web/packages-protected.html
@@ -1,83 +1,14 @@
-
-
+
-
Package Server - FHIR Server [%id%] Version [%ver%]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
Package Server (FHIR Server [%id%] Version [%ver%])
+ [%include head.html%]
+[%include top.html%]
-
-
-
-
-
-
-
-
-
FHIR Package Server - #current for Package [%pid%] Protected
The token [%pword%]
has been assigned to the package, and must now be
@@ -88,77 +19,8 @@
FHIR Package Server - #current for Package [%pid%] Protected
See [doco] for information about how to use the token.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+[%include bottom.html%]
+
diff --git a/server/web/packages-search.html b/server/web/packages-search.html
index d0a789bc9..1d05782a4 100644
--- a/server/web/packages-search.html
+++ b/server/web/packages-search.html
@@ -1,83 +1,13 @@
-
-
+
-
Package Server - FHIR Server [%id%] Version [%ver%]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
Package Server (FHIR Server [%id%] Version [%ver%])
+ [%include head.html%]
-
-
-
-
-
-
-
-
-
-
+[%include top.html%]
FHIR Package Server
Search the Catalog:
@@ -110,79 +40,8 @@
FHIR Package Server
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+[%include bottom.html%]
+
diff --git a/server/web/packages-upload-api.html b/server/web/packages-upload-api.html
index 5530bab97..013f6f221 100644
--- a/server/web/packages-upload-api.html
+++ b/server/web/packages-upload-api.html
@@ -1,83 +1,14 @@
-
-
+
-
Package Server - FHIR Server [%id%] Version [%ver%]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
Package Server (FHIR Server [%id%] Version [%ver%])
+ [%include head.html%]
+[%include top.html%]
-
-
-
-
-
-
-
-
-
FHIR Package Server - Upload API
This API allow FHIR users to upload their package directly to the Package server.
@@ -97,77 +28,8 @@
FHIR Package Server - Upload API
server, and then creates the package.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+[%include bottom.html%]
+
diff --git a/server/web/packages-versions.html b/server/web/packages-versions.html
index 44b9fb929..ad9534011 100644
--- a/server/web/packages-versions.html
+++ b/server/web/packages-versions.html
@@ -1,83 +1,14 @@
-
-
+
-
Package Server - FHIR Server [%id%] Version [%ver%]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
Package Server (FHIR Server [%id%] Version [%ver%])
+ [%include head.html%]
+[%include top.html%]
-
-
-
-
-
-
-
-
-
FHIR Package Server
Versions for [%name%]
@@ -96,77 +27,8 @@
FHIR Package Server
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+[%include bottom.html%]
+
diff --git a/server/web/patient.html b/server/web/patient.html
index fac081061..0f465d1b1 100644
--- a/server/web/patient.html
+++ b/server/web/patient.html
@@ -2,79 +2,12 @@
-
FHIR Server [%id%] Version [%ver%]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
Patient (FHIR Server [%id%] Version [%ver%])
+ [%include head.html%]
-
-
-
-
-
-
-
-
-
-
-
+[%include top.html%]
Page for Patient
@@ -102,56 +35,10 @@
CDS Hooks:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+[%include bottom.html%]
diff --git a/server/web/registerclient.html b/server/web/registerclient.html
index bba5bea48..0ab69a0ae 100644
--- a/server/web/registerclient.html
+++ b/server/web/registerclient.html
@@ -1,82 +1,15 @@
-
-
+
-
Register a client: FHIR Server [%id%] Version [%ver%]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
Register (FHIR Server [%id%] Version [%ver%])
+ [%include head.html%]
-
-
-
-
-
-
-
-
-
-
-
+[%include top.html%]
+
Register a Client
@@ -104,50 +37,7 @@ Register a Client
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+[%include bottom.html%]
diff --git a/server/web/scimuser.html b/server/web/scimuser.html
index 5aa2ad585..efa4f1552 100644
--- a/server/web/scimuser.html
+++ b/server/web/scimuser.html
@@ -1,82 +1,14 @@
-
-
-
+
-
FHIR Server [%id%] Version [%ver%]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
User (FHIR Server [%id%] Version [%ver%])
+ [%include head.html%]
+[%include top.html%]
-
-
-
-
-
-
-
-
-
Edit User: [%user.fname%]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+[%include bottom.html%]
+
+
diff --git a/server/web/scimusers.html b/server/web/scimusers.html
index 6c7aee739..3912d3d96 100644
--- a/server/web/scimusers.html
+++ b/server/web/scimusers.html
@@ -1,82 +1,13 @@
-
-
-
+
-
FHIR Server [%id%] Version [%ver%]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
Users (FHIR Server [%id%] Version [%ver%])
+ [%include head.html%]
-
-
-
-
-
-
-
-
-
-
+[%include top.html%]
Registered Users
@@ -87,50 +18,9 @@ Registered Users
Add a new user
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+[%include bottom.html%]
+
diff --git a/server/web/sct-choice.html b/server/web/sct-choice.html
index 96cb7db08..f4ce66faf 100644
--- a/server/web/sct-choice.html
+++ b/server/web/sct-choice.html
@@ -1,131 +1,19 @@
-
-
-
+
- SNOMED CT Edition Choice - FHIR Server [%id%] Version [%ver%]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ SCT (FHIR Server [%id%] Version [%ver%])
+ [%include head.html%]
-
-
-
-
-
-
-
-
-
-
+[%include top.html%]
SNOMED CT Edition Choice
[%choice%]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+[%include bottom.html%]
+
diff --git a/server/web/sessions.html b/server/web/sessions.html
index 7c99af649..764097c88 100644
--- a/server/web/sessions.html
+++ b/server/web/sessions.html
@@ -1,82 +1,14 @@
-
-
-
+
- FHIR Server [%id%] Version [%ver%]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ Sessions (FHIR Server [%id%] Version [%ver%])
+ [%include head.html%]
+[%include top.html%]
-
-
-
-
-
-
-
-
-
Current Sessions
@@ -84,50 +16,8 @@
Current Sessions
[%sessions-table%]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+[%include bottom.html%]
+
diff --git a/server/web/tabs.html b/server/web/tabs.html
new file mode 100644
index 000000000..69cb8a8eb
--- /dev/null
+++ b/server/web/tabs.html
@@ -0,0 +1,28 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/server/web/task-redirect.html b/server/web/task-redirect.html
index a1857c1b3..25a91efa1 100644
--- a/server/web/task-redirect.html
+++ b/server/web/task-redirect.html
@@ -1,119 +1,21 @@
-
-
+
- ${title}
- ${redirect}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ Task (FHIR Server [%id%] Version [%ver%])
+ [%include head.html%]
-
-
-
-
-
-
-
-
-
-
+[%include top.html%]
${body}
+ [%include bottom.html%]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/server/web/template-fhir.html b/server/web/template-fhir.html
index 8fe37dd1b..93a159ef1 100644
--- a/server/web/template-fhir.html
+++ b/server/web/template-fhir.html
@@ -1,157 +1,20 @@
-
-
+
- [%title%] - FHIR Server [%id%] Version [%ver%]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ [%title%] (FHIR Server [%id%] Version [%ver%])
+ [%include head.html%]
-
-
-
-
-
-
-
-
-
-
+[%include top.html%]
[%content%]
-
-
-
-
-
-
-
-
-
-
+[%include bottom.html%]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+[%include tabs.html%]
+
diff --git a/server/web/template-nfhir.html b/server/web/template-nfhir.html
index ff8e491b4..b40d798de 100644
--- a/server/web/template-nfhir.html
+++ b/server/web/template-nfhir.html
@@ -1,156 +1,21 @@
-
-
+
- [%title%] - FHIR Server [%id%]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ [%title%] (FHIR Server [%id%] Version [%ver%])
+ [%include head.html%]
-
-
-
-
-
-
-
-
-
-
+[%include top.html%]
[%content%]
-
-
-
-
-
-
-
-
-
-
+[%include bottom.html%]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+[%include tabs.html%]
+
+
diff --git a/server/web/token.html b/server/web/token.html
index 563dc3214..2af51d955 100644
--- a/server/web/token.html
+++ b/server/web/token.html
@@ -1,83 +1,13 @@
-
-
- Session JWT: FHIR Server [%id%] Version [%ver%]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ Session (FHIR Server [%id%] Version [%ver%])
+ [%include head.html%]
-
-
-
-
-
-
-
-
-
-
-
-
+[%include top.html%]
Session Token
@@ -88,48 +18,7 @@
Session Token
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ [%include bottom.html%]
diff --git a/server/web/top.html b/server/web/top.html
index a23e0597a..5bd56c59f 100644
--- a/server/web/top.html
+++ b/server/web/top.html
@@ -8,7 +8,7 @@
© HL7.org
|
Server Home |
- [%id%] FHIR Server
+ [%id%] FHIR Server [%server-ver%]
|
FHIR Version [%ver%]
[%logout%]
diff --git a/server/web/tx-cm-id.html b/server/web/tx-cm-id.html
index 29875064b..49aa8de54 100644
--- a/server/web/tx-cm-id.html
+++ b/server/web/tx-cm-id.html
@@ -1,82 +1,13 @@
-
-
-
+
- Concept Map [%name%] - FHIR Server [%id%] Version [%ver%]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ Concept Map (FHIR Server [%id%] Version [%ver%])
+ [%include head.html%]
-
-
-
-
-
-
-
-
-
-
+[%include top.html%]
Concept Map [%name%] ([%url%])
[%html%]
@@ -92,51 +23,8 @@ Concept Map [%name%] ([%url%])
[%xml%]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+[%include bottom.html%]
+
diff --git a/server/web/tx-cs-id.html b/server/web/tx-cs-id.html
index 57c7ad284..799b7a721 100644
--- a/server/web/tx-cs-id.html
+++ b/server/web/tx-cs-id.html
@@ -1,82 +1,13 @@
-
-
-
+
- Code System [%name%] - FHIR Server [%id%] Version [%ver%]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ Code System (FHIR Server [%id%] Version [%ver%])
+ [%include head.html%]
-
-
-
-
-
-
-
-
-
-
+[%include top.html%]
Code System [%name%] ([%url%])
[%html%]
@@ -92,51 +23,8 @@ Code System [%name%] ([%url%])
[%xml%]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+[%include bottom.html%]
+
diff --git a/server/web/tx-registry.html b/server/web/tx-registry.html
index aef7fdcf5..2b3646372 100644
--- a/server/web/tx-registry.html
+++ b/server/web/tx-registry.html
@@ -1,82 +1,15 @@
-
-
+
- Tx Server Registry - FHIR Server [%id%] Version [%ver%]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ Tx Server Registry (FHIR Server [%id%] Version [%ver%])
+ [%include head.html%]
+[%include top.html%]
-
-
-
-
-
-
-
-
-
FHIR Tx Server Registry
Filter the Tx Servers:
@@ -109,53 +42,8 @@
FHIR Tx Server Registry
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+[%include bottom.html%]
+
diff --git a/server/web/tx-vs-id.html b/server/web/tx-vs-id.html
index ee7ff41bc..4da08cd5a 100644
--- a/server/web/tx-vs-id.html
+++ b/server/web/tx-vs-id.html
@@ -1,82 +1,14 @@
-
-
-
+
- Value Set [%name%] - FHIR Server [%id%] Version [%ver%]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ ValueSet (FHIR Server [%id%] Version [%ver%])
+ [%include head.html%]
+[%include top.html%]
-
-
-
-
-
-
-
-
-
Value Set [%name%] ([%url%])
[%html%]
@@ -92,51 +24,8 @@ Value Set [%name%] ([%url%])
[%xml%]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+[%include bottom.html%]
+
diff --git a/server/web/tx-vs.html b/server/web/tx-vs.html
index 0b43793cc..c0c573fa7 100644
--- a/server/web/tx-vs.html
+++ b/server/web/tx-vs.html
@@ -1,131 +1,21 @@
-
-
-
+
- [%kind%]s - FHIR Server [%id%] Version [%ver%]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ [%kind%] List (FHIR Server [%id%] Version [%ver%])
+ [%include head.html%]
+[%include top.html%]
-
-
-
-
-
-
-
-
-
[%kind%] List
[%table%]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+[%include bottom.html%]
+
diff --git a/server/web/txform.html b/server/web/txform.html
index 47a15debe..7fdaadcc0 100644
--- a/server/web/txform.html
+++ b/server/web/txform.html
@@ -227,7 +227,7 @@
© HL7.org
|
Server Home |
- [%id%] FHIR Server
+ [%id%] FHIR Server [%server-ver%]
|
FHIR Version [%ver%]
[%logout%]
@@ -288,7 +288,7 @@ Test Code Selection Form
- Server Home . | FHIR © HL7.org 2011+. | This server based on version [%ver%]
+ Server Home . | FHIR © HL7.org 2011+. | Server v[%server-ver%] on [%os%] | This server based on version [%ver%]
diff --git a/server/web/txhome.html b/server/web/txhome.html
index 07dbe1482..356bc4fd1 100644
--- a/server/web/txhome.html
+++ b/server/web/txhome.html
@@ -1,83 +1,14 @@
-
-
+
-
Terminology Home - FHIR Server [%id%] Version [%ver%]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
Terminology service (FHIR Server [%id%] Version [%ver%])
+ [%include head.html%]
+[%include top.html%]
-
-
-
-
-
-
-
-
-
Terminology service Resources
Explore the resources available to this server:
@@ -170,80 +101,8 @@
Terminology service operations
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+[%include bottom.html%]
+
diff --git a/server/web/xig.html b/server/web/xig.html
index 0244ae1fc..4a45cfad6 100644
--- a/server/web/xig.html
+++ b/server/web/xig.html
@@ -2,7 +2,7 @@
-
FHIR Server [%id%] Version [%ver%]
+
XIG (FHIR Server [%id%] Version [%ver%])
[%include head.html%]
@@ -23,6 +23,7 @@
FHIR IG Statistics ([%ms%] ms)
XIG built as of [%metadata-date%]. Found [%metadata-resources%] resources in [%metadata-packages%] packages.
+
[%include bottom.html%]
diff --git a/server/web_server.pas b/server/web_server.pas
index 8681428ff..bd1aaa96f 100644
--- a/server/web_server.pas
+++ b/server/web_server.pas
@@ -1274,6 +1274,10 @@ function TFhirWebServer.insertValue(n : String; secure: boolean; variables: TFs
result := WebDesc(secure)
else if n = 'admin' then
result := Common.AdminEmail
+ else if n = 'server-ver' then
+ result := FHIR_CODE_FULL_VERSION
+ else if n = 'os' then
+ result := SERVER_OS
else if n = 'logout' then
result := 'User: [n/a]'
else if n = 'endpoints' then