Merge branch 't-eguchi' of https://gitea.it-college.co.jp/2026_0910_AI_5G_Java_MUN/last-group-delevelopment-team2 into m_shimizu

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>

book-rent/src/main/resources/templates/approvalConfilm.html

@@ -9,61 +9,59 @@
 
 <body>
 	<div th:replace="~{fragments/header :: header}"></div>
-	<h1>
+	<main>
-		書籍貸出承認確認　　　
+		<h1>書籍貸出承認確認</h1>
-
+		<div class="card">
-	</h1>
-
-
 			<table>
 				<tr>
-			<th class="header">申請ID</th>
+					<th>申請ID</th>
-			<td><input type="text" readonly="readonly" th:value="${r.idRequest}" /></td>
+					<td th:text="${r.idRequest}"></td>
 				</tr>
 				<tr>
-			<th class="header">申請者名</th>
+					<th>申請者名</th>
-			<td><input type="text" readonly="readonly" th:value="${r.nmApplicant}" /></td>
+					<td th:text="${r.nmApplicant}"></td>
 				</tr>
 				<tr>
-			<th class="header">申請日</th>
+					<th>申請日</th>
-			<td><input type="text" readonly="readonly" th:value="${r.dateRequest}" /></td>
+					<td th:text="${r.dateRequest}"></td>
 				</tr>
 				<tr>
-			<th class="header">ISBN</th>
+					<th>ISBN</th>
-			<td><input type="text" readonly="readonly" th:value="${r.isbn}" /></td>
+					<td th:text="${r.isbn}"></td>
 				</tr>
 				<tr>
-			<th class="header">書籍名</th>
+				<th>書籍名</th>
-			<td><input type="text" readonly="readonly" th:value="${r.nmBook}" style="width: 300px;" /></td>
+				<td th:text="${r.nmBook}" style="width: 700px;"></td>
 				</tr>
 				<tr>
-			<th class="header">出版社</th>
+					<th>出版社</th>
-			<td><input type="text" readonly="readonly" th:value="${r.publisher}" /></td>
+					<td th:text="${r.publisher}"></td>
 				</tr>
 				<tr>
-			<th class="header">特記事項</th>
+					<th>特記事項</th>
-			<td><input type="text" readonly="readonly" th:value="${r.note}" /></td>
+					<td th:text="${r.note}"></td>
 				</tr>
 				<tr>
-			<th class="header">貸出日</th>
+					<th>貸出日</th>
-			<td><input type="text" readonly="readonly" th:value="${r.dateBorrow}" /></td>
+					<td th:text="${r.dateBorrow}"></td>
 				</tr>
 				<tr>
-			<th class="header">返却予定日</th>
+					<th>返却予定日</th>
-			<td><input type="text" readonly="readonly" th:value="${r.dateScheduledReturn}" /></td>
+					<td th:text="${r.dateScheduledReturn}"></td>
 				</tr>
 			</table>
 		
 		<div class="buttonSection" style="margin-top: 20px;">
 
-		<form th:action="@{/admin/applications/{id}/approve(id=${r.idRequest})}" method="post" style="display: inline;">
+			<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>
+				<button type="submit" class="sub">却下</button>
 			</form>
 		</div>
 
@@ -77,6 +75,8 @@
 				}
 			}
 		</script>
+		</div>
+	</main>
 </body>
 
 </html>

book-rent/src/main/resources/templates/approvalRejected.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>
 
@@ -17,7 +18,8 @@
 				<a class="btn sub" th:href="@{/menu}">メニューに戻る</a>
 			</p>
 
-	
+		</main>
 	</body>
 
+
 </html>

book-rent/src/main/resources/templates/employeeRegistComplete.html

@@ -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>

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>