Skip to Content
Last modified by Super Admin on 2026/04/05 18:59
From version Icon 94.1 Icon
edited by Super Admin
on 2026/03/20 17:50
Change comment: There is no comment for this version
To version Icon 41.1 Icon
edited by Super Admin
on 2026/03/10 22:25
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'))
... ... @@ -34,10 +34,8 @@
34 34  #set($schoolLevel = $doc.getValue('schoolLevel'))
35 35  #set($schoolSystem = $doc.getValue('schoolSystem'))
36 36  #set($website = $doc.getValue('website'))
37 -#set($schoolPhoto = $doc.getValue('schoolPhoto'))
38 -#set($schoolDescription = $doc.getValue('schoolDescription'))
39 39  
40 -## --- 生徒会組織 ---
32 +## --- 組織図 ---
41 41  #set($orgChart = $doc.getValue('orgChart'))
42 42  #set($orgChartImage = $doc.getValue('orgChartImage'))
43 43  
... ... @@ -57,7 +57,7 @@
57 57  #set($budgetAllocation = $doc.getValue('budgetAllocation'))
58 58  #set($budgetNote = $doc.getValue('budgetNote'))
59 59  
60 -## --- 校則・生徒会会則の見直し ---
52 +## --- 校則の見直し ---
61 61  #set($ruleReviewStatus = $doc.getValue('ruleReviewStatus'))
62 62  #set($ruleReviewContent = $doc.getValue('ruleReviewContent'))
63 63  #set($ruleReviewProposer = $doc.getValue('ruleReviewProposer'))
... ... @@ -64,43 +64,6 @@
64 64  #set($ruleReviewImplementer = $doc.getValue('ruleReviewImplementer'))
65 65  #set($ruleReviewSystem = $doc.getValue('ruleReviewSystem'))
66 66  
67 -## --- 活動環境 ---
68 -#set($activityPlace = $doc.getValue('activityPlace'))
69 -#set($activityRoomEquipment = $doc.getValue('activityRoomEquipment'))
70 -#set($activityRoomImage = $doc.getValue('activityRoomImage'))
71 -#set($ictUsage = $doc.getValue('ictUsage'))
72 -
73 -## --- 生徒総会 ---
74 -#set($assemblyFormat = $doc.getValue('assemblyFormat'))
75 -#set($assemblyCount = $doc.getValue('assemblyCount'))
76 -#set($assemblyAgenda = $doc.getValue('assemblyAgenda'))
77 -#set($assemblyTopics = $doc.getValue('assemblyTopics'))
78 -#set($assemblyNote = $doc.getValue('assemblyNote'))
79 -
80 -## --- 広報 ---
81 -#set($publicityMethod = $doc.getValue('publicityMethod'))
82 -#set($publicityFrequency = $doc.getValue('publicityFrequency'))
83 -#set($publicityNote = $doc.getValue('publicityNote'))
84 -
85 -## --- 外部連携 ---
86 -#set($externalCooperation = $doc.getValue('externalCooperation'))
87 -#set($externalOrgName = $doc.getValue('externalOrgName'))
88 -#set($socialParticipation = $doc.getValue('socialParticipation'))
89 -
90 -## --- 年間主要行事 ---
91 -#set($eventApril = $doc.getValue('eventApril'))
92 -#set($eventMay = $doc.getValue('eventMay'))
93 -#set($eventJune = $doc.getValue('eventJune'))
94 -#set($eventJuly = $doc.getValue('eventJuly'))
95 -#set($eventAugust = $doc.getValue('eventAugust'))
96 -#set($eventSeptember = $doc.getValue('eventSeptember'))
97 -#set($eventOctober = $doc.getValue('eventOctober'))
98 -#set($eventNovember = $doc.getValue('eventNovember'))
99 -#set($eventDecember = $doc.getValue('eventDecember'))
100 -#set($eventJanuary = $doc.getValue('eventJanuary'))
101 -#set($eventFebruary = $doc.getValue('eventFebruary'))
102 -#set($eventMarch = $doc.getValue('eventMarch'))
103 -
104 104  ## --- 課題・連絡先 ---
105 105  #set($challenges = $doc.getValue('challenges'))
106 106  #set($contactInfo = $doc.getValue('contactInfo'))
... ... @@ -110,7 +110,9 @@
110 110  #set($seitokaiYoutube = $doc.getValue('seitokaiYoutube'))
111 111  #set($seitokaiOtherSns = $doc.getValue('seitokaiOtherSns'))
112 112  
113 -## --- 現在の年度を計算（4月始まり） ---
68 +## --- 年度アーカイブ ---
69 +#set($pageFiscalYear = $!doc.getValue('fiscalYear'))
70 +## 現在の年度を計算（4月始まり）
114 114  #set($nowFY = $datetool.date)
115 115  #set($currentFYMonth = $mathtool.toInteger($datetool.format('MM', $nowFY)))
116 116  #set($currentFYYear = $mathtool.toInteger($datetool.format('yyyy', $nowFY)))
... ... @@ -119,6 +119,10 @@
119 119  #else
120 120   #set($currentFiscalYear = $mathtool.sub($currentFYYear, 1))
121 121  #end
79 +## fiscalYear 未設定時はデフォルトとして現在の年度を使う
80 +#if(!$pageFiscalYear || $pageFiscalYear == '')
81 + #set($pageFiscalYear = $currentFiscalYear.toString())
82 +#end
122 122  
123 123  ## --- 公開範囲フィールド ---
124 124  #set($visibilityOrgChart = $!doc.getValue('visibilityOrgChart'))
... ... @@ -140,81 +140,15 @@
140 140   #set($viewerDoc = $xwiki.getDocument($viewerUser))
141 141   #set($viewerAccountType = $!viewerDoc.getValue('accountType'))
142 142   #set($viewerSchoolCode = $!viewerDoc.getValue('schoolCode'))
143 - #set($viewerSecondarySchoolCode = $!viewerDoc.getValue('secondarySchoolCode'))
144 - #set($viewerUserRole = $!viewerDoc.getValue('userRole'))
145 145   #if($viewerAccountType == 'admin')
146 146   #set($isViewerAdmin = true)
147 147   #end
148 148  #end
149 149  
150 -## --- 関連校（中高一貫校）情報 ---
151 -#set($affiliatedSchoolCode = $!doc.getValue('affiliatedSchoolCode'))
152 -#set($affiliatedSchoolName = $!doc.getValue('affiliatedSchoolName'))
153 -#set($isAffiliated = false)
154 -#if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
155 - #if($viewerSchoolCode == $affiliatedSchoolCode)
156 - #set($isAffiliated = true)
157 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode)
158 - #set($isAffiliated = true)
159 - #end
160 -#end
161 -
162 -## --- 校内判定（卒業生を除外、secondarySchoolCodeも含む） ---
163 -#set($isSchoolMember = false)
164 -#if(!$isGuest && $viewerUserRole != 'graduate')
165 - #if($viewerSchoolCode == $schoolCode || $isAffiliated)
166 - #set($isSchoolMember = true)
167 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode)
168 - #set($isSchoolMember = true)
169 - #end
170 -#end
171 -## 卒業生の母校判定（投稿バッジ用）
172 -#set($isAlumniOfSchool = false)
173 -#if(!$isGuest && $viewerUserRole == 'graduate')
174 - #if($viewerSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $viewerSchoolCode == $affiliatedSchoolCode))
175 - #set($isAlumniOfSchool = true)
176 - #end
177 -#end
178 -
179 -## --- 学校ページ非表示チェック ---
180 -#set($schoolHidden = $doc.getValue('hidden'))
181 -#if($schoolHidden == 1)
182 - #if($isViewerAdmin)
183 - ## 管理者: 黄色バナー + ページ内容は通常表示（プレビュー）
184 -<div class="school-hidden-banner admin">
185 - <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>
186 - <div>
187 - <strong>このページは非表示になっています</strong>（管理者のみ閲覧可能）
188 - #set($hBy = $!doc.getValue('hiddenBy'))
189 - #set($hAt = $!doc.getValue('hiddenAt'))
190 - #set($hReason = $!doc.getValue('hiddenReason'))
191 - <div class="school-hidden-detail">
192 - 非表示: $!escapetool.xml($hAt) / $!escapetool.xml($hBy)
193 - #if($hReason && $hReason != '') ・ 理由: $!escapetool.xml($hReason)#end
194 - </div>
195 - <a href="$xwiki.getURL('SeitokaiAdmin.SchoolManagement', 'view')" style="color:#92400e;text-decoration:underline">学校ページ管理へ</a>
196 - </div>
197 -</div>
198 - #else
199 - ## 一般ユーザー・ゲスト: 非公開メッセージを表示して停止
200 -<div class="school-hidden-public">
201 - <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>
202 - <h2>このページは現在公開されていません</h2>
203 - <p>このページは管理者により非公開に設定されています。</p>
204 - <a href="$xwiki.getURL('Schools.WebHome', 'view')" class="btn-back-list">学校一覧に戻る</a>
205 -</div>
206 -#stop
207 - #end
208 -#end
209 -
210 210  ## --- 投稿固定/解除処理 ---
211 211  #set($pinAction = $!request.action)
212 -#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $isSchoolMember)) && $services.csrf.isTokenValid($request.form_token))
213 - #set($pinPostObjStr = $!request.postObj)
214 - #if(!$pinPostObjStr.matches('^\d+$'))
215 - ## 不正な値 → 無視
216 - #else
217 - #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))
218 218   #set($postObj = $doc.getObject('SeitokaiCode.ActivityPostClass', $postObjNum))
219 219   #if($postObj)
220 220   #if($pinAction == 'pin')
... ... @@ -234,15 +234,12 @@
234 234   $response.sendRedirect($doc.getURL('view'))
235 235   #stop
236 236   #end
237 - #end## /matches
238 238  #end
239 239  
240 240  ## --- 特色ある活動 選定/解除処理 ---
241 241  #set($featAction = $!request.action)
242 -#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $isSchoolMember)) && $services.csrf.isTokenValid($request.form_token))
243 - #set($featActObjStr = $!request.actObj)
244 - #if($featActObjStr.matches('^\d+$'))
245 - #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))
246 246   #set($actObj = $doc.getObject('SeitokaiCode.ActivityClass', $actObjNum))
247 247   #if($actObj)
248 248   #if($featAction == 'feature')
... ... @@ -274,7 +274,6 @@
274 274   $response.sendRedirect($doc.getURL('view'))
275 275   #stop
276 276   #end
277 - #end## /matches
278 278  #end
279 279  
280 280  ## --- ユーザー情報取得 ---
... ... @@ -341,7 +341,7 @@
341 341  
342 342  ## --- 編集ボタン（権限があるユーザーのみ表示） ---
343 343  #set($canEditSchool = false)
344 -#if(!$isGuest && ($isViewerAdmin || $isSchoolMember || $isAlumniOfSchool))
235 +#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode))
345 345   #set($canEditSchool = true)
346 346  #end
347 347  #if($canEditSchool)
... ... @@ -350,492 +350,305 @@
350 350  </div>
351 351  #end
352 352  
353 -## --- 関連校（中高一貫校）バナー ---
354 -#if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
355 - #set($affiliatedPageRef = "Schools.${affiliatedSchoolCode}.WebHome")
356 - #set($affiliatedPageExists = $xwiki.exists($affiliatedPageRef))
357 -<div class="affiliated-school-banner">
358 - <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>
359 - <div>
360 - <strong>中高一貫校</strong>：
361 - #if($affiliatedPageExists)
362 - <a href="$xwiki.getURL($affiliatedPageRef, 'view')">$!escapetool.xml($affiliatedSchoolName)</a>
363 - #else
364 - $!escapetool.xml($affiliatedSchoolName)
244 +## --- ① 学校基本情報 + 連絡先（左右グリッド・折りたたみ対応） ---
245 +<div class="school-info-grid">
246 + <div class="school-info-card collapsed" id="card-basic-info">
247 + <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>
248 + <table class="wiki-table school-info-table">
249 + <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
250 + <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
251 + <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
252 + <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
253 + <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
254 + <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
255 + <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
256 + <tr><th>課程</th><td>#if($schoolSystem && $schoolSystem != '' && $schoolSystem != '[]')$!escapetool.xml($!schoolSystem)#end</td></tr>
257 + <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>
258 + </table>
259 + #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
260 + #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
261 + #if($infoEditDate && $infoEditDate != '')
262 + <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>
365 365   #end
366 - と連携しています
367 367   </div>
368 -</div>
369 -#end
370 370  
371 -## --- ① 学校基本情報 ---
372 -<div class="school-info-card collapsed" id="card-basic-info">
373 - <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>
374 - <div class="school-basic-info-layout">
375 - <div class="school-basic-info-table">
376 - <table class="wiki-table school-info-table">
377 - <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
378 - <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
379 - <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
380 - <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
381 - <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
382 - <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
383 - <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
384 - <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
385 - <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>
386 - </table>
387 - </div>
388 - #if($schoolPhoto && $schoolPhoto != '')
389 - <div class="school-photo-area">
390 - <img src="$doc.getAttachmentURL($schoolPhoto)" alt="$!escapetool.xml($schoolName)" class="school-photo" />
391 - </div>
392 - #end
266 + <div class="school-info-card collapsed" id="card-contact">
267 + <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>
268 + <table class="wiki-table school-info-table">
269 + <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr>
270 + <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>
271 + <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>
272 + <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>
273 + <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>
274 + <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
275 + </table>
393 393   </div>
394 - #if($schoolDescription && $schoolDescription.trim() != '')
395 - <div class="free-note" style="margin-top:var(--sp-4);">$!escapetool.xml($schoolDescription)</div>
396 - #end
277 +</div>
397 397  
279 +## --- 生徒会情報アコーディオン ---
280 +<div class="school-section-divider">
281 + <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')?'▲':'▼';">
282 + <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>
283 + 生徒会情報を見る <span class="shortcut-arrow">▼</span>
284 + </button>
398 398  </div>
399 399  
400 -## --- ② 生徒会情報（折りたたみカード） ---
401 -<div class="school-info-card" id="card-seitokai-info">
402 - <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>
403 - <div class="seitokai-info-body">
287 +<div id="seitokai-info-section" class="seitokai-info-accordion">
404 404  
405 - ## --- 生徒会組織 ---
406 - #set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
407 - #if($hasOrgContent)
408 - #set($canViewOrgChart = true)
409 - #if($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewOrgChart = false)
410 - #elseif($visibilityOrgChart == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewOrgChart = false)
411 - #end
412 - #if($canViewOrgChart)
413 - <div class="seitokai-subsection">
414 - <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>
415 - <div class="seitokai-subsection-content">
416 - #if($orgChartImage && $orgChartImage != '')
417 - <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
418 - #end
419 - #if($orgChart && $orgChart != '')<div class="free-note">$!escapetool.xml($orgChart)</div>#end
420 - </div>
421 - </div>
422 - #else
423 - <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>
424 - #end
289 +## --- ② 組織図 ---
290 +#set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
291 +#if($hasOrgContent)
292 + ## 公開範囲チェック
293 + #set($canViewOrgChart = true)
294 + #if($visibilityOrgChart == 'members' && $isGuest) #set($canViewOrgChart = false)
295 + #elseif($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewOrgChart = false)
296 + #end
297 + #if($canViewOrgChart)
298 +<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>
299 +<div class="school-section-card">
300 + <div class="card-inner">
301 + #if($orgChartImage && $orgChartImage != '')
302 + <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
425 425   #end
304 + #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end
305 + </div>
306 +</div>
307 + #else
308 +<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>
309 + #end
310 +#end
426 426  
427 - ## --- 日常の活動 ---
428 - #if($dailyActivities && !$dailyActivities.isEmpty())
429 - <div class="seitokai-subsection">
430 - <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>
431 - <div class="seitokai-subsection-content">
432 - <p class="activity-hint">活動時間が多い3つ</p>
433 - <div class="tag-container">
434 - #foreach($da in $dailyActivities)
435 - <span class="tag tag-accent">$!escapetool.xml($da.trim())</span>
436 - #end
437 - </div>
438 - #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
439 - <div class="free-note">$!escapetool.xml($dailyActivitiesNote)</div>
312 +## --- ③④⑤ 日常の活動・選挙・定例活動 ---
313 +<div class="school-section-grid">
314 + #if($dailyActivities && $dailyActivities != '')
315 + <div class="school-section-card">
316 + <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>
317 + <div class="card-inner">
318 + <p class="activity-hint">活動時間の多い順に上位3つ</p>
319 + <div class="tag-container">
320 + #set($daIdx = 1)
321 + #foreach($da in $dailyActivities.split(","))
322 + <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
323 + #set($daIdx = $daIdx + 1)
440 440   #end
441 441   </div>
326 + #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
327 + <div class="free-note">$!escapetool.xml($dailyActivitiesNote)</div>
328 + #end
442 442   </div>
443 - #end
330 + </div>
331 + #end
444 444  
445 - ## --- 選挙 ---
446 - #if($electionExists && $electionExists != '')
447 - <div class="seitokai-subsection">
448 - <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>
449 - <div class="seitokai-subsection-content">
450 - <div class="info-row">
451 - <span class="info-label">役員選挙</span>
452 - <span class="info-value">$!escapetool.xml($!electionExists)</span>
453 - </div>
454 - #if($electionType && $electionType != '')
455 - <div class="info-row">
456 - <span class="info-label">直近の選挙方式</span>
457 - <span class="info-value">$!escapetool.xml($!electionType)</span>
458 - </div>
459 - #end
460 - #if($electionNote && $electionNote.trim() != '')
461 - <div class="free-note">$!escapetool.xml($electionNote)</div>
462 - #end
333 + #if($electionExists && $electionExists != '')
334 + <div class="school-section-card">
335 + <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>
336 + <div class="card-inner">
337 + <div class="info-row">
338 + <span class="info-label">役員選挙</span>
339 + <span class="info-value">$!escapetool.xml($!electionExists)</span>
463 463   </div>
341 + #if($electionType && $electionType != '')
342 + <div class="info-row">
343 + <span class="info-label">直近の選挙方式</span>
344 + <span class="info-value">$!escapetool.xml($!electionType)</span>
345 + </div>
346 + #end
347 + #if($electionNote && $electionNote.trim() != '')
348 + <div class="free-note">$!escapetool.xml($electionNote)</div>
349 + #end
464 464   </div>
465 - #end
351 + </div>
352 + #end
353 +</div>
466 466  
467 - ## --- 定例活動 ---
468 - #if($meetingFrequency && $meetingFrequency != '')
469 - <div class="seitokai-subsection">
470 - <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>
471 - <div class="seitokai-subsection-content">
472 - <div class="info-row">
473 - <span class="info-label">役員定例会の頻度</span>
474 - <span class="info-value">$!escapetool.xml($!meetingFrequency)</span>
475 - </div>
476 - #if($regularActivitiesNote && $regularActivitiesNote.trim() != '')
477 - <div class="free-note">$!escapetool.xml($regularActivitiesNote)</div>
478 - #end
355 +<div class="school-section-grid">
356 + #if($meetingFrequency && $meetingFrequency != '')
357 + <div class="school-section-card">
358 + <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>
359 + <div class="card-inner">
360 + <div class="info-row">
361 + <span class="info-label">役員定例会の頻度</span>
362 + <span class="info-value">$!escapetool.xml($!meetingFrequency)</span>
479 479   </div>
364 + #if($regularActivitiesNote && $regularActivitiesNote.trim() != '')
365 + <div class="free-note">$!escapetool.xml($regularActivitiesNote)</div>
366 + #end
480 480   </div>
481 - #end
368 + </div>
369 + #end
482 482  
483 - ## --- 予算 ---
484 - #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
485 - #if($hasBudget)
486 - #set($canViewBudget = true)
487 - #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewBudget = false)
488 - #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false)
371 + ## --- ⑦ 予算 ---
372 + #set($hasBudget = ($budgetProcess && $budgetProcess != '') || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
373 + #if($hasBudget)
374 + ## 公開範囲チェック
375 + #set($canViewBudget = true)
376 + #if($visibilityBudget == 'members' && $isGuest) #set($canViewBudget = false)
377 + #elseif($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewBudget = false)
378 + #end
379 + #if($canViewBudget)
380 + <div class="school-section-card">
381 + <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>
382 + <div class="card-inner">
383 + #if($budgetProcess && $budgetProcess != '')
384 + <div class="info-row">
385 + <span class="info-label">作成過程の生徒関与</span>
386 + <span class="info-value">
387 + <div class="selection-display">
388 + #foreach($bp in $budgetProcess.split(","))
389 + <span class="selection-item">$!escapetool.xml($bp.trim())</span>
390 + #end
391 + </div>
392 + </span>
393 + </div>
489 489   #end
490 - #if($canViewBudget)
491 - <div class="seitokai-subsection">
492 - <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>
493 - <div class="seitokai-subsection-content">
494 - #if($budgetProcess && !$budgetProcess.isEmpty())
495 - <div class="info-row">
496 - <span class="info-label">作成過程の生徒関与</span>
497 - <span class="info-value">
498 - <div class="selection-display">
499 - #set($allBpOpts = ["各部・委員会等への予算希望額調査","予算額調整（折衝等）","生徒会予算案の作成","生徒総会での議決","生徒関与なし","その他"])
500 - #foreach($bpOpt in $allBpOpts)
501 - #if($budgetProcess.contains($bpOpt))
502 - <span class="selection-item">$!escapetool.xml($bpOpt)</span>
503 - #else
504 - <span class="selection-item selection-item-off">$!escapetool.xml($bpOpt)</span>
505 - #end
506 - #end
507 - </div>
508 - </span>
509 - </div>
510 - #end
511 - #if($studentFee && $studentFee != '')
512 - <div class="info-row">
513 - <span class="info-label">生徒会費（年額）</span>
514 - <span class="info-value">$!escapetool.xml($!studentFee)</span>
515 - </div>
516 - #end
517 - #if($budgetScale && $budgetScale != '')
518 - <div class="info-row">
519 - <span class="info-label">予算規模</span>
520 - <span class="info-value">$!escapetool.xml($!budgetScale)</span>
521 - </div>
522 - #end
523 - #if($budgetAllocation && !$budgetAllocation.isEmpty())
524 - <div class="info-row">
525 - <span class="info-label">主な予算配分</span>
526 - <span class="info-value">
527 - <div class="selection-display">
528 - #foreach($ba in $budgetAllocation)
529 - <span class="selection-item">$!escapetool.xml($ba.trim())</span>
530 - #end
531 - </div>
532 - </span>
533 - </div>
534 - #end
535 - #if($budgetNote && $budgetNote.trim() != '')
536 - <div class="free-note">$!escapetool.xml($budgetNote)</div>
537 - #end
395 + #if($studentFee && $studentFee != '')
396 + <div class="info-row">
397 + <span class="info-label">生徒会費（年額）</span>
398 + <span class="info-value">$!escapetool.xml($!studentFee)</span>
538 538   </div>
539 - </div>
540 - #else
541 - <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>
542 542   #end
543 - #end
544 -
545 - ## --- 校則・生徒会会則の見直し ---
546 - #if($ruleReviewStatus && $ruleReviewStatus != '')
547 - #set($canViewRuleReview = true)
548 - #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewRuleReview = false)
549 - #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false)
550 - #end
551 - #if($canViewRuleReview)
552 - <div class="seitokai-subsection">
553 - <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>
554 - <div class="seitokai-subsection-content">
555 - <div class="info-row">
556 - <span class="info-label">見直しの有無（3年以内）</span>
557 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
558 - </div>
559 - #if($ruleReviewStatus != '実施なし')
560 - #if($ruleReviewContent && !$ruleReviewContent.isEmpty())
561 - <div class="info-row">
562 - <span class="info-label">見直しの内容</span>
563 - <span class="info-value">
564 - <div class="selection-display">
565 - #foreach($rc in $ruleReviewContent)
566 - <span class="selection-item">$!escapetool.xml($rc.trim())</span>
567 - #end
568 - </div>
569 - </span>
570 - </div>
571 - #end
572 - #if($ruleReviewProposer && !$ruleReviewProposer.isEmpty())
573 - <div class="info-row">
574 - <span class="info-label">見直しの提案者</span>
575 - <span class="info-value">
576 - <div class="selection-display">
577 - #foreach($rp in $ruleReviewProposer)
578 - <span class="selection-item">$!escapetool.xml($rp.trim())</span>
579 - #end
580 - </div>
581 - </span>
582 - </div>
583 - #end
584 - #if($ruleReviewImplementer && !$ruleReviewImplementer.isEmpty())
585 - <div class="info-row">
586 - <span class="info-label">見直しの実施者</span>
587 - <span class="info-value">
588 - <div class="selection-display">
589 - #foreach($ri in $ruleReviewImplementer)
590 - <span class="selection-item">$!escapetool.xml($ri.trim())</span>
591 - #end
592 - </div>
593 - </span>
594 - </div>
595 - #end
596 - #end
597 - #if($ruleReviewSystem && $ruleReviewSystem != '')
598 - <div class="info-row">
599 - <span class="info-label">見直しの仕組み</span>
600 - <span class="info-value">$!escapetool.xml($!ruleReviewSystem)</span>
601 - </div>
602 - #end
401 + #if($budgetScale && $budgetScale != '')
402 + <div class="info-row">
403 + <span class="info-label">予算規模</span>
404 + <span class="info-value">$!escapetool.xml($!budgetScale)</span>
603 603   </div>
604 - </div>
605 - #else
606 - <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>
607 607   #end
608 - #end
609 -
610 - ## --- 活動環境 ---
611 - #set($hasActivityEnv = ($activityPlace && $activityPlace != '') || ($activityRoomEquipment && $activityRoomEquipment != '') || ($activityRoomImage && $activityRoomImage != '') || ($ictUsage && !$ictUsage.isEmpty()))
612 - #if($hasActivityEnv)
613 - <div class="seitokai-subsection">
614 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M3 9l9-7 9 7v11a2 2 0 01-2 2H5a2 2 0 01-2-2z"/><polyline points="9 22 9 12 15 12 15 22"/></svg> 生徒会の活動環境</h3>
615 - <div class="seitokai-subsection-content">
616 - #if($activityPlace && $activityPlace != '')
617 - <div class="info-row">
618 - <span class="info-label">普段の活動場所</span>
619 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($activityPlace)</span></span>
620 - </div>
621 - #end
622 - #if($activityRoomEquipment && $activityRoomEquipment != '')
623 - <div class="info-row">
624 - <span class="info-label">生徒会室の設備</span>
625 - <span class="info-value free-text-value">$!escapetool.xml($activityRoomEquipment)</span>
626 - </div>
627 - #end
628 - #if($activityRoomImage && $activityRoomImage != '')
629 - <div class="info-row">
630 - <span class="info-label">活動場所の写真</span>
631 - <span class="info-value"><div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($activityRoomImage)" alt="活動場所の写真" class="org-chart-img" /></div></span>
632 - </div>
633 - #end
634 - #if($ictUsage && !$ictUsage.isEmpty())
635 - <div class="info-row">
636 - <span class="info-label">ICT活用している場面</span>
637 - <span class="info-value">
638 - <div class="selection-display">
639 - #foreach($iu in $ictUsage)
640 - <span class="selection-item">$!escapetool.xml($iu.trim())</span>
641 - #end
642 - </div>
643 - </span>
644 - </div>
645 - #end
407 + #if($budgetAllocation && $budgetAllocation != '')
408 + <div class="info-row">
409 + <span class="info-label">主な予算配分</span>
410 + <span class="info-value">
411 + <div class="selection-display">
412 + #foreach($ba in $budgetAllocation.split(","))
413 + <span class="selection-item">$!escapetool.xml($ba.trim())</span>
414 + #end
415 + </div>
416 + </span>
646 646   </div>
418 + #end
419 + #if($budgetNote && $budgetNote.trim() != '')
420 + <div class="free-note">$!escapetool.xml($budgetNote)</div>
421 + #end
647 647   </div>
423 + </div>
424 + #else
425 + <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>
648 648   #end
427 + #end
428 +</div>
649 649  
650 - ## --- 生徒総会 ---
651 - #set($hasAssembly = ($assemblyFormat && $assemblyFormat != '') || ($assemblyCount && $assemblyCount > 0) || ($assemblyAgenda && !$assemblyAgenda.isEmpty()) || ($assemblyTopics && !$assemblyTopics.isEmpty()) || ($assemblyNote && $assemblyNote != ''))
652 - #if($hasAssembly)
653 - <div class="seitokai-subsection">
654 - <h3 class="seitokai-subsection-title"><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> 生徒総会</h3>
655 - <div class="seitokai-subsection-content">
656 - #if($assemblyFormat && $assemblyFormat != '')
657 - <div class="info-row">
658 - <span class="info-label">開催方式</span>
659 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($assemblyFormat)</span></span>
660 - </div>
661 - #end
662 - #if($assemblyCount && $assemblyCount > 0)
663 - <div class="info-row">
664 - <span class="info-label">開催回数（年）</span>
665 - <span class="info-value">$!escapetool.xml($assemblyCount)回</span>
666 - </div>
667 - #end
668 - #if($assemblyAgenda && !$assemblyAgenda.isEmpty())
669 - <div class="info-row">
670 - <span class="info-label">議案の集め方</span>
671 - <span class="info-value">
672 - <div class="selection-display">
673 - #foreach($aa in $assemblyAgenda)
674 - <span class="selection-item">$!escapetool.xml($aa.trim())</span>
675 - #end
676 - </div>
677 - </span>
678 - </div>
679 - #end
680 - #if($assemblyTopics && !$assemblyTopics.isEmpty())
681 - <div class="info-row">
682 - <span class="info-label">扱う内容</span>
683 - <span class="info-value">
684 - <div class="selection-display">
685 - #foreach($at in $assemblyTopics)
686 - <span class="selection-item">$!escapetool.xml($at.trim())</span>
687 - #end
688 - </div>
689 - </span>
690 - </div>
691 - #end
692 - #if($assemblyNote && $assemblyNote != '')
693 - <div class="info-row">
694 - <span class="info-label">自由記述</span>
695 - <span class="info-value free-text-value">$!escapetool.xml($assemblyNote)</span>
696 - </div>
697 - #end
698 - </div>
430 +## --- ⑧ 校則の見直し ---
431 +#if($ruleReviewStatus && $ruleReviewStatus != '')
432 + ## 公開範囲チェック
433 + #set($canViewRuleReview = true)
434 + #if($visibilityRuleReview == 'members' && $isGuest) #set($canViewRuleReview = false)
435 + #elseif($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewRuleReview = false)
436 + #end
437 + #if($canViewRuleReview)
438 +<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>
439 +<div class="school-section-card">
440 + <div class="card-inner">
441 + <div class="info-row">
442 + <span class="info-label">見直しの有無（3年以内）</span>
443 + <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
699 699   </div>
700 - #end
701 -
702 - ## --- 広報 ---
703 - #set($hasPublicity = ($publicityMethod && !$publicityMethod.isEmpty()) || ($publicityFrequency && $publicityFrequency != '') || ($publicityNote && $publicityNote != ''))
704 - #if($hasPublicity)
705 - <div class="seitokai-subsection">
706 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M1 12s4-8 11-8 11 8 11 8-4 8-11 8-11-8-11-8z"/><circle cx="12" cy="12" r="3"/></svg> 広報</h3>
707 - <div class="seitokai-subsection-content">
708 - #if($publicityMethod && !$publicityMethod.isEmpty())
709 - <div class="info-row">
710 - <span class="info-label">方法</span>
711 - <span class="info-value">
712 - <div class="selection-display">
713 - #foreach($pm in $publicityMethod)
714 - <span class="selection-item">$!escapetool.xml($pm.trim())</span>
715 - #end
716 - </div>
717 - </span>
445 + #if($ruleReviewContent && $ruleReviewContent != '')
446 + <div class="info-row">
447 + <span class="info-label">見直しの内容</span>
448 + <span class="info-value">
449 + <div class="selection-display">
450 + #foreach($rc in $ruleReviewContent.split(","))
451 + <span class="selection-item">$!escapetool.xml($rc.trim())</span>
452 + #end
718 718   </div>
719 - #end
720 - #if($publicityFrequency && $publicityFrequency != '')
721 - <div class="info-row">
722 - <span class="info-label">頻度</span>
723 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($publicityFrequency)</span></span>
724 - </div>
725 - #end
726 - #if($publicityNote && $publicityNote != '')
727 - <div class="info-row">
728 - <span class="info-label">自由記述</span>
729 - <span class="info-value free-text-value">$!escapetool.xml($publicityNote)</span>
730 - </div>
731 - #end
732 - </div>
454 + </span>
733 733   </div>
734 734   #end
735 -
736 - ## --- 外部連携 ---
737 - #set($hasExternal = ($externalCooperation && $externalCooperation != '') || ($externalOrgName && $externalOrgName != '') || ($socialParticipation && !$socialParticipation.isEmpty()))
738 - #if($hasExternal)
739 - <div class="seitokai-subsection">
740 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><circle cx="18" cy="5" r="3"/><circle cx="6" cy="12" r="3"/><circle cx="18" cy="19" r="3"/><line x1="8.59" y1="13.51" x2="15.42" y2="17.49"/><line x1="15.41" y1="6.51" x2="8.59" y2="10.49"/></svg> 外部連携</h3>
741 - <div class="seitokai-subsection-content">
742 - #if($externalCooperation && $externalCooperation != '')
743 - <div class="info-row">
744 - <span class="info-label">他校の生徒会との連携</span>
745 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($externalCooperation)</span></span>
457 + #if($ruleReviewProposer && $ruleReviewProposer != '')
458 + <div class="info-row">
459 + <span class="info-label">見直しの提案者</span>
460 + <span class="info-value">
461 + <div class="selection-display">
462 + #foreach($rp in $ruleReviewProposer.split(","))
463 + <span class="selection-item">$!escapetool.xml($rp.trim())</span>
464 + #end
746 746   </div>
747 - #end
748 - #if($externalOrgName && $externalOrgName != '')
749 - <div class="info-row">
750 - <span class="info-label">参加している生徒会団体の名前</span>
751 - <span class="info-value">$!escapetool.xml($externalOrgName)</span>
752 - </div>
753 - #end
754 - #if($socialParticipation && !$socialParticipation.isEmpty())
755 - <div class="info-row">
756 - <span class="info-label">社会参加・地域連携・ボランティア</span>
757 - <span class="info-value">
758 - <div class="selection-display">
759 - #foreach($sp2 in $socialParticipation)
760 - <span class="selection-item">$!escapetool.xml($sp2.trim())</span>
761 - #end
762 - </div>
763 - </span>
764 - </div>
765 - #end
766 - </div>
466 + </span>
767 767   </div>
768 768   #end
769 -
770 - ## --- 年間主要行事 ---
771 - #set($months = [["4月", $eventApril], ["5月", $eventMay], ["6月", $eventJune], ["7月", $eventJuly], ["8月", $eventAugust], ["9月", $eventSeptember], ["10月", $eventOctober], ["11月", $eventNovember], ["12月", $eventDecember], ["1月", $eventJanuary], ["2月", $eventFebruary], ["3月", $eventMarch]])
772 - #set($hasAnyEvent = false)
773 - #foreach($m in $months)
774 - #if($m.get(1) && $m.get(1) != '') #set($hasAnyEvent = true) #end
775 - #end
776 - #if($hasAnyEvent)
777 - <div class="seitokai-subsection">
778 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="4" width="18" height="18" rx="2" ry="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>
779 - <div class="seitokai-subsection-content">
780 - <table class="wiki-table school-info-table" style="margin:0">
781 - #foreach($m in $months)
782 - #if($m.get(1) && $m.get(1) != '')
783 - <tr><td style="width:60px;font-weight:600;white-space:nowrap">$m.get(0)</td><td>$!escapetool.xml($m.get(1))</td></tr>
469 + #if($ruleReviewImplementer && $ruleReviewImplementer != '')
470 + <div class="info-row">
471 + <span class="info-label">見直しの実施者</span>
472 + <span class="info-value">
473 + <div class="selection-display">
474 + #foreach($ri in $ruleReviewImplementer.split(","))
475 + <span class="selection-item">$!escapetool.xml($ri.trim())</span>
784 784   #end
785 - #end
786 - </table>
787 - </div>
477 + </div>
478 + </span>
788 788   </div>
789 789   #end
790 -
791 - ## --- 生徒会の課題意識 ---
792 - #if($challenges && $challenges != '')
793 - #set($canViewChallenges = true)
794 - #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewChallenges = false)
795 - #elseif($visibilityChallenges == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewChallenges = false)
796 - #end
797 - #if($canViewChallenges)
798 - <div class="seitokai-subsection">
799 - <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>
800 - <div class="seitokai-subsection-content">
801 - <div class="challenge-text">$!escapetool.xml($challenges)</div>
802 - </div>
481 + #if($ruleReviewSystem && $ruleReviewSystem != '')
482 + <div class="info-row">
483 + <span class="info-label">見直しの仕組み</span>
484 + <span class="info-value">$!escapetool.xml($!ruleReviewSystem)</span>
803 803   </div>
804 - #else
805 - <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>
806 - #end
807 807   #end
487 + </div>
488 +</div>
489 + #else
490 +<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>
491 + #end
492 +#end
808 808  
809 - </div>## seitokai-info-body 終了
810 -</div>## card-seitokai-info 終了
811 -
812 -## --- ③ SNS・連絡先 ---
813 -<div class="school-info-card collapsed" id="card-contact">
814 - <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>
815 - <table class="wiki-table school-info-table">
816 - <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr>
817 - <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>
818 - <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>
819 - <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>
820 - <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>
821 - <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
822 - </table>
823 - #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
824 - #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
825 - #if($infoEditDate && $infoEditDate != '')
826 - <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>
494 +## --- ⑨ 課題 ---
495 +#if($challenges && $challenges != '')
496 + ## 公開範囲チェック
497 + #set($canViewChallenges = true)
498 + #if($visibilityChallenges == 'members' && $isGuest) #set($canViewChallenges = false)
499 + #elseif($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewChallenges = false)
827 827   #end
828 -</div>
501 + #if($canViewChallenges)
502 +<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>
503 +<div class="challenge-text">$!escapetool.xml($challenges)</div>
504 + #else
505 +<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>
506 + #end
507 +#end
829 829  
509 +</div>## seitokai-info-accordion 終了
510 +
830 830  {{/html}}
831 831  
832 -----
833 -
834 834  ## --- ⑩ 活動報告一覧（スレッド型・年度タブ付き） ---
835 835  = 活動報告 =
836 836  
837 -## --- 年度タブ + 投稿者ステータス凡例 ---
516 +## --- 投稿者ステータス凡例（折りたたみ） ---
838 838  {{html clean="false"}}
518 +<div class="author-legend-wrapper">
519 + <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>
520 + <div class="author-legend-body">
521 + <div class="author-legend">
522 + <span class="author-legend-title">投稿者の信頼度:</span>
523 + <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者</span>
524 + <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み</span>
525 + <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介</span>
526 + <span class="author-legend-item"><span class="bar bar-general"></span> 一般（未承認）</span>
527 + </div>
528 + <div class="author-legend">
529 + <span class="author-legend-title">所属:</span>
530 + <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>
531 + <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>
532 + <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>
533 + <span class="author-legend-item text-hint">※一般アカウントは所属未確認のため非表示</span>
534 + </div>
535 + <div class="author-legend">
536 + <span class="author-legend-title">役割:</span>
537 + <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>
538 + <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>
539 + <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>
540 + </div>
541 + </div>
542 +</div>
839 839  
840 840  ## --- 年度タブ ---
841 841  ## 全活動から年度一覧を収集
... ... @@ -857,49 +857,14 @@
857 857  #end
858 858  ## ソート（降順にしたいが Velocity にはないので JS で制御）
859 859  
860 -<div class="activity-toolbar">
861 - <div class="activity-fy-tabs">
862 - <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
863 - #foreach($fy in $fySet)
864 - #if($fy != $currentFYStr)
865 - <button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button>
866 - #end
564 +<div class="activity-fy-tabs">
565 + <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
566 + #foreach($fy in $fySet)
567 + #if($fy != $currentFYStr)
568 + <button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button>
867 867   #end
868 - <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
869 - </div>
870 - <div class="activity-toolbar-right">
871 - <button class="btn-view-toggle" id="btnViewToggle" onclick="toggleCompactView()" title="タイトルのみ表示">
872 - <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>
873 - <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>
874 - <span class="toggle-label">一覧表示</span>
875 - </button>
876 - </div>
877 - <div class="author-legend-wrapper">
878 - <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>
879 - <div class="author-legend-body">
880 - <div class="author-legend">
881 - <span class="author-legend-title">投稿者の信頼度:</span>
882 - <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者 <span class="text-hint">— 運営スタッフ</span></span>
883 - <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み <span class="text-hint">— 本人確認済みのユーザー</span></span>
884 - <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介 <span class="text-hint">— 承認済みユーザーからの紹介</span></span>
885 - <span class="author-legend-item"><span class="bar bar-general"></span> 一般 <span class="text-hint">— 一般登録ユーザー</span></span>
886 - </div>
887 - <div class="author-legend">
888 - <span class="author-legend-title">所属:</span>
889 - <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>
890 - <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>
891 - <span class="author-legend-item"><span class="badge badge-alumni 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> <span class="text-hint">この学校の卒業生</span></span>
892 - <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>
893 - <span class="author-legend-item text-hint">※一般アカウントは所属バッジが表示されません</span>
894 - </div>
895 - <div class="author-legend">
896 - <span class="author-legend-title">役割:</span>
897 - <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>
898 - <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>
899 - <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>
900 - </div>
901 - </div>
902 - </div>
570 + #end
571 + <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
903 903  </div>
904 904  
905 905  {{/html}}
... ... @@ -964,18 +964,10 @@
964 964  <div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)">
965 965   <div class="activity-thread-header">
966 966   <div class="activity-thread-title">
967 - <h3 #if($actFeatured == '1')class="featured-title"#end>#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$!escapetool.xml($!actTitle)</h3>
968 - <div class="activity-meta-line">
969 - <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
970 - #set($actTagsList = $activity.getValue('tags'))
971 - #if($actTagsList && !$actTagsList.isEmpty())
972 - #foreach($tagItem in $actTagsList)
973 - #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end
974 - #end
975 - #end
976 - </div>
636 + <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>
637 + <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
977 977   </div>
978 - <div class="thread-meta-right">
639 + <div class="thread-meta-row">
979 979   <span class="thread-post-count">${reportCount}件の報告 ・ ${commentCount}件のコメント</span>
980 980   #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred')
981 981   #if($actFeatured == '1')
... ... @@ -1035,12 +1035,12 @@
1035 1035   #set($postVis = $!post.getValue('visibility'))
1036 1036   #if(!$postVis || $postVis == '') #set($postVis = 'public') #end
1037 1037   #set($canViewPost = true)
1038 - #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewPost = false)
1039 - #elseif($postVis == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPost = false)
699 + #if($postVis == 'members' && $isGuest) #set($canViewPost = false)
700 + #elseif($postVis == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewPost = false)
1040 1040   #end
1041 1041   #if(!$canViewPost)
1042 1042   <div class="thread-post visibility-restricted-post">
1043 - <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>
704 + <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>
1044 1044   </div>
1045 1045   #else
1046 1046   ## 投稿者のアカウント種別に基づいたCSSクラス
... ... @@ -1080,11 +1080,8 @@
1080 1080   <span class="badge badge-general badge-sm">一般</span>
1081 1081   #end
1082 1082   ## 所属バッジ（投稿者の学校コードとページの学校コードを比較）
1083 - #set($postIsSchoolMatch = ($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode)))
1084 1084   #if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general')
1085 - #if($postUserRole == 'graduate' && $postIsSchoolMatch)
1086 - <span class="badge badge-alumni 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>
1087 - #elseif($postIsSchoolMatch && $postUserRole != 'graduate')
745 + #if($postSchoolCode == $schoolCode)
1088 1088   #if($postAccountType == 'verified' || $postAccountType == 'admin')
1089 1089   <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>
1090 1090   #else
... ... @@ -1105,6 +1105,9 @@
1105 1105   #elseif($postUserRole == 'graduate')
1106 1106   <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>
1107 1107   #end
766 + #if($postGrade && $postGrade != '')
767 + <span class="badge badge-grade badge-sm">$postGrade</span>
768 + #end
1108 1108   </span>
1109 1109   <span class="thread-post-date">$!postDate</span>
1110 1110   #set($postEdited = $!post.getValue('edited'))
... ... @@ -1111,13 +1111,6 @@
1111 1111   #if($postEdited == 1 || $postEdited == '1')
1112 1112   <span class="post-edited-label">（編集済み）</span>
1113 1113   #end
1114 - #set($postAuthorRefH = $!post.getValue('authorRef'))
1115 - #set($postObjNumH = $post.number)
1116 - #if(!$isGuest && $xcontext.user != $postAuthorRefH)
1117 - <button type="button" class="btn-post-report btn-post-report-header" onclick="openReportDialog(this, '${doc.fullName}', $postObjNumH, '${services.csrf.getToken()}')" title="この投稿を通報">
1118 - <svg class="ico ico-fixed-14" viewBox="0 0 24 24"><path d="M4 15s1-1 4-1 5 2 8 2 4-1 4-1V3s-1 1-4 1-5-2-8-2-4 1-4 1z"/><line x1="4" y1="22" x2="4" y2="15"/></svg> 通報
1119 - </button>
1120 - #end
1121 1121   </div>
1122 1122   <div class="thread-post-body">
1123 1123   $!escapetool.xml($!postContent)
... ... @@ -1182,18 +1182,12 @@
1182 1182   #end
1183 1183   </div>
1184 1184   #if($postVis != 'public')
1185 - <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>
839 + <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>
1186 1186   #end
1187 - ## 固定/編集/削除/通報/非表示ボタン（横並び）
1188 - #set($postAuthorRef = $!post.getValue('authorRef'))
1189 - #set($postObjNumED = $post.number)
1190 - #set($showPinBtn = ($viewerAccountType == 'admin' || $viewerAccountType == 'verified'))
1191 - #set($showEditDeleteBtn = ($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin'))
1192 - #set($showHideBtn = ($viewerAccountType == 'admin'))
1193 - #if($showPinBtn || $showEditDeleteBtn || $showHideBtn)
1194 - <div class="post-edit-actions post-action-mt">
1195 - #if($showPinBtn)
1196 - #set($postObjNum = $post.number)
841 + ## 固定/解除ボタン（承認済み・管理者のみ）
842 + #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
843 + #set($postObjNum = $post.number)
844 + <div class="post-pin-action post-action-mt">
1197 1197   #if($isPinned == '1')
1198 1198   <a href="$doc.getURL('view', "action=unpin&postObj=${postObjNum}&form_token=${services.csrf.getToken()}")" class="btn-pin-toggle btn-unpin" title="固定を解除">
1199 1199   <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> 固定を解除
... ... @@ -1203,12 +1203,15 @@
1203 1203   <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> 固定する
1204 1204   </a>
1205 1205   #end
1206 - #end
1207 - #if($showEditDeleteBtn)
854 + </div>
855 + #end
856 + ## 編集・削除ボタン（投稿者本人 or 管理者）
857 + #set($postAuthorRef = $!post.getValue('authorRef'))
858 + #set($postObjNumED = $post.number)
859 + #if($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin')
860 + <div class="post-edit-actions post-action-mt">
1208 1208   #if($xcontext.user == $postAuthorRef)
1209 - #set($editImages = $!post.getValue('images'))
1210 - #set($editFiles = $!post.getValue('files'))
1211 - <button type="button" class="btn-post-edit" data-school="${doc.fullName}" data-obj="$postObjNumED" data-content="$!escapetool.xml($!postContent)" data-images="$!escapetool.xml($!editImages)" data-files="$!escapetool.xml($!editFiles)" data-post-type="$!post.getValue('postType')" onclick="openEditPost(this)" title="この投稿を編集">
862 + <button type="button" class="btn-post-edit" onclick="openEditPost(this, '${doc.fullName}', $postObjNumED, '$!escapetool.javascript($!postContent)')" title="この投稿を編集">
1212 1212   <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> 編集
1213 1213   </button>
1214 1214   #end
... ... @@ -1215,12 +1215,6 @@
1215 1215   <button type="button" class="btn-post-delete" onclick="confirmDeletePost('${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を削除">
1216 1216   <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> 削除
1217 1217   </button>
1218 - #end
1219 - #if($showHideBtn)
1220 - <button type="button" class="btn-post-hide" onclick="openHideDialog(this, '${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を非表示にする">
1221 - <svg class="ico ico-fixed-14" 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 11-4.24-4.24"/><line x1="1" y1="1" x2="23" y2="23"/></svg> 非表示
1222 - </button>
1223 - #end
1224 1224   </div>
1225 1225   #end
1226 1226   </div>
... ... @@ -1270,11 +1270,9 @@
1270 1270  
1271 1271   #if($xcontext.user != "XWiki.XWikiGuest")
1272 1272   <div class="thread-add-post">
1273 - #if($isSchoolMember || $isAlumniOfSchool || $isViewerAdmin)
1274 1274   <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
1275 1275   ＋ 活動報告を追加
1276 1276   </a>
1277 - #end
1278 1278   <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
1279 1279   <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> コメントを書く
1280 1280   </a>
... ... @@ -1304,38 +1304,62 @@
1304 1304  {{/html}}
1305 1305  #end
1306 1306  
1307 -## --- 年度タブ切り替え JavaScript ---
950 +## --- 年度アーカイブ セクション ---
1308 1308  {{html clean="false"}}
1309 -<script>
1310 -// コンパクト表示（タイトルのみ）トグル
1311 -function toggleCompactView() {
1312 - var container = document.querySelector('.xwiki-content') || document.body;
1313 - var isCompact = container.classList.toggle('activity-compact-view');
1314 - var btn = document.getElementById('btnViewToggle');
1315 - if (btn) {
1316 - btn.querySelector('.toggle-label').textContent = isCompact ? '詳細表示' : '一覧表示';
1317 - btn.title = isCompact ? '詳細表示に戻す' : 'タイトルのみ表示';
1318 - }
1319 - // コンパクトモードでは各スレッドヘッダーをクリックで個別展開可能にする
1320 - document.querySelectorAll('.activity-thread').forEach(function(thread) {
1321 - if (isCompact) {
1322 - thread.classList.remove('compact-expanded');
1323 - }
1324 - });
1325 -}
952 +<div class="school-section-card school-archive-card">
953 + <h2 class="archive-section-title">
954 + <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>
955 + 年度アーカイブ
956 + </h2>
957 + <div class="archive-meta">
958 + 現在のページ: <strong>${pageFiscalYear}年度</strong>
959 + #set($lyud = $!doc.getValue('lastYearUpdateDate'))
960 + #if($lyud && $lyud != '')
961 + | 最終年度更新: $!escapetool.xml($lyud) ($!escapetool.xml($!doc.getValue('lastYearUpdateBy')))
962 + #end
963 + </div>
1326 1326  
1327 -// コンパクトモードで個別スレッドを展開/折りたたみ
1328 -function toggleThreadExpand(e) {
1329 - var container = document.querySelector('.xwiki-content') || document.body;
1330 - if (!container.classList.contains('activity-compact-view')) return;
1331 - // リンクやボタンのクリックはスルー
1332 - if (e.target.closest('a, button, .btn-featured-toggle')) return;
1333 - var thread = e.target.closest('.activity-thread');
1334 - if (thread) {
1335 - thread.classList.toggle('compact-expanded');
1336 - }
1337 -}
965 + ## 過去アーカイブの検索
966 + #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))
967 + #set($archivePages = $archiveQuery.execute())
1338 1338  
969 + #if($archivePages && $archivePages.size() > 0)
970 + <div class="archive-card-field-lg">
971 + <div class="archive-list-label">過去の年度アーカイブ</div>
972 + <div class="archive-list">
973 + #foreach($archPage in $archivePages)
974 + #set($archPageDoc = $xwiki.getDocument($archPage))
975 + #set($archPageObj = $archPageDoc.getObject('SeitokaiCode.SchoolClass'))
976 + #if($archPageObj)
977 + #set($archPageFY = $!archPageObj.getValue('fiscalYear'))
978 + <a href="$archPageDoc.getURL('view')" class="archive-link">
979 + <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>
980 + ${archPageFY}年度
981 + </a>
982 + #end
983 + #end
984 + </div>
985 + </div>
986 + #else
987 + <div class="archive-empty">過去のアーカイブはまだありません</div>
988 + #end
989 +
990 + ## 新年度に移行ボタン（承認済み・管理者のみ）
991 + #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
992 + <div class="archive-action">
993 + <a href="/bin/SeitokaiCode/YearArchiveAction?schoolPage=${doc.fullName}" class="btn-accent">
994 + <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>
995 + ${pageFiscalYear}年度をアーカイブして新年度に移行
996 + </a>
997 + <div class="archive-action-hint">現在の学校情報を${pageFiscalYear}年度として保存し、新しい年度に移行します。</div>
998 + </div>
999 + #end
1000 +</div>
1001 +{{/html}}
1002 +
1003 +## --- 年度タブ切り替え JavaScript ---
1004 +{{html clean="false"}}
1005 +<script>
1339 1339  function switchActivityFY(fy, btn) {
1340 1340   // タブのアクティブ状態を切り替え
1341 1341   document.querySelectorAll('.activity-fy-tab').forEach(function(t) { t.classList.remove('active'); });
... ... @@ -1351,31 +1351,13 @@
1351 1351  }
1352 1352  // ページ読み込み時の初期化
1353 1353  document.addEventListener('DOMContentLoaded', function() {
1354 - // 年度タブを降順にソート（「全期間」タブは末尾に固定）
1355 - var tabContainer = document.querySelector('.activity-fy-tabs');
1356 - if (tabContainer) {
1357 - var tabs = Array.from(tabContainer.querySelectorAll('.activity-fy-tab'));
1358 - var allTab = null;
1359 - var fyTabs = [];
1360 - tabs.forEach(function(t) {
1361 - var onclickStr = t.getAttribute('onclick') || '';
1362 - if (onclickStr.indexOf("'all'") !== -1) { allTab = t; }
1363 - else { fyTabs.push(t); }
1364 - });
1365 - // 年度タブを数値の降順でソート
1366 - fyTabs.sort(function(a, b) {
1367 - var aYear = parseInt(a.textContent) || 0;
1368 - var bYear = parseInt(b.textContent) || 0;
1369 - return bYear - aYear;
1370 - });
1371 - // DOM再配置
1372 - fyTabs.forEach(function(t) { tabContainer.appendChild(t); });
1373 - if (allTab) { tabContainer.appendChild(allTab); }
1374 - }
1375 1375   // デフォルトで現在の年度を表示
1376 1376   var defaultTab = document.querySelector('.activity-fy-tab.active');
1377 1377   if (defaultTab) { defaultTab.click(); }
1378 1378   // 保存成功時のトースト通知
1025 + if (window.location.search.indexOf('archived=1') !== -1) {
1026 + showToast('年度アーカイブを作成しました', 'success');
1027 + }
1379 1379   if (window.location.search.indexOf('saved=1') !== -1) {
1380 1380   showToast('学校情報を保存しました', 'success');
1381 1381   // URLパラメータをクリーンアップ（リロード時に再表示されないよう）
... ... @@ -1383,30 +1383,6 @@
1383 1383   window.history.replaceState({}, document.title, window.location.pathname);
1384 1384   }
1385 1385   }
1386 - // コンパクトモード: スレッドヘッダークリックで個別展開
1387 - document.querySelectorAll('.activity-thread-header').forEach(function(header) {
1388 - header.addEventListener('click', toggleThreadExpand);
1389 - });
1390 - // 長文投稿の折りたたみ初期化（max-height: 12em 超で省略）
1391 - document.querySelectorAll('.thread-post-body').forEach(function(body) {
1392 - // pre-wrapのまま高さを測定し、max-height(12em ≒ ~200px)を超える場合に折りたたむ
1393 - var fullH = body.scrollHeight;
1394 - // 12em を px に変換（font-size × line-height × 行数 の近似値ではなくCSSと同じ値を取得）
1395 - body.classList.add('truncated');
1396 - var maxH = body.clientHeight; // max-height: 12em 適用後の高さ
1397 - body.classList.remove('truncated');
1398 - if (fullH > maxH + 30) {
1399 - body.classList.add('truncated');
1400 - var btn = document.createElement('button');
1401 - btn.className = 'btn-read-more';
1402 - btn.textContent = '広げて読む ▼';
1403 - btn.addEventListener('click', function() {
1404 - var isExpanded = body.classList.toggle('expanded');
1405 - btn.textContent = isExpanded ? '折りたたむ ▲' : '広げて読む ▼';
1406 - });
1407 - body.parentNode.insertBefore(btn, body.nextSibling);
1408 - }
1409 - });
1410 1410  });
1411 1411  
1412 1412  // トースト通知表示
... ... @@ -1435,136 +1435,38 @@
1435 1435   var card = document.getElementById(cardId);
1436 1436   if (!card) return;
1437 1437   card.classList.toggle('collapsed');
1438 - var isCollapsed = card.classList.contains('collapsed');
1439 - var h2 = card.querySelector('h2[role="button"]');
1440 - if (h2) h2.setAttribute('aria-expanded', !isCollapsed);
1441 1441  }
1442 1442  
1443 1443  // 投稿の編集（インライン編集フォームを開く）
1444 -function openEditPost(btn) {
1066 +function openEditPost(btn, schoolPage, postObjNum, currentContent) {
1445 1445   var postEl = btn.closest('.thread-post');
1446 1446   if (!postEl) return;
1069 + // 既存の編集フォームがあれば閉じる
1447 1447   var existing = postEl.querySelector('.post-edit-form');
1448 1448   if (existing) { existing.remove(); return; }
1449 1449   var bodyEl = postEl.querySelector('.thread-post-body');
1450 1450   if (!bodyEl) return;
1451 -
1452 - var schoolPage = btn.getAttribute('data-school');
1453 - var postObjNum = btn.getAttribute('data-obj');
1454 - var currentContent = btn.getAttribute('data-content') || '';
1455 - var currentImages = btn.getAttribute('data-images') || '';
1456 - var currentFiles = btn.getAttribute('data-files') || '';
1457 - var postType = btn.getAttribute('data-post-type') || 'report';
1458 -
1459 1459   var form = document.createElement('div');
1460 1460   form.className = 'post-edit-form';
1461 - form.setAttribute('data-school', schoolPage);
1462 - form.setAttribute('data-obj', postObjNum);
1463 -
1464 - var html = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>';
1465 -
1466 - // コメント以外は添付ファイル編集を表示
1467 - if (postType !== 'comment') {
1468 - // 既存画像
1469 - html += '<div class="edit-attachments">';
1470 - if (currentImages.trim()) {
1471 - html += '<div class="edit-attach-section"><span class="edit-attach-label">画像</span>';
1472 - var imgs = currentImages.trim().split('\n');
1473 - for (var i = 0; i < imgs.length; i++) {
1474 - var img = imgs[i].trim();
1475 - if (!img) continue;
1476 - html += '<div class="edit-attach-item" data-name="' + img.replace(/"/g,'&quot;') + '">' +
1477 - '<img src="/xwiki/bin/download/' + schoolPage.replace(/\./g,'/') + '/' + encodeURIComponent(img) + '" class="edit-attach-thumb" />' +
1478 - '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1479 - '<input type="hidden" name="keepImages" value="' + img.replace(/"/g,'&quot;') + '" />' +
1480 - '</div>';
1481 - }
1482 - html += '</div>';
1483 - }
1484 - // 既存ファイル
1485 - if (currentFiles.trim()) {
1486 - html += '<div class="edit-attach-section"><span class="edit-attach-label">ファイル</span>';
1487 - var files = currentFiles.trim().split('\n');
1488 - for (var j = 0; j < files.length; j++) {
1489 - var f = files[j].trim();
1490 - if (!f) continue;
1491 - var displayName = f;
1492 - if (/^file_\d{14}_\d+_/.test(f)) displayName = f.replace(/^file_\d{14}_\d+_/, '');
1493 - html += '<div class="edit-attach-item" data-name="' + f.replace(/"/g,'&quot;') + '">' +
1494 - '<span class="edit-attach-fname">' + displayName.replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</span>' +
1495 - '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1496 - '<input type="hidden" name="keepFiles" value="' + f.replace(/"/g,'&quot;') + '" />' +
1497 - '</div>';
1498 - }
1499 - html += '</div>';
1500 - }
1501 - // 新規追加
1502 - html += '<div class="edit-attach-add">' +
1503 - '<label class="form-label-sm">画像を追加（最大4枚まで）</label>' +
1504 - '<input type="file" name="editNewImages" accept="image/*" multiple class="form-file-input-sm" />' +
1505 - '<div class="form-hint">JPEG / PNG / GIF / WebP、各5MBまで</div>' +
1506 - '<label class="form-label-sm" style="margin-top:8px;">ファイルを追加（最大2つまで）</label>' +
1507 - '<input type="file" name="editNewFiles" accept=".pdf,.docx,.xlsx,.pptx" multiple class="form-file-input-sm" />' +
1508 - '<div class="form-hint">PDF / Word / Excel / PowerPoint、各10MBまで</div>' +
1509 - '</div>';
1510 - html += '</div>';
1511 - }
1512 -
1513 - html += '<div class="post-edit-form-actions">' +
1076 + form.innerHTML = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>' +
1077 + '<div class="post-edit-form-actions">' +
1514 1514   '<button type="button" class="btn-cancel-edit" onclick="this.closest(\'.post-edit-form\').remove()">キャンセル</button>' +
1515 - '<button type="button" class="btn-save" onclick="saveEditPost(this)">保存</button>' +
1079 + '<button type="button" class="btn-save" onclick="saveEditPost(\'' + schoolPage + '\', ' + postObjNum + ')">保存</button>' +
1516 1516   '</div>';
1517 -
1518 - form.innerHTML = html;
1519 1519   bodyEl.parentNode.insertBefore(form, bodyEl.nextSibling);
1520 1520   form.querySelector('textarea').focus();
1521 1521  }
1522 1522  
1523 -function removeEditAttach(btn) {
1524 - var item = btn.closest('.edit-attach-item');
1525 - if (item) item.remove();
1526 -}
1527 -
1528 1528  // 投稿の編集を保存
1529 -function saveEditPost(btn) {
1530 - var formEl = btn.closest('.post-edit-form');
1531 - if (!formEl) return;
1532 - var schoolPage = formEl.getAttribute('data-school');
1533 - var postObjNum = formEl.getAttribute('data-obj');
1534 - var textarea = formEl.querySelector('textarea');
1086 +function saveEditPost(schoolPage, postObjNum) {
1087 + var textarea = document.getElementById('editContent_' + postObjNum);
1535 1535   if (!textarea) return;
1536 1536   var newContent = textarea.value.trim();
1537 1537   if (!newContent) { alert('投稿内容を入力してください'); return; }
1538 -
1539 1539   var csrfEl = document.querySelector('input[name="form_token"]');
1540 1540   var csrfToken = csrfEl ? csrfEl.value : '';
1541 -
1542 - var fd = new FormData();
1543 - fd.append('schoolPage', schoolPage);
1544 - fd.append('postObj', postObjNum);
1545 - fd.append('newContent', newContent);
1546 - fd.append('form_token', csrfToken);
1547 -
1548 - // 残す画像・ファイル
1549 - formEl.querySelectorAll('input[name="keepImages"]').forEach(function(el) { fd.append('keepImages', el.value); });
1550 - formEl.querySelectorAll('input[name="keepFiles"]').forEach(function(el) { fd.append('keepFiles', el.value); });
1551 -
1552 - // 新規画像
1553 - var newImgInput = formEl.querySelector('input[name="editNewImages"]');
1554 - if (newImgInput && newImgInput.files) {
1555 - for (var i = 0; i < newImgInput.files.length; i++) { fd.append('editNewImages', newImgInput.files[i]); }
1556 - }
1557 - // 新規ファイル
1558 - var newFileInput = formEl.querySelector('input[name="editNewFiles"]');
1559 - if (newFileInput && newFileInput.files) {
1560 - for (var j = 0; j < newFileInput.files.length; j++) { fd.append('editNewFiles', newFileInput.files[j]); }
1561 - }
1562 -
1563 - btn.disabled = true;
1564 - btn.textContent = '保存中...';
1565 -
1566 1566   var xhr = new XMLHttpRequest();
1567 - xhr.open('POST', '/bin/get/SeitokaiCode/EditPost?outputSyntax=plain', true);
1094 + xhr.open('GET', '/bin/SeitokaiCode/EditPost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken), true);
1568 1568   xhr.onload = function() {
1569 1569   try {
1570 1570   var res = JSON.parse(xhr.responseText);
... ... @@ -1572,13 +1572,12 @@
1572 1572   showToast('投稿を更新しました', 'success');
1573 1573   setTimeout(function() { location.reload(); }, 800);
1574 1574   } else {
1575 - btn.disabled = false; btn.textContent = '保存';
1576 1576   alert('編集に失敗しました: ' + (res.error || ''));
1577 1577   }
1578 - } catch(e) { btn.disabled = false; btn.textContent = '保存'; alert('編集に失敗しました'); }
1104 + } catch(e) { alert('編集に失敗しました'); }
1579 1579   };
1580 - xhr.onerror = function() { btn.disabled = false; btn.textContent = '保存'; alert('通信エラーが発生しました'); };
1581 - xhr.send(fd);
1106 + xhr.onerror = function() { alert('通信エラーが発生しました'); };
1107 + xhr.send();
1582 1582  }
1583 1583  
1584 1584  // 投稿の削除（確認ダイアログ付き）
... ... @@ -1585,9 +1585,7 @@
1585 1585  function confirmDeletePost(schoolPage, postObjNum, token) {
1586 1586   if (!confirm('この投稿を削除しますか？\\n削除後は「この投稿は削除されました」と表示されます。')) return;
1587 1587   var xhr = new XMLHttpRequest();
1588 - xhr.open('POST', '/bin/get/SeitokaiCode/DeletePost?outputSyntax=plain', true);
1589 - xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1590 - var deletePostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token);
1114 + xhr.open('GET', '/bin/SeitokaiCode/DeletePost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token), true);
1591 1591   xhr.onload = function() {
1592 1592   try {
1593 1593   var res = JSON.parse(xhr.responseText);
... ... @@ -1600,82 +1600,8 @@
1600 1600   } catch(e) { alert('削除に失敗しました'); }
1601 1601   };
1602 1602   xhr.onerror = function() { alert('通信エラーが発生しました'); };
1603 - xhr.send(deletePostData);
1127 + xhr.send();
1604 1604  }
1605 -
1606 -/* --- 通報ダイアログ --- */
1607 -function openReportDialog(btn, targetPage, postObjNum, token) {
1608 - if (document.getElementById('report-dialog-overlay')) return;
1609 - var reasons = ['宣伝・スパム','不適切な内容','個人情報の露出','誹謗中傷','誤情報','その他'];
1610 - var overlay = document.createElement('div');
1611 - overlay.id = 'report-dialog-overlay';
1612 - overlay.style.cssText = 'position:fixed;inset:0;background:rgba(0,0,0,0.5);z-index:9999;display:flex;align-items:center;justify-content:center;';
1613 - var dialog = document.createElement('div');
1614 - dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;max-height:80vh;overflow-y:auto;';
1615 - var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を通報</h3>';
1616 - html += '<p style="margin:0 0 12px;font-size:0.9em;color:#4b5563;">通報された投稿は管理者が確認するまで一時的に非表示になります。</p>';
1617 - html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">通報理由</label>';
1618 - html += '<select id="report-reason" style="width:100%;padding:8px;border:1px solid #d1d5db;border-radius:8px;margin-bottom:12px;font-size:0.9em;">';
1619 - for (var i=0; i<reasons.length; i++) html += '<option value="'+reasons[i]+'">'+reasons[i]+'</option>';
1620 - html += '</select>';
1621 - html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">補足コメント（任意）</label>';
1622 - html += '<textarea id="report-detail" rows="3" maxlength="500" style="width:100%;padding:8px;border:1px solid #d1d5db;border-radius:8px;resize:vertical;font-size:0.9em;box-sizing:border-box;" placeholder="具体的な内容があればご記入ください"></textarea>';
1623 - html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
1624 - html += '<button type="button" id="report-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
1625 - html += '<button type="button" id="report-submit-btn" style="padding:8px 16px;border:none;border-radius:8px;background:#dc2626;color:#fff;cursor:pointer;font-weight:600;">通報する</button>';
1626 - html += '</div>';
1627 - dialog.innerHTML = html;
1628 - overlay.appendChild(dialog);
1629 - document.body.appendChild(overlay);
1630 - overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
1631 - document.getElementById('report-cancel-btn').addEventListener('click', function() { overlay.remove(); });
1632 - document.getElementById('report-submit-btn').addEventListener('click', function() {
1633 - var reason = document.getElementById('report-reason').value;
1634 - var detail = document.getElementById('report-detail').value;
1635 - var submitBtn = document.getElementById('report-submit-btn');
1636 - submitBtn.disabled = true; submitBtn.textContent = '送信中...';
1637 - var xhr = new XMLHttpRequest();
1638 - xhr.open('POST', '/bin/get/SeitokaiCode/ReportAction?outputSyntax=plain', true);
1639 - xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1640 - var data = 'targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&detail=' + encodeURIComponent(detail) + '&form_token=' + encodeURIComponent(token);
1641 - xhr.onload = function() {
1642 - overlay.remove();
1643 - showToast('通報を受け付けました', 'success');
1644 - setTimeout(function() { location.reload(); }, 1000);
1645 - };
1646 - xhr.onerror = function() { overlay.remove(); alert('通信エラーが発生しました'); };
1647 - xhr.send(data);
1648 - });
1649 -}
1650 -
1651 -/* --- 非表示ダイアログ（管理者用） --- */
1652 -function openHideDialog(btn, targetPage, postObjNum, token) {
1653 - if (document.getElementById('hide-dialog-overlay')) return;
1654 - var overlay = document.createElement('div');
1655 - overlay.id = 'hide-dialog-overlay';
1656 - overlay.style.cssText = 'position:fixed;inset:0;background:rgba(0,0,0,0.5);z-index:9999;display:flex;align-items:center;justify-content:center;';
1657 - var dialog = document.createElement('div');
1658 - dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;';
1659 - var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を非表示にする</h3>';
1660 - html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">非表示の理由</label>';
1661 - html += '<input type="text" id="hide-reason" style="width:100%;padding:8px;border:1px solid #d1d5db;border-radius:8px;margin-bottom:12px;font-size:0.9em;box-sizing:border-box;" placeholder="理由を入力" />';
1662 - html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
1663 - html += '<button type="button" id="hide-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
1664 - html += '<button type="button" id="hide-submit-btn" style="padding:8px 16px;border:none;border-radius:8px;background:#d97706;color:#fff;cursor:pointer;font-weight:600;">非表示にする</button>';
1665 - html += '<button type="button" id="hide-warn-btn" style="padding:8px 16px;border:none;border-radius:8px;background:#dc2626;color:#fff;cursor:pointer;font-weight:600;">非表示+警告</button>';
1666 - html += '</div>';
1667 - dialog.innerHTML = html;
1668 - overlay.appendChild(dialog);
1669 - document.body.appendChild(overlay);
1670 - overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
1671 - document.getElementById('hide-cancel-btn').addEventListener('click', function() { overlay.remove(); });
1672 - function doHide(action) {
1673 - var reason = document.getElementById('hide-reason').value || '管理者判断';
1674 - window.location.href = '/bin/view/SeitokaiCode/ModerationAction?action=' + action + '&targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&form_token=' + encodeURIComponent(token);
1675 - }
1676 - document.getElementById('hide-submit-btn').addEventListener('click', function() { doHide('hide'); });
1677 - document.getElementById('hide-warn-btn').addEventListener('click', function() { doHide('hide-warn'); });
1678 -}
1679 1679  </script>
1680 1680  {{/html}}
1681 1681  {{/velocity}}