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

fixing deprecated thymeleaf syntax (#6064)

This commit is contained in:
TipzCM 2024-07-04 11:08:26 -04:00 committed by GitHub
parent 724339c886
commit 371aad2b08
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 51 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/7_4_0/6063-removing-deprecated-thymeleaf-syntax.yaml Normal file
View File

@ -0,0 +1,6 @@
---
type: fix
issue: 6063
title: "Removing deprecated thymeleaf syntax from existing templates,
so as to avoid deprecation warnings in logs.
"

8
hapi-fhir-jpaserver-uhnfhirtest/src/main/webapp/WEB-INF/templates/about.html
View File

@ -1,20 +1,20 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head th:include="tmpl-head :: head"> <head th:insert="~{tmpl-head :: head}">
<title>About This Server</title> <title>About This Server</title>
</head> </head>
<body> <body>
<form action="" method="get" id="outerForm"> <form action="" method="get" id="outerForm">
<div th:replace="tmpl-navbar-top :: top" ></div> <div th:replace="~{tmpl-navbar-top :: top}" ></div>
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<div th:replace="tmpl-navbar-left :: left" ></div> <div th:replace="~{tmpl-navbar-left :: left}" ></div>
<div class="col-sm-9 col-sm-offset-3 col-md-9 col-md-offset-3 main"> <div class="col-sm-9 col-sm-offset-3 col-md-9 col-md-offset-3 main">
<div th:replace="tmpl-banner :: banner"></div> <div th:replace="~{tmpl-banner :: banner}"></div>
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">

11
hapi-fhir-jpaserver-uhnfhirtest/src/main/webapp/WEB-INF/templates/subscriptions.html
View File

@ -1,7 +1,8 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head th:include="tmpl-head :: head"> <head>
<title>RESTful Tester</title> <th:block th:insert="~{tmpl-head :: head}" />
<title>RESTful Tester</title>
</head> </head>
<body> <body>
@ -9,16 +10,16 @@
<input type="hidden" id="serverId" name="serverId" <input type="hidden" id="serverId" name="serverId"
th:value="${serverId}" /> th:value="${serverId}" />
<div th:replace="tmpl-navbar-top :: top"></div> <div th:replace="~{tmpl-navbar-top :: top}"></div>
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<div th:replace="tmpl-navbar-left :: left"></div> <div th:replace="~{tmpl-navbar-left :: left}"></div>
<div class="col-sm-9 col-sm-offset-3 col-md-9 col-md-offset-3 main"> <div class="col-sm-9 col-sm-offset-3 col-md-9 col-md-offset-3 main">
<div th:replace="tmpl-banner :: banner"></div> <div th:replace="~{tmpl-banner :: banner}"></div>
<!-- ********************************************************** --> <!-- ********************************************************** -->
<!-- ** Subscriptions Playground ** --> <!-- ** Subscriptions Playground ** -->

9
hapi-fhir-testpage-overlay/src/main/webapp/WEB-INF/templates/about.html
View File

@ -1,19 +1,20 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head th:include="tmpl-head :: head"> <head>
<title>About This Server</title> <title>About This Server</title>
<th:block th:insert="~{tmpl-head :: head}" />
</head> </head>
<body> <body>
<div th:replace="tmpl-navbar-top :: top" ></div> <div th:replace="~{tmpl-navbar-top :: top}" ></div>
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<div th:replace="tmpl-navbar-left :: left" ></div> <div th:replace="~{tmpl-navbar-left :: left}" ></div>
<div class="col-sm-9 col-sm-offset-3 col-md-9 col-md-offset-3 main"> <div class="col-sm-9 col-sm-offset-3 col-md-9 col-md-offset-3 main">
<div th:replace="tmpl-banner :: banner"></div> <div th:replace="~{tmpl-banner :: banner}"></div>
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">

14
hapi-fhir-testpage-overlay/src/main/webapp/WEB-INF/templates/hfql.html
View File

@ -1,9 +1,9 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" xmlns:th="http://www.thymeleaf.org"> <html lang="en" xmlns:th="http://www.thymeleaf.org">
<head> <head>
<title th:include="window-title :: hfql" /> <title th:replace="~{window-title :: hfql}" />
<th:block th:include="tmpl-head :: head" /> <th:block th:insert="~{tmpl-head :: head}" />
<script th:include="tmpl-buttonclick-handler :: handler" /> <th:block th:insert="~{tmpl-buttonclick-handler :: handler}" />
<style type="text/css" media="screen"> <style type="text/css" media="screen">
#editor { #editor {
@ -30,18 +30,18 @@
<input type="hidden" id="serverId" name="serverId" th:value="${serverId}"></input> <input type="hidden" id="serverId" name="serverId" th:value="${serverId}"></input>
<input th:if="${_csrf} != null" type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}" /> <input th:if="${_csrf} != null" type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}" />
<div th:replace="tmpl-navbar-top :: top" ></div> <div th:replace="~{tmpl-navbar-top :: top}" ></div>
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<div th:replace="tmpl-navbar-left :: left" ></div> <div th:replace="~{tmpl-navbar-left :: left}" ></div>
<div class="col-sm-9 col-sm-offset-3 col-md-9 col-md-offset-3 main" style="height: calc(100% - 200px);"> <div class="col-sm-9 col-sm-offset-3 col-md-9 col-md-offset-3 main" style="height: calc(100% - 200px);">
<div th:replace="tmpl-banner :: banner"></div> <div th:replace="~{tmpl-banner :: banner}"></div>
<div th:replace="tmpl-hfql-banner-card :: banner"></div> <div th:replace="~{tmpl-hfql-banner-card :: banner}"></div>
<!-- ************************************************ --> <!-- ************************************************ -->
<!-- ** SQL Editor ** --> <!-- ** SQL Editor ** -->

