From a5bd7c0f08ebc76234ad05a360c87358001886c5 Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Sat, 13 Jan 2024 07:49:34 +1100 Subject: [PATCH] refactor web content to use templates --- server/web/bottom.html | 2 +- server/web/coverage.html | 116 +------------------- server/web/covid-patient-error.html | 117 +------------------- server/web/covid-patient.secure.html | 108 +------------------ server/web/covid-result.secure.html | 109 +------------------ server/web/covid.secure.html | 117 +------------------- server/web/create-coverage.html | 116 +------------------- server/web/diagnostics.html | 122 ++------------------- server/web/encounter.html | 117 +------------------- server/web/fitbit-start.html | 122 ++------------------- server/web/homepage.html | 121 ++------------------- server/web/local.html | 121 ++------------------- server/web/oauth_choice.html | 122 ++------------------- server/web/oauth_login.html | 122 ++------------------- server/web/oauth_login_denied.html | 122 ++------------------- server/web/oauth_skype.html | 123 ++------------------- server/web/oauth_userdetails.html | 122 ++------------------- server/web/package-client.html | 151 ++------------------------ server/web/packages-home.html | 151 ++------------------------ server/web/packages-protect.html | 151 ++------------------------ server/web/packages-protected.html | 150 ++------------------------ server/web/packages-search.html | 153 ++------------------------- server/web/packages-upload-api.html | 150 ++------------------------ server/web/packages-versions.html | 150 ++------------------------ server/web/patient.html | 121 +-------------------- server/web/registerclient.html | 122 ++------------------- server/web/scimuser.html | 122 ++------------------- server/web/scimusers.html | 122 ++------------------- server/web/sct-choice.html | 124 ++-------------------- server/web/sessions.html | 122 ++------------------- server/web/tabs.html | 28 +++++ server/web/task-redirect.html | 116 ++------------------ server/web/template-fhir.html | 151 ++------------------------ server/web/template-nfhir.html | 151 ++------------------------ server/web/token.html | 119 +-------------------- server/web/top.html | 2 +- server/web/tx-cm-id.html | 124 ++-------------------- server/web/tx-cs-id.html | 124 ++-------------------- server/web/tx-registry.html | 124 ++-------------------- server/web/tx-vs-id.html | 123 ++------------------- server/web/tx-vs.html | 122 ++------------------- server/web/txform.html | 4 +- server/web/txhome.html | 153 ++------------------------- server/web/xig.html | 3 +- server/web_server.pas | 4 + 45 files changed, 263 insertions(+), 4773 deletions(-) create mode 100644 server/web/tabs.html 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%] - -
-
-
-
- FHIR - - © HL7.org -  |  - Server Home  |  - [%id%] FHIR Server -  |  - FHIR Version [%ver%] -  [%logout%] -
-
-
- - - -
-
-
-
-
+[%include top.html%]

Coverage Entry

@@ -213,49 +147,7 @@

Coverage Entry

-
- -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - + COVID (FHIR Server [%id%] Version [%ver%]) + [%include head.html%] - -
-
-
-
- FHIR - - © HL7.org -  |  - Server Home  |  - [%id%] FHIR Server -  |  - FHIR Version [%ver%] -  [%logout%] -
-
-
- - - -
-
-
-
-
+[%include top.html%]

Page for Patient

@@ -97,50 +31,7 @@

Page for Patient

[%covid.newpatient covid-patient-form.liquid%] -
- - -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - + COVID (FHIR Server [%id%] Version [%ver%]) + [%include head.html%] +[%include top.html%] -
-
-
-
- FHIR - - © HL7.org -  |  - Server Home  |  - [%id%] FHIR Server -  |  - FHIR Version [%ver%] -  [%logout%] -
-
-
- - - - - - - - - - - - - - + COVID (FHIR Server [%id%] Version [%ver%]) + [%include head.html%] - -
-
-
-
- FHIR - - © HL7.org -  |  - Server Home  |  - [%id%] FHIR Server -  |  - FHIR Version [%ver%] -  [%logout%] -
-
-
+[%include top.html%] - - - - - - - - - - - - - - + COVID (FHIR Server [%id%] Version [%ver%]) + [%include head.html%] - -
-
-
-
- FHIR - - © HL7.org -  |  - Server Home  |  - [%id%] FHIR Server -  |  - FHIR Version [%ver%] -  [%logout%] -
-
-
- - - -
-
-
-
-
+[%include top.html%]

COVID-19 Maintenance System

@@ -97,50 +31,7 @@

COVID-19 Maintenance System

