Skip to Content
Last modified by Super Admin on 2026/04/05 18:59
From version Icon 44.1 Icon
edited by Super Admin
on 2026/03/13 00:18
Change comment: There is no comment for this version
To version Icon 94.1 Icon
edited by Super Admin
on 2026/03/20 17:50
Change comment: There is no comment for this version

Summary

Details

Icon Page properties
Content
... ... @@ -1,5 +1,11 @@
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
3 3  {{html clean="false"}}
4 4  ## メンテナンスバナー（{{include}}ではなくインラインで記述し、<p>タグ挿入を回避）
5 5  #set($bannerDoc = $xwiki.getDocument('SeitokaiAdmin.MaintenanceBanner'))
... ... @@ -28,8 +28,10 @@
28 28  #set($schoolLevel = $doc.getValue('schoolLevel'))
29 29  #set($schoolSystem = $doc.getValue('schoolSystem'))
30 30  #set($website = $doc.getValue('website'))
37 +#set($schoolPhoto = $doc.getValue('schoolPhoto'))
38 +#set($schoolDescription = $doc.getValue('schoolDescription'))
31 31  
32 -## --- 組織図 ---
40 +## --- 生徒会組織 ---
33 33  #set($orgChart = $doc.getValue('orgChart'))
34 34  #set($orgChartImage = $doc.getValue('orgChartImage'))
35 35  
... ... @@ -49,7 +49,7 @@
49 49  #set($budgetAllocation = $doc.getValue('budgetAllocation'))
50 50  #set($budgetNote = $doc.getValue('budgetNote'))
51 51  
52 -## --- 校則の見直し ---
60 +## --- 校則・生徒会会則の見直し ---
53 53  #set($ruleReviewStatus = $doc.getValue('ruleReviewStatus'))
54 54  #set($ruleReviewContent = $doc.getValue('ruleReviewContent'))
55 55  #set($ruleReviewProposer = $doc.getValue('ruleReviewProposer'))
... ... @@ -56,6 +56,43 @@
56 56  #set($ruleReviewImplementer = $doc.getValue('ruleReviewImplementer'))
57 57  #set($ruleReviewSystem = $doc.getValue('ruleReviewSystem'))
58 58  
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 +
59 59  ## --- 課題・連絡先 ---
60 60  #set($challenges = $doc.getValue('challenges'))
61 61  #set($contactInfo = $doc.getValue('contactInfo'))
... ... @@ -95,15 +95,81 @@
95 95   #set($viewerDoc = $xwiki.getDocument($viewerUser))
96 96   #set($viewerAccountType = $!viewerDoc.getValue('accountType'))
97 97   #set($viewerSchoolCode = $!viewerDoc.getValue('schoolCode'))
143 + #set($viewerSecondarySchoolCode = $!viewerDoc.getValue('secondarySchoolCode'))
144 + #set($viewerUserRole = $!viewerDoc.getValue('userRole'))
98 98   #if($viewerAccountType == 'admin')
99 99   #set($isViewerAdmin = true)
100 100   #end
101 101  #end
102 102  
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 +
103 103  ## --- 投稿固定/解除処理 ---
104 104  #set($pinAction = $!request.action)
105 -#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || $viewerAccountType == 'verified') && $services.csrf.isTokenValid($request.form_token))
106 - #set($postObjNum = $mathtool.toInteger($!request.postObj))
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))
107 107   #set($postObj = $doc.getObject('SeitokaiCode.ActivityPostClass', $postObjNum))
108 108   #if($postObj)
109 109   #if($pinAction == 'pin')
... ... @@ -123,12 +123,15 @@
123 123   $response.sendRedirect($doc.getURL('view'))
124 124   #stop
125 125   #end
237 + #end## /matches
126 126  #end
127 127  
128 128  ## --- 特色ある活動 選定/解除処理 ---
129 129  #set($featAction = $!request.action)
130 -#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $services.csrf.isTokenValid($request.form_token))
131 - #set($actObjNum = $mathtool.toInteger($!request.actObj))
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))
132 132   #set($actObj = $doc.getObject('SeitokaiCode.ActivityClass', $actObjNum))
133 133   #if($actObj)
134 134   #if($featAction == 'feature')
... ... @@ -160,6 +160,7 @@
160 160   $response.sendRedirect($doc.getURL('view'))
161 161   #stop
162 162   #end
277 + #end## /matches
163 163  #end
164 164  
165 165  ## --- ユーザー情報取得 ---
... ... @@ -226,7 +226,7 @@
226 226  
227 227  ## --- 編集ボタン（権限があるユーザーのみ表示） ---
228 228  #set($canEditSchool = false)
229 -#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode))
344 +#if(!$isGuest && ($isViewerAdmin || $isSchoolMember || $isAlumniOfSchool))
230 230   #set($canEditSchool = true)
231 231  #end
232 232  #if($canEditSchool)
... ... @@ -235,305 +235,492 @@
235 235  </div>
236 236  #end
237 237  
238 -## --- ① 学校基本情報 + 連絡先（左右グリッド・折りたたみ対応） ---
239 -<div class="school-info-grid">
240 - <div class="school-info-card collapsed" id="card-basic-info">
241 - <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>
242 - <table class="wiki-table school-info-table">
243 - <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
244 - <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
245 - <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
246 - <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
247 - <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
248 - <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
249 - <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
250 - <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
251 - <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>
252 - </table>
253 - #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
254 - #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
255 - #if($infoEditDate && $infoEditDate != '')
256 - <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>
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)
257 257   #end
366 + と連携しています
258 258   </div>
368 +</div>
369 +#end
259 259  
260 - <div class="school-info-card collapsed" id="card-contact">
261 - <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>
262 - <table class="wiki-table school-info-table">
263 - <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr>
264 - <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>
265 - <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>
266 - <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>
267 - <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>
268 - <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
269 - </table>
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
270 270   </div>
271 -</div>
394 + #if($schoolDescription && $schoolDescription.trim() != '')
395 + <div class="free-note" style="margin-top:var(--sp-4);">$!escapetool.xml($schoolDescription)</div>
396 + #end
272 272  
273 -## --- 生徒会情報アコーディオン ---
274 -<div class="school-section-divider">
275 - <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')?'▲':'▼';">
276 - <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>
277 - 生徒会情報を見る <span class="shortcut-arrow">▼</span>
278 - </button>
279 279  </div>
280 280  
281 -<div id="seitokai-info-section" class="seitokai-info-accordion">
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">
282 282  
283 -## --- ② 組織図 ---
284 -#set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
285 -#if($hasOrgContent)
286 - ## 公開範囲チェック
287 - #set($canViewOrgChart = true)
288 - #if($visibilityOrgChart == 'members' && $isGuest) #set($canViewOrgChart = false)
289 - #elseif($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewOrgChart = false)
290 - #end
291 - #if($canViewOrgChart)
292 -<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>
293 -<div class="school-section-card">
294 - <div class="card-inner">
295 - #if($orgChartImage && $orgChartImage != '')
296 - <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
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
297 297   #end
298 - #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end
299 - </div>
300 -</div>
301 - #else
302 -<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>
303 - #end
304 -#end
305 305  
306 -## --- ③④⑤ 日常の活動・選挙・定例活動 ---
307 -<div class="school-section-grid">
308 - #if($dailyActivities && !$dailyActivities.isEmpty())
309 - <div class="school-section-card">
310 - <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>
311 - <div class="card-inner">
312 - <p class="activity-hint">活動時間の多い順に上位3つ</p>
313 - <div class="tag-container">
314 - #set($daIdx = 1)
315 - #foreach($da in $dailyActivities)
316 - <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
317 - #set($daIdx = $daIdx + 1)
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>
318 318   #end
319 319   </div>
320 - #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
321 - <div class="free-note">$!escapetool.xml($dailyActivitiesNote)</div>
322 - #end
323 323   </div>
324 - </div>
325 - #end
443 + #end
326 326  
327 - #if($electionExists && $electionExists != '')
328 - <div class="school-section-card">
329 - <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>
330 - <div class="card-inner">
331 - <div class="info-row">
332 - <span class="info-label">役員選挙</span>
333 - <span class="info-value">$!escapetool.xml($!electionExists)</span>
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
334 334   </div>
335 - #if($electionType && $electionType != '')
336 - <div class="info-row">
337 - <span class="info-label">直近の選挙方式</span>
338 - <span class="info-value">$!escapetool.xml($!electionType)</span>
339 - </div>
340 - #end
341 - #if($electionNote && $electionNote.trim() != '')
342 - <div class="free-note">$!escapetool.xml($electionNote)</div>
343 - #end
344 344   </div>
345 - </div>
346 - #end
347 -</div>
465 + #end
348 348  
349 -<div class="school-section-grid">
350 - #if($meetingFrequency && $meetingFrequency != '')
351 - <div class="school-section-card">
352 - <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>
353 - <div class="card-inner">
354 - <div class="info-row">
355 - <span class="info-label">役員定例会の頻度</span>
356 - <span class="info-value">$!escapetool.xml($!meetingFrequency)</span>
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
357 357   </div>
358 - #if($regularActivitiesNote && $regularActivitiesNote.trim() != '')
359 - <div class="free-note">$!escapetool.xml($regularActivitiesNote)</div>
360 - #end
361 361   </div>
362 - </div>
363 - #end
364 -
365 - ## --- ⑦ 予算 ---
366 - #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
367 - #if($hasBudget)
368 - ## 公開範囲チェック
369 - #set($canViewBudget = true)
370 - #if($visibilityBudget == 'members' && $isGuest) #set($canViewBudget = false)
371 - #elseif($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewBudget = false)
372 372   #end
373 - #if($canViewBudget)
374 - <div class="school-section-card">
375 - <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>
376 - <div class="card-inner">
377 - #if($budgetProcess && !$budgetProcess.isEmpty())
378 - <div class="info-row">
379 - <span class="info-label">作成過程の生徒関与</span>
380 - <span class="info-value">
381 - <div class="selection-display">
382 - #foreach($bp in $budgetProcess)
383 - <span class="selection-item">$!escapetool.xml($bp.trim())</span>
384 - #end
385 - </div>
386 - </span>
387 - </div>
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)
388 388   #end
389 - #if($studentFee && $studentFee != '')
390 - <div class="info-row">
391 - <span class="info-label">生徒会費（年額）</span>
392 - <span class="info-value">$!escapetool.xml($!studentFee)</span>
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
393 393   </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>
394 394   #end
395 - #if($budgetScale && $budgetScale != '')
396 - <div class="info-row">
397 - <span class="info-label">予算規模</span>
398 - <span class="info-value">$!escapetool.xml($!budgetScale)</span>
399 - </div>
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)
400 400   #end
401 - #if($budgetAllocation && !$budgetAllocation.isEmpty())
402 - <div class="info-row">
403 - <span class="info-label">主な予算配分</span>
404 - <span class="info-value">
405 - <div class="selection-display">
406 - #foreach($ba in $budgetAllocation)
407 - <span class="selection-item">$!escapetool.xml($ba.trim())</span>
408 - #end
409 - </div>
410 - </span>
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
411 411   </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>
412 412   #end
413 - #if($budgetNote && $budgetNote.trim() != '')
414 - <div class="free-note">$!escapetool.xml($budgetNote)</div>
415 - #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
646 + </div>
416 416   </div>
417 - </div>
418 - #else
419 - <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>
420 420   #end
421 - #end
422 -</div>
423 423  
424 -## --- ⑧ 校則の見直し ---
425 -#if($ruleReviewStatus && $ruleReviewStatus != '')
426 - ## 公開範囲チェック
427 - #set($canViewRuleReview = true)
428 - #if($visibilityRuleReview == 'members' && $isGuest) #set($canViewRuleReview = false)
429 - #elseif($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewRuleReview = false)
430 - #end
431 - #if($canViewRuleReview)
432 -<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>
433 -<div class="school-section-card">
434 - <div class="card-inner">
435 - <div class="info-row">
436 - <span class="info-label">見直しの有無（3年以内）</span>
437 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
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>
438 438   </div>
439 - #if($ruleReviewContent && !$ruleReviewContent.isEmpty())
440 - <div class="info-row">
441 - <span class="info-label">見直しの内容</span>
442 - <span class="info-value">
443 - <div class="selection-display">
444 - #foreach($rc in $ruleReviewContent)
445 - <span class="selection-item">$!escapetool.xml($rc.trim())</span>
446 - #end
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>
447 447   </div>
448 - </span>
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>
449 449   </div>
450 450   #end
451 - #if($ruleReviewProposer && !$ruleReviewProposer.isEmpty())
452 - <div class="info-row">
453 - <span class="info-label">見直しの提案者</span>
454 - <span class="info-value">
455 - <div class="selection-display">
456 - #foreach($rp in $ruleReviewProposer)
457 - <span class="selection-item">$!escapetool.xml($rp.trim())</span>
458 - #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>
459 459   </div>
460 - </span>
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>
461 461   </div>
462 462   #end
463 - #if($ruleReviewImplementer && !$ruleReviewImplementer.isEmpty())
464 - <div class="info-row">
465 - <span class="info-label">見直しの実施者</span>
466 - <span class="info-value">
467 - <div class="selection-display">
468 - #foreach($ri in $ruleReviewImplementer)
469 - <span class="selection-item">$!escapetool.xml($ri.trim())</span>
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>
470 470   #end
471 - </div>
472 - </span>
785 + #end
786 + </table>
787 + </div>
473 473   </div>
474 474   #end
475 - #if($ruleReviewSystem && $ruleReviewSystem != '')
476 - <div class="info-row">
477 - <span class="info-label">見直しの仕組み</span>
478 - <span class="info-value">$!escapetool.xml($!ruleReviewSystem)</span>
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>
479 479   </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
480 480   #end
481 - </div>
482 -</div>
483 - #else
484 -<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>
485 - #end
486 -#end
487 487  
488 -## --- ⑨ 課題 ---
489 -#if($challenges && $challenges != '')
490 - ## 公開範囲チェック
491 - #set($canViewChallenges = true)
492 - #if($visibilityChallenges == 'members' && $isGuest) #set($canViewChallenges = false)
493 - #elseif($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewChallenges = false)
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 494   #end
495 - #if($canViewChallenges)
496 -<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>
497 -<div class="challenge-text">$!escapetool.xml($challenges)</div>
498 - #else
499 -<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>
500 - #end
501 -#end
828 +</div>
502 502  
503 -</div>## seitokai-info-accordion 終了
504 -
505 505  {{/html}}
506 506  
832 +----
833 +
507 507  ## --- ⑩ 活動報告一覧（スレッド型・年度タブ付き） ---
508 508  = 活動報告 =
509 509  
510 -## --- 投稿者ステータス凡例（折りたたみ） ---
837 +## --- 年度タブ + 投稿者ステータス凡例 ---
511 511  {{html clean="false"}}
512 -<div class="author-legend-wrapper">
513 - <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>
514 - <div class="author-legend-body">
515 - <div class="author-legend">
516 - <span class="author-legend-title">投稿者の信頼度:</span>
517 - <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者</span>
518 - <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み</span>
519 - <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介</span>
520 - <span class="author-legend-item"><span class="bar bar-general"></span> 一般（未承認）</span>
521 - </div>
522 - <div class="author-legend">
523 - <span class="author-legend-title">所属:</span>
524 - <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>
525 - <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>
526 - <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>
527 - <span class="author-legend-item text-hint">※一般アカウントは所属未確認のため非表示</span>
528 - </div>
529 - <div class="author-legend">
530 - <span class="author-legend-title">役割:</span>
531 - <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>
532 - <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>
533 - <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>
534 - </div>
535 - </div>
536 -</div>
537 537  
538 538  ## --- 年度タブ ---
539 539  ## 全活動から年度一覧を収集
... ... @@ -555,14 +555,49 @@
555 555  #end
556 556  ## ソート（降順にしたいが Velocity にはないので JS で制御）
557 557  
558 -<div class="activity-fy-tabs">
559 - <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
560 - #foreach($fy in $fySet)
561 - #if($fy != $currentFYStr)
562 - <button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button>
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
563 563   #end
564 - #end
565 - <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
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>
566 566  </div>
567 567  
568 568  {{/html}}
... ... @@ -627,10 +627,18 @@
627 627  <div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)">
628 628   <div class="activity-thread-header">
629 629   <div class="activity-thread-title">
630 - <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>
631 - <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
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>
632 632   </div>
633 - <div class="thread-meta-row">
978 + <div class="thread-meta-right">
634 634   <span class="thread-post-count">${reportCount}件の報告 ・ ${commentCount}件のコメント</span>
635 635   #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred')
636 636   #if($actFeatured == '1')
... ... @@ -690,12 +690,12 @@
690 690   #set($postVis = $!post.getValue('visibility'))
691 691   #if(!$postVis || $postVis == '') #set($postVis = 'public') #end
692 692   #set($canViewPost = true)
693 - #if($postVis == 'members' && $isGuest) #set($canViewPost = false)
694 - #elseif($postVis == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewPost = false)
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)
695 695   #end
696 696   #if(!$canViewPost)
697 697   <div class="thread-post visibility-restricted-post">
698 - <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>
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>
699 699   </div>
700 700   #else
701 701   ## 投稿者のアカウント種別に基づいたCSSクラス
... ... @@ -735,8 +735,11 @@
735 735   <span class="badge badge-general badge-sm">一般</span>
736 736   #end
737 737   ## 所属バッジ（投稿者の学校コードとページの学校コードを比較）
1083 + #set($postIsSchoolMatch = ($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode)))
738 738   #if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general')
739 - #if($postSchoolCode == $schoolCode)
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')
740 740   #if($postAccountType == 'verified' || $postAccountType == 'admin')
741 741   <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>
742 742   #else
... ... @@ -757,9 +757,6 @@
757 757   #elseif($postUserRole == 'graduate')
758 758   <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>
759 759   #end
760 - #if($postGrade && $postGrade != '')
761 - <span class="badge badge-grade badge-sm">$postGrade</span>
762 - #end
763 763   </span>
764 764   <span class="thread-post-date">$!postDate</span>
765 765   #set($postEdited = $!post.getValue('edited'))
... ... @@ -766,6 +766,13 @@
766 766   #if($postEdited == 1 || $postEdited == '1')
767 767   <span class="post-edited-label">（編集済み）</span>
768 768   #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
769 769   </div>
770 770   <div class="thread-post-body">
771 771   $!escapetool.xml($!postContent)
... ... @@ -830,12 +830,18 @@
830 830   #end
831 831   </div>
832 832   #if($postVis != 'public')
833 - <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>
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>
834 834   #end
835 - ## 固定/解除ボタン（承認済み・管理者のみ）
836 - #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
837 - #set($postObjNum = $post.number)
838 - <div class="post-pin-action post-action-mt">
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)
839 839   #if($isPinned == '1')
840 840   <a href="$doc.getURL('view', "action=unpin&postObj=${postObjNum}&form_token=${services.csrf.getToken()}")" class="btn-pin-toggle btn-unpin" title="固定を解除">
841 841   <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> 固定を解除
... ... @@ -845,15 +845,12 @@
845 845   <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> 固定する
846 846   </a>
847 847   #end
848 - </div>
849 - #end
850 - ## 編集・削除ボタン（投稿者本人 or 管理者）
851 - #set($postAuthorRef = $!post.getValue('authorRef'))
852 - #set($postObjNumED = $post.number)
853 - #if($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin')
854 - <div class="post-edit-actions post-action-mt">
1206 + #end
1207 + #if($showEditDeleteBtn)
855 855   #if($xcontext.user == $postAuthorRef)
856 - <button type="button" class="btn-post-edit" onclick="openEditPost(this, '${doc.fullName}', $postObjNumED, '$!escapetool.javascript($!postContent)')" title="この投稿を編集">
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="この投稿を編集">
857 857   <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> 編集
858 858   </button>
859 859   #end
... ... @@ -860,6 +860,12 @@
860 860   <button type="button" class="btn-post-delete" onclick="confirmDeletePost('${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を削除">
861 861   <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> 削除
862 862   </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
863 863   </div>
864 864   #end
865 865   </div>
... ... @@ -909,9 +909,11 @@
909 909  
910 910   #if($xcontext.user != "XWiki.XWikiGuest")
911 911   <div class="thread-add-post">
1273 + #if($isSchoolMember || $isAlumniOfSchool || $isViewerAdmin)
912 912   <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
913 913   ＋ 活動報告を追加
914 914   </a>
1277 + #end
915 915   <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
916 916   <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> コメントを書く
917 917   </a>
... ... @@ -944,6 +944,35 @@
944 944  ## --- 年度タブ切り替え JavaScript ---
945 945  {{html clean="false"}}
946 946  <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 +}
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 +}
1338 +
947 947  function switchActivityFY(fy, btn) {
948 948   // タブのアクティブ状態を切り替え
949 949   document.querySelectorAll('.activity-fy-tab').forEach(function(t) { t.classList.remove('active'); });
... ... @@ -959,6 +959,27 @@
959 959  }
960 960  // ページ読み込み時の初期化
961 961  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 + }
962 962   // デフォルトで現在の年度を表示
963 963   var defaultTab = document.querySelector('.activity-fy-tab.active');
964 964   if (defaultTab) { defaultTab.click(); }
... ... @@ -970,6 +970,30 @@
970 970   window.history.replaceState({}, document.title, window.location.pathname);
971 971   }
972 972   }
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 + });
973 973  });
974 974  
975 975  // トースト通知表示
... ... @@ -998,40 +998,136 @@
998 998   var card = document.getElementById(cardId);
999 999   if (!card) return;
1000 1000   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);
1001 1001  }
1002 1002  
1003 1003  // 投稿の編集（インライン編集フォームを開く）
1004 -function openEditPost(btn, schoolPage, postObjNum, currentContent) {
1444 +function openEditPost(btn) {
1005 1005   var postEl = btn.closest('.thread-post');
1006 1006   if (!postEl) return;
1007 - // 既存の編集フォームがあれば閉じる
1008 1008   var existing = postEl.querySelector('.post-edit-form');
1009 1009   if (existing) { existing.remove(); return; }
1010 1010   var bodyEl = postEl.querySelector('.thread-post-body');
1011 1011   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 +
1012 1012   var form = document.createElement('div');
1013 1013   form.className = 'post-edit-form';
1014 - form.innerHTML = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>' +
1015 - '<div class="post-edit-form-actions">' +
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">' +
1016 1016   '<button type="button" class="btn-cancel-edit" onclick="this.closest(\'.post-edit-form\').remove()">キャンセル</button>' +
1017 - '<button type="button" class="btn-save" onclick="saveEditPost(\'' + schoolPage + '\', ' + postObjNum + ')">保存</button>' +
1515 + '<button type="button" class="btn-save" onclick="saveEditPost(this)">保存</button>' +
1018 1018   '</div>';
1517 +
1518 + form.innerHTML = html;
1019 1019   bodyEl.parentNode.insertBefore(form, bodyEl.nextSibling);
1020 1020   form.querySelector('textarea').focus();
1021 1021  }
1022 1022  
1523 +function removeEditAttach(btn) {
1524 + var item = btn.closest('.edit-attach-item');
1525 + if (item) item.remove();
1526 +}
1527 +
1023 1023  // 投稿の編集を保存
1024 -function saveEditPost(schoolPage, postObjNum) {
1025 - var textarea = document.getElementById('editContent_' + postObjNum);
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');
1026 1026   if (!textarea) return;
1027 1027   var newContent = textarea.value.trim();
1028 1028   if (!newContent) { alert('投稿内容を入力してください'); return; }
1538 +
1029 1029   var csrfEl = document.querySelector('input[name="form_token"]');
1030 1030   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 +
1031 1031   var xhr = new XMLHttpRequest();
1032 - xhr.open('POST', '/bin/SeitokaiCode/EditPost?outputSyntax=plain', true);
1033 - xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1034 - var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken);
1567 + xhr.open('POST', '/bin/get/SeitokaiCode/EditPost?outputSyntax=plain', true);
1035 1035   xhr.onload = function() {
1036 1036   try {
1037 1037   var res = JSON.parse(xhr.responseText);
... ... @@ -1039,12 +1039,13 @@
1039 1039   showToast('投稿を更新しました', 'success');
1040 1040   setTimeout(function() { location.reload(); }, 800);
1041 1041   } else {
1575 + btn.disabled = false; btn.textContent = '保存';
1042 1042   alert('編集に失敗しました: ' + (res.error || ''));
1043 1043   }
1044 - } catch(e) { alert('編集に失敗しました'); }
1578 + } catch(e) { btn.disabled = false; btn.textContent = '保存'; alert('編集に失敗しました'); }
1045 1045   };
1046 - xhr.onerror = function() { alert('通信エラーが発生しました'); };
1047 - xhr.send(editPostData);
1580 + xhr.onerror = function() { btn.disabled = false; btn.textContent = '保存'; alert('通信エラーが発生しました'); };
1581 + xhr.send(fd);
1048 1048  }
1049 1049  
1050 1050  // 投稿の削除（確認ダイアログ付き）
... ... @@ -1051,7 +1051,7 @@
1051 1051  function confirmDeletePost(schoolPage, postObjNum, token) {
1052 1052   if (!confirm('この投稿を削除しますか？\\n削除後は「この投稿は削除されました」と表示されます。')) return;
1053 1053   var xhr = new XMLHttpRequest();
1054 - xhr.open('POST', '/bin/SeitokaiCode/DeletePost?outputSyntax=plain', true);
1588 + xhr.open('POST', '/bin/get/SeitokaiCode/DeletePost?outputSyntax=plain', true);
1055 1055   xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1056 1056   var deletePostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token);
1057 1057   xhr.onload = function() {
... ... @@ -1068,6 +1068,80 @@
1068 1068   xhr.onerror = function() { alert('通信エラーが発生しました'); };
1069 1069   xhr.send(deletePostData);
1070 1070  }
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 +}
1071 1071  </script>
1072 1072  {{/html}}
1073 1073  {{/velocity}}