From 3ed197e0fe019efa86ce3eafcb914b284e5ffffa Mon Sep 17 00:00:00 2001 From: James Agnew Date: Mon, 29 Aug 2016 19:11:41 -0400 Subject: [PATCH] Fix #431 - Regressions to testing UI caused by Thymeleaf upgrade --- hapi-fhir-jpaserver-example/pom.xml | 8 +++- .../main/webapp/WEB-INF/templates/home.html | 12 ++--- .../webapp/WEB-INF/templates/resource.html | 6 +-- .../main/webapp/WEB-INF/templates/result.html | 19 ++++---- .../webapp/WEB-INF/templates/tmpl-head.html | 29 ++++-------- .../WEB-INF/templates/tmpl-navbar-left.html | 47 ++++++++----------- .../templates/tmpl-navbar-top-farright.html | 4 +- .../WEB-INF/templates/tmpl-navbar-top.html | 11 +++-- .../src/main/webapp/css/hapi-narrative.css | 1 + .../src/main/webapp/js/RestfulTester.js | 2 +- 10 files changed, 64 insertions(+), 75 deletions(-) create mode 100644 hapi-fhir-testpage-overlay/src/main/webapp/css/hapi-narrative.css diff --git a/hapi-fhir-jpaserver-example/pom.xml b/hapi-fhir-jpaserver-example/pom.xml index 5751a39978ea..14be7e138e65 100644 --- a/hapi-fhir-jpaserver-example/pom.xml +++ b/hapi-fhir-jpaserver-example/pom.xml @@ -1,8 +1,12 @@ 4.0.0 - + ca.uhn.hapi.fhir hapi-fhir diff --git a/hapi-fhir-testpage-overlay/src/main/webapp/WEB-INF/templates/home.html b/hapi-fhir-testpage-overlay/src/main/webapp/WEB-INF/templates/home.html index 32fd57522a98..0ff375be6aa0 100644 --- a/hapi-fhir-testpage-overlay/src/main/webapp/WEB-INF/templates/home.html +++ b/hapi-fhir-testpage-overlay/src/main/webapp/WEB-INF/templates/home.html @@ -8,7 +8,7 @@
- +
@@ -25,7 +25,7 @@ -
+
@@ -72,7 +72,7 @@

Server Actions

- + Conformance - +
@@ -95,8 +96,8 @@ Response @@ -142,8 +143,8 @@

Prev Page - - - - - - + - - + + + + + - - - - - - - - - - + diff --git a/hapi-fhir-testpage-overlay/src/main/webapp/WEB-INF/templates/tmpl-navbar-left.html b/hapi-fhir-testpage-overlay/src/main/webapp/WEB-INF/templates/tmpl-navbar-left.html index a0c3badf2012..030c25897e65 100644 --- a/hapi-fhir-testpage-overlay/src/main/webapp/WEB-INF/templates/tmpl-navbar-left.html +++ b/hapi-fhir-testpage-overlay/src/main/webapp/WEB-INF/templates/tmpl-navbar-left.html @@ -47,7 +47,7 @@

Options

-
- - + +