Merge remote-tracking branch 'upstream/main' into addGraphicsToRotatePage

# Conflicts:
#	src/main/resources/templates/rotate-pdf.html
This commit is contained in:
Saud Fatayerji
2023-02-05 18:20:41 +03:00
22 changed files with 671 additions and 168 deletions

View File

@@ -2,7 +2,7 @@
<html lang="en" xmlns:th="http://www.thymeleaf.org">
<th:block th:insert="~{fragments/common :: head(title='Rotate')}"></th:block>
<th:block th:insert="~{fragments/common :: head(title=#{rotate.title})}"></th:block>
<body> <div id="page-container">
@@ -13,7 +13,7 @@
<div class="container">
<div class="row justify-content-center">
<div class="col-md-6">
<h2>Rotate PDF</h2>
<h2 th:text="#{rotate.header}"></h2>
<form action="#" th:action="@{rotate-pdf}" th:object="${rotateForm}" method="post" enctype="multipart/form-data">
<div th:replace="fragments/common :: fileSelector(name='fileInput', multiple=false)"></div>