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.

Sign up for GitHub

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

Jump to bottom

Fix wronly added / to the start of the thymeleaf replace tags #4470

Merged
merged 1 commit into from
Jan 3, 2024
Merged

Fix wronly added / to the start of the thymeleaf replace tags #4470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/settings/absence-types/settings_absence_types.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ <h1 th:text="#{settings.header.title}" class="tw-sr-only"></h1>
<input type="hidden" th:field="*{id}" />
<button type="submit" hidden></button>

<th:block th:replace="~{/settings/fragments::save-feedback}" />
<th:block th:replace="~{settings/fragments::save-feedback}" />

<th:block th:replace="~{/settings/fragments::tab-navigation(activeElement='absence-types')}" />
<th:block th:replace="~{settings/fragments::tab-navigation(activeElement='absence-types')}" />

<div id="absenceTypes" class="tw-mt-6">
<div class="form-section tw-mb-12 tw-relative tw-z-10">
Expand Down Expand Up @@ -57,7 +57,7 @@ <h1 th:text="#{settings.header.title}" class="tw-sr-only"></h1>
</div>
<div class="form-section">
<div th:replace="~{settings/absence-types/special-leave::section}"></div>
<th:block th:replace="~{/settings/fragments::save-button}" />
<th:block th:replace="~{settings/fragments::save-button}" />
</div>
</div>
</form>
Expand Down
14 changes: 7 additions & 7 deletions src/main/resources/templates/settings/absences/settings_absences.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,30 +24,30 @@ <h1 th:text="#{settings.header.title}" class="tw-sr-only"></h1>
<input type="hidden" th:field="*{id}" />
<button type="submit" hidden></button>

<th:block th:replace="~{/settings/fragments::save-feedback}" />
<th:block th:replace="~{settings/fragments::save-feedback}" />

<th:block th:replace="~{/settings/fragments::tab-navigation(activeElement='absences')}" />
<th:block th:replace="~{settings/fragments::tab-navigation(activeElement='absences')}" />

<div id="absence" class="tw-mt-6">
<div class="form-section tw-mb-8">
<div th:replace="~{settings/absences/vacation::section}"></div>
<th:block th:replace="~{/settings/fragments::save-button}" />
<th:block th:replace="~{settings/fragments::save-button}" />
</div>
<div class="form-section tw-mb-8">
<div th:replace="~{settings/absences/reminder-waiting-application::section}"></div>
<th:block th:replace="~{/settings/fragments::save-button}" />
<th:block th:replace="~{settings/fragments::save-button}" />
</div>
<div class="form-section tw-mb-8">
<div th:replace="~{settings/absences/reminder-holiday-replacement::section}"></div>
<th:block th:replace="~{/settings/fragments::save-button}" />
<th:block th:replace="~{settings/fragments::save-button}" />
</div>
<div class="form-section tw-mb-8">
<div th:replace="~{settings/absences/reminder-upcoming-application::section}"></div>
<th:block th:replace="~{/settings/fragments::save-button}" />
<th:block th:replace="~{settings/fragments::save-button}" />
</div>
<div class="form-section">
<div th:replace="~{settings/absences/sick-days::section}"></div>
<th:block th:replace="~{/settings/fragments::save-button}" />
<th:block th:replace="~{settings/fragments::save-button}" />
</div>
</div>
</form>
Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/templates/settings/avatar/settings_avatar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ <h1 th:text="#{settings.header.title}" class="tw-sr-only"></h1>
<input type="hidden" th:field="*{id}" />
<button type="submit" hidden></button>

<th:block th:replace="~{/settings/fragments::save-feedback}" />
<th:block th:replace="~{settings/fragments::save-feedback}" />

<th:block th:replace="~{/settings/fragments::tab-navigation(activeElement='avatar')}" />
<th:block th:replace="~{settings/fragments::tab-navigation(activeElement='avatar')}" />

<div id="avatar" class="tw-mt-6">
<div class="form-section tw-mb-8">
<div th:replace="~{settings/avatar/avatar::section}"></div>
<th:block th:replace="~{/settings/fragments::save-button}" />
<th:block th:replace="~{settings/fragments::save-button}" />
</div>
</div>
</form>
Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/templates/settings/calendar/settings_calendar_sync.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ <h1 th:text="#{settings.header.title}" class="tw-sr-only"></h1>
<input type="hidden" th:field="*{id}" />
<button type="submit" hidden></button>

<th:block th:replace="~{/settings/fragments::save-feedback}" />
<th:block th:replace="~{settings/fragments::save-feedback}" />

<th:block th:replace="~{/settings/fragments::tab-navigation(activeElement='calendar-sync')}" />
<th:block th:replace="~{settings/fragments::tab-navigation(activeElement='calendar-sync')}" />

<div id="calendar" class="tw-mt-6">
<div class="form-section">
Expand All @@ -37,7 +37,7 @@ <h1 th:text="#{settings.header.title}" class="tw-sr-only"></h1>
</div>
</div>

<th:block th:replace="~{/settings/fragments::save-button}" />
<th:block th:replace="~{settings/fragments::save-button}" />
</form>
</main>
</th:block>
Expand Down
12 changes: 6 additions & 6 deletions src/main/resources/templates/settings/public-holidays/settings_working_time.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,26 +24,26 @@ <h1 th:text="#{settings.header.title}" class="tw-sr-only"></h1>
<input type="hidden" th:field="*{id}" />
<button type="submit" hidden></button>

<th:block th:replace="~{/settings/fragments::save-feedback}" />
<th:block th:replace="~{settings/fragments::save-feedback}" />

<th:block th:replace="~{/settings/fragments::tab-navigation(activeElement='working-time')}" />
<th:block th:replace="~{settings/fragments::tab-navigation(activeElement='working-time')}" />

<div id="publicHolidays" class="tw-mt-6">
<div th:if="${defaultWorkingTimeFromSettings}" class="form-section tw-mb-8">
<div th:replace="~{settings/public-holidays/default-workingtime::section}"></div>
<th:block th:replace="~{/settings/fragments::save-button}" />
<th:block th:replace="~{settings/fragments::save-button}" />
</div>
<div class="form-section tw-mb-8">
<div th:replace="~{settings/public-holidays/time::section}"></div>
<th:block th:replace="~{/settings/fragments::save-button}" />
<th:block th:replace="~{settings/fragments::save-button}" />
</div>
<div class="form-section tw-mb-8">
<div th:replace="~{settings/public-holidays/public-holidays::section}"></div>
<th:block th:replace="~{/settings/fragments::save-button}" />
<th:block th:replace="~{settings/fragments::save-button}" />
</div>
<div class="form-section tw-mb-8">
<div th:replace="~{settings/public-holidays/overtime::section}"></div>
<th:block th:replace="~{/settings/fragments::save-button}" />
<th:block th:replace="~{settings/fragments::save-button}" />
</div>
</div>
</form>
Expand Down
Loading