Skip to Content
Last modified by Super Admin on 2026/04/05 18:59
From version Icon 70.1 Icon
edited by Super Admin
on 2026/03/18 18:54
Change comment: There is no comment for this version
To version Icon 31.1 Icon
edited by Super Admin
on 2026/03/10 13:42
Change comment: There is no comment for this version

Summary

Details

Icon Page properties
Content
... ... @@ -1,11 +1,5 @@
1 1  {{velocity}}
2 2  ## ===== 学校ページ テンプレート =====
3 -## ゲストが ?sheet= 付きURL（編集フォーム等）に直接アクセスした場合、ログインページへリダイレクト
4 -#if($xcontext.user == 'XWiki.XWikiGuest' && $request.sheet && $request.sheet != '')
5 - #set($currentUrl = $doc.getURL('view', "sheet=${request.sheet}"))
6 - $response.sendRedirect("/bin/login/XWiki/XWikiLogin?srid=$escapetool.url($currentUrl)")
7 - #stop
8 -#end
9 9  {{html clean="false"}}
10 10  ## メンテナンスバナー（{{include}}ではなくインラインで記述し、<p>タグ挿入を回避）
11 11  #set($bannerDoc = $xwiki.getDocument('SeitokaiAdmin.MaintenanceBanner'))
... ... @@ -71,7 +71,9 @@
71 71  #set($seitokaiYoutube = $doc.getValue('seitokaiYoutube'))
72 72  #set($seitokaiOtherSns = $doc.getValue('seitokaiOtherSns'))
73 73  
74 -## --- 現在の年度を計算（4月始まり） ---
68 +## --- 年度アーカイブ ---
69 +#set($pageFiscalYear = $!doc.getValue('fiscalYear'))
70 +## 現在の年度を計算（4月始まり）
75 75  #set($nowFY = $datetool.date)
76 76  #set($currentFYMonth = $mathtool.toInteger($datetool.format('MM', $nowFY)))
77 77  #set($currentFYYear = $mathtool.toInteger($datetool.format('yyyy', $nowFY)))
... ... @@ -80,6 +80,10 @@
80 80  #else
81 81   #set($currentFiscalYear = $mathtool.sub($currentFYYear, 1))
82 82  #end
79 +## fiscalYear 未設定時はデフォルトとして現在の年度を使う
80 +#if(!$pageFiscalYear || $pageFiscalYear == '')
81 + #set($pageFiscalYear = $currentFiscalYear.toString())
82 +#end
83 83  
84 84  ## --- 公開範囲フィールド ---
85 85  #set($visibilityOrgChart = $!doc.getValue('visibilityOrgChart'))
... ... @@ -106,53 +106,10 @@
106 106   #end
107 107  #end
108 108  
109 -## --- 関連校（中高一貫校）情報 ---
110 -#set($affiliatedSchoolCode = $!doc.getValue('affiliatedSchoolCode'))
111 -#set($affiliatedSchoolName = $!doc.getValue('affiliatedSchoolName'))
112 -#set($isAffiliated = false)
113 -#if($affiliatedSchoolCode && $affiliatedSchoolCode != '' && $viewerSchoolCode == $affiliatedSchoolCode)
114 - #set($isAffiliated = true)
115 -#end
116 -
117 -## --- 学校ページ非表示チェック ---
118 -#set($schoolHidden = $doc.getValue('hidden'))
119 -#if($schoolHidden == 1)
120 - #if($isViewerAdmin)
121 - ## 管理者: 黄色バナー + ページ内容は通常表示（プレビュー）
122 -<div class="school-hidden-banner admin">
123 - <svg class="ico" viewBox="0 0 24 24"><path d="M17.94 17.94A10.07 10.07 0 0112 20c-7 0-11-8-11-8a18.45 18.45 0 015.06-5.94M9.9 4.24A9.12 9.12 0 0112 4c7 0 11 8 11 8a18.5 18.5 0 01-2.16 3.19m-6.72-1.07a3 3 0 01-4.24-4.24"/><line x1="1" y1="1" x2="23" y2="23"/></svg>
124 - <div>
125 - <strong>このページは非表示になっています</strong>（管理者のみ閲覧可能）
126 - #set($hBy = $!doc.getValue('hiddenBy'))
127 - #set($hAt = $!doc.getValue('hiddenAt'))
128 - #set($hReason = $!doc.getValue('hiddenReason'))
129 - <div class="school-hidden-detail">
130 - 非表示: $!escapetool.xml($hAt) / $!escapetool.xml($hBy)
131 - #if($hReason && $hReason != '') ・ 理由: $!escapetool.xml($hReason)#end
132 - </div>
133 - <a href="$xwiki.getURL('SeitokaiAdmin.SchoolManagement', 'view')" style="color:#92400e;text-decoration:underline">学校ページ管理へ</a>
134 - </div>
135 -</div>
136 - #else
137 - ## 一般ユーザー・ゲスト: 非公開メッセージを表示して停止
138 -<div class="school-hidden-public">
139 - <svg class="ico" viewBox="0 0 24 24" style="width:2.5em;height:2.5em"><path d="M17.94 17.94A10.07 10.07 0 0112 20c-7 0-11-8-11-8a18.45 18.45 0 015.06-5.94M9.9 4.24A9.12 9.12 0 0112 4c7 0 11 8 11 8a18.5 18.5 0 01-2.16 3.19m-6.72-1.07a3 3 0 01-4.24-4.24"/><line x1="1" y1="1" x2="23" y2="23"/></svg>
140 - <h2>このページは現在公開されていません</h2>
141 - <p>このページは管理者により非公開に設定されています。</p>
142 - <a href="$xwiki.getURL('Schools.WebHome', 'view')" class="btn-back-list">学校一覧に戻る</a>
143 -</div>
144 -#stop
145 - #end
146 -#end
147 -
148 148  ## --- 投稿固定/解除処理 ---
149 149  #set($pinAction = $!request.action)
150 -#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && ($viewerSchoolCode == $schoolCode || $isAffiliated))) && $services.csrf.isTokenValid($request.form_token))
151 - #set($pinPostObjStr = $!request.postObj)
152 - #if(!$pinPostObjStr.matches('^\d+$'))
153 - ## 不正な値 → 無視
154 - #else
155 - #set($postObjNum = $mathtool.toInteger($pinPostObjStr))
111 +#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || $viewerAccountType == 'verified') && $services.csrf.isTokenValid($request.form_token))
112 + #set($postObjNum = $mathtool.toInteger($!request.postObj))
156 156   #set($postObj = $doc.getObject('SeitokaiCode.ActivityPostClass', $postObjNum))
157 157   #if($postObj)
158 158   #if($pinAction == 'pin')
... ... @@ -172,15 +172,12 @@
172 172   $response.sendRedirect($doc.getURL('view'))
173 173   #stop
174 174   #end
175 - #end## /matches
176 176  #end
177 177  
178 178  ## --- 特色ある活動 選定/解除処理 ---
179 179  #set($featAction = $!request.action)
180 -#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token))
181 - #set($featActObjStr = $!request.actObj)
182 - #if($featActObjStr.matches('^\d+$'))
183 - #set($actObjNum = $mathtool.toInteger($featActObjStr))
136 +#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $services.csrf.isTokenValid($request.form_token))
137 + #set($actObjNum = $mathtool.toInteger($!request.actObj))
184 184   #set($actObj = $doc.getObject('SeitokaiCode.ActivityClass', $actObjNum))
185 185   #if($actObj)
186 186   #if($featAction == 'feature')
... ... @@ -212,7 +212,6 @@
212 212   $response.sendRedirect($doc.getURL('view'))
213 213   #stop
214 214   #end
215 - #end## /matches
216 216  #end
217 217  
218 218  ## --- ユーザー情報取得 ---
... ... @@ -271,310 +271,351 @@
271 271   #end
272 272  #end
273 273  
274 -## --- 学校名見出し（XWikiデフォルトタイトルを非表示にし、学校名を表示） ---
275 -#if($schoolName && $schoolName != '')
276 -<style>.document-header { display: none !important; }</style>
277 -<h1 class="school-page-title">$!escapetool.xml($schoolName)</h1>
278 -#end
279 -
280 -## --- 編集ボタン（権限があるユーザーのみ表示） ---
281 -#set($canEditSchool = false)
282 -#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode || $isAffiliated))
283 - #set($canEditSchool = true)
284 -#end
285 -#if($canEditSchool)
286 -<div style="text-align:right; margin-bottom:12px;">
227 +## --- 信頼性バッジ + ユーザー情報 ---
228 +<div class="seitokai-badge-container">
229 + ## 承認バッジ
230 + #if($authorAccountType == 'admin')
231 + <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>
232 + #elseif($authorAccountType == 'verified')
233 + <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>
234 + #elseif($authorAccountType == 'referred')
235 + <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>
236 + #else
237 + <span class="badge badge-general">一般</span>
238 + #end
239 + ## 役割バッジ
240 + #if($authorUserRole == 'student')
241 + <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>
242 + #set($authorIsOfficer = $!lastAuthorDoc.getValue('isOfficer'))
243 + #if($authorIsOfficer == 'true')
244 + <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>
245 + #end
246 + #elseif($authorUserRole == 'teacher')
247 + <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>
248 + #elseif($authorUserRole == 'graduate')
249 + <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>
250 + #end
251 + ## 学年（生徒のみ公開）
252 + #if($authorGrade && $authorGrade != '')
253 + <span class="badge badge-grade">$authorGrade</span>
254 + #end
255 + ## 在籍状態（卒業・休学等の場合のみ表示）
256 + #if($authorUserStatus == 'graduated')
257 + <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>
258 + #elseif($authorUserStatus == 'on_leave')
259 + <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>
260 + #elseif($authorUserStatus == 'transferred')
261 + <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>
262 + #end
263 + ## 編集ボタン（権限があるユーザーのみ表示）
264 + #set($canEditSchool = false)
265 + #if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode))
266 + #set($canEditSchool = true)
267 + #end
268 + #if($canEditSchool)
287 287   <a href="$doc.getURL('view', 'sheet=SeitokaiCode.SchoolEditForm')" class="btn-school-edit"><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> 基本情報を編集</a>
270 + #end
288 288  </div>
289 -#end
290 290  
291 -## --- 関連校（中高一貫校）バナー ---
292 -#if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
293 - #set($affiliatedPageRef = "Schools.${affiliatedSchoolCode}.WebHome")
294 - #set($affiliatedPageExists = $xwiki.exists($affiliatedPageRef))
295 -<div class="affiliated-school-banner">
296 - <svg class="ico" viewBox="0 0 24 24" stroke-width="1.5"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg>
297 - <div>
298 - <strong>中高一貫校</strong>：
299 - #if($affiliatedPageExists)
300 - <a href="$xwiki.getURL($affiliatedPageRef, 'view')">$!escapetool.xml($affiliatedSchoolName)</a>
301 - #else
302 - $!escapetool.xml($affiliatedSchoolName)
273 +## --- ① 学校基本情報 + 連絡先（左右グリッド・折りたたみ対応） ---
274 +<div class="school-info-grid">
275 + <div class="school-info-card collapsed" id="card-basic-info">
276 + <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>
277 + <table class="wiki-table school-info-table">
278 + <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
279 + <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
280 + <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
281 + <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
282 + <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
283 + <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
284 + <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
285 + <tr><th>課程</th><td>#if($schoolSystem && $schoolSystem != '' && $schoolSystem != '[]')$!escapetool.xml($!schoolSystem)#end</td></tr>
286 + <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>
287 + </table>
288 + #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
289 + #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
290 + #if($infoEditDate && $infoEditDate != '')
291 + <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>
303 303   #end
304 - と連携しています
305 305   </div>
294 +
295 + <div class="school-info-card collapsed" id="card-contact">
296 + <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>
297 + <table class="wiki-table school-info-table">
298 + <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr>
299 + <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>
300 + <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>
301 + <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>
302 + <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>
303 + <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
304 + </table>
305 + </div>
306 306  </div>
307 -#end
308 308  
309 -## --- ① 学校基本情報 ---
310 -<div class="school-info-card collapsed" id="card-basic-info">
311 - <h2 role="button" tabindex="0" aria-expanded="false" onclick="toggleInfoCard('card-basic-info')" onkeydown="if(event.key==='Enter'||event.key===' '){event.preventDefault();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>
312 - <table class="wiki-table school-info-table">
313 - <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
314 - <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
315 - <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
316 - <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
317 - <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
318 - <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
319 - <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
320 - <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
321 - <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>
322 - </table>
323 - #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
324 - #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
325 - #if($infoEditDate && $infoEditDate != '')
326 - <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>
327 - #end
308 +## --- 生徒会情報アコーディオン ---
309 +<div class="school-section-divider">
310 + <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')?'▲':'▼';">
311 + <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>
312 + 生徒会情報を見る <span class="shortcut-arrow">▼</span>
313 + </button>
328 328  </div>
329 329  
330 -## --- ② 生徒会基本情報（折りたたみカード） ---
331 -<div class="school-info-card" id="card-seitokai-info">
332 - <h2 role="button" tabindex="0" aria-expanded="true" onclick="toggleInfoCard('card-seitokai-info')" onkeydown="if(event.key==='Enter'||event.key===' '){event.preventDefault();toggleInfoCard('card-seitokai-info')}"><span><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> 生徒会基本情報</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2>
333 - <div class="seitokai-info-body">
316 +<div id="seitokai-info-section" class="seitokai-info-accordion">
334 334  
335 - ## --- 組織図 ---
336 - #set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
337 - #if($hasOrgContent)
338 - #set($canViewOrgChart = true)
339 - #if($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewOrgChart = false)
340 - #elseif($visibilityOrgChart == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewOrgChart = false)
341 - #end
342 - #if($canViewOrgChart)
343 - <div class="seitokai-subsection">
344 - <h3 class="seitokai-subsection-title"><svg class="ico" 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 == 'school_trusted')<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> 校内承認者限定#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>
345 - <div class="seitokai-subsection-content">
346 - #if($orgChartImage && $orgChartImage != '')
347 - <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
348 - #end
349 - #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end
350 - </div>
351 - </div>
352 - #else
353 - <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 == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
354 - #end
318 +## --- ② 組織図 ---
319 +#set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
320 +#if($hasOrgContent)
321 + ## 公開範囲チェック
322 + #set($canViewOrgChart = true)
323 + #if($visibilityOrgChart == 'members' && $isGuest) #set($canViewOrgChart = false)
324 + #elseif($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewOrgChart = false)
325 + #end
326 + #if($canViewOrgChart)
327 +<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>
328 +<div class="school-section-card">
329 + <div class="card-inner">
330 + #if($orgChartImage && $orgChartImage != '')
331 + <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
355 355   #end
333 + #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end
334 + </div>
335 +</div>
336 + #else
337 +<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>
338 + #end
339 +#end
356 356  
357 - ## --- 日常の活動 ---
358 - #if($dailyActivities && !$dailyActivities.isEmpty())
359 - <div class="seitokai-subsection">
360 - <h3 class="seitokai-subsection-title"><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>
361 - <div class="seitokai-subsection-content">
362 - <p class="activity-hint">活動時間の多い順に上位3つ</p>
363 - <div class="tag-container">
364 - #set($daIdx = 1)
365 - #foreach($da in $dailyActivities)
366 - <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
367 - #set($daIdx = $daIdx + 1)
368 - #end
369 - </div>
370 - #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
371 - <div class="free-note">$!escapetool.xml($dailyActivitiesNote)</div>
341 +## --- ③④⑤ 日常の活動・選挙・定例活動 ---
342 +<div class="school-section-grid">
343 + #if($dailyActivities && $dailyActivities != '')
344 + <div class="school-section-card">
345 + <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>
346 + <div class="card-inner">
347 + <p class="activity-hint">活動時間の多い順に上位3つ</p>
348 + <div class="tag-container">
349 + #set($daIdx = 1)
350 + #foreach($da in $dailyActivities.split(","))
351 + <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
352 + #set($daIdx = $daIdx + 1)
372 372   #end
373 373   </div>
355 + #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
356 + <div class="free-note">$!escapetool.xml($dailyActivitiesNote)</div>
357 + #end
374 374   </div>
375 - #end
359 + </div>
360 + #end
376 376  
377 - ## --- 選挙 ---
378 - #if($electionExists && $electionExists != '')
379 - <div class="seitokai-subsection">
380 - <h3 class="seitokai-subsection-title"><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>
381 - <div class="seitokai-subsection-content">
382 - <div class="info-row">
383 - <span class="info-label">役員選挙</span>
384 - <span class="info-value">$!escapetool.xml($!electionExists)</span>
385 - </div>
386 - #if($electionType && $electionType != '')
387 - <div class="info-row">
388 - <span class="info-label">直近の選挙方式</span>
389 - <span class="info-value">$!escapetool.xml($!electionType)</span>
390 - </div>
391 - #end
392 - #if($electionNote && $electionNote.trim() != '')
393 - <div class="free-note">$!escapetool.xml($electionNote)</div>
394 - #end
362 + #if($electionExists && $electionExists != '')
363 + <div class="school-section-card">
364 + <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>
365 + <div class="card-inner">
366 + <div class="info-row">
367 + <span class="info-label">役員選挙</span>
368 + <span class="info-value">$!escapetool.xml($!electionExists)</span>
395 395   </div>
370 + #if($electionType && $electionType != '')
371 + <div class="info-row">
372 + <span class="info-label">直近の選挙方式</span>
373 + <span class="info-value">$!escapetool.xml($!electionType)</span>
374 + </div>
375 + #end
376 + #if($electionNote && $electionNote.trim() != '')
377 + <div class="free-note">$!escapetool.xml($electionNote)</div>
378 + #end
396 396   </div>
397 - #end
380 + </div>
381 + #end
382 +</div>
398 398  
399 - ## --- 定例活動 ---
400 - #if($meetingFrequency && $meetingFrequency != '')
401 - <div class="seitokai-subsection">
402 - <h3 class="seitokai-subsection-title"><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>
403 - <div class="seitokai-subsection-content">
404 - <div class="info-row">
405 - <span class="info-label">役員定例会の頻度</span>
406 - <span class="info-value">$!escapetool.xml($!meetingFrequency)</span>
407 - </div>
408 - #if($regularActivitiesNote && $regularActivitiesNote.trim() != '')
409 - <div class="free-note">$!escapetool.xml($regularActivitiesNote)</div>
410 - #end
384 +<div class="school-section-grid">
385 + #if($meetingFrequency && $meetingFrequency != '')
386 + <div class="school-section-card">
387 + <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>
388 + <div class="card-inner">
389 + <div class="info-row">
390 + <span class="info-label">役員定例会の頻度</span>
391 + <span class="info-value">$!escapetool.xml($!meetingFrequency)</span>
411 411   </div>
393 + #if($regularActivitiesNote && $regularActivitiesNote.trim() != '')
394 + <div class="free-note">$!escapetool.xml($regularActivitiesNote)</div>
395 + #end
412 412   </div>
413 - #end
397 + </div>
398 + #end
414 414  
415 - ## --- 予算 ---
416 - #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
417 - #if($hasBudget)
418 - #set($canViewBudget = true)
419 - #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewBudget = false)
420 - #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false)
400 + ## --- ⑦ 予算 ---
401 + #set($hasBudget = ($budgetProcess && $budgetProcess != '') || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
402 + #if($hasBudget)
403 + ## 公開範囲チェック
404 + #set($canViewBudget = true)
405 + #if($visibilityBudget == 'members' && $isGuest) #set($canViewBudget = false)
406 + #elseif($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewBudget = false)
407 + #end
408 + #if($canViewBudget)
409 + <div class="school-section-card">
410 + <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>
411 + <div class="card-inner">
412 + #if($budgetProcess && $budgetProcess != '')
413 + <div class="info-row">
414 + <span class="info-label">作成過程の生徒関与</span>
415 + <span class="info-value">
416 + <div class="selection-display">
417 + #foreach($bp in $budgetProcess.split(","))
418 + <span class="selection-item">$!escapetool.xml($bp.trim())</span>
419 + #end
420 + </div>
421 + </span>
422 + </div>
421 421   #end
422 - #if($canViewBudget)
423 - <div class="seitokai-subsection">
424 - <h3 class="seitokai-subsection-title"><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 == 'school_trusted')<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> 校内承認者限定#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>
425 - <div class="seitokai-subsection-content">
426 - #if($budgetProcess && !$budgetProcess.isEmpty())
427 - <div class="info-row">
428 - <span class="info-label">作成過程の生徒関与</span>
429 - <span class="info-value">
430 - <div class="selection-display">
431 - #foreach($bp in $budgetProcess)
432 - <span class="selection-item">$!escapetool.xml($bp.trim())</span>
433 - #end
434 - </div>
435 - </span>
436 - </div>
437 - #end
438 - #if($studentFee && $studentFee != '')
439 - <div class="info-row">
440 - <span class="info-label">生徒会費（年額）</span>
441 - <span class="info-value">$!escapetool.xml($!studentFee)</span>
442 - </div>
443 - #end
444 - #if($budgetScale && $budgetScale != '')
445 - <div class="info-row">
446 - <span class="info-label">予算規模</span>
447 - <span class="info-value">$!escapetool.xml($!budgetScale)</span>
448 - </div>
449 - #end
450 - #if($budgetAllocation && !$budgetAllocation.isEmpty())
451 - <div class="info-row">
452 - <span class="info-label">主な予算配分</span>
453 - <span class="info-value">
454 - <div class="selection-display">
455 - #foreach($ba in $budgetAllocation)
456 - <span class="selection-item">$!escapetool.xml($ba.trim())</span>
457 - #end
458 - </div>
459 - </span>
460 - </div>
461 - #end
462 - #if($budgetNote && $budgetNote.trim() != '')
463 - <div class="free-note">$!escapetool.xml($budgetNote)</div>
464 - #end
424 + #if($studentFee && $studentFee != '')
425 + <div class="info-row">
426 + <span class="info-label">生徒会費（年額）</span>
427 + <span class="info-value">$!escapetool.xml($!studentFee)</span>
465 465   </div>
466 - </div>
467 - #else
468 - <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 == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
469 469   #end
430 + #if($budgetScale && $budgetScale != '')
431 + <div class="info-row">
432 + <span class="info-label">予算規模</span>
433 + <span class="info-value">$!escapetool.xml($!budgetScale)</span>
434 + </div>
435 + #end
436 + #if($budgetAllocation && $budgetAllocation != '')
437 + <div class="info-row">
438 + <span class="info-label">主な予算配分</span>
439 + <span class="info-value">
440 + <div class="selection-display">
441 + #foreach($ba in $budgetAllocation.split(","))
442 + <span class="selection-item">$!escapetool.xml($ba.trim())</span>
443 + #end
444 + </div>
445 + </span>
446 + </div>
447 + #end
448 + #if($budgetNote && $budgetNote.trim() != '')
449 + <div class="free-note">$!escapetool.xml($budgetNote)</div>
450 + #end
451 + </div>
452 + </div>
453 + #else
454 + <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>
470 470   #end
456 + #end
457 +</div>
471 471  
472 - ## --- 校則の見直し ---
473 - #if($ruleReviewStatus && $ruleReviewStatus != '')
474 - #set($canViewRuleReview = true)
475 - #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewRuleReview = false)
476 - #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false)
477 - #end
478 - #if($canViewRuleReview)
479 - <div class="seitokai-subsection">
480 - <h3 class="seitokai-subsection-title"><svg class="ico" 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 == 'school_trusted')<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> 校内承認者限定#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>
481 - <div class="seitokai-subsection-content">
482 - <div class="info-row">
483 - <span class="info-label">見直しの有無（3年以内）</span>
484 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
459 +## --- ⑧ 校則の見直し ---
460 +#if($ruleReviewStatus && $ruleReviewStatus != '')
461 + ## 公開範囲チェック
462 + #set($canViewRuleReview = true)
463 + #if($visibilityRuleReview == 'members' && $isGuest) #set($canViewRuleReview = false)
464 + #elseif($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewRuleReview = false)
465 + #end
466 + #if($canViewRuleReview)
467 +<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>
468 +<div class="school-section-card">
469 + <div class="card-inner">
470 + <div class="info-row">
471 + <span class="info-label">見直しの有無（3年以内）</span>
472 + <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
473 + </div>
474 + #if($ruleReviewContent && $ruleReviewContent != '')
475 + <div class="info-row">
476 + <span class="info-label">見直しの内容</span>
477 + <span class="info-value">
478 + <div class="selection-display">
479 + #foreach($rc in $ruleReviewContent.split(","))
480 + <span class="selection-item">$!escapetool.xml($rc.trim())</span>
481 + #end
485 485   </div>
486 - #if($ruleReviewContent && !$ruleReviewContent.isEmpty())
487 - <div class="info-row">
488 - <span class="info-label">見直しの内容</span>
489 - <span class="info-value">
490 - <div class="selection-display">
491 - #foreach($rc in $ruleReviewContent)
492 - <span class="selection-item">$!escapetool.xml($rc.trim())</span>
493 - #end
494 - </div>
495 - </span>
483 + </span>
484 + </div>
485 + #end
486 + #if($ruleReviewProposer && $ruleReviewProposer != '')
487 + <div class="info-row">
488 + <span class="info-label">見直しの提案者</span>
489 + <span class="info-value">
490 + <div class="selection-display">
491 + #foreach($rp in $ruleReviewProposer.split(","))
492 + <span class="selection-item">$!escapetool.xml($rp.trim())</span>
493 + #end
496 496   </div>
497 - #end
498 - #if($ruleReviewProposer && !$ruleReviewProposer.isEmpty())
499 - <div class="info-row">
500 - <span class="info-label">見直しの提案者</span>
501 - <span class="info-value">
502 - <div class="selection-display">
503 - #foreach($rp in $ruleReviewProposer)
504 - <span class="selection-item">$!escapetool.xml($rp.trim())</span>
505 - #end
506 - </div>
507 - </span>
495 + </span>
496 + </div>
497 + #end
498 + #if($ruleReviewImplementer && $ruleReviewImplementer != '')
499 + <div class="info-row">
500 + <span class="info-label">見直しの実施者</span>
501 + <span class="info-value">
502 + <div class="selection-display">
503 + #foreach($ri in $ruleReviewImplementer.split(","))
504 + <span class="selection-item">$!escapetool.xml($ri.trim())</span>
505 + #end
508 508   </div>
509 - #end
510 - #if($ruleReviewImplementer && !$ruleReviewImplementer.isEmpty())
511 - <div class="info-row">
512 - <span class="info-label">見直しの実施者</span>
513 - <span class="info-value">
514 - <div class="selection-display">
515 - #foreach($ri in $ruleReviewImplementer)
516 - <span class="selection-item">$!escapetool.xml($ri.trim())</span>
517 - #end
518 - </div>
519 - </span>
520 - </div>
521 - #end
522 - #if($ruleReviewSystem && $ruleReviewSystem != '')
523 - <div class="info-row">
524 - <span class="info-label">見直しの仕組み</span>
525 - <span class="info-value">$!escapetool.xml($!ruleReviewSystem)</span>
526 - </div>
527 - #end
528 - </div>
507 + </span>
529 529   </div>
530 - #else
531 - <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 == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
532 - #end
533 533   #end
534 -
535 - ## --- 生徒会の課題意識 ---
536 - #if($challenges && $challenges != '')
537 - #set($canViewChallenges = true)
538 - #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewChallenges = false)
539 - #elseif($visibilityChallenges == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewChallenges = false)
540 - #end
541 - #if($canViewChallenges)
542 - <div class="seitokai-subsection">
543 - <h3 class="seitokai-subsection-title"><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> 生徒会の課題意識 #if($visibilityChallenges != 'public')<span class="visibility-badge visibility-${visibilityChallenges}">#if($visibilityChallenges == 'school_trusted')<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> 校内承認者限定#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>
544 - <div class="seitokai-subsection-content">
545 - <div class="challenge-text">$!escapetool.xml($challenges)</div>
546 - </div>
510 + #if($ruleReviewSystem && $ruleReviewSystem != '')
511 + <div class="info-row">
512 + <span class="info-label">見直しの仕組み</span>
513 + <span class="info-value">$!escapetool.xml($!ruleReviewSystem)</span>
547 547   </div>
548 - #else
549 - <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 == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
550 - #end
551 551   #end
516 + </div>
517 +</div>
518 + #else
519 +<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>
520 + #end
521 +#end
552 552  
553 - </div>## seitokai-info-body 終了
554 -</div>## card-seitokai-info 終了
523 +## --- ⑨ 課題 ---
524 +#if($challenges && $challenges != '')
525 + ## 公開範囲チェック
526 + #set($canViewChallenges = true)
527 + #if($visibilityChallenges == 'members' && $isGuest) #set($canViewChallenges = false)
528 + #elseif($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewChallenges = false)
529 + #end
530 + #if($canViewChallenges)
531 +<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>
532 +<div class="challenge-text">$!escapetool.xml($challenges)</div>
533 + #else
534 +<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>
535 + #end
536 +#end
555 555  
556 -## --- ③ SNS・連絡先 ---
557 -<div class="school-info-card collapsed" id="card-contact">
558 - <h2 role="button" tabindex="0" aria-expanded="false" onclick="toggleInfoCard('card-contact')" onkeydown="if(event.key==='Enter'||event.key===' '){event.preventDefault();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>
559 - <table class="wiki-table school-info-table">
560 - <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr>
561 - <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>
562 - <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>
563 - <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>
564 - <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>
565 - <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
566 - </table>
567 -</div>
538 +</div>## seitokai-info-accordion 終了
568 568  
569 569  {{/html}}
570 570  
571 -----
572 -
573 573  ## --- ⑩ 活動報告一覧（スレッド型・年度タブ付き） ---
574 574  = 活動報告 =
575 575  
576 -## --- 年度タブ + 投稿者ステータス凡例 ---
545 +## --- 投稿者ステータス凡例（折りたたみ） ---
577 577  {{html clean="false"}}
547 +<div class="author-legend-wrapper">
548 + <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>
549 + <div class="author-legend-body">
550 + <div class="author-legend">
551 + <span class="author-legend-title">投稿者の信頼度:</span>
552 + <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者</span>
553 + <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み</span>
554 + <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介</span>
555 + <span class="author-legend-item"><span class="bar bar-general"></span> 一般（未承認）</span>
556 + </div>
557 + <div class="author-legend">
558 + <span class="author-legend-title">所属:</span>
559 + <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>
560 + <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>
561 + <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>
562 + <span class="author-legend-item text-hint">※一般アカウントは所属未確認のため非表示</span>
563 + </div>
564 + <div class="author-legend">
565 + <span class="author-legend-title">役割:</span>
566 + <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>
567 + <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>
568 + <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>
569 + </div>
570 + </div>
571 +</div>
578 578  
579 579  ## --- 年度タブ ---
580 580  ## 全活動から年度一覧を収集
... ... @@ -596,48 +596,14 @@
596 596  #end
597 597  ## ソート（降順にしたいが Velocity にはないので JS で制御）
598 598  
599 -<div class="activity-toolbar">
600 - <div class="activity-fy-tabs">
601 - <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
602 - #foreach($fy in $fySet)
603 - #if($fy != $currentFYStr)
604 - <button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button>
605 - #end
593 +<div class="activity-fy-tabs">
594 + <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
595 + #foreach($fy in $fySet)
596 + #if($fy != $currentFYStr)
597 + <button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button>
606 606   #end
607 - <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
608 - </div>
609 - <div class="activity-toolbar-right">
610 - <button class="btn-view-toggle" id="btnViewToggle" onclick="toggleCompactView()" title="タイトルのみ表示">
611 - <svg class="ico-list" viewBox="0 0 24 24" stroke="currentColor" fill="none" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><line x1="8" y1="6" x2="21" y2="6"/><line x1="8" y1="12" x2="21" y2="12"/><line x1="8" y1="18" x2="21" y2="18"/><line x1="3" y1="6" x2="3.01" y2="6"/><line x1="3" y1="12" x2="3.01" y2="12"/><line x1="3" y1="18" x2="3.01" y2="18"/></svg>
612 - <svg class="ico-detail" viewBox="0 0 24 24" stroke="currentColor" fill="none" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="3" width="7" height="7"/><rect x="14" y="3" width="7" height="7"/><rect x="3" y="14" width="7" height="7"/><rect x="14" y="14" width="7" height="7"/></svg>
613 - <span class="toggle-label">一覧表示</span>
614 - </button>
615 - </div>
616 - <div class="author-legend-wrapper">
617 - <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>
618 - <div class="author-legend-body">
619 - <div class="author-legend">
620 - <span class="author-legend-title">投稿者の信頼度:</span>
621 - <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者 <span class="text-hint">— 運営スタッフ</span></span>
622 - <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み <span class="text-hint">— 本人確認済みのユーザー</span></span>
623 - <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介 <span class="text-hint">— 承認済みユーザーからの紹介</span></span>
624 - <span class="author-legend-item"><span class="bar bar-general"></span> 一般 <span class="text-hint">— 一般登録ユーザー</span></span>
625 - </div>
626 - <div class="author-legend">
627 - <span class="author-legend-title">所属:</span>
628 - <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 class="text-hint">所属が確認されたこの学校のユーザー</span></span>
629 - <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 class="text-hint">この学校に所属登録しているユーザー</span></span>
630 - <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 class="text-hint">別の学校に所属しているユーザー</span></span>
631 - <span class="author-legend-item text-hint">※一般アカウントは所属バッジが表示されません</span>
632 - </div>
633 - <div class="author-legend">
634 - <span class="author-legend-title">役割:</span>
635 - <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>
636 - <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 class="text-hint">生徒会役員</span></span>
637 - <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>
638 - </div>
639 - </div>
640 - </div>
599 + #end
600 + <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
641 641  </div>
642 642  
643 643  {{/html}}
... ... @@ -702,14 +702,8 @@
702 702  <div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)">
703 703   <div class="activity-thread-header">
704 704   <div class="activity-thread-title">
705 - <h3 #if($actFeatured == '1')class="featured-title"#end>$!escapetool.xml($!actTitle) #if($actFeatured == '1')<svg class="ico ico-fixed-14 ico-star-offset" 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>
665 + <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>
706 706   <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
707 - #set($actTagsList = $activity.getValue('tags'))
708 - #if($actTagsList && !$actTagsList.isEmpty())
709 - #foreach($tagItem in $actTagsList)
710 - #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end
711 - #end
712 - #end
713 713   </div>
714 714   <div class="thread-meta-row">
715 715   <span class="thread-post-count">${reportCount}件の報告 ・ ${commentCount}件のコメント</span>
... ... @@ -771,12 +771,12 @@
771 771   #set($postVis = $!post.getValue('visibility'))
772 772   #if(!$postVis || $postVis == '') #set($postVis = 'public') #end
773 773   #set($canViewPost = true)
774 - #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewPost = false)
775 - #elseif($postVis == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPost = false)
728 + #if($postVis == 'members' && $isGuest) #set($canViewPost = false)
729 + #elseif($postVis == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewPost = false)
776 776   #end
777 777   #if(!$canViewPost)
778 778   <div class="thread-post visibility-restricted-post">
779 - <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 == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
733 + <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>
780 780   </div>
781 781   #else
782 782   ## 投稿者のアカウント種別に基づいたCSSクラス
... ... @@ -817,7 +817,7 @@
817 817   #end
818 818   ## 所属バッジ（投稿者の学校コードとページの学校コードを比較）
819 819   #if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general')
820 - #if($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode))
774 + #if($postSchoolCode == $schoolCode)
821 821   #if($postAccountType == 'verified' || $postAccountType == 'admin')
822 822   <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>
823 823   #else
... ... @@ -838,6 +838,9 @@
838 838   #elseif($postUserRole == 'graduate')
839 839   <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>
840 840   #end
795 + #if($postGrade && $postGrade != '')
796 + <span class="badge badge-grade badge-sm">$postGrade</span>
797 + #end
841 841   </span>
842 842   <span class="thread-post-date">$!postDate</span>
843 843   #set($postEdited = $!post.getValue('edited'))
... ... @@ -908,7 +908,7 @@
908 908   #end
909 909   </div>
910 910   #if($postVis != 'public')
911 - <div class="visibility-badge visibility-${postVis} post-action-mt">#if($postVis == 'school_trusted')<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> 校内承認者限定#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>
868 + <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>
912 912   #end
913 913   ## 固定/解除ボタン（承認済み・管理者のみ）
914 914   #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
... ... @@ -987,10 +987,10 @@
987 987  
988 988   #if($xcontext.user != "XWiki.XWikiGuest")
989 989   <div class="thread-add-post">
990 - <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
947 + <a href="/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
991 991   ＋ 活動報告を追加
992 992   </a>
993 - <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
950 + <a href="/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
994 994   <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> コメントを書く
995 995   </a>
996 996   </div>
... ... @@ -1012,7 +1012,7 @@
1012 1012  #if($xcontext.user != "XWiki.XWikiGuest")
1013 1013  {{html clean="false"}}
1014 1014  <div class="activity-add-section">
1015 - <a href="/bin/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$!escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity">
972 + <a href="/bin/view/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$!escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity">
1016 1016   <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> 活動を追加
1017 1017   </a>
1018 1018  </div>
... ... @@ -1019,38 +1019,62 @@
1019 1019  {{/html}}
1020 1020  #end
1021 1021  
1022 -## --- 年度タブ切り替え JavaScript ---
979 +## --- 年度アーカイブ セクション ---
1023 1023  {{html clean="false"}}
1024 -<script>
1025 -// コンパクト表示（タイトルのみ）トグル
1026 -function toggleCompactView() {
1027 - var container = document.querySelector('.xwiki-content') || document.body;
1028 - var isCompact = container.classList.toggle('activity-compact-view');
1029 - var btn = document.getElementById('btnViewToggle');
1030 - if (btn) {
1031 - btn.querySelector('.toggle-label').textContent = isCompact ? '詳細表示' : '一覧表示';
1032 - btn.title = isCompact ? '詳細表示に戻す' : 'タイトルのみ表示';
1033 - }
1034 - // コンパクトモードでは各スレッドヘッダーをクリックで個別展開可能にする
1035 - document.querySelectorAll('.activity-thread').forEach(function(thread) {
1036 - if (isCompact) {
1037 - thread.classList.remove('compact-expanded');
1038 - }
1039 - });
1040 -}
981 +<div class="school-section-card school-archive-card">
982 + <h2 class="archive-section-title">
983 + <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>
984 + 年度アーカイブ
985 + </h2>
986 + <div class="archive-meta">
987 + 現在のページ: <strong>${pageFiscalYear}年度</strong>
988 + #set($lyud = $!doc.getValue('lastYearUpdateDate'))
989 + #if($lyud && $lyud != '')
990 + | 最終年度更新: $!escapetool.xml($lyud) ($!escapetool.xml($!doc.getValue('lastYearUpdateBy')))
991 + #end
992 + </div>
1041 1041  
1042 -// コンパクトモードで個別スレッドを展開/折りたたみ
1043 -function toggleThreadExpand(e) {
1044 - var container = document.querySelector('.xwiki-content') || document.body;
1045 - if (!container.classList.contains('activity-compact-view')) return;
1046 - // リンクやボタンのクリックはスルー
1047 - if (e.target.closest('a, button, .btn-featured-toggle')) return;
1048 - var thread = e.target.closest('.activity-thread');
1049 - if (thread) {
1050 - thread.classList.toggle('compact-expanded');
1051 - }
1052 -}
994 + ## 過去アーカイブの検索
995 + #set($archiveQuery = $services.query.hql("where doc.fullName like :pattern and doc.fullName like '%Archive_%' order by doc.fullName desc").bindValue("pattern", "${doc.fullName}.Archive_%").setLimit(20))
996 + #set($archivePages = $archiveQuery.execute())
1053 1053  
998 + #if($archivePages && $archivePages.size() > 0)
999 + <div class="archive-card-field-lg">
1000 + <div class="archive-list-label">過去の年度アーカイブ</div>
1001 + <div class="archive-list">
1002 + #foreach($archPage in $archivePages)
1003 + #set($archPageDoc = $xwiki.getDocument($archPage))
1004 + #set($archPageObj = $archPageDoc.getObject('SeitokaiCode.SchoolClass'))
1005 + #if($archPageObj)
1006 + #set($archPageFY = $!archPageObj.getValue('fiscalYear'))
1007 + <a href="$archPageDoc.getURL('view')" class="archive-link">
1008 + <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>
1009 + ${archPageFY}年度
1010 + </a>
1011 + #end
1012 + #end
1013 + </div>
1014 + </div>
1015 + #else
1016 + <div class="archive-empty">過去のアーカイブはまだありません</div>
1017 + #end
1018 +
1019 + ## 新年度に移行ボタン（承認済み・管理者のみ）
1020 + #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
1021 + <div class="archive-action">
1022 + <a href="/bin/view/SeitokaiCode/YearArchiveAction?schoolPage=${doc.fullName}" class="btn-accent">
1023 + <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>
1024 + ${pageFiscalYear}年度をアーカイブして新年度に移行
1025 + </a>
1026 + <div class="archive-action-hint">現在の学校情報を${pageFiscalYear}年度として保存し、新しい年度に移行します。</div>
1027 + </div>
1028 + #end
1029 +</div>
1030 +{{/html}}
1031 +
1032 +## --- 年度タブ切り替え JavaScript ---
1033 +{{html clean="false"}}
1034 +<script>
1054 1054  function switchActivityFY(fy, btn) {
1055 1055   // タブのアクティブ状態を切り替え
1056 1056   document.querySelectorAll('.activity-fy-tab').forEach(function(t) { t.classList.remove('active'); });
... ... @@ -1064,12 +1064,14 @@
1064 1064   }
1065 1065   });
1066 1066  }
1067 -// ページ読み込み時の初期化
1048 +// ページ読み込み時にデフォルトで現在の年度を表示
1068 1068  document.addEventListener('DOMContentLoaded', function() {
1069 - // デフォルトで現在の年度を表示
1070 1070   var defaultTab = document.querySelector('.activity-fy-tab.active');
1071 1071   if (defaultTab) { defaultTab.click(); }
1072 1072   // 保存成功時のトースト通知
1053 + if (window.location.search.indexOf('archived=1') !== -1) {
1054 + showToast('年度アーカイブを作成しました', 'success');
1055 + }
1073 1073   if (window.location.search.indexOf('saved=1') !== -1) {
1074 1074   showToast('学校情報を保存しました', 'success');
1075 1075   // URLパラメータをクリーンアップ（リロード時に再表示されないよう）
... ... @@ -1077,30 +1077,6 @@
1077 1077   window.history.replaceState({}, document.title, window.location.pathname);
1078 1078   }
1079 1079   }
1080 - // コンパクトモード: スレッドヘッダークリックで個別展開
1081 - document.querySelectorAll('.activity-thread-header').forEach(function(header) {
1082 - header.addEventListener('click', toggleThreadExpand);
1083 - });
1084 - // 長文投稿の折りたたみ初期化（max-height: 12em 超で省略）
1085 - document.querySelectorAll('.thread-post-body').forEach(function(body) {
1086 - // pre-wrapのまま高さを測定し、max-height(12em ≒ ~200px)を超える場合に折りたたむ
1087 - var fullH = body.scrollHeight;
1088 - // 12em を px に変換（font-size × line-height × 行数 の近似値ではなくCSSと同じ値を取得）
1089 - body.classList.add('truncated');
1090 - var maxH = body.clientHeight; // max-height: 12em 適用後の高さ
1091 - body.classList.remove('truncated');
1092 - if (fullH > maxH + 30) {
1093 - body.classList.add('truncated');
1094 - var btn = document.createElement('button');
1095 - btn.className = 'btn-read-more';
1096 - btn.textContent = '広げて読む ▼';
1097 - btn.addEventListener('click', function() {
1098 - var isExpanded = body.classList.toggle('expanded');
1099 - btn.textContent = isExpanded ? '折りたたむ ▲' : '広げて読む ▼';
1100 - });
1101 - body.parentNode.insertBefore(btn, body.nextSibling);
1102 - }
1103 - });
1104 1104  });
1105 1105  
1106 1106  // トースト通知表示
... ... @@ -1129,9 +1129,6 @@
1129 1129   var card = document.getElementById(cardId);
1130 1130   if (!card) return;
1131 1131   card.classList.toggle('collapsed');
1132 - var isCollapsed = card.classList.contains('collapsed');
1133 - var h2 = card.querySelector('h2[role="button"]');
1134 - if (h2) h2.setAttribute('aria-expanded', !isCollapsed);
1135 1135  }
1136 1136  
1137 1137  // 投稿の編集（インライン編集フォームを開く）
... ... @@ -1163,9 +1163,7 @@
1163 1163   var csrfEl = document.querySelector('input[name="form_token"]');
1164 1164   var csrfToken = csrfEl ? csrfEl.value : '';
1165 1165   var xhr = new XMLHttpRequest();
1166 - xhr.open('POST', '/bin/get/SeitokaiCode/EditPost?outputSyntax=plain', true);
1167 - xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1168 - var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken);
1122 + xhr.open('GET', '/bin/view/SeitokaiCode/EditPost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken), true);
1169 1169   xhr.onload = function() {
1170 1170   try {
1171 1171   var res = JSON.parse(xhr.responseText);
... ... @@ -1178,7 +1178,7 @@
1178 1178   } catch(e) { alert('編集に失敗しました'); }
1179 1179   };
1180 1180   xhr.onerror = function() { alert('通信エラーが発生しました'); };
1181 - xhr.send(editPostData);
1135 + xhr.send();
1182 1182  }
1183 1183  
1184 1184  // 投稿の削除（確認ダイアログ付き）
... ... @@ -1185,9 +1185,7 @@
1185 1185  function confirmDeletePost(schoolPage, postObjNum, token) {
1186 1186   if (!confirm('この投稿を削除しますか？\\n削除後は「この投稿は削除されました」と表示されます。')) return;
1187 1187   var xhr = new XMLHttpRequest();
1188 - xhr.open('POST', '/bin/get/SeitokaiCode/DeletePost?outputSyntax=plain', true);
1189 - xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1190 - var deletePostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token);
1142 + xhr.open('GET', '/bin/view/SeitokaiCode/DeletePost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token), true);
1191 1191   xhr.onload = function() {
1192 1192   try {
1193 1193   var res = JSON.parse(xhr.responseText);
... ... @@ -1200,7 +1200,7 @@
1200 1200   } catch(e) { alert('削除に失敗しました'); }
1201 1201   };
1202 1202   xhr.onerror = function() { alert('通信エラーが発生しました'); };
1203 - xhr.send(deletePostData);
1155 + xhr.send();
1204 1204  }
1205 1205  </script>
1206 1206  {{/html}}