From da41c781dfd584e755f6921ec0e7ee9dedfafb35 Mon Sep 17 00:00:00 2001
From: t-eguchi <26-t-eguchi-tmn@it-college.co.jp>
Date: Wed, 21 Oct 2026 16:22:56 +0900
Subject: [PATCH] =?UTF-8?q?=E3=83=AC=E3=82=A4=E3=82=A2=E3=82=A6=E3=83=88?=
 =?UTF-8?q?=E5=A4=89=E6=9B=B4=E3=82=92=E8=A1=8C=E3=81=84=E3=81=BE=E3=81=97?=
 =?UTF-8?q?=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/approvalComplete.html |   3 +-
 .../resources/templates/approvalConfilm.html  | 124 +++++++++---------
 .../resources/templates/approvalRejected.html |  32 ++---
 .../main/resources/templates/complete.html    |   2 +-
 .../templates/employeeRegistComplete.html     |  20 ---
 .../resources/templates/returnComplete.html   |   2 +
 6 files changed, 84 insertions(+), 99 deletions(-)
 delete mode 100644 book-rent/src/main/resources/templates/employeeRegistComplete.html

diff --git a/book-rent/src/main/resources/templates/approvalComplete.html b/book-rent/src/main/resources/templates/approvalComplete.html
index 0854508..f59cc1a 100644
--- a/book-rent/src/main/resources/templates/approvalComplete.html
+++ b/book-rent/src/main/resources/templates/approvalComplete.html
@@ -9,6 +9,7 @@
 
 <body>
 	<div th:replace="~{fragments/header :: header}"></div>
+	<main class="complete-container">
 	<h1>完了</h1>
 	<div class="info" th:text="${message} ?:'書籍貸出申請を承認しました。'"></div>
 
@@ -16,7 +17,7 @@
 		<a class="btn" th:href="@{/admin/applications}">承認待ち一覧に戻る</a>
 		<a class="btn sub" th:href="@{/menu}">メニューに戻る</a>
 	</p>
-
+	</main>
 </body>
 
 </html>
\ No newline at end of file
diff --git a/book-rent/src/main/resources/templates/approvalConfilm.html b/book-rent/src/main/resources/templates/approvalConfilm.html
index 529b0e9..149e913 100644
--- a/book-rent/src/main/resources/templates/approvalConfilm.html
+++ b/book-rent/src/main/resources/templates/approvalConfilm.html
@@ -9,74 +9,74 @@
 
 <body>
 	<div th:replace="~{fragments/header :: header}"></div>
-	<h1>
-		書籍貸出承認確認　　　
+	<main>
+		<h1>書籍貸出承認確認</h1>
+		<div class="card">
+			<table>
+				<tr>
+					<th>申請ID</th>
+					<td th:text="${r.idRequest}"></td>
+				</tr>
+				<tr>
+					<th>申請者名</th>
+					<td th:text="${r.nmApplicant}"></td>
+				</tr>
+				<tr>
+					<th>申請日</th>
+					<td th:text="${r.dateRequest}"></td>
+				</tr>
+				<tr>
+					<th>ISBN</th>
+					<td th:text="${r.isbn}"></td>
+				</tr>
+				<tr>
+				<th>書籍名</th>
+				<td th:text="${r.nmBook}" style="width: 700px;"></td>
+				</tr>
+				<tr>
+					<th>出版社</th>
+					<td th:text="${r.publisher}"></td>
+				</tr>
+				<tr>
+					<th>特記事項</th>
+					<td th:text="${r.note}"></td>
+				</tr>
+				<tr>
+					<th>貸出日</th>
+					<td th:text="${r.dateBorrow}"></td>
+				</tr>
+				<tr>
+					<th>返却予定日</th>
+					<td th:text="${r.dateScheduledReturn}"></td>
+				</tr>
+			</table>
+		
+		<div class="buttonSection" style="margin-top: 20px;">
 
-	</h1>
+			<form th:action="@{/admin/applications/{id}/approve(id=${r.idRequest})}" method="post"
+				style="display: inline;">
+				<button type="submit">承認</button>
+			</form>
 
 
-	<table>
-		<tr>
-			<th class="header">申請ID</th>
-			<td><input type="text" readonly="readonly" th:value="${r.idRequest}" /></td>
-		</tr>
-		<tr>
-			<th class="header">申請者名</th>
-			<td><input type="text" readonly="readonly" th:value="${r.nmApplicant}" /></td>
-		</tr>
-		<tr>
-			<th class="header">申請日</th>
-			<td><input type="text" readonly="readonly" th:value="${r.dateRequest}" /></td>
-		</tr>
-		<tr>
-			<th class="header">ISBN</th>
-			<td><input type="text" readonly="readonly" th:value="${r.isbn}" /></td>
-		</tr>
-		<tr>
-			<th class="header">書籍名</th>
-			<td><input type="text" readonly="readonly" th:value="${r.nmBook}" style="width: 300px;" /></td>
-		</tr>
-		<tr>
-			<th class="header">出版社</th>
-			<td><input type="text" readonly="readonly" th:value="${r.publisher}" /></td>
-		</tr>
-		<tr>
-			<th class="header">特記事項</th>
-			<td><input type="text" readonly="readonly" th:value="${r.note}" /></td>
-		</tr>
-		<tr>
-			<th class="header">貸出日</th>
-			<td><input type="text" readonly="readonly" th:value="${r.dateBorrow}" /></td>
-		</tr>
-		<tr>
-			<th class="header">返却予定日</th>
-			<td><input type="text" readonly="readonly" th:value="${r.dateScheduledReturn}" /></td>
-		</tr>
-	</table>
+			<form th:action="@{/admin/applications/{id}/reject(id=${r.idRequest})}" method="post"
+				style="display: inline; margin-left: 10px;">
+				<button type="submit" class="sub">却下</button>
+			</form>
+		</div>
 