[%covid.newpatient covid-patient-form.liquid%] -
- - -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Coverage Entry (FHIR Server [%id%] Version [%ver%]) + [%include head.html%] - -
-
-
-
- FHIR - - © HL7.org -  |  - Server Home  |  - [%id%] FHIR Server -  |  - FHIR Version [%ver%] -  [%logout%] -
-
-
- - - -
-
-
-
-
+[%include top.html%]

Coverage Entry Created

@@ -81,49 +15,7 @@

Coverage Entry Created

See the coverage resource at [%path%]/Coverage/[%rid%].

-
- -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Diagnostics (FHIR Server [%id%] Version [%ver%]) + [%include head.html%] +[%include top.html%] -
-
-
-
- FHIR - - © HL7.org -  |  - Server Home  |  - [%id%] FHIR Server -  |  - FHIR Version [%ver%] -  [%logout%] -
-
-
- - - -
-
-
-
-

FHIR Server Internal Diagnostics

Current Activity

@@ -106,50 +38,8 @@

Locks

[%status.locks%] -
- - -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Patient Page (FHIR Server [%id%] Version [%ver%]) + [%include head.html%] - -
-
-
-
- FHIR - - © HL7.org -  |  - Server Home  |  - [%id%] FHIR Server -  |  - FHIR Version [%ver%] -  [%logout%] -
-
-
- - - -
-
-
-
-
+[%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
    • --> -
    - - -
    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + FitBit (FHIR Server [%id%] Version [%ver%]) + [%include head.html%] - -
    -
    -
    -
    - FHIR - - © HL7.org -  |  - Server Home  |  - [%id%] FHIR Server -  |  - FHIR Version [%ver%] -  [%logout%] -
    -
    -
    - - - -
    -
    -
    -
    -
    +[%include top.html%]

    FitBit Application Starter

    @@ -85,50 +17,8 @@

    FitBit Application Starter

    [%fitbit-redirect%] -
    - - -
    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + HOME (FHIR Server [%id%] Version [%ver%]) + [%include head.html%] +[%include top.html%] -
    -
    -
    -
    - FHIR - - © HL7.org -  |  - Server Home  |  - [%id%] FHIR Server -  |  - FHIR Version [%ver%] -  [%logout%] -
    -
    -
    - - - -
    -
    -
    -
    -

    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.

    -
    - - -
    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Extensions (FHIR Server [%id%] Version [%ver%]) + [%include head.html%] +[%include top.html%] -
    -
    -
    -
    - FHIR - - © HL7.org -  |  - Server Home  |  - [%id%] FHIR Server -  |  - FHIR Version [%ver%] -  [%logout%] -
    -
    -
    - - - -
    -
    -
    -
    -

    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.

    --> -
    - - -
    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Authorization (FHIR Server [%id%] Version [%ver%]) + [%include head.html%] +[%include top.html%] -
    -
    -
    -
    - FHIR - - © HL7.org -  |  - Server Home  |  - [%id%] FHIR Server -  |  - FHIR Version [%ver%] -   -
    -
    -
    - - - -
    -
    -
    -
    -

    FHIR Server Authorization

    @@ -208,50 +140,8 @@

    FHIR Server Authorization

    --> -
    - - -
    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Login (FHIR Server [%id%] Version [%ver%]) + [%include head.html%] +[%include top.html%] -
    -
    -
    -
    - FHIR - - © HL7.org -  |  - Server Home  |  - [%id%] FHIR Server -  |  - FHIR Version [%ver%] -  [%logout%] -
    -
    -
    - - - -
    -
    -
    -
    -

    FHIR Server Login

    @@ -94,50 +26,10 @@

    FHIR Server Login

      [%client-notes%]
    -
    - - -
    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Login (FHIR Server [%id%] Version [%ver%]) + [%include head.html%] +[%include top.html%] -
    -
    -
    -
    - FHIR - - © HL7.org -  |  - Server Home  |  - [%id%] FHIR Server -  |  - FHIR Version [%ver%] -  [%logout%] -
    -
    -
    - - - -
    -
    -
    -
    -

    FHIR Server Login

    @@ -85,50 +17,10 @@

    FHIR Server Login

      [%client-notes%]
    -
    - - -
    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Skype Login (FHIR Server [%id%] Version [%ver%]) + [%include head.html%] - -
    -
    -
    -
    - FHIR - - © HL7.org -  |  - Server Home  |  - [%id%] FHIR Server -  |  - FHIR Version [%ver%] -  [%logout%] -
    -
    -
    - - - -
    -
    -
    -
    -
    +[%include top.html%]

    FHIR Server Skype based Login handler

    @@ -89,50 +20,8 @@

    FHIR Server Skype based Login handler

    -
    - - -
    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + User Details (FHIR Server [%id%] Version [%ver%]) + [%include head.html%] +[%include top.html%] -
    -
    -
    -
    - FHIR - - © HL7.org -  |  - Server Home  |  - [%id%] FHIR Server -  |  - FHIR Version [%ver%] -   -
    -
    -
    - - - -
    -
    -
    -
    -

    [%username%] Account Details

    @@ -90,50 +22,8 @@

    [%username%] Account Details

    -
    - - -
    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Package Client (FHIR Server [%id%] Version [%ver%]) + [%include head.html%] +[%include top.html%] -
    -
    -
    -
    - FHIR - - © HL7.org -  |  - Server Home  |  - [%id%] FHIR Server -  |  - FHIR Version [%ver%] -  [%logout%] -
    -
    -
    - - - -
    -
    -
    -
    -

    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 - - © HL7.org -  |  - Server Home  |  - [%id%] FHIR Server -  |  - FHIR Version [%ver%] -  [%logout%] -
    -
    -
    - - - -
    -
    -
    -
    -

    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%] - -
    -
    -
    -
    - FHIR - - © HL7.org -  |  - Server Home  |  - [%id%] FHIR Server -  |  - FHIR Version [%ver%] -  [%logout%] -
    -
    -
    - - - -
    -
    -
    -
    -
    +[%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 - - © HL7.org -  |  - Server Home  |  - [%id%] FHIR Server -  |  - FHIR Version [%ver%] -  [%logout%] -
    -
    -
    - - - -
    -
    -
    -
    -

    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%] - -
    -
    -
    -
    - FHIR - - © HL7.org -  |  - Server Home  |  - [%id%] FHIR Server -  |  - FHIR Version [%ver%] -  [%logout%] -
    -
    -
    - - - -
    -
    -
    -
    -
    +[%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 - - © HL7.org -  |  - Server Home  |  - [%id%] FHIR Server -  |  - FHIR Version [%ver%] -  [%logout%] -
    -
    -
    - - - -
    -
    -
    -
    -

    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 - - © HL7.org -  |  - Server Home  |  - [%id%] FHIR Server -  |  - FHIR Version [%ver%] -  [%logout%] -
    -
    -
    - - - -
    -
    -
    -
    -

    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%] - -
    -
    -
    -
    - FHIR - - © HL7.org -  |  - Server Home  |  - [%id%] FHIR Server -  |  - FHIR Version [%ver%] -  [%logout%] -
    -
    -
    - - - -
    -
    -
    -
    -
    - +[%include top.html%]

    Page for Patient

    @@ -102,56 +35,10 @@

    CDS Hooks:

      [%patient-app-list%] -
    -
    - - -
    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Register (FHIR Server [%id%] Version [%ver%]) + [%include head.html%] - -
    -
    -
    -
    - FHIR - - © HL7.org -  |  - Server Home  |  - [%id%] FHIR Server -  |  - FHIR Version [%ver%] -  [%logout%] -
    -
    -
    - - - -
    -
    -
    -
    -
    - +[%include top.html%] +

    Register a Client

    @@ -104,50 +37,7 @@

    Register a Client

    -
    - - -
    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + User (FHIR Server [%id%] Version [%ver%]) + [%include head.html%] +[%include top.html%] -
    -
    -
    -
    - FHIR - - © HL7.org -  |  - Server Home  |  - [%id%] FHIR Server -  |  - FHIR Version [%ver%] -  [%logout%] -
    -
    -
    - - - -
    -
    -
    -
    -

    Edit User: [%user.fname%]

    @@ -103,50 +35,10 @@

    Edit User: [%user.fname%]

    Or go Back to the user list.

    -
    - - -
    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Users (FHIR Server [%id%] Version [%ver%]) + [%include head.html%] - -
    -
    -
    -
    - FHIR - - © HL7.org -  |  - Server Home  |  - [%id%] FHIR Server -  |  - FHIR Version [%ver%] -  [%logout%] -
    -
    -
    - - - -
    -
    -
    -
    -
    +[%include top.html%]

    Registered Users

    @@ -87,50 +18,9 @@

    Registered Users

    Add a new user

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + SCT (FHIR Server [%id%] Version [%ver%]) + [%include head.html%] - -
    -
    -
    -
    - FHIR - - © HL7.org -  |  - Server Home  |  - [%id%] FHIR Server -  |  - FHIR Version [%ver%] -  [%logout%] -
    -
    -
    - - - -
    -
    -
    -
    -
    +[%include top.html%]

    SNOMED CT Edition Choice

    [%choice%] - -
    - - -
    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Sessions (FHIR Server [%id%] Version [%ver%]) + [%include head.html%] +[%include top.html%] -
    -
    -
    -
    - FHIR - - © HL7.org -  |  - Server Home  |  - [%id%] FHIR Server -  |  - FHIR Version [%ver%] -  [%logout%] -
    -
    -
    - - - -
    -
    -
    -
    -

    Current Sessions

    @@ -84,50 +16,8 @@

    Current Sessions

    [%sessions-table%] -
    - - -
    -
    -
    -
    - - - - - - - - - - - - - - - + + \ 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%] - -
    -
    -
    -
    - FHIR - - © HL7.org -  |  - Server Home  |  - [%id%] FHIR Server -  |  - FHIR Version [%ver%] -  [%logout%] -
    -
    -
    - - - -
    -
    -
    -
    -
    +[%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%] - -
    -
    -
    -
    - FHIR - - © HL7.org -  |  - Server Home  |  - [%id%] FHIR Server -  |  - FHIR Version [%ver%] -  [%logout%] -
    -
    -
    - - - -
    -
    -
    -
    -
    +[%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%] - -
    -
    -
    -
    - FHIR - - © HL7.org -  |  - Server Home  |  - [%id%] FHIR Server -  |  -  [%logout%] -
    -
    -
    - - - -
    -
    -
    -
    -
    +[%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%] - -
    -
    -
    -
    - FHIR - - © HL7.org -  |  - Server Home  |  - [%id%] FHIR Server -  |  - FHIR Version [%ver%] -  [%logout%] -
    -
    -
    - - - -
    -
    -
    -
    -
    - - +[%include top.html%]

    Session Token

    @@ -88,48 +18,7 @@

    Session Token

    - -
    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Concept Map (FHIR Server [%id%] Version [%ver%]) + [%include head.html%] - -
    -
    -
    -
    - FHIR - - © HL7.org -  |  - Server Home  |  - [%id%] FHIR Server -  |  - FHIR Version [%ver%] -  [%logout%] -
    -
    -
    - - - -
    -
    -
    -
    -
    +[%include top.html%]

    Concept Map [%name%] ([%url%])

    [%html%] @@ -92,51 +23,8 @@

    Concept Map [%name%] ([%url%])

    [%xml%] - -
    - - -
    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Code System (FHIR Server [%id%] Version [%ver%]) + [%include head.html%] - -
    -
    -
    -
    - FHIR - - © HL7.org -  |  - Server Home  |  - [%id%] FHIR Server -  |  - FHIR Version [%ver%] -  [%logout%] -
    -
    -
    - - - -
    -
    -
    -
    -
    +[%include top.html%]

    Code System [%name%] ([%url%])

    [%html%] @@ -92,51 +23,8 @@

    Code System [%name%] ([%url%])

    [%xml%] - -
    - - -
    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Tx Server Registry (FHIR Server [%id%] Version [%ver%]) + [%include head.html%] +[%include top.html%] -
    -
    -
    -
    - FHIR - © HL7.org -  |  - Server Home  |  - [%id%] FHIR Server -  |  - FHIR Version [%ver%] -  [%logout%] -
    -
    -
    - - - -
    -
    -
    -
    -

    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%] -
    -
    -
    -
    - FHIR - - © HL7.org -  |  - Server Home  |  - [%id%] FHIR Server -  |  - FHIR Version [%ver%] -  [%logout%] -
    -
    -
    - - - -
    -
    -
    -
    -

    Value Set [%name%] ([%url%])

    [%html%] @@ -92,51 +24,8 @@

    Value Set [%name%] ([%url%])

    [%xml%] - -
    - - -
    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + [%kind%] List (FHIR Server [%id%] Version [%ver%]) + [%include head.html%] +[%include top.html%] -
    -
    -
    -
    - FHIR - - © HL7.org -  |  - Server Home  |  - [%id%] FHIR Server -  |  - FHIR Version [%ver%] -  [%logout%] -
    -
    -
    - - - -
    -
    -
    -
    -

    [%kind%] List

    [%table%] -
    - - -
    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Terminology service (FHIR Server [%id%] Version [%ver%]) + [%include head.html%] +[%include top.html%] -
    -
    -
    -
    - FHIR - - © HL7.org -  |  - Server Home  |  - [%id%] FHIR Server -  |  - FHIR Version [%ver%] -  [%logout%] -
    -
    -
    - - - -
    -
    -
    -
    -

    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