14
hapi-fhir-testpage-overlay/src/main/webapp/WEB-INF/templates/home.html
View File

@ -1,9 +1,9 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" xmlns:th="http://www.thymeleaf.org"> <html lang="en" xmlns:th="http://www.thymeleaf.org">
<head> <head>
<title th:include="window-title :: home" /> <th:block th:insert="~{window-title :: home}" />
<th:block th:include="tmpl-head :: head" /> <th:block th:insert="~{tmpl-head :: head}" />
<script th:include="tmpl-buttonclick-handler :: handler" /> <th:block th:insert="~{tmpl-buttonclick-handler :: handler}" />
</head> </head>
<body> <body>
@ -11,22 +11,22 @@
<input type="hidden" id="serverId" name="serverId" th:value="${serverId}"></input> <input type="hidden" id="serverId" name="serverId" th:value="${serverId}"></input>
<input th:if="${_csrf} != null" type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}" /> <input th:if="${_csrf} != null" type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}" />
<div th:replace="tmpl-navbar-top :: top" ></div> <div th:replace="~{tmpl-navbar-top :: top}" ></div>
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<div th:replace="tmpl-navbar-left :: left" ></div> <div th:replace="~{tmpl-navbar-left :: left}" ></div>
<div class="col-sm-9 col-sm-offset-3 col-md-9 col-md-offset-3 main"> <div class="col-sm-9 col-sm-offset-3 col-md-9 col-md-offset-3 main">
<div th:replace="tmpl-banner :: banner"></div> <div th:replace="~{tmpl-banner :: banner}"></div>
<!-- ********************************************************** --> <!-- ********************************************************** -->
<!-- ** Default Home ** --> <!-- ** Default Home ** -->
<!-- ********************************************************** --> <!-- ********************************************************** -->
<div th:replace="tmpl-home-welcome :: banner"></div> <div th:replace="~{tmpl-home-welcome :: banner}"></div>
<table class="table table-bordered table-striped" th:if="${resourceName.empty}"> <table class="table table-bordered table-striped" th:if="${resourceName.empty}">
<colgroup> <colgroup>

14
hapi-fhir-testpage-overlay/src/main/webapp/WEB-INF/templates/resource.html
View File