-	<div class="buttonSection" style="margin-top: 20px;">
+		<br>
+		<a th:href="@{/admin/applications}">承認待ち一覧へ戻る</a>
 
-		<form th:action="@{/admin/applications/{id}/approve(id=${r.idRequest})}" method="post" style="display: inline;">
-			<button type="submit">承認</button>
-		</form>
-
-
-		<form th:action="@{/admin/applications/{id}/reject(id=${r.idRequest})}" method="post"
-			style="display: inline; margin-left: 10px;">
-			<button type="submit">却下</button>
-		</form>
-	</div>
-
-	<br>
-	<a th:href="@{/admin/applications}">承認待ち一覧へ戻る</a>
-
-	<script>
-		function logoutSubmit() {
-			if (confirm("ログアウトしますか？")) {
-				window.location.href = "/logout";
+		<script>
+			function logoutSubmit() {
+				if (confirm("ログアウトしますか？")) {
+					window.location.href = "/logout";
+				}
 			}
-		}
-	</script>
+		</script>
+		</div>
+	</main>
 </body>
 
 </html>
\ No newline at end of file
diff --git a/book-rent/src/main/resources/templates/approvalRejected.html b/book-rent/src/main/resources/templates/approvalRejected.html
index 26a6f6f..2b7b3b3 100644
--- a/book-rent/src/main/resources/templates/approvalRejected.html
+++ b/book-rent/src/main/resources/templates/approvalRejected.html
@@ -1,23 +1,25 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org">
 
-<head>
-	<meta charset="UTF-8">
-	<title>書籍貸出申請</title>
-	<link rel="stylesheet" th:href="@{/css/style.css}">
-</head>
+	<head>
+		<meta charset="UTF-8">
+		<title>書籍貸出申請</title>
+		<link rel="stylesheet" th:href="@{/css/style.css}">
+	</head>
 
-<body>
-	<div th:replace="~{fragments/header :: header}"></div>
-	<h1>却下</h1>
-	<div class="info" th:text="${message} ?: '書籍貸出申請を却下しました。'"></div>
+	<body>
+		<div th:replace="~{fragments/header :: header}"></div>
+		<main class="complete-container">
+		<h1>却下</h1>
+			<div class="info" th:text="${message} ?: '書籍貸出申請を却下しました。'"></div>
 
-	<p>
-		<a class="btn" th:href="@{/admin/applications}">承認待ち一覧に戻る</a>
-		<a class="btn sub" th:href="@{/menu}">メニューに戻る</a>
-	</p>
+			<p>
+				<a class="btn" th:href="@{/admin/applications}">承認待ち一覧に戻る</a>
+				<a class="btn sub" th:href="@{/menu}">メニューに戻る</a>
+			</p>
+
+		</main>
+	</body>
 
-	
-</body>
 
 </html>
\ No newline at end of file
diff --git a/book-rent/src/main/resources/templates/complete.html b/book-rent/src/main/resources/templates/complete.html
index 9e84135..e597e2e 100644
--- a/book-rent/src/main/resources/templates/complete.html
+++ b/book-rent/src/main/resources/templates/complete.html
@@ -12,7 +12,7 @@
   <div class="info" th:text="${message} ?: '処理が完了しました。'"></div>
   <p>
     <a class="btn" th:href="@{${backUrl}}" th:text="${backLabel}">戻る</a>
-    <a class="btn sub" th:href="@{/menu}">メニューに戻る</a>
+<!--    <a class="btn sub" th:href="@{/menu}">メニューに戻る</a>-->
   </p>
 </main>
 </body>
diff --git a/book-rent/src/main/resources/templates/employeeRegistComplete.html b/book-rent/src/main/resources/templates/employeeRegistComplete.html
deleted file mode 100644
index ac13d6c..0000000
--- a/book-rent/src/main/resources/templates/employeeRegistComplete.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>社員登録完了画面</title>
-    <link rel="stylesheet" th:href="@{/css/style.css}">
-</head>
-<body>
-    <!-- 共通ヘッダー -->
-    <div th:replace="~{fragments/header :: header}"></div>
-    <main class="complete-container">
-        <h2>社員登録完了</h2>
-        <p th:text="${message != null ? message : '社員登録が完了しました。'}">
-            社員登録が完了しました。
-        </p>
-        <a th:href="@{/menu}">メニューへ戻る</a>
-    </main>
-</body>
-</html>
\ No newline at end of file
diff --git a/book-rent/src/main/resources/templates/returnComplete.html b/book-rent/src/main/resources/templates/returnComplete.html
index edc9d59..18dcfb3 100644
--- a/book-rent/src/main/resources/templates/returnComplete.html
+++ b/book-rent/src/main/resources/templates/returnComplete.html
@@ -9,6 +9,7 @@
 
 <body>
 	<div th:replace="~{fragments/header :: header}"></div>
+	<main class="complete-container">
 	<h1>返却完了</h1>
 	<div class="info" th:text="${message} ?: '書籍の返却が完了しました。'"></div>
 
@@ -16,6 +17,7 @@
 		<a class="btn" th:href="@{/admin/lendings}">貸出中書籍一覧に戻る</a>
 		<a class="btn sub" th:href="@{/menu}">メニューに戻る</a>
 	</p>
+	</main>
 </body>
 
 </html>
\ No newline at end of file