Skip to content

Commit bead8a3

Browse files
committed
update layout
1 parent 52ab073 commit bead8a3

File tree

1 file changed

+21
-5
lines changed

1 file changed

+21
-5
lines changed

src/main/webapp/WEB-INF/jsp/index.jsp

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
rel="stylesheet"
1212
integrity="sha384-9ndCyUaIbzAi2FUVXJi0CjmCapSmO7SnpJef0486qhLnuZ2cdeRhO02iuK6FUUVM"
1313
crossorigin="anonymous">
14-
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.10.5/font/bootstrap-icons.css">
14+
<link rel="stylesheet"
15+
href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.10.5/font/bootstrap-icons.css">
1516
<link rel="stylesheet" href="css/style.css">
1617
</head>
1718
<body class="bg-body-tertiary">
@@ -54,26 +55,41 @@
5455
</c:choose>
5556
<div class="card-body">
5657
<h5 class="card-title">${blog.title}</h5>
57-
<p class="card-text date-icon"><i class="bi bi-clock"></i>${blog.createdAt}</p>
58+
<p class="card-text date-icon">
59+
<i class="bi bi-clock"></i>${blog.createdAt}</p>
5860
<button type="button" class="btn btn-primary"
5961
data-bs-toggle="modal" data-bs-target="#modal${blog.id}">
6062
記事表示</button>
6163

6264
<!-- モーダルの設定 -->
6365
<div class="modal fade" id="modal${blog.id}" tabindex="-1"
6466
aria-labelledby="exampleModalLabel">
65-
<div class="modal-dialog modal-dialog-centered modal-dialog-scrollable">
67+
<div
68+
class="modal-dialog modal-dialog-centered modal-dialog-scrollable">
6669
<div class="modal-content">
6770
<div class="modal-header">
6871
<h1 class="modal-title fs-5" id="exampleModalLabel">${blog.title}</h1>
6972
<button type="button" class="btn-close"
7073
data-bs-dismiss="modal" aria-label="閉じる"></button>
7174
</div>
7275
<div class="modal-body">
73-
<p class="card-text">${blog.content}</p>
76+
<c:choose>
77+
<c:when test="${empty blog.imageUrl}">
78+
<img
79+
src="${pageContext.request.contextPath}/images/dummy.png"
80+
class="card-img-top custom-img" alt="No Image">
81+
</c:when>
82+
<c:otherwise>
83+
<img
84+
src="${pageContext.request.contextPath}/${blog.imageUrl}"
85+
class="card-img-top custom-img" alt="${blog.title}">
86+
</c:otherwise>
87+
</c:choose>
88+
<p class="card-text mt-3">${blog.content}</p>
7489
</div>
7590
<div class="modal-footer">
76-
<p class="date-icon"><i class="bi bi-clock"></i>${blog.createdAt}</p>
91+
<p class="date-icon">
92+
<i class="bi bi-clock"></i>${blog.createdAt}</p>
7793
</div>
7894
<!-- /.modal-footer -->
7995
</div>

0 commit comments

Comments
 (0)