Skip to Content
Last modified by Super Admin on 2026/04/05 18:59
From version Icon 26.1 Icon
edited by Super Admin
on 2026/03/09 12:38
Change comment: There is no comment for this version
To version 1.1 Icon
edited by Super Admin
on 2026/03/05 22:05
Change comment: There is no comment for this version

Summary

Details

Icon Page properties
Content
... ... @@ -3,7 +3,8 @@
3 3  ## このテンプレートは学校ページの表示と入力フォームを制御します。
4 4  
5 5  ## メンテナンスバナー
6 -{{include reference="SeitokaiCode.MaintenanceBannerInclude" /}}{{html clean="false"}}
6 +{{include reference="SeitokaiCode.MaintenanceBannerInclude" /}}
7 +
7 7  ## --- 学校基本情報フィールド ---
8 8  #set($schoolCode = $doc.getValue('schoolCode'))
9 9  #set($schoolName = $doc.getValue('schoolName'))
... ... @@ -173,8 +173,7 @@
173 173   #set($authorEnrollmentYear = $!lastAuthorDoc.getValue('enrollmentYear'))
174 174   #set($authorDisplayName = $!lastAuthorDoc.getValue('displayName'))
175 175   #if(!$authorDisplayName || $authorDisplayName == '')
176 - ## false引数でプレーンテキスト（HTMLリンクなし）を取得
177 - #set($authorDisplayName = $xwiki.getUserName($doc.author, false))
177 + #set($authorDisplayName = $xwiki.getUserName($doc.author))
178 178   #end
179 179   ## --- 学年の動的計算（学校種別対応） ---
180 180   ## 日本の学校年度: 4月始まり。currentSchoolYear = (月>=4) ? 今年 : 去年
... ... @@ -213,28 +213,25 @@
213 213  #end
214 214  
215 215  ## --- 信頼性バッジ + ユーザー情報 ---
216 +{{html clean="false"}}
216 216  <div class="seitokai-badge-container">
217 217   ## 承認バッジ
218 218   #if($authorAccountType == 'admin')
219 - <span class="badge badge-admin"><svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 管理者</span>
220 + <span class="badge badge-admin"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 管理者</span>
220 220   #elseif($authorAccountType == 'verified')
221 - <span class="badge badge-verified"><svg class="ico" viewBox="0 0 24 24" stroke-width="2.5"><path d="M20 6L9 17l-5-5"/></svg> 承認済み</span>
222 + <span class="badge badge-verified"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"><path d="M20 6L9 17l-5-5"/></svg> 承認済み</span>
222 222   #elseif($authorAccountType == 'referred')
223 - <span class="badge badge-referred"><svg class="ico" viewBox="0 0 24 24"><path d="M10 13a5 5 0 007.54.54l3-3a5 5 0 00-7.07-7.07l-1.72 1.71"/><path d="M14 11a5 5 0 00-7.54-.54l-3 3a5 5 0 007.07 7.07l1.71-1.71"/></svg> 紹介</span>
224 + <span class="badge badge-referred"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M10 13a5 5 0 007.54.54l3-3a5 5 0 00-7.07-7.07l-1.72 1.71"/><path d="M14 11a5 5 0 00-7.54-.54l-3 3a5 5 0 007.07 7.07l1.71-1.71"/></svg> 紹介</span>
224 224   #else
225 225   <span class="badge badge-general">一般</span>
226 226   #end
227 227   ## 役割バッジ
228 228   #if($authorUserRole == 'student')
229 - <span class="badge badge-role-student"><svg class="ico" viewBox="0 0 24 24"><path d="M22 10l-10-5L2 10l10 5 10-5z"/><path d="M6 12v5c0 1.66 2.69 3 6 3s6-1.34 6-3v-5"/></svg> 生徒</span>
230 - #set($authorIsOfficer = $!lastAuthorDoc.getValue('isOfficer'))
231 - #if($authorIsOfficer == 'true')
232 - <span class="badge badge-role-officer"><svg class="ico" viewBox="0 0 24 24"><path d="M12 2l3.09 6.26L22 9.27l-5 4.87 1.18 6.88L12 17.77l-6.18 3.25L7 14.14 2 9.27l6.91-1.01L12 2z"/></svg> 役員</span>
233 - #end
230 + <span class="badge badge-role-student"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M22 10l-10-5L2 10l10 5 10-5z"/><path d="M6 12v5c0 1.66 2.69 3 6 3s6-1.34 6-3v-5"/></svg> 生徒</span>
234 234   #elseif($authorUserRole == 'teacher')
235 - <span class="badge badge-role-teacher"><svg class="ico" viewBox="0 0 24 24"><path d="M4 19.5A2.5 2.5 0 016.5 17H20"/><path d="M6.5 2H20v20H6.5A2.5 2.5 0 014 19.5v-15A2.5 2.5 0 016.5 2z"/></svg> 教員</span>
232 + <span class="badge badge-role-teacher"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M4 19.5A2.5 2.5 0 016.5 17H20"/><path d="M6.5 2H20v20H6.5A2.5 2.5 0 014 19.5v-15A2.5 2.5 0 016.5 2z"/></svg> 教員</span>
236 236   #elseif($authorUserRole == 'graduate')
237 - <span class="badge badge-role-graduate"><svg class="ico" viewBox="0 0 24 24"><path d="M22 10l-10-5L2 10l10 5 10-5z"/><path d="M6 12v5c0 1.66 2.69 3 6 3s6-1.34 6-3v-5"/></svg> 卒業生</span>
234 + <span class="badge badge-role-graduate"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M22 10l-10-5L2 10l10 5 10-5z"/><path d="M6 12v5c0 1.66 2.69 3 6 3s6-1.34 6-3v-5"/></svg> 卒業生</span>
238 238   #end
239 239   ## 学年（生徒のみ公開）
240 240   #if($authorGrade && $authorGrade != '')
... ... @@ -242,54 +242,57 @@
242 242   #end
243 243   ## 在籍状態（卒業・休学等の場合のみ表示）
244 244   #if($authorUserStatus == 'graduated')
245 - <span class="badge badge-status-graduated"><svg class="ico" viewBox="0 0 24 24"><path d="M22 10l-10-5L2 10l10 5 10-5z"/><path d="M6 12v5c0 1.66 2.69 3 6 3s6-1.34 6-3v-5"/></svg> 卒業済み</span>
242 + <span class="badge badge-status-graduated"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M22 10l-10-5L2 10l10 5 10-5z"/><path d="M6 12v5c0 1.66 2.69 3 6 3s6-1.34 6-3v-5"/></svg> 卒業済み</span>
246 246   #elseif($authorUserStatus == 'on_leave')
247 - <span class="badge badge-status-onleave"><svg class="ico" viewBox="0 0 24 24" fill="currentColor"><rect x="6" y="4" width="4" height="16" rx="1"/><rect x="14" y="4" width="4" height="16" rx="1"/></svg> 休学中</span>
244 + <span class="badge badge-status-onleave"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="currentColor"><rect x="6" y="4" width="4" height="16" rx="1"/><rect x="14" y="4" width="4" height="16" rx="1"/></svg> 休学中</span>
248 248   #elseif($authorUserStatus == 'transferred')
249 - <span class="badge badge-status-transferred"><svg class="ico" viewBox="0 0 24 24"><polyline points="23 4 23 10 17 10"/><polyline points="1 20 1 14 7 14"/><path d="M3.51 9a9 9 0 0114.85-3.36L23 10M1 14l4.64 4.36A9 9 0 0020.49 15"/></svg> 転校済み</span>
246 + <span class="badge badge-status-transferred"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="23 4 23 10 17 10"/><polyline points="1 20 1 14 7 14"/><path d="M3.51 9a9 9 0 0114.85-3.36L23 10M1 14l4.64 4.36A9 9 0 0020.49 15"/></svg> 転校済み</span>
250 250   #end
251 - <span class="badge-info">最終編集: $!escapetool.xml($authorDisplayName) ($xwiki.formatDate($doc.date, "yyyy/MM/dd"))</span>
248 + <span class="badge-info">最終編集: $escapetool.xml($authorDisplayName) ($xwiki.formatDate($doc.date, "yyyy/MM/dd"))</span>
252 252  </div>
250 +{{/html}}
253 253  
252 +{{html clean="false"}}
253 +
254 254  ## --- ① 学校基本情報 + 連絡先（左右グリッド・折りたたみ対応） ---
255 255  <div class="school-info-grid">
256 256   <div class="school-info-card mobile-collapse" id="card-basic-info">
257 - <h2 onclick="toggleInfoCard('card-basic-info')"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M4 19.5A2.5 2.5 0 016.5 17H20"/><path d="M6.5 2H20v20H6.5A2.5 2.5 0 014 19.5v-15A2.5 2.5 0 016.5 2z"/></svg> 学校基本情報</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2>
257 + <h2 onclick="toggleInfoCard('card-basic-info')"><span><svg class="ico" style="width:1.1em;height:1.1em;vertical-align:-0.15em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M4 19.5A2.5 2.5 0 016.5 17H20"/><path d="M6.5 2H20v20H6.5A2.5 2.5 0 014 19.5v-15A2.5 2.5 0 016.5 2z"/></svg> 学校基本情報</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2>
258 258   <table class="wiki-table school-info-table">
259 - <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
260 - <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
261 - <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
259 + <tr><th>学校コード</th><td>$escapetool.xml($!schoolCode)</td></tr>
260 + <tr><th>学校名</th><td>$escapetool.xml($!schoolName)</td></tr>
261 + <tr><th>所在地</th><td>$escapetool.xml($!prefecture) #if($city && $city != '')$escapetool.xml($city)#end</td></tr>
262 262   <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
263 - <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
264 - <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
265 - <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
266 - <tr><th>課程</th><td>#if($schoolSystem && $schoolSystem != '' && $schoolSystem != '[]')$!escapetool.xml($!schoolSystem)#end</td></tr>
267 - <tr><th>公式サイト</th><td>#if($website && $website != '')<a href="$!escapetool.xml($website)" target="_blank" rel="noopener">$!escapetool.xml($website)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
263 + <tr><th>共学・別学</th><td>$escapetool.xml($!coeducation)</td></tr>
264 + <tr><th>設置者</th><td>$escapetool.xml($!establishment)</td></tr>
265 + <tr><th>学校種</th><td>$escapetool.xml($!schoolLevel)</td></tr>
266 + <tr><th>課程</th><td>$escapetool.xml($!schoolSystem)</td></tr>
267 + <tr><th>公式サイト</th><td>#if($website && $website != '')<a href="$escapetool.xml($website)" target="_blank" rel="noopener">$escapetool.xml($website)</a>#else<span style="color:#9ca3af;">未登録</span>#end</td></tr>
268 268   </table>
269 269   #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
270 270   #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
271 271   #if($infoEditDate && $infoEditDate != '')
272 - <div class="info-last-updated"><svg class="ico" viewBox="0 0 24 24"><path d="M11 4H4a2 2 0 00-2 2v14a2 2 0 002 2h14a2 2 0 002-2v-7"/><path d="M18.5 2.5a2.121 2.121 0 013 3L12 15l-4 1 1-4 9.5-9.5z"/></svg> 基本情報の最終更新: $!escapetool.xml($infoEditBy) — $!escapetool.xml($infoEditDate)</div>
272 + <div class="info-last-updated"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M11 4H4a2 2 0 00-2 2v14a2 2 0 002 2h14a2 2 0 002-2v-7"/><path d="M18.5 2.5a2.121 2.121 0 013 3L12 15l-4 1 1-4 9.5-9.5z"/></svg> 基本情報の最終更新: $escapetool.xml($infoEditBy) — $escapetool.xml($infoEditDate)</div>
273 273   #end
274 274   </div>
275 275  
276 276   <div class="school-info-card mobile-collapse" id="card-contact">
277 - <h2 onclick="toggleInfoCard('card-contact')"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M22 16.92v3a2 2 0 01-2.18 2 19.79 19.79 0 01-8.63-3.07 19.5 19.5 0 01-6-6 19.79 19.79 0 01-3.07-8.67A2 2 0 014.11 2h3a2 2 0 012 1.72c.127.96.361 1.903.7 2.81a2 2 0 01-.45 2.11L8.09 9.91a16 16 0 006 6l1.27-1.27a2 2 0 012.11-.45c.907.339 1.85.573 2.81.7A2 2 0 0122 16.92z"/></svg> 連絡先・SNS</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2>
277 + <h2 onclick="toggleInfoCard('card-contact')"><span><svg class="ico" style="width:1.1em;height:1.1em;vertical-align:-0.15em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M22 16.92v3a2 2 0 01-2.18 2 19.79 19.79 0 01-8.63-3.07 19.5 19.5 0 01-6-6 19.79 19.79 0 01-3.07-8.67A2 2 0 014.11 2h3a2 2 0 012 1.72c.127.96.361 1.903.7 2.81a2 2 0 01-.45 2.11L8.09 9.91a16 16 0 006 6l1.27-1.27a2 2 0 012.11-.45c.907.339 1.85.573 2.81.7A2 2 0 0122 16.92z"/></svg> 連絡先・SNS</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2>
278 278   <table class="wiki-table school-info-table">
279 - <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr>
280 - <tr><th>生徒会Web</th><td>#if($seitokaiWebsite && $seitokaiWebsite != '')<a href="$!escapetool.xml($seitokaiWebsite)" target="_blank" rel="noopener"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M2 12h20"/><path d="M12 2a15.3 15.3 0 014 10 15.3 15.3 0 01-4 10 15.3 15.3 0 01-4-10 15.3 15.3 0 014-10z"/></svg> $!escapetool.xml($seitokaiWebsite)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
281 - <tr><th>X (Twitter)</th><td>#if($seitokaiTwitter && $seitokaiTwitter != '')<a href="https://x.com/$!escapetool.url($seitokaiTwitter)" target="_blank" rel="noopener">𝕏 @$!escapetool.xml($seitokaiTwitter)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
282 - <tr><th>Instagram</th><td>#if($seitokaiInstagram && $seitokaiInstagram != '')<a href="https://instagram.com/$!escapetool.url($seitokaiInstagram)" target="_blank" rel="noopener"><svg class="ico" viewBox="0 0 24 24"><path d="M23 19a2 2 0 01-2 2H3a2 2 0 01-2-2V8a2 2 0 012-2h4l2-3h6l2 3h4a2 2 0 012 2z"/><circle cx="12" cy="13" r="4"/></svg> @$!escapetool.xml($seitokaiInstagram)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
283 - <tr><th>YouTube</th><td>#if($seitokaiYoutube && $seitokaiYoutube != '')<a href="$!escapetool.xml($seitokaiYoutube)" target="_blank" rel="noopener"><svg class="ico" viewBox="0 0 24 24"><polygon points="5 3 19 12 5 21 5 3"/></svg> YouTubeチャンネル</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
284 - <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
279 + <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$escapetool.xml($contactInfo)#else<span style="color:#9ca3af;">未登録</span>#end</td></tr>
280 + <tr><th>生徒会Web</th><td>#if($seitokaiWebsite && $seitokaiWebsite != '')<a href="$escapetool.xml($seitokaiWebsite)" target="_blank" rel="noopener"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="10"/><path d="M2 12h20"/><path d="M12 2a15.3 15.3 0 014 10 15.3 15.3 0 01-4 10 15.3 15.3 0 01-4-10 15.3 15.3 0 014-10z"/></svg> $escapetool.xml($seitokaiWebsite)</a>#else<span style="color:#9ca3af;">未登録</span>#end</td></tr>
281 + <tr><th>X (Twitter)</th><td>#if($seitokaiTwitter && $seitokaiTwitter != '')<a href="https://x.com/$escapetool.url($seitokaiTwitter)" target="_blank" rel="noopener">𝕏 @$escapetool.xml($seitokaiTwitter)</a>#else<span style="color:#9ca3af;">未登録</span>#end</td></tr>
282 + <tr><th>Instagram</th><td>#if($seitokaiInstagram && $seitokaiInstagram != '')<a href="https://instagram.com/$escapetool.url($seitokaiInstagram)" target="_blank" rel="noopener"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M23 19a2 2 0 01-2 2H3a2 2 0 01-2-2V8a2 2 0 012-2h4l2-3h6l2 3h4a2 2 0 012 2z"/><circle cx="12" cy="13" r="4"/></svg> @$escapetool.xml($seitokaiInstagram)</a>#else<span style="color:#9ca3af;">未登録</span>#end</td></tr>
283 + <tr><th>YouTube</th><td>#if($seitokaiYoutube && $seitokaiYoutube != '')<a href="$escapetool.xml($seitokaiYoutube)" target="_blank" rel="noopener"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polygon points="5 3 19 12 5 21 5 3"/></svg> YouTubeチャンネル</a>#else<span style="color:#9ca3af;">未登録</span>#end</td></tr>
284 + <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$escapetool.xml($seitokaiOtherSns)#else<span style="color:#9ca3af;">未登録</span>#end</td></tr>
285 285   </table>
286 286   </div>
287 287  </div>
288 288  
289 289  ## --- 生徒会情報アコーディオン ---
290 -<div class="school-section-divider">
290 +<div style="margin:20px 0 16px;">
291 291   <button class="shortcut-btn shortcut-btn-secondary" onclick="var sec=document.getElementById('seitokai-info-section');sec.classList.toggle('open');this.querySelector('.shortcut-arrow').textContent=sec.classList.contains('open')?'▲':'▼';">
292 - <svg class="ico ico-md" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/></svg>
292 + <svg class="ico" style="width:1.1em;height:1.1em;vertical-align:-0.15em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/></svg>
293 293   生徒会情報を見る <span class="shortcut-arrow">▼</span>
294 294   </button>
295 295  </div>
... ... @@ -305,17 +305,17 @@
305 305   #elseif($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewOrgChart = false)
306 306   #end
307 307   #if($canViewOrgChart)
308 -<h2 class="section-title"><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/><line x1="9" y1="10" x2="9" y2="10.01"/><line x1="15" y1="10" x2="15" y2="10.01"/><line x1="9" y1="14" x2="9" y2="14.01"/><line x1="15" y1="14" x2="15" y2="14.01"/></svg> 組織図 #if($visibilityOrgChart != 'public')<span class="visibility-badge visibility-${visibilityOrgChart}">#if($visibilityOrgChart == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h2>
308 +<h2 class="section-title"><svg class="ico" style="width:1.1em;height:1.1em;vertical-align:-0.15em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/><line x1="9" y1="10" x2="9" y2="10.01"/><line x1="15" y1="10" x2="15" y2="10.01"/><line x1="9" y1="14" x2="9" y2="14.01"/><line x1="15" y1="14" x2="15" y2="14.01"/></svg> 組織図 #if($visibilityOrgChart != 'public')<span class="visibility-badge visibility-${visibilityOrgChart}">#if($visibilityOrgChart == 'members')<svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h2>
309 309  <div class="school-section-card">
310 310   <div class="card-inner">
311 311   #if($orgChartImage && $orgChartImage != '')
312 - <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
312 + <div style="margin-bottom:12px;"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" style="max-width:100%; border-radius:8px;" /></div>
313 313   #end
314 - #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end
314 + #if($orgChart && $orgChart != '')$escapetool.xml($orgChart)#end
315 315   </div>
316 316  </div>
317 317   #else
318 -<div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 組織図は #if($visibilityOrgChart == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
318 +<div class="visibility-restricted-notice"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 組織図は #if($visibilityOrgChart == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
319 319   #end
320 320  #end
321 321  
... ... @@ -323,18 +323,18 @@
323 323  <div class="school-section-grid">
324 324   #if($dailyActivities && $dailyActivities != '')
325 325   <div class="school-section-card">
326 - <h3><svg class="ico" viewBox="0 0 24 24"><path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z"/><polyline points="14 2 14 8 20 8"/><line x1="16" y1="13" x2="8" y2="13"/><line x1="16" y1="17" x2="8" y2="17"/></svg> 日常の活動</h3>
326 + <h3><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z"/><polyline points="14 2 14 8 20 8"/><line x1="16" y1="13" x2="8" y2="13"/><line x1="16" y1="17" x2="8" y2="17"/></svg> 日常の活動</h3>
327 327   <div class="card-inner">
328 - <p class="activity-hint">活動時間の多い順に上位3つ</p>
328 + <p style="font-size:0.88em; color:#9ca3af; margin-bottom:12px;">活動時間の多い順に上位3つ</p>
329 329   <div class="tag-container">
330 330   #set($daIdx = 1)
331 331   #foreach($da in $dailyActivities.split(","))
332 - <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
332 + <span class="tag tag-accent">${daIdx}. $escapetool.xml($da.trim())</span>
333 333   #set($daIdx = $daIdx + 1)
334 334   #end
335 335   </div>
336 336   #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
337 - <div class="free-note">$!escapetool.xml($dailyActivitiesNote)</div>
337 + <div class="free-note">$escapetool.xml($dailyActivitiesNote)</div>
338 338   #end
339 339   </div>
340 340   </div>
... ... @@ -342,20 +342,20 @@
342 342  
343 343   #if($electionExists && $electionExists != '')
344 344   <div class="school-section-card">
345 - <h3><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="3" width="18" height="18" rx="2"/><path d="M7 13l3 3 7-7"/></svg> 選挙</h3>
345 + <h3><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="3" width="18" height="18" rx="2"/><path d="M7 13l3 3 7-7"/></svg> 選挙</h3>
346 346   <div class="card-inner">
347 347   <div class="info-row">
348 348   <span class="info-label">役員選挙</span>
349 - <span class="info-value">$!escapetool.xml($!electionExists)</span>
349 + <span class="info-value">$escapetool.xml($!electionExists)</span>
350 350   </div>
351 351   #if($electionType && $electionType != '')
352 352   <div class="info-row">
353 353   <span class="info-label">直近の選挙方式</span>
354 - <span class="info-value">$!escapetool.xml($!electionType)</span>
354 + <span class="info-value">$escapetool.xml($!electionType)</span>
355 355   </div>
356 356   #end
357 357   #if($electionNote && $electionNote.trim() != '')
358 - <div class="free-note">$!escapetool.xml($electionNote)</div>
358 + <div class="free-note">$escapetool.xml($electionNote)</div>
359 359   #end
360 360   </div>
361 361   </div>
... ... @@ -365,14 +365,14 @@
365 365  <div class="school-section-grid">
366 366   #if($meetingFrequency && $meetingFrequency != '')
367 367   <div class="school-section-card">
368 - <h3><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="4" width="18" height="18" rx="2"/><line x1="16" y1="2" x2="16" y2="6"/><line x1="8" y1="2" x2="8" y2="6"/><line x1="3" y1="10" x2="21" y2="10"/></svg> 定例活動</h3>
368 + <h3><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="4" width="18" height="18" rx="2"/><line x1="16" y1="2" x2="16" y2="6"/><line x1="8" y1="2" x2="8" y2="6"/><line x1="3" y1="10" x2="21" y2="10"/></svg> 定例活動</h3>
369 369   <div class="card-inner">
370 370   <div class="info-row">
371 371   <span class="info-label">役員定例会の頻度</span>
372 - <span class="info-value">$!escapetool.xml($!meetingFrequency)</span>
372 + <span class="info-value">$escapetool.xml($!meetingFrequency)</span>
373 373   </div>
374 374   #if($regularActivitiesNote && $regularActivitiesNote.trim() != '')
375 - <div class="free-note">$!escapetool.xml($regularActivitiesNote)</div>
375 + <div class="free-note">$escapetool.xml($regularActivitiesNote)</div>
376 376   #end
377 377   </div>
378 378   </div>
... ... @@ -388,7 +388,7 @@
388 388   #end
389 389   #if($canViewBudget)
390 390   <div class="school-section-card">
391 - <h3><svg class="ico" viewBox="0 0 24 24"><line x1="12" y1="1" x2="12" y2="23"/><path d="M17 5H9.5a3.5 3.5 0 000 7h5a3.5 3.5 0 010 7H6"/></svg> 予算 #if($visibilityBudget != 'public')<span class="visibility-badge visibility-${visibilityBudget}">#if($visibilityBudget == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
391 + <h3><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><line x1="12" y1="1" x2="12" y2="23"/><path d="M17 5H9.5a3.5 3.5 0 000 7h5a3.5 3.5 0 010 7H6"/></svg> 予算 #if($visibilityBudget != 'public')<span class="visibility-badge visibility-${visibilityBudget}">#if($visibilityBudget == 'members')<svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
392 392   <div class="card-inner">
393 393   #if($budgetProcess && $budgetProcess != '')
394 394   <div class="info-row">
... ... @@ -396,7 +396,7 @@
396 396   <span class="info-value">
397 397   <div class="selection-display">
398 398   #foreach($bp in $budgetProcess.split(","))
399 - <span class="selection-item">$!escapetool.xml($bp.trim())</span>
399 + <span class="selection-item">$escapetool.xml($bp.trim())</span>
400 400   #end
401 401   </div>
402 402   </span>
... ... @@ -405,13 +405,13 @@
405 405   #if($studentFee && $studentFee != '')
406 406   <div class="info-row">
407 407   <span class="info-label">生徒会費（年額）</span>
408 - <span class="info-value">$!escapetool.xml($!studentFee)</span>
408 + <span class="info-value">$escapetool.xml($!studentFee)</span>
409 409   </div>
410 410   #end
411 411   #if($budgetScale && $budgetScale != '')
412 412   <div class="info-row">
413 413   <span class="info-label">予算規模</span>
414 - <span class="info-value">$!escapetool.xml($!budgetScale)</span>
414 + <span class="info-value">$escapetool.xml($!budgetScale)</span>
415 415   </div>
416 416   #end
417 417   #if($budgetAllocation && $budgetAllocation != '')
... ... @@ -420,7 +420,7 @@
420 420   <span class="info-value">
421 421   <div class="selection-display">
422 422   #foreach($ba in $budgetAllocation.split(","))
423 - <span class="selection-item">$!escapetool.xml($ba.trim())</span>
423 + <span class="selection-item">$escapetool.xml($ba.trim())</span>
424 424   #end
425 425   </div>
426 426   </span>
... ... @@ -427,12 +427,12 @@
427 427   </div>
428 428   #end
429 429   #if($budgetNote && $budgetNote.trim() != '')
430 - <div class="free-note">$!escapetool.xml($budgetNote)</div>
430 + <div class="free-note">$escapetool.xml($budgetNote)</div>
431 431   #end
432 432   </div>
433 433   </div>
434 434   #else
435 - <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 予算情報は #if($visibilityBudget == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
435 + <div class="visibility-restricted-notice"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 予算情報は #if($visibilityBudget == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
436 436   #end
437 437   #end
438 438  </div>
... ... @@ -445,12 +445,12 @@
445 445   #elseif($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewRuleReview = false)
446 446   #end
447 447   #if($canViewRuleReview)
448 -<h2 class="section-title"><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M16 4h2a2 2 0 012 2v12a2 2 0 01-2 2h-2"/><path d="M8 4H6a2 2 0 00-2 2v12a2 2 0 002 2h2"/><line x1="12" y1="4" x2="12" y2="8"/><line x1="12" y1="16" x2="12" y2="20"/><line x1="8" y1="8" x2="16" y2="8"/><line x1="8" y1="16" x2="16" y2="16"/></svg> 校則の見直し #if($visibilityRuleReview != 'public')<span class="visibility-badge visibility-${visibilityRuleReview}">#if($visibilityRuleReview == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h2>
448 +<h2 class="section-title"><svg class="ico" style="width:1.1em;height:1.1em;vertical-align:-0.15em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M16 4h2a2 2 0 012 2v12a2 2 0 01-2 2h-2"/><path d="M8 4H6a2 2 0 00-2 2v12a2 2 0 002 2h2"/><line x1="12" y1="4" x2="12" y2="8"/><line x1="12" y1="16" x2="12" y2="20"/><line x1="8" y1="8" x2="16" y2="8"/><line x1="8" y1="16" x2="16" y2="16"/></svg> 校則の見直し #if($visibilityRuleReview != 'public')<span class="visibility-badge visibility-${visibilityRuleReview}">#if($visibilityRuleReview == 'members')<svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h2>
449 449  <div class="school-section-card">
450 450   <div class="card-inner">
451 451   <div class="info-row">
452 452   <span class="info-label">見直しの有無（3年以内）</span>
453 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
453 + <span class="info-value"><span class="tag tag-primary" style="font-size:0.9em;">$escapetool.xml($!ruleReviewStatus)</span></span>
454 454   </div>
455 455   #if($ruleReviewContent && $ruleReviewContent != '')
456 456   <div class="info-row">
... ... @@ -458,7 +458,7 @@
458 458   <span class="info-value">
459 459   <div class="selection-display">
460 460   #foreach($rc in $ruleReviewContent.split(","))
461 - <span class="selection-item">$!escapetool.xml($rc.trim())</span>
461 + <span class="selection-item">$escapetool.xml($rc.trim())</span>
462 462   #end
463 463   </div>
464 464   </span>
... ... @@ -470,7 +470,7 @@
470 470   <span class="info-value">
471 471   <div class="selection-display">
472 472   #foreach($rp in $ruleReviewProposer.split(","))
473 - <span class="selection-item">$!escapetool.xml($rp.trim())</span>
473 + <span class="selection-item">$escapetool.xml($rp.trim())</span>
474 474   #end
475 475   </div>
476 476   </span>
... ... @@ -482,7 +482,7 @@
482 482   <span class="info-value">
483 483   <div class="selection-display">
484 484   #foreach($ri in $ruleReviewImplementer.split(","))
485 - <span class="selection-item">$!escapetool.xml($ri.trim())</span>
485 + <span class="selection-item">$escapetool.xml($ri.trim())</span>
486 486   #end
487 487   </div>
488 488   </span>
... ... @@ -491,13 +491,13 @@
491 491   #if($ruleReviewSystem && $ruleReviewSystem != '')
492 492   <div class="info-row">
493 493   <span class="info-label">見直しの仕組み</span>
494 - <span class="info-value">$!escapetool.xml($!ruleReviewSystem)</span>
494 + <span class="info-value">$escapetool.xml($!ruleReviewSystem)</span>
495 495   </div>
496 496   #end
497 497   </div>
498 498  </div>
499 499   #else
500 -<div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 校則の見直し情報は #if($visibilityRuleReview == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
500 +<div class="visibility-restricted-notice"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 校則の見直し情報は #if($visibilityRuleReview == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
501 501   #end
502 502  #end
503 503  
... ... @@ -509,10 +509,10 @@
509 509   #elseif($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewChallenges = false)
510 510   #end
511 511   #if($canViewChallenges)
512 -<h2 class="section-title">生徒会の課題意識 #if($visibilityChallenges != 'public')<span class="visibility-badge visibility-${visibilityChallenges}">#if($visibilityChallenges == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h2>
513 -<div class="challenge-text">$!escapetool.xml($challenges)</div>
512 +<h2 class="section-title">生徒会の課題意識 #if($visibilityChallenges != 'public')<span class="visibility-badge visibility-${visibilityChallenges}">#if($visibilityChallenges == 'members')<svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h2>
513 +<div class="challenge-text">$escapetool.xml($challenges)</div>
514 514   #else
515 -<div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 課題情報は #if($visibilityChallenges == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
515 +<div class="visibility-restricted-notice"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 課題情報は #if($visibilityChallenges == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
516 516   #end
517 517  #end
518 518  
... ... @@ -521,12 +521,12 @@
521 521  {{/html}}
522 522  
523 523  ## --- ⑩ 活動報告一覧（スレッド型・年度タブ付き） ---
524 -= 活動報告 =
524 += <svg class="ico" style="width:1.1em;height:1.1em;vertical-align:-0.15em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z"/><polyline points="14 2 14 8 20 8"/><line x1="16" y1="13" x2="8" y2="13"/><line x1="16" y1="17" x2="8" y2="17"/></svg> 活動報告 =
525 525  
526 526  ## --- 投稿者ステータス凡例（折りたたみ） ---
527 527  {{html clean="false"}}
528 528  <div class="author-legend-wrapper">
529 - <button class="author-legend-toggle" onclick="this.classList.toggle('open');this.nextElementSibling.classList.toggle('open')"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M12 16v-4"/><path d="M12 8h.01"/></svg> バッジの見方 <span class="chevron">▼</span></button>
529 + <button class="author-legend-toggle" onclick="this.classList.toggle('open');this.nextElementSibling.classList.toggle('open')"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="10"/><path d="M12 16v-4"/><path d="M12 8h.01"/></svg> バッジの見方 <span class="chevron">▼</span></button>
530 530   <div class="author-legend-body">
531 531   <div class="author-legend">
532 532   <span class="author-legend-title">投稿者の信頼度:</span>
... ... @@ -537,17 +537,11 @@
537 537   </div>
538 538   <div class="author-legend">
539 539   <span class="author-legend-title">所属:</span>
540 - <span class="author-legend-item"><span class="badge badge-school-internal-confirmed badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内（確認済）</span> 承認済み＋同校</span>
541 - <span class="author-legend-item"><span class="badge badge-school-internal badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内</span> 紹介＋同校</span>
542 - <span class="author-legend-item"><span class="badge badge-school-external badge-sm"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M2 12h20"/><path d="M12 2a15.3 15.3 0 014 10 15.3 15.3 0 01-4 10 15.3 15.3 0 01-4-10 15.3 15.3 0 014-10z"/></svg> 他校</span> 他校所属</span>
543 - <span class="author-legend-item text-hint">※一般アカウントは所属未確認のため非表示</span>
540 + <span class="author-legend-item"><span class="badge badge-school-internal-confirmed" style="font-size:0.72em; padding: 1px 7px;"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内（確認済）</span> 承認済み＋同校</span>
541 + <span class="author-legend-item"><span class="badge badge-school-internal" style="font-size:0.72em; padding: 1px 7px;"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内</span> 紹介＋同校</span>
542 + <span class="author-legend-item"><span class="badge badge-school-external" style="font-size:0.72em; padding: 1px 7px;"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="10"/><path d="M2 12h20"/><path d="M12 2a15.3 15.3 0 014 10 15.3 15.3 0 01-4 10 15.3 15.3 0 01-4-10 15.3 15.3 0 014-10z"/></svg> 他校</span> 他校所属</span>
543 + <span class="author-legend-item" style="color:var(--text-light);font-size:0.85em;">※一般アカウントは所属未確認のため非表示</span>
544 544   </div>
545 - <div class="author-legend">
546 - <span class="author-legend-title">役割:</span>
547 - <span class="author-legend-item"><span class="badge badge-role-student badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M22 10v6M2 10l10-5 10 5-10 5z"/><path d="M6 12v5c0 2 4 3 6 3s6-1 6-3v-5"/></svg> 生徒</span></span>
548 - <span class="author-legend-item"><span class="badge badge-role-officer badge-sm"><svg class="ico" viewBox="0 0 24 24"><polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"/></svg> 役員</span></span>
549 - <span class="author-legend-item"><span class="badge badge-role-teacher badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M20 21v-2a4 4 0 00-4-4H8a4 4 0 00-4 4v2"/><circle cx="12" cy="7" r="4"/></svg> 教員</span></span>
550 - </div>
551 551   </div>
552 552  </div>
553 553  
... ... @@ -627,41 +627,27 @@
627 627   #set($threadPosts = [])
628 628   #set($discard = $threadPosts.addAll($pinnedPosts))
629 629   #set($discard = $threadPosts.addAll($normalPosts))
630 - ## report/comment カウント
631 - #set($reportCount = 0)
632 - #set($commentCount = 0)
633 - #foreach($tp in $threadPosts)
634 - #set($tpType = $!tp.getValue('postType'))
635 - #if($tpType == 'comment')
636 - #set($commentCount = $commentCount + 1)
637 - #else
638 - #set($reportCount = $reportCount + 1)
639 - #end
640 - #end
641 641  
642 642  {{html clean="false"}}
643 -<div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)">
626 +<div class="activity-thread" data-fiscal-year="$escapetool.xml($actFY)">
644 644   <div class="activity-thread-header">
645 645   <div class="activity-thread-title">
646 - <h3 #if($actFeatured == '1')class="featured-title"#end>$!escapetool.xml($!actTitle) #if($actFeatured == '1')<svg class="ico ico-fixed-14" viewBox="0 0 24 24" fill="currentColor" stroke="none" class="ico-star-offset"><polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"/></svg>#end</h3>
647 - <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
629 + <h3 #if($actFeatured == '1')class="featured-title"#end>$escapetool.xml($!actTitle) #if($actFeatured == '1')<svg style="width:14px;height:14px;vertical-align:-1px;margin-left:4px;" viewBox="0 0 24 24" fill="currentColor" stroke="none"><polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"/></svg>#end</h3>
630 + <span class="activity-meta">$escapetool.xml($!actCommittee) | $escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $escapetool.xml($actFY)年度#end</span>
648 648   </div>
649 - <div class="thread-meta-row">
650 - <span class="thread-post-count">${reportCount}件の報告 ・ ${commentCount}件のコメント</span>
632 + <div style="display:flex;align-items:center;gap:8px;">
633 + <span class="thread-post-count">${threadPosts.size()}件の投稿</span>
651 651   #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred')
652 652   #if($actFeatured == '1')
653 - <a href="$doc.getURL('view', "action=unfeature&actObj=${actIdx}&form_token=${services.csrf.getToken()}")" class="btn-featured-toggle btn-unfeature" title="特色ある活動の選定を解除"><svg class="ico ico-fixed-14" viewBox="0 0 24 24" fill="currentColor" stroke="none"><polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"/></svg> 特色解除</a>
636 + <a href="$doc.getURL('view', "action=unfeature&actObj=${actIdx}&form_token=${services.csrf.getToken()}")" class="btn-featured-toggle btn-unfeature" title="特色ある活動の選定を解除"><svg style="width:14px;height:14px;" viewBox="0 0 24 24" fill="currentColor" stroke="none"><polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"/></svg> 特色解除</a>
654 654   #else
655 - <a href="$doc.getURL('view', "action=feature&actObj=${actIdx}&form_token=${services.csrf.getToken()}")" class="btn-featured-toggle btn-feature" title="特色ある活動に選定（最大3件）"><svg class="ico ico-fixed-14" viewBox="0 0 24 24"><polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"/></svg> 特色設定</a>
638 + <a href="$doc.getURL('view', "action=feature&actObj=${actIdx}&form_token=${services.csrf.getToken()}")" class="btn-featured-toggle btn-feature" title="特色ある活動に選定（最大3件）"><svg style="width:14px;height:14px;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"/></svg> 特色設定</a>
656 656   #end
657 657   #end
658 658   </div>
659 659   </div>
660 660  
661 - ## --- 活動報告セクション ---
662 662   #foreach($post in $threadPosts)
663 - #set($thisPostType = $!post.getValue('postType'))
664 - #if($thisPostType != 'comment')
665 665   #set($postContent = $post.getValue('content'))
666 666   #set($postAuthor = $post.getValue('author'))
667 667   #set($postAccountType = $!post.getValue('authorAccountType'))
... ... @@ -669,35 +669,15 @@
669 669   #set($postGrade = $!post.getValue('authorGrade'))
670 670   #set($postSchoolCode = $!post.getValue('authorSchoolCode'))
671 671   #set($postDate = $post.getValue('createdDate'))
672 - ## 論理削除チェック
673 - #set($postDeleted = $!post.getValue('deleted'))
674 - #if($postDeleted == 1 || $postDeleted == '1')
675 - #if($viewerAccountType == 'admin')
676 - <div class="thread-post thread-post-deleted thread-post-admin-deleted">
677 - <div class="thread-post-admin-deleted-content">
678 - <svg class="ico" viewBox="0 0 24 24"><polyline points="3 6 5 6 21 6"/><path d="M19 6v14a2 2 0 01-2 2H7a2 2 0 01-2-2V6m3 0V4a2 2 0 012-2h4a2 2 0 012 2v2"/></svg>
679 - <strong>投稿者により削除済み</strong>（$!post.getValue('deletedAt')）
680 - <div class="thread-post-restored-content">$!escapetool.xml($!postContent)</div>
681 - </div>
682 - </div>
683 - #else
684 - <div class="thread-post thread-post-deleted thread-post-user-deleted">
685 - <div class="thread-post-user-deleted-content">
686 - <svg class="ico" viewBox="0 0 24 24"><polyline points="3 6 5 6 21 6"/><path d="M19 6v14a2 2 0 01-2 2H7a2 2 0 01-2-2V6m3 0V4a2 2 0 012-2h4a2 2 0 012 2v2"/></svg>
687 - この投稿は削除されました
688 - </div>
689 - </div>
690 - #end
691 - #else
692 692   ## 通報による非表示チェック
693 693   #set($postHidden = $!post.getValue('hidden'))
694 694   #if($postHidden == 1 || $postHidden == '1')
695 695   #if($viewerAccountType == 'admin')
696 - <div class="thread-post thread-post-admin-hidden">
697 - <div class="thread-post-admin-hidden-content">
698 - <svg class="ico" viewBox="0 0 24 24"><path d="M10.29 3.86L1.82 18a2 2 0 001.71 3h16.94a2 2 0 001.71-3L13.71 3.86a2 2 0 00-3.42 0z"/><line x1="12" y1="9" x2="12" y2="13"/><line x1="12" y1="17" x2="12.01" y2="17"/></svg>
699 - <strong>通報により非表示中</strong>（理由: $!escapetool.xml($!post.getValue('hiddenReason'))）
700 - <div class="thread-post-restored-content">$!escapetool.xml($!postContent)</div>
656 + <div class="thread-post" style="opacity:0.5;border:2px dashed #dc2626;">
657 + <div style="padding:10px 16px;font-size:0.85em;color:#dc2626;">
658 + <svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M10.29 3.86L1.82 18a2 2 0 001.71 3h16.94a2 2 0 001.71-3L13.71 3.86a2 2 0 00-3.42 0z"/><line x1="12" y1="9" x2="12" y2="13"/><line x1="12" y1="17" x2="12.01" y2="17"/></svg>
659 + <strong>通報により非表示中</strong>（理由: $escapetool.xml($!post.getValue('hiddenReason'))）
660 + <div style="margin-top:4px;font-size:0.92em;color:var(--text-mid);">$escapetool.xml($!postContent)</div>
701 701   </div>
702 702   </div>
703 703   #end
... ... @@ -711,7 +711,7 @@
711 711   #end
712 712   #if(!$canViewPost)
713 713   <div class="thread-post visibility-restricted-post">
714 - <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> この投稿は #if($postVis == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
674 + <div class="visibility-restricted-notice" style="margin:8px 0;"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> この投稿は #if($postVis == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
715 715   </div>
716 716   #else
717 717   ## 投稿者のアカウント種別に基づいたCSSクラス
... ... @@ -730,61 +730,53 @@
730 730   <div class="thread-post-content">
731 731   <div class="thread-post-header">
732 732   #if($isPinned == '1')
733 - <span class="pin-badge"><svg class="ico ico-fixed-14" viewBox="0 0 24 24" fill="currentColor" stroke="none"><path d="M16 2l-4 4-2-1-5 5 3 3-6 6h4l4-4 3 3 5-5-1-2 4-4-5-5z"/></svg> 固定</span>
693 + <span class="pin-badge"><svg style="width:12px;height:12px;" viewBox="0 0 24 24" fill="currentColor" stroke="none"><path d="M16 2l-4 4-2-1-5 5 3 3-6 6h4l4-4 3 3 5-5-1-2 4-4-5-5z"/></svg> 固定</span>
734 734   #end
735 735   #set($postAuthorRef = $!post.getValue('authorRef'))
736 736   <span class="thread-post-author">
737 737   #if($postAuthorRef && $postAuthorRef != '')
738 - <a href="$xwiki.getURL('SeitokaiCode.UserProfile', 'view', "user=${escapetool.url($postAuthorRef)}")">$!escapetool.xml($!postAuthor)</a>
698 + <a href="$xwiki.getURL('SeitokaiCode.UserProfile', 'view', "user=${escapetool.url($postAuthorRef)}")">$escapetool.xml($!postAuthor)</a>
739 739   #else
740 - $!escapetool.xml($!postAuthor)
700 + $escapetool.xml($!postAuthor)
741 741   #end
742 742   </span>
743 743   <span class="author-badge">
744 744   #if($postAccountType == 'admin')
745 - <span class="badge badge-admin badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 管理者</span>
705 + <span class="badge badge-admin" style="font-size:0.75em;padding:1px 7px;"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 管理者</span>
746 746   #elseif($postAccountType == 'verified')
747 - <span class="badge badge-verified badge-sm"><svg class="ico" viewBox="0 0 24 24" stroke-width="2.5"><path d="M20 6L9 17l-5-5"/></svg> 承認済み</span>
707 + <span class="badge badge-verified" style="font-size:0.75em;padding:1px 7px;"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"><path d="M20 6L9 17l-5-5"/></svg> 承認済み</span>
748 748   #elseif($postAccountType == 'referred')
749 - <span class="badge badge-referred badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M10 13a5 5 0 007.54.54l3-3a5 5 0 00-7.07-7.07l-1.72 1.71"/><path d="M14 11a5 5 0 00-7.54-.54l-3 3a5 5 0 007.07 7.07l1.71-1.71"/></svg> 紹介</span>
709 + <span class="badge badge-referred" style="font-size:0.75em;padding:1px 7px;"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M10 13a5 5 0 007.54.54l3-3a5 5 0 00-7.07-7.07l-1.72 1.71"/><path d="M14 11a5 5 0 00-7.54-.54l-3 3a5 5 0 007.07 7.07l1.71-1.71"/></svg> 紹介</span>
750 750   #else
751 - <span class="badge badge-general badge-sm">一般</span>
711 + <span class="badge badge-general" style="font-size:0.75em;padding:1px 7px;">一般</span>
752 752   #end
753 753   ## 所属バッジ（投稿者の学校コードとページの学校コードを比較）
754 754   #if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general')
755 755   #if($postSchoolCode == $schoolCode)
756 756   #if($postAccountType == 'verified' || $postAccountType == 'admin')
757 - <span class="badge badge-school-internal-confirmed badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内（確認済）</span>
717 + <span class="badge badge-school-internal-confirmed" style="font-size:0.75em;padding:1px 7px;"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内（確認済）</span>
758 758   #else
759 - <span class="badge badge-school-internal badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内</span>
719 + <span class="badge badge-school-internal" style="font-size:0.75em;padding:1px 7px;"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内</span>
760 760   #end
761 761   #else
762 - <span class="badge badge-school-external badge-sm"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M2 12h20"/><path d="M12 2a15.3 15.3 0 014 10 15.3 15.3 0 01-4 10 15.3 15.3 0 01-4-10 15.3 15.3 0 014-10z"/></svg> 他校</span>
722 + <span class="badge badge-school-external" style="font-size:0.75em;padding:1px 7px;"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="10"/><path d="M2 12h20"/><path d="M12 2a15.3 15.3 0 014 10 15.3 15.3 0 01-4 10 15.3 15.3 0 01-4-10 15.3 15.3 0 014-10z"/></svg> 他校</span>
763 763   #end
764 764   #end
765 765   #if($postUserRole == 'student')
766 - <span class="badge badge-role-student badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M22 10l-10-5L2 10l10 5 10-5z"/><path d="M6 12v5c0 1.66 2.69 3 6 3s6-1.34 6-3v-5"/></svg> 生徒</span>
767 - #set($postIsOfficer = $!post.getValue('authorIsOfficer'))
768 - #if($postIsOfficer == 'true')
769 - <span class="badge badge-role-officer badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M12 2l3.09 6.26L22 9.27l-5 4.87 1.18 6.88L12 17.77l-6.18 3.25L7 14.14 2 9.27l6.91-1.01L12 2z"/></svg> 役員</span>
770 - #end
726 + <span class="badge badge-role-student" style="font-size:0.75em;padding:1px 7px;"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M22 10l-10-5L2 10l10 5 10-5z"/><path d="M6 12v5c0 1.66 2.69 3 6 3s6-1.34 6-3v-5"/></svg> 生徒</span>
771 771   #elseif($postUserRole == 'teacher')
772 - <span class="badge badge-role-teacher badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M4 19.5A2.5 2.5 0 016.5 17H20"/><path d="M6.5 2H20v20H6.5A2.5 2.5 0 014 19.5v-15A2.5 2.5 0 016.5 2z"/></svg> 教員</span>
728 + <span class="badge badge-role-teacher" style="font-size:0.75em;padding:1px 7px;"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M4 19.5A2.5 2.5 0 016.5 17H20"/><path d="M6.5 2H20v20H6.5A2.5 2.5 0 014 19.5v-15A2.5 2.5 0 016.5 2z"/></svg> 教員</span>
773 773   #elseif($postUserRole == 'graduate')
774 - <span class="badge badge-role-graduate badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M22 10l-10-5L2 10l10 5 10-5z"/><path d="M6 12v5c0 1.66 2.69 3 6 3s6-1.34 6-3v-5"/></svg> 卒業生</span>
730 + <span class="badge badge-role-graduate" style="font-size:0.75em;padding:1px 7px;"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M22 10l-10-5L2 10l10 5 10-5z"/><path d="M6 12v5c0 1.66 2.69 3 6 3s6-1.34 6-3v-5"/></svg> 卒業生</span>
775 775   #end
776 776   #if($postGrade && $postGrade != '')
777 - <span class="badge badge-grade badge-sm">$postGrade</span>
733 + <span class="badge badge-grade" style="font-size:0.75em;padding:1px 7px;">$postGrade</span>
778 778   #end
779 779   </span>
780 780   <span class="thread-post-date">$!postDate</span>
781 - #set($postEdited = $!post.getValue('edited'))
782 - #if($postEdited == 1 || $postEdited == '1')
783 - <span class="post-edited-label">（編集済み）</span>
784 - #end
785 785   </div>
786 786   <div class="thread-post-body">
787 - $!escapetool.xml($!postContent)
739 + $escapetool.xml($!postContent)
788 788   #set($postImages = $!post.getValue('images'))
789 789   #if($postImages && $postImages.trim() != '')
790 790   <div class="post-images">
... ... @@ -798,7 +798,7 @@
798 798   #if($imgName != '')
799 799   <div class="post-image-item">
800 800   <a href="$doc.getAttachmentURL($imgName)" target="_blank">
801 - <img src="$doc.getAttachmentURL($imgName)" alt="$!escapetool.xml($imgName)" loading="lazy"/>
753 + <img src="$doc.getAttachmentURL($imgName)" alt="$escapetool.xml($imgName)" loading="lazy"/>
802 802   </a>
803 803   </div>
804 804   #end
... ... @@ -829,14 +829,14 @@
829 829   #set($displayName = $fName.replaceFirst('file_\d{14}_\d+_', ''))
830 830   #end
831 831   <div class="post-file-item">
832 - <a href="$doc.getAttachmentURL($fName)" target="_blank" download="$!escapetool.xml($displayName)">
833 - #if($fIcon == 'pdf')<svg class="ico ico-md" style="color:${fColor};" viewBox="0 0 24 24"><path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z"/><polyline points="14 2 14 8 20 8"/><path d="M9 15v-2h1.5a1.5 1.5 0 010 3H9"/></svg>
834 - #elseif($fIcon == 'word')<svg class="ico ico-md" style="color:${fColor};" viewBox="0 0 24 24"><path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z"/><polyline points="14 2 14 8 20 8"/><path d="M8 15l1.5-5 1.5 5 1.5-5 1.5 5"/></svg>
835 - #elseif($fIcon == 'excel')<svg class="ico ico-md" style="color:${fColor};" viewBox="0 0 24 24"><path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z"/><polyline points="14 2 14 8 20 8"/><line x1="8" y1="13" x2="16" y2="13"/><line x1="8" y1="17" x2="16" y2="17"/><line x1="12" y1="13" x2="12" y2="17"/></svg>
836 - #elseif($fIcon == 'ppt')<svg class="ico ico-md" style="color:${fColor};" viewBox="0 0 24 24"><path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z"/><polyline points="14 2 14 8 20 8"/><rect x="8" y="12" width="8" height="6" rx="1"/></svg>
837 - #else<svg class="ico ico-md" style="color:${fColor};" viewBox="0 0 24 24"><path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z"/><polyline points="14 2 14 8 20 8"/></svg>
784 + <a href="$doc.getAttachmentURL($fName)" target="_blank" download="$escapetool.xml($displayName)">
785 + #if($fIcon == 'pdf')<svg class="ico" style="width:1.1em;height:1.1em;vertical-align:-0.15em;color:${fColor};" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z"/><polyline points="14 2 14 8 20 8"/><path d="M9 15v-2h1.5a1.5 1.5 0 010 3H9"/></svg>
786 + #elseif($fIcon == 'word')<svg class="ico" style="width:1.1em;height:1.1em;vertical-align:-0.15em;color:${fColor};" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z"/><polyline points="14 2 14 8 20 8"/><path d="M8 15l1.5-5 1.5 5 1.5-5 1.5 5"/></svg>
787 + #elseif($fIcon == 'excel')<svg class="ico" style="width:1.1em;height:1.1em;vertical-align:-0.15em;color:${fColor};" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z"/><polyline points="14 2 14 8 20 8"/><line x1="8" y1="13" x2="16" y2="13"/><line x1="8" y1="17" x2="16" y2="17"/><line x1="12" y1="13" x2="12" y2="17"/></svg>
788 + #elseif($fIcon == 'ppt')<svg class="ico" style="width:1.1em;height:1.1em;vertical-align:-0.15em;color:${fColor};" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z"/><polyline points="14 2 14 8 20 8"/><rect x="8" y="12" width="8" height="6" rx="1"/></svg>
789 + #else<svg class="ico" style="width:1.1em;height:1.1em;vertical-align:-0.15em;color:${fColor};" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z"/><polyline points="14 2 14 8 20 8"/></svg>
838 838   #end
839 - <span class="post-file-name">$!escapetool.xml($displayName)</span>
791 + <span class="post-file-name">$escapetool.xml($displayName)</span>
840 840   </a>
841 841   </div>
842 842   #end
... ... @@ -846,90 +846,36 @@
846 846   #end
847 847   </div>
848 848   #if($postVis != 'public')
849 - <div class="visibility-badge visibility-${postVis} post-action-mt">#if($postVis == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</div>
801 + <div class="visibility-badge visibility-${postVis}" style="margin-top:6px;font-size:0.75em;">#if($postVis == 'members')<svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</div>
850 850   #end
851 851   ## 固定/解除ボタン（承認済み・管理者のみ）
852 852   #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
853 853   #set($postObjNum = $post.number)
854 - <div class="post-pin-action post-action-mt">
806 + <div class="post-pin-action" style="margin-top:6px;">
855 855   #if($isPinned == '1')
856 856   <a href="$doc.getURL('view', "action=unpin&postObj=${postObjNum}&form_token=${services.csrf.getToken()}")" class="btn-pin-toggle btn-unpin" title="固定を解除">
857 - <svg class="ico ico-fixed-14" viewBox="0 0 24 24" fill="currentColor" stroke="none"><path d="M16 2l-4 4-2-1-5 5 3 3-6 6h4l4-4 3 3 5-5-1-2 4-4-5-5z"/></svg> 固定を解除
809 + <svg style="width:13px;height:13px;" viewBox="0 0 24 24" fill="currentColor" stroke="none"><path d="M16 2l-4 4-2-1-5 5 3 3-6 6h4l4-4 3 3 5-5-1-2 4-4-5-5z"/></svg> 固定を解除
858 858   </a>
859 859   #else
860 860   <a href="$doc.getURL('view', "action=pin&postObj=${postObjNum}&form_token=${services.csrf.getToken()}")" class="btn-pin-toggle btn-pin" title="この投稿を固定">
861 - <svg class="ico ico-fixed-14" viewBox="0 0 24 24"><path d="M16 2l-4 4-2-1-5 5 3 3-6 6h4l4-4 3 3 5-5-1-2 4-4-5-5z"/></svg> 固定する
813 + <svg style="width:13px;height:13px;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M16 2l-4 4-2-1-5 5 3 3-6 6h4l4-4 3 3 5-5-1-2 4-4-5-5z"/></svg> 固定する
862 862   </a>
863 863   #end
864 864   </div>
865 865   #end
866 - ## 編集・削除ボタン（投稿者本人 or 管理者）
867 - #set($postAuthorRef = $!post.getValue('authorRef'))
868 - #set($postObjNumED = $post.number)
869 - #if($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin')
870 - <div class="post-edit-actions post-action-mt">
871 - #if($xcontext.user == $postAuthorRef)
872 - <button type="button" class="btn-post-edit" onclick="openEditPost(this, '${doc.fullName}', $postObjNumED, '$!escapetool.javascript($!postContent)')" title="この投稿を編集">
873 - <svg class="ico ico-fixed-14" viewBox="0 0 24 24"><path d="M11 4H4a2 2 0 00-2 2v14a2 2 0 002 2h14a2 2 0 002-2v-7"/><path d="M18.5 2.5a2.121 2.121 0 013 3L12 15l-4 1 1-4 9.5-9.5z"/></svg> 編集
874 - </button>
875 - #end
876 - <button type="button" class="btn-post-delete" onclick="confirmDeletePost('${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を削除">
877 - <svg class="ico ico-fixed-14" viewBox="0 0 24 24"><polyline points="3 6 5 6 21 6"/><path d="M19 6v14a2 2 0 01-2 2H7a2 2 0 01-2-2V6m3 0V4a2 2 0 012-2h4a2 2 0 012 2v2"/></svg> 削除
878 - </button>
879 - </div>
880 - #end
881 881   </div>
882 882   </div>
883 883   #end## /canViewPost
884 884   #end## /postHidden
885 - #end## /postDeleted
886 - #end## /postType != comment
887 - #end## /foreach reports
888 -
889 - ## --- コメントセクション（折りたたみ） ---
890 - #if($commentCount > 0)
891 - <details class="thread-comments-section">
892 - <summary class="thread-comments-toggle">
893 - <svg class="ico" viewBox="0 0 24 24"><path d="M21 15a2 2 0 01-2 2H7l-4 4V5a2 2 0 012-2h14a2 2 0 012 2z"/></svg> ${commentCount}件のコメント
894 - </summary>
895 - #foreach($post in $threadPosts)
896 - #set($thisPostType = $!post.getValue('postType'))
897 - #if($thisPostType == 'comment')
898 - #set($postContent = $post.getValue('content'))
899 - #set($postAuthor = $post.getValue('author'))
900 - #set($postAccountType = $!post.getValue('authorAccountType'))
901 - #set($postDate = $post.getValue('createdDate'))
902 - #set($postDeleted = $!post.getValue('deleted'))
903 - #if($postDeleted == 1 || $postDeleted == '1')
904 - <div class="thread-comment thread-comment-deleted">
905 - <span class="thread-comment-meta">このコメントは削除されました</span>
906 - </div>
907 - #else
908 - #set($postHidden = $!post.getValue('hidden'))
909 - #if($postHidden == 1 || $postHidden == '1')
910 - <div class="thread-comment thread-comment-hidden">
911 - <span class="thread-comment-meta">このコメントは非表示にされました</span>
912 - </div>
913 - #else
914 - <div class="thread-comment">
915 - <span class="thread-comment-author">$!escapetool.xml($postAuthor)</span>
916 - <span class="thread-comment-date">$!postDate</span>
917 - <div class="thread-comment-body">$!escapetool.xml($postContent)</div>
918 - </div>
919 - #end
920 - #end
921 - #end
922 - #end
923 - </details>
924 924   #end
925 925  
926 926   #if($xcontext.user != "XWiki.XWikiGuest")
927 927   <div class="thread-add-post">
928 - <a href="/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
826 + <a href="/xwiki/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
929 929   ＋ 活動報告を追加
930 930   </a>
931 - <a href="/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
932 - <svg class="ico" viewBox="0 0 24 24"><path d="M21 15a2 2 0 01-2 2H7l-4 4V5a2 2 0 012-2h14a2 2 0 012 2z"/></svg> コメントを書く
829 + <a href="/xwiki/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
830 + <svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M21 15a2 2 0 01-2 2H7l-4 4V5a2 2 0 012-2h14a2 2 0 012 2z"/></svg> コメントを書く
933 933   </a>
934 934   </div>
935 935   #end
... ... @@ -939,7 +939,7 @@
939 939  #else
940 940  {{html clean="false"}}
941 941  <div class="empty-state">
942 - <div class="empty-state-icon"><svg class="ico" viewBox="0 0 24 24" stroke-width="1.5"><path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z"/><polyline points="14 2 14 8 20 8"/><line x1="16" y1="13" x2="8" y2="13"/><line x1="16" y1="17" x2="8" y2="17"/></svg></div>
840 + <div class="empty-state-icon"><svg style="width:1em;height:1em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z"/><polyline points="14 2 14 8 20 8"/><line x1="16" y1="13" x2="8" y2="13"/><line x1="16" y1="17" x2="8" y2="17"/></svg></div>
943 943   <div class="empty-state-title">活動報告はまだありません</div>
944 944   <div class="empty-state-desc">この学校の活動を記録して、他校と共有しましょう。<br>「活動を追加」ボタンから最初の活動を作成できます。</div>
945 945  </div>
... ... @@ -950,8 +950,8 @@
950 950  #if($xcontext.user != "XWiki.XWikiGuest")
951 951  {{html clean="false"}}
952 952  <div class="activity-add-section">
953 - <a href="/bin/view/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$!escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity">
954 - <svg class="ico" viewBox="0 0 24 24" stroke-width="2.5"><line x1="12" y1="5" x2="12" y2="19"/><line x1="5" y1="12" x2="19" y2="12"/></svg> 活動を追加
851 + <a href="/xwiki/bin/view/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity">
852 + <svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round"><line x1="12" y1="5" x2="12" y2="19"/><line x1="5" y1="12" x2="19" y2="12"/></svg> 活動を追加
955 955   </a>
956 956  </div>
957 957  {{/html}}
... ... @@ -959,16 +959,16 @@
959 959  
960 960  ## --- 年度アーカイブ セクション ---
961 961  {{html clean="false"}}
962 -<div class="school-section-card school-archive-card">
963 - <h2 class="archive-section-title">
964 - <svg class="ico ico-md" viewBox="0 0 24 24"><path d="M19 21H5a2 2 0 01-2-2V5a2 2 0 012-2h11l5 5v11a2 2 0 01-2 2z"/><polyline points="17 21 17 13 7 13 7 21"/><polyline points="7 3 7 8 15 8"/></svg>
860 +<div class="school-section-card" style="margin-top:24px;">
861 + <h2 style="font-size:1.05em;font-weight:700;margin:0 0 12px;display:flex;align-items:center;gap:6px;">
862 + <svg style="width:1.1em;height:1.1em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M19 21H5a2 2 0 01-2-2V5a2 2 0 012-2h11l5 5v11a2 2 0 01-2 2z"/><polyline points="17 21 17 13 7 13 7 21"/><polyline points="7 3 7 8 15 8"/></svg>
965 965   年度アーカイブ
966 966   </h2>
967 - <div class="archive-meta">
865 + <div style="font-size:0.88em;color:var(--text-mid);margin-bottom:12px;">
968 968   現在のページ: <strong>${pageFiscalYear}年度</strong>
969 969   #set($lyud = $!doc.getValue('lastYearUpdateDate'))
970 970   #if($lyud && $lyud != '')
971 - | 最終年度更新: $!escapetool.xml($lyud) ($!escapetool.xml($!doc.getValue('lastYearUpdateBy')))
869 + | 最終年度更新: $escapetool.xml($lyud) ($escapetool.xml($!doc.getValue('lastYearUpdateBy')))
972 972   #end
973 973   </div>
974 974  
... ... @@ -977,16 +977,16 @@
977 977   #set($archivePages = $archiveQuery.execute())
978 978  
979 979   #if($archivePages && $archivePages.size() > 0)
980 - <div class="archive-card-field-lg">
981 - <div class="archive-list-label">過去の年度アーカイブ</div>
982 - <div class="archive-list">
878 + <div style="margin-bottom:12px;">
879 + <div style="font-weight:600;font-size:0.9em;margin-bottom:8px;">過去の年度アーカイブ</div>
880 + <div style="display:flex;flex-wrap:wrap;gap:8px;">
983 983   #foreach($archPage in $archivePages)
984 984   #set($archPageDoc = $xwiki.getDocument($archPage))
985 985   #set($archPageObj = $archPageDoc.getObject('SeitokaiCode.SchoolClass'))
986 986   #if($archPageObj)
987 987   #set($archPageFY = $!archPageObj.getValue('fiscalYear'))
988 - <a href="$archPageDoc.getURL('view')" class="archive-link">
989 - <svg class="ico" viewBox="0 0 24 24"><path d="M19 21H5a2 2 0 01-2-2V5a2 2 0 012-2h11l5 5v11a2 2 0 01-2 2z"/><polyline points="17 21 17 13 7 13 7 21"/><polyline points="7 3 7 8 15 8"/></svg>
886 + <a href="$archPageDoc.getURL('view')" style="display:inline-flex;align-items:center;gap:5px;padding:8px 14px;background:#e0e7ff;border:1px solid #c7d2fe;border-radius:8px;color:#4338ca;text-decoration:none;font-size:0.9em;font-weight:600;transition:all 0.15s;">
887 + <svg style="width:1em;height:1em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M19 21H5a2 2 0 01-2-2V5a2 2 0 012-2h11l5 5v11a2 2 0 01-2 2z"/><polyline points="17 21 17 13 7 13 7 21"/><polyline points="7 3 7 8 15 8"/></svg>
990 990   ${archPageFY}年度
991 991   </a>
992 992   #end
... ... @@ -994,17 +994,17 @@
994 994   </div>
995 995   </div>
996 996   #else
997 - <div class="archive-empty">過去のアーカイブはまだありません</div>
895 + <div style="font-size:0.88em;color:var(--text-light);margin-bottom:12px;">過去のアーカイブはまだありません</div>
998 998   #end
999 999  
1000 1000   ## 新年度に移行ボタン（承認済み・管理者のみ）
1001 1001   #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
1002 - <div class="archive-action">
1003 - <a href="/bin/view/SeitokaiCode/YearArchiveAction?schoolPage=${doc.fullName}" class="btn-accent">
1004 - <svg class="ico" viewBox="0 0 24 24" stroke-width="2.5"><path d="M19 21H5a2 2 0 01-2-2V5a2 2 0 012-2h11l5 5v11a2 2 0 01-2 2z"/><polyline points="17 21 17 13 7 13 7 21"/><polyline points="7 3 7 8 15 8"/></svg>
900 + <div style="margin-top:12px;padding-top:12px;border-top:1px solid #e2e8f0;">
901 + <a href="/xwiki/bin/view/SeitokaiCode/YearArchiveAction?schoolPage=${doc.fullName}" style="display:inline-flex;align-items:center;gap:6px;padding:8px 18px;background:#4f46e5;color:white;border-radius:8px;text-decoration:none;font-size:0.9em;font-weight:600;">
902 + <svg style="width:1em;height:1em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"><path d="M19 21H5a2 2 0 01-2-2V5a2 2 0 012-2h11l5 5v11a2 2 0 01-2 2z"/><polyline points="17 21 17 13 7 13 7 21"/><polyline points="7 3 7 8 15 8"/></svg>
1005 1005   ${pageFiscalYear}年度をアーカイブして新年度に移行
1006 1006   </a>
1007 - <div class="archive-action-hint">現在の学校情報を${pageFiscalYear}年度として保存し、新しい年度に移行します。</div>
905 + <div style="font-size:0.8em;color:var(--text-light);margin-top:6px;">現在の学校情報を${pageFiscalYear}年度として保存し、新しい年度に移行します。</div>
1008 1008   </div>
1009 1009   #end
1010 1010  </div>
... ... @@ -1019,10 +1019,12 @@
1019 1019   btn.classList.add('active');
1020 1020   // 活動スレッドの表示切り替え
1021 1021   document.querySelectorAll('.activity-thread[data-fiscal-year]').forEach(function(thread) {
1022 - if (fy === 'all' || thread.getAttribute('data-fiscal-year') === fy) {
1023 - thread.classList.remove('fy-hidden');
920 + if (fy === 'all') {
921 + thread.style.display = '';
922 + } else if (thread.getAttribute('data-fiscal-year') === fy) {
923 + thread.style.display = '';
1024 1024   } else {
1025 - thread.classList.add('fy-hidden');
925 + thread.style.display = 'none';
1026 1026   }
1027 1027   });
1028 1028  }
... ... @@ -1060,8 +1060,8 @@
1060 1060   document.body.appendChild(container);
1061 1061   }
1062 1062   var icons = {
1063 - success: '<svg class="ico ico-md" viewBox="0 0 24 24" stroke-width="2.5"><path d="M20 6L9 17l-5-5"/></svg>',
1064 - error: '<svg class="ico ico-md" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><line x1="15" y1="9" x2="9" y2="15"/><line x1="9" y1="9" x2="15" y2="15"/></svg>'
963 + success: '<svg style="width:1.1em;height:1.1em;flex-shrink:0;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"><path d="M20 6L9 17l-5-5"/></svg>',
964 + error: '<svg style="width:1.1em;height:1.1em;flex-shrink:0;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="10"/><line x1="15" y1="9" x2="9" y2="15"/><line x1="9" y1="9" x2="15" y2="15"/></svg>'
1065 1065   };
1066 1066   var toast = document.createElement('div');
1067 1067   toast.className = 'toast toast-' + type;
... ... @@ -1077,71 +1077,6 @@
1077 1077   card.classList.toggle('collapsed');
1078 1078   card.classList.remove('mobile-collapse');
1079 1079  }
1080 -
1081 -// 投稿の編集（インライン編集フォームを開く）
1082 -function openEditPost(btn, schoolPage, postObjNum, currentContent) {
1083 - var postEl = btn.closest('.thread-post');
1084 - if (!postEl) return;
1085 - // 既存の編集フォームがあれば閉じる
1086 - var existing = postEl.querySelector('.post-edit-form');
1087 - if (existing) { existing.remove(); return; }
1088 - var bodyEl = postEl.querySelector('.thread-post-body');
1089 - if (!bodyEl) return;
1090 - var form = document.createElement('div');
1091 - form.className = 'post-edit-form';
1092 - form.innerHTML = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>' +
1093 - '<div class="post-edit-form-actions">' +
1094 - '<button type="button" class="btn-cancel-edit" onclick="this.closest(\'.post-edit-form\').remove()">キャンセル</button>' +
1095 - '<button type="button" class="btn-save" onclick="saveEditPost(\'' + schoolPage + '\', ' + postObjNum + ')">保存</button>' +
1096 - '</div>';
1097 - bodyEl.parentNode.insertBefore(form, bodyEl.nextSibling);
1098 - form.querySelector('textarea').focus();
1099 -}
1100 -
1101 -// 投稿の編集を保存
1102 -function saveEditPost(schoolPage, postObjNum) {
1103 - var textarea = document.getElementById('editContent_' + postObjNum);
1104 - if (!textarea) return;
1105 - var newContent = textarea.value.trim();
1106 - if (!newContent) { alert('投稿内容を入力してください'); return; }
1107 - var csrfEl = document.querySelector('input[name="form_token"]');
1108 - var csrfToken = csrfEl ? csrfEl.value : '';
1109 - var xhr = new XMLHttpRequest();
1110 - xhr.open('GET', '/bin/view/SeitokaiCode/EditPost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken), true);
1111 - xhr.onload = function() {
1112 - try {
1113 - var res = JSON.parse(xhr.responseText);
1114 - if (res.success) {
1115 - showToast('投稿を更新しました', 'success');
1116 - setTimeout(function() { location.reload(); }, 800);
1117 - } else {
1118 - alert('編集に失敗しました: ' + (res.error || ''));
1119 - }
1120 - } catch(e) { alert('編集に失敗しました'); }
1121 - };
1122 - xhr.onerror = function() { alert('通信エラーが発生しました'); };
1123 - xhr.send();
1124 -}
1125 -
1126 -// 投稿の削除（確認ダイアログ付き）
1127 -function confirmDeletePost(schoolPage, postObjNum, token) {
1128 - if (!confirm('この投稿を削除しますか？\\n削除後は「この投稿は削除されました」と表示されます。')) return;
1129 - var xhr = new XMLHttpRequest();
1130 - xhr.open('GET', '/bin/view/SeitokaiCode/DeletePost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token), true);
1131 - xhr.onload = function() {
1132 - try {
1133 - var res = JSON.parse(xhr.responseText);
1134 - if (res.success) {
1135 - showToast('投稿を削除しました', 'success');
1136 - setTimeout(function() { location.reload(); }, 800);
1137 - } else {
1138 - alert('削除に失敗しました: ' + (res.error || ''));
1139 - }
1140 - } catch(e) { alert('削除に失敗しました'); }
1141 - };
1142 - xhr.onerror = function() { alert('通信エラーが発生しました'); };
1143 - xhr.send();
1144 -}
1145 1145  </script>
1146 1146  {{/html}}
1147 1147  {{/velocity}}