Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace deprecated thymeleaf syntax #481

Merged
merged 1 commit into from
May 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/main/resources/templates/admin/customers/customer.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,17 @@
</head>

<body>
<nav th:replace="fragments/header :: header"></nav>
<nav th:replace="~{fragments/header :: header}"></nav>

<!--/*@thymesVar id="customer" type="ch.wisv.events.core.model.customer.Customer"*/-->
<div class="container-fluid">
<div class="row">
<nav th:replace="admin/sidebar :: sidebar"></nav>
<nav th:replace="~{admin/sidebar :: sidebar}"></nav>

<main class="col-sm-9 ml-sm-auto col-md-10 p-5" role="main">
<h1>Create/update customer</h1>

<div th:replace="fragments/messages :: messages"></div>
<div th:replace="~{fragments/messages :: messages}"></div>

<form th:action="@{./}" th:object="${customer}" method="POST">
<input type="hidden" th:field="*{key}" th:value="*{key}">
Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/templates/admin/customers/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@
</head>

<body>
<nav th:replace="fragments/header :: header"></nav>
<nav th:replace="~{fragments/header :: header}"></nav>

<div class="container-fluid">
<div class="row">
<nav th:replace="admin/sidebar :: sidebar"></nav>
<nav th:replace="~{admin/sidebar :: sidebar}"></nav>

<main class="col-sm-9 ml-sm-auto col-md-10 p-5" role="main">
<h1>Customers
Expand All @@ -45,7 +45,7 @@ <h1>Customers
</a>
</h1>

<div th:replace="fragments/messages :: messages"></div>
<div th:replace="~{fragments/messages :: messages}"></div>

<div class="table-responsive">
<table id="customerTable" class="table table-striped">
Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/templates/admin/customers/view.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@
</head>

<body>
<nav th:replace="fragments/header :: header"></nav>
<nav th:replace="~{fragments/header :: header}"></nav>

<!--/*@thymesVar id="customer" type="ch.wisv.events.core.model.customer.Customer"*/-->
<div class="container-fluid">
<div class="row">
<nav th:replace="admin/sidebar :: sidebar"></nav>
<nav th:replace="~{admin/sidebar :: sidebar}"></nav>

<main class="col-sm-9 ml-sm-auto col-md-10 p-5" role="main">
<h1>[[${customer.getName()}]]
Expand All @@ -46,7 +46,7 @@ <h1>[[${customer.getName()}]]
</a>
</h1>

<div th:replace="fragments/messages :: messages"></div>
<div th:replace="~{fragments/messages :: messages}"></div>


<div class="row mb-5">
Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/templates/admin/events/event.html
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@
</head>

<body>
<nav th:replace="fragments/header :: header"></nav>
<nav th:replace="~{fragments/header :: header}"></nav>

<!--/*@thymesVar id="event" type="ch.wisv.events.core.model.event.Event"*/-->
<div class="container-fluid">
<div class="row">
<nav th:replace="admin/sidebar :: sidebar"></nav>
<nav th:replace="~{admin/sidebar :: sidebar}"></nav>

<main class="col-sm-9 ml-sm-auto col-md-10 p-5" role="main">
<h1>Create/update event
Expand All @@ -62,7 +62,7 @@ <h4 class="dropdown-header">Select a template</h4>
</div>
</h1>

<div th:replace="fragments/messages :: messages"></div>
<div th:replace="~{fragments/messages :: messages}"></div>

<form th:action="@{./}" th:object="${event}" method="POST" enctype="multipart/form-data">
<input type="hidden" th:field="*{key}" th:value="*{key}">
Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/templates/admin/events/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@
</head>

<body>
<nav th:replace="fragments/header :: header"></nav>
<nav th:replace="~{fragments/header :: header}"></nav>

<div class="container-fluid">
<div class="row">
<nav th:replace="admin/sidebar :: sidebar"></nav>
<nav th:replace="~{admin/sidebar :: sidebar}"></nav>

<main class="col-sm-9 ml-sm-auto col-md-10 p-5" role="main">
<h1>Events
Expand All @@ -45,7 +45,7 @@ <h1>Events
</a>
</h1>

<div th:replace="fragments/messages :: messages"></div>
<div th:replace="~{fragments/messages :: messages}"></div>

<div class="table-responsive">
<table id="eventTable" class="table table-striped">
Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/templates/admin/events/overview.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,17 @@
</head>

<body>
<nav th:replace="fragments/header :: header"></nav>
<nav th:replace="~{fragments/header :: header}"></nav>

<!--/*@thymesVar id="event" type="ch.wisv.events.core.model.event.Event"*/-->
<div class="container-fluid">
<div class="row">
<nav th:replace="admin/sidebar :: sidebar"></nav>
<nav th:replace="~{admin/sidebar :: sidebar}"></nav>