@ -1,9 +1,9 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" xmlns:th="http://www.thymeleaf.org"> <html lang="en" xmlns:th="http://www.thymeleaf.org">
<head> <head>
<title th:include="window-title :: resource" /> <th:block th:insert="~{window-title :: resource}" />
<th:block th:include="tmpl-head :: head" /> <th:block th:insert="~{tmpl-head :: head}" />
<script th:include="tmpl-buttonclick-handler :: handler" /> <th:block th:insert="~{tmpl-buttonclick-handler :: handler}" />
</head> </head>
<body> <body>
@ -11,16 +11,16 @@
<input type="hidden" id="serverId" name="serverId" th:value="${serverId}"/> <input type="hidden" id="serverId" name="serverId" th:value="${serverId}"/>
<input th:if="${_csrf} != null" type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}" /> <input th:if="${_csrf} != null" type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}" />
<div th:replace="tmpl-navbar-top :: top" ></div> <div th:replace="~{tmpl-navbar-top :: top}" ></div>
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<div th:replace="tmpl-navbar-left :: left" ></div> <div th:replace="~{tmpl-navbar-left :: left}" ></div>
<div class="col-sm-9 col-sm-offset-3 col-md-9 col-md-offset-3 main"> <div class="col-sm-9 col-sm-offset-3 col-md-9 col-md-offset-3 main">
<div th:replace="tmpl-banner :: banner"></div> <div th:replace="~{tmpl-banner :: banner}"></div>
<!-- ********************************************************** --> <!-- ********************************************************** -->
<!-- ** Default Home ** --> <!-- ** Default Home ** -->
@ -229,7 +229,7 @@
<!-- Queries Tab --> <!-- Queries Tab -->
<!-- *************************************************** --> <!-- *************************************************** -->
<div class="tab-pane" id="tab-queries" aria-labelledby="queries-tab"> <div class="tab-pane" id="tab-queries" aria-labelledby="queries-tab">
<div th:replace="tmpl-queries :: queries-list" ></div> <div th:replace="~{tmpl-queries :: queries-list}" ></div>
</div> </div>
<!-- End of queries tab --> <!-- End of queries tab -->

16
hapi-fhir-testpage-overlay/src/main/webapp/WEB-INF/templates/result.html
View File

@ -1,25 +1,25 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" xmlns:th="http://www.thymeleaf.org"> <html lang="en" xmlns:th="http://www.thymeleaf.org">
<head> <head>
<title th:include="window-title :: result" /> <th:block th:insert="~{window-title :: result}" />
<th:block th:include="tmpl-head :: head" /> <th:block th:insert="~{tmpl-head :: head}" />
<script th:include="tmpl-buttonclick-handler :: handler" /> <th:block th:insert="~{tmpl-buttonclick-handler :: handler}" />
</head> </head>
<body> <body>
<form action="" method="get" id="outerForm"> <form action="" method="get" id="outerForm">
<input type="hidden" id="serverId" name="serverId" th:value="${serverId}"/> <input type="hidden" id="serverId" name="serverId" th:value="${serverId}"/>
<div th:replace="tmpl-navbar-top :: top" ></div> <div th:replace="~{tmpl-navbar-top :: top}" ></div>
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<div th:replace="tmpl-navbar-left :: left" ></div> <div th:replace="~{tmpl-navbar-left :: left}" ></div>
<div class="col-sm-9 col-sm-offset-3 col-md-9 col-md-offset-3 main"> <div class="col-sm-9 col-sm-offset-3 col-md-9 col-md-offset-3 main">
<div th:replace="tmpl-banner :: banner"></div> <div th:replace="~{tmpl-banner :: banner}"></div>
<!-- *************************************************** --> <!-- *************************************************** -->
<!-- ** Response ** --> <!-- ** Response ** -->
@ -129,10 +129,10 @@
<td style="border-width: 0px; padding: 0px;"> <td style="border-width: 0px; padding: 0px;">
<th:block th:if="${bundle} != null"> <th:block th:if="${bundle} != null">
<th:block th:replace="tmpl-result-controltable-hapi :: controltable"></th:block> <th:block th:replace="~{tmpl-result-controltable-hapi :: controltable}"></th:block>
</th:block> </th:block>
<th:block th:if="${riBundle} != null AND ( ${riBundle.type.name()} == 'SEARCHSET' OR ${riBundle.type.name()} == 'HISTORY' )"> <th:block th:if="${riBundle} != null AND ( ${riBundle.type.name()} == 'SEARCHSET' OR ${riBundle.type.name()} == 'HISTORY' )">
<th:block th:replace="tmpl-result-controltable-ri :: controltable"></th:block> <th:block th:replace="~{tmpl-result-controltable-ri :: controltable}"></th:block>
</th:block> </th:block>
<div class="panel-heading"> <div class="panel-heading">

2
hapi-fhir-testpage-overlay/src/main/webapp/WEB-INF/templates/tmpl-navbar-top.html
View File

@ -69,7 +69,7 @@
<!-- <!--
SourceCode / About this Server SourceCode / About this Server
--> -->
<th:block th:replace="tmpl-navbar-top-farright :: farright"/> <th:block th:replace="~{tmpl-navbar-top-farright :: farright}"/>
</div> </div>