<main class="col-sm-9 ml-sm-auto col-md-10 p-5" role="main">
<h1>Ticket [[${event.getTitle()}]]</h1>

<div th:replace="fragments/messages :: messages"></div>
<div th:replace="~{fragments/messages :: messages}"></div>

<div class="row mb-4">
<div class="col-auto">
Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/templates/admin/events/view.html
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@
</head>

<body>
<nav th:replace="fragments/header :: header"></nav>
<nav th:replace="~{fragments/header :: header}"></nav>

<!--/*@thymesVar id="event" type="ch.wisv.events.core.model.event.Event"*/-->
<div class="container-fluid">
<div class="row">
<nav th:replace="admin/sidebar :: sidebar"></nav>
<nav th:replace="~{admin/sidebar :: sidebar}"></nav>

<main class="col-sm-9 ml-sm-auto col-md-10 p-5" role="main">
<h1>[[${event.getTitle()}]]
Expand All @@ -49,7 +49,7 @@ <h1>[[${event.getTitle()}]]
</a>
</h1>

<div th:replace="fragments/messages :: messages"></div>
<div th:replace="~{fragments/messages :: messages}"></div>

<div class="row">
<div class="col">
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/templates/admin/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@
</head>

<body>
<nav th:replace="fragments/header :: header"></nav>
<nav th:replace="~{fragments/header :: header}"></nav>

<!--/*@thymesVar id="webhook" type="ch.wisv.events.core.model.webhook.Webhook"*/-->
<div class="container-fluid">
<div class="row">
<nav th:replace="admin/sidebar :: sidebar"></nav>
<nav th:replace="~{admin/sidebar :: sidebar}"></nav>

<main class="col-sm-9 ml-sm-auto col-md-10 p-5" role="main">
<h1>Overview</h1>
Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/templates/admin/orders/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,16 @@
</head>

<body>
<nav th:replace="fragments/header :: header"></nav>
<nav th:replace="~{fragments/header :: header}"></nav>

<div class="container-fluid">
<div class="row">
<nav th:replace="admin/sidebar :: sidebar"></nav>
<nav th:replace="~{admin/sidebar :: sidebar}"></nav>

<main class="col-sm-9 ml-sm-auto col-md-10 p-5" role="main">
<h1>Orders</h1>

<div th:replace="fragments/messages :: messages"></div>
<div th:replace="~{fragments/messages :: messages}"></div>

<div class="table-responsive">
<table id="orderTable" class="table table-striped">
Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/templates/admin/orders/view.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,16 @@
</head>

<body>
<nav th:replace="fragments/header :: header"></nav>
<nav th:replace="~{fragments/header :: header}"></nav>

<div class="container-fluid">
<div class="row">
<nav th:replace="admin/sidebar :: sidebar"></nav>
<nav th:replace="~{admin/sidebar :: sidebar}"></nav>

<main class="col-sm-9 ml-sm-auto col-md-10 p-5" role="main">
<h1>Order #[[${order.getId()}]]</h1>

<div th:replace="fragments/messages :: messages"></div>
<div th:replace="~{fragments/messages :: messages}"></div>

<div class="row" th:if="${order.getStatus() == T(ch.wisv.events.core.model.order.OrderStatus).RESERVATION}">
<div class="col">
Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/templates/admin/products/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@
</head>

<body>
<nav th:replace="fragments/header :: header"></nav>
<nav th:replace="~{fragments/header :: header}"></nav>

<!--/*@thymesVar id="product" type="ch.wisv.events.core.model.product.Product"*/-->
<div class="container-fluid">
<div class="row">
<nav th:replace="admin/sidebar :: sidebar"></nav>
<nav th:replace="~{admin/sidebar :: sidebar}"></nav>

<main class="col-sm-9 ml-sm-auto col-md-10 p-5" role="main">
<h1>Products
Expand All @@ -46,7 +46,7 @@ <h1>Products
</a>
</h1>

<div th:replace="fragments/messages :: messages"></div>
<div th:replace="~{fragments/messages :: messages}"></div>

<div class="table-responsive">
<table class="table table-striped" id="productTable">
Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/templates/admin/products/overview.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,17 @@
</head>

<body>
<nav th:replace="fragments/header :: header"></nav>
<nav th:replace="~{fragments/header :: header}"></nav>

<!--/*@thymesVar id="product" type="ch.wisv.events.core.model.product.Product"*/-->
<div class="container-fluid">
<div class="row">
<nav th:replace="admin/sidebar :: sidebar"></nav>
<nav th:replace="~{admin/sidebar :: sidebar}"></nav>

<main class="col-sm-9 ml-sm-auto col-md-10 p-5" role="main">
<h1>Sold ticket [[${product.getTitle()}]]</h1>

<div th:replace="fragments/messages :: messages"></div>
<div th:replace="~{fragments/messages :: messages}"></div>

<div class="table-responsive">
<table id="soldProductTable" class="table table-hover">
Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/templates/admin/products/product.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@
</head>

<body>
<nav th:replace="fragments/header :: header"></nav>
<nav th:replace="~{fragments/header :: header}"></nav>

<!--/*@thymesVar id="product" type="ch.wisv.events.core.model.product.Product"*/-->
<div class="container-fluid">
<div class="row">
<nav th:replace="admin/sidebar :: sidebar"></nav>
<nav th:replace="~{admin/sidebar :: sidebar}"></nav>

<main class="col-sm-9 ml-sm-auto col-md-10 p-5" role="main">
<h1>Create/update product
Expand All @@ -59,7 +59,7 @@ <h4 class="dropdown-header">Select a template</h4>
</div>
</h1>

<div th:replace="fragments/messages :: messages"></div>
<div th:replace="~{fragments/messages :: messages}"></div>

<form th:action="@{./}" th:object="${product}" method="POST">
<input type="hidden" th:field="*{key}" th:value="*{key}">
Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/templates/admin/products/view.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@
</head>

<body>
<nav th:replace="fragments/header :: header"></nav>
<nav th:replace="~{fragments/header :: header}"></nav>

<!--/*@thymesVar id="product" type="ch.wisv.events.core.model.product.Product"*/-->
<div class="container-fluid">
<div class="row">
<nav th:replace="admin/sidebar :: sidebar"></nav>
<nav th:replace="~{admin/sidebar :: sidebar}"></nav>

<main class="col-sm-9 ml-sm-auto col-md-10 p-5" role="main">
<h1>[[${product.getTitle()}]]
Expand All @@ -46,7 +46,7 @@ <h1>[[${product.getTitle()}]]
</a>
</h1>

<div th:replace="fragments/messages :: messages"></div>
<div th:replace="~{fragments/messages :: messages}"></div>

<div class="row">
<div class="col">
Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/templates/admin/salesexport/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,11 @@
</head>

<body>
<nav th:replace="fragments/header :: header"></nav>
<nav th:replace="~{fragments/header :: header}"></nav>

<div class="container-fluid">
<div class="row">
<nav th:replace="admin/sidebar :: sidebar"></nav>
<nav th:replace="~{admin/sidebar :: sidebar}"></nav>

<main class="col-sm-9 ml-sm-auto col-md-10 p-5" role="main">
<h1>
Expand All @@ -85,7 +85,7 @@ <h1>
Old Treasurer Tab
</a>
</h1>
<div th:replace="fragments/messages :: messages"></div>
<div th:replace="~{fragments/messages :: messages}"></div>
<form
th:action="@{./csv}"
th:object="${SalesExportSubmission}"
Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/templates/admin/tasks/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,16 @@
</head>

<body>
<nav th:replace="fragments/header :: header"></nav>
<nav th:replace="~{fragments/header :: header}"></nav>

<div class="container-fluid">
<div class="row">
<nav th:replace="admin/sidebar :: sidebar"></nav>
<nav th:replace="~{admin/sidebar :: sidebar}"></nav>

<main class="col-sm-9 ml-sm-auto col-md-10 p-5" role="main">
<h1>Pending tasks</h1>

<div th:replace="fragments/messages :: messages"></div>
<div th:replace="~{fragments/messages :: messages}"></div>

<div class="table-responsive">
<table id="webhookTable" class="table table-striped">
Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/templates/admin/treasurer/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,16 @@
</head>

<body>
<nav th:replace="fragments/header :: header"></nav>
<nav th:replace="~{fragments/header :: header}"></nav>

<div class="container-fluid">
<div class="row">
<nav th:replace="admin/sidebar :: sidebar"></nav>
<nav th:replace="~{admin/sidebar :: sidebar}"></nav>

<main class="col-sm-9 ml-sm-auto col-md-10 p-5" role="main">
<h1>Mollie Overview</h1>

<div th:replace="fragments/messages :: messages"></div>
<div th:replace="~{fragments/messages :: messages}"></div>

<div class="table-responsive">
<table id="treasurerOverview" class="table table-striped">
Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/templates/admin/webhooks/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@
</head>

<body>
<nav th:replace="fragments/header :: header"></nav>
<nav th:replace="~{fragments/header :: header}"></nav>

<div class="container-fluid">
<div class="row">
<nav th:replace="admin/sidebar :: sidebar"></nav>
<nav th:replace="~{admin/sidebar :: sidebar}"></nav>

<main class="col-sm-9 ml-sm-auto col-md-10 p-5" role="main">
<h1>Webhooks
Expand All @@ -45,7 +45,7 @@ <h1>Webhooks
</a>
</h1>

<div th:replace="fragments/messages :: messages"></div>
<div th:replace="~{fragments/messages :: messages}"></div>

<div class="table-responsive">
<table id="webhookTable" class="table table-striped">
Expand Down
Loading
Loading