Skip to Content
Last modified by Super Admin on 2026/04/05 18:59
From version Icon 87.1 Icon
edited by Super Admin
on 2026/03/20 02:07
Change comment: There is no comment for this version
To version 1.1 Icon
edited by Super Admin
on 2026/03/05 22:05
Change comment: There is no comment for this version

Summary

Details

Icon Page properties
Content
... ... @@ -1,27 +1,10 @@
1 1  {{velocity}}
2 2  ## ===== 学校ページ テンプレート =====
3 -## ゲストが ?sheet= 付きURL（編集フォーム等）に直接アクセスした場合、ログインページへリダイレクト
4 -#if($xcontext.user == 'XWiki.XWikiGuest' && $request.sheet && $request.sheet != '')
5 - #set($currentUrl = $doc.getURL('view', "sheet=${request.sheet}"))
6 - $response.sendRedirect("/bin/login/XWiki/XWikiLogin?srid=$escapetool.url($currentUrl)")
7 - #stop
8 -#end
9 -{{html clean="false"}}
10 -## メンテナンスバナー（{{include}}ではなくインラインで記述し、<p>タグ挿入を回避）
11 -#set($bannerDoc = $xwiki.getDocument('SeitokaiAdmin.MaintenanceBanner'))
12 -#set($bannerObj = $bannerDoc.getObject('SeitokaiCode.MaintenanceBannerClass'))
13 -#if($bannerObj && $bannerObj.getValue('enabled') == 1)
14 -#set($bannerMsg = $bannerObj.getValue('message'))
15 -#set($bannerLevel = $bannerObj.getValue('level'))
16 -#if(!$bannerLevel || $bannerLevel == '')#set($bannerLevel = 'warning')#end
17 -<div class="maintenance-banner active maintenance-${bannerLevel}" id="maintenance-banner">
18 - <div class="maintenance-banner-inner">
19 - <span class="maintenance-icon">#if($bannerLevel == 'urgent')<svg class="ico-banner" viewBox="0 0 24 24"><path d="M10.29 3.86L1.82 18a2 2 0 001.71 3h16.94a2 2 0 001.71-3L13.71 3.86a2 2 0 00-3.42 0z"/><line x1="12" y1="9" x2="12" y2="13"/><line x1="12" y1="17" x2="12.01" y2="17"/></svg>#elseif($bannerLevel == 'info')<svg class="ico-banner" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><line x1="12" y1="16" x2="12" y2="12"/><line x1="12" y1="8" x2="12.01" y2="8"/></svg>#else<svg class="ico-banner" viewBox="0 0 24 24"><path d="M14.7 6.3a1 1 0 000 1.4l1.6 1.6a1 1 0 001.4 0l3.77-3.77a6 6 0 01-7.94 7.94l-6.91 6.91a2.12 2.12 0 01-3-3l6.91-6.91a6 6 0 017.94-7.94l-3.76 3.76z"/></svg>#end</span>
20 - <span class="maintenance-text">$!escapetool.xml($bannerMsg)</span>
21 - <button class="maintenance-close" onclick="document.getElementById('maintenance-banner').style.display='none'">&times;</button>
22 - </div>
23 -</div>
24 -#end
3 +## このテンプレートは学校ページの表示と入力フォームを制御します。
4 +
5 +## メンテナンスバナー
6 +{{include reference="SeitokaiCode.MaintenanceBannerInclude" /}}
7 +
25 25  ## --- 学校基本情報フィールド ---
26 26  #set($schoolCode = $doc.getValue('schoolCode'))
27 27  #set($schoolName = $doc.getValue('schoolName'))
... ... @@ -34,10 +34,8 @@
34 34  #set($schoolLevel = $doc.getValue('schoolLevel'))
35 35  #set($schoolSystem = $doc.getValue('schoolSystem'))
36 36  #set($website = $doc.getValue('website'))
37 -#set($schoolPhoto = $doc.getValue('schoolPhoto'))
38 -#set($schoolDescription = $doc.getValue('schoolDescription'))
39 39  
40 -## --- 生徒会組織 ---
21 +## --- 組織図 ---
41 41  #set($orgChart = $doc.getValue('orgChart'))
42 42  #set($orgChartImage = $doc.getValue('orgChartImage'))
43 43  
... ... @@ -73,7 +73,9 @@
73 73  #set($seitokaiYoutube = $doc.getValue('seitokaiYoutube'))
74 74  #set($seitokaiOtherSns = $doc.getValue('seitokaiOtherSns'))
75 75  
76 -## --- 現在の年度を計算（4月始まり） ---
57 +## --- 年度アーカイブ ---
58 +#set($pageFiscalYear = $!doc.getValue('fiscalYear'))
59 +## 現在の年度を計算（4月始まり）
77 77  #set($nowFY = $datetool.date)
78 78  #set($currentFYMonth = $mathtool.toInteger($datetool.format('MM', $nowFY)))
79 79  #set($currentFYYear = $mathtool.toInteger($datetool.format('yyyy', $nowFY)))
... ... @@ -82,6 +82,10 @@
82 82  #else
83 83   #set($currentFiscalYear = $mathtool.sub($currentFYYear, 1))
84 84  #end
68 +## fiscalYear 未設定時はデフォルトとして現在の年度を使う
69 +#if(!$pageFiscalYear || $pageFiscalYear == '')
70 + #set($pageFiscalYear = $currentFiscalYear.toString())
71 +#end
85 85  
86 86  ## --- 公開範囲フィールド ---
87 87  #set($visibilityOrgChart = $!doc.getValue('visibilityOrgChart'))
... ... @@ -103,81 +103,15 @@
103 103   #set($viewerDoc = $xwiki.getDocument($viewerUser))
104 104   #set($viewerAccountType = $!viewerDoc.getValue('accountType'))
105 105   #set($viewerSchoolCode = $!viewerDoc.getValue('schoolCode'))
106 - #set($viewerSecondarySchoolCode = $!viewerDoc.getValue('secondarySchoolCode'))
107 - #set($viewerUserRole = $!viewerDoc.getValue('userRole'))
108 108   #if($viewerAccountType == 'admin')
109 109   #set($isViewerAdmin = true)
110 110   #end
111 111  #end
112 112  
113 -## --- 関連校（中高一貫校）情報 ---
114 -#set($affiliatedSchoolCode = $!doc.getValue('affiliatedSchoolCode'))
115 -#set($affiliatedSchoolName = $!doc.getValue('affiliatedSchoolName'))
116 -#set($isAffiliated = false)
117 -#if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
118 - #if($viewerSchoolCode == $affiliatedSchoolCode)
119 - #set($isAffiliated = true)
120 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode)
121 - #set($isAffiliated = true)
122 - #end
123 -#end
124 -
125 -## --- 校内判定（卒業生を除外、secondarySchoolCodeも含む） ---
126 -#set($isSchoolMember = false)
127 -#if(!$isGuest && $viewerUserRole != 'graduate')
128 - #if($viewerSchoolCode == $schoolCode || $isAffiliated)
129 - #set($isSchoolMember = true)
130 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode)
131 - #set($isSchoolMember = true)
132 - #end
133 -#end
134 -## 卒業生の母校判定（投稿バッジ用）
135 -#set($isAlumniOfSchool = false)
136 -#if(!$isGuest && $viewerUserRole == 'graduate')
137 - #if($viewerSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $viewerSchoolCode == $affiliatedSchoolCode))
138 - #set($isAlumniOfSchool = true)
139 - #end
140 -#end
141 -
142 -## --- 学校ページ非表示チェック ---
143 -#set($schoolHidden = $doc.getValue('hidden'))
144 -#if($schoolHidden == 1)
145 - #if($isViewerAdmin)
146 - ## 管理者: 黄色バナー + ページ内容は通常表示（プレビュー）
147 -<div class="school-hidden-banner admin">
148 - <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>
149 - <div>
150 - <strong>このページは非表示になっています</strong>（管理者のみ閲覧可能）
151 - #set($hBy = $!doc.getValue('hiddenBy'))
152 - #set($hAt = $!doc.getValue('hiddenAt'))
153 - #set($hReason = $!doc.getValue('hiddenReason'))
154 - <div class="school-hidden-detail">
155 - 非表示: $!escapetool.xml($hAt) / $!escapetool.xml($hBy)
156 - #if($hReason && $hReason != '') ・ 理由: $!escapetool.xml($hReason)#end
157 - </div>
158 - <a href="$xwiki.getURL('SeitokaiAdmin.SchoolManagement', 'view')" style="color:#92400e;text-decoration:underline">学校ページ管理へ</a>
159 - </div>
160 -</div>
161 - #else
162 - ## 一般ユーザー・ゲスト: 非公開メッセージを表示して停止
163 -<div class="school-hidden-public">
164 - <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>
165 - <h2>このページは現在公開されていません</h2>
166 - <p>このページは管理者により非公開に設定されています。</p>
167 - <a href="$xwiki.getURL('Schools.WebHome', 'view')" class="btn-back-list">学校一覧に戻る</a>
168 -</div>
169 -#stop
170 - #end
171 -#end
172 -
173 173  ## --- 投稿固定/解除処理 ---
174 174  #set($pinAction = $!request.action)
175 -#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $isSchoolMember)) && $services.csrf.isTokenValid($request.form_token))
176 - #set($pinPostObjStr = $!request.postObj)
177 - #if(!$pinPostObjStr.matches('^\d+$'))
178 - ## 不正な値 → 無視
179 - #else
180 - #set($postObjNum = $mathtool.toInteger($pinPostObjStr))
100 +#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || $viewerAccountType == 'verified') && $services.csrf.isTokenValid($request.form_token))
101 + #set($postObjNum = $mathtool.toInteger($!request.postObj))
181 181   #set($postObj = $doc.getObject('SeitokaiCode.ActivityPostClass', $postObjNum))
182 182   #if($postObj)
183 183   #if($pinAction == 'pin')
... ... @@ -197,15 +197,12 @@
197 197   $response.sendRedirect($doc.getURL('view'))
198 198   #stop
199 199   #end
200 - #end## /matches
201 201  #end
202 202  
203 203  ## --- 特色ある活動 選定/解除処理 ---
204 204  #set($featAction = $!request.action)
205 -#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $isSchoolMember)) && $services.csrf.isTokenValid($request.form_token))
206 - #set($featActObjStr = $!request.actObj)
207 - #if($featActObjStr.matches('^\d+$'))
208 - #set($actObjNum = $mathtool.toInteger($featActObjStr))
125 +#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $services.csrf.isTokenValid($request.form_token))
126 + #set($actObjNum = $mathtool.toInteger($!request.actObj))
209 209   #set($actObj = $doc.getObject('SeitokaiCode.ActivityClass', $actObjNum))
210 210   #if($actObj)
211 211   #if($featAction == 'feature')
... ... @@ -237,13 +237,12 @@
237 237   $response.sendRedirect($doc.getURL('view'))
238 238   #stop
239 239   #end
240 - #end## /matches
241 241  #end
242 242  
243 243  ## --- ユーザー情報取得 ---
244 244  ## displayName: Wiki上の表示名（ニックネーム）。本名(firstName/lastName)は管理者のみ閲覧可能。
245 245  #set($lastAuthor = $doc.author)
246 -#set($lastAuthorDoc = $xwiki.getDocument($lastAuthor))
163 +#set($lastAuthorDoc = $xwiki.getDocument("XWiki.${lastAuthor}"))
247 247  #set($authorAccountType = '')
248 248  #set($authorUserRole = '')
249 249  #set($authorUserStatus = '')
... ... @@ -257,8 +257,7 @@
257 257   #set($authorEnrollmentYear = $!lastAuthorDoc.getValue('enrollmentYear'))
258 258   #set($authorDisplayName = $!lastAuthorDoc.getValue('displayName'))
259 259   #if(!$authorDisplayName || $authorDisplayName == '')
260 - ## false引数でプレーンテキスト（HTMLリンクなし）を取得
261 - #set($authorDisplayName = $xwiki.getUserName($doc.author, false))
177 + #set($authorDisplayName = $xwiki.getUserName($doc.author))
262 262   #end
263 263   ## --- 学年の動的計算（学校種別対応） ---
264 264   ## 日本の学校年度: 4月始まり。currentSchoolYear = (月>=4) ? 今年 : 去年
... ... @@ -296,321 +296,338 @@
296 296   #end
297 297  #end
298 298  
299 -## --- 学校名見出し（XWikiデフォルトタイトルを非表示にし、学校名を表示） ---
300 -#if($schoolName && $schoolName != '')
301 -<style>.document-header { display: none !important; }</style>
302 -<h1 class="school-page-title">$!escapetool.xml($schoolName)</h1>
303 -#end
215 +## --- 信頼性バッジ + ユーザー情報 ---
216 +{{html clean="false"}}
217 +<div class="seitokai-badge-container">
218 + ## 承認バッジ
219 + #if($authorAccountType == 'admin')
220 + <span class="badge badge-admin"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 管理者</span>
221 + #elseif($authorAccountType == 'verified')
222 + <span class="badge badge-verified"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"><path d="M20 6L9 17l-5-5"/></svg> 承認済み</span>
223 + #elseif($authorAccountType == 'referred')
224 + <span class="badge badge-referred"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M10 13a5 5 0 007.54.54l3-3a5 5 0 00-7.07-7.07l-1.72 1.71"/><path d="M14 11a5 5 0 00-7.54-.54l-3 3a5 5 0 007.07 7.07l1.71-1.71"/></svg> 紹介</span>
225 + #else
226 + <span class="badge badge-general">一般</span>
227 + #end
228 + ## 役割バッジ
229 + #if($authorUserRole == 'student')
230 + <span class="badge badge-role-student"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M22 10l-10-5L2 10l10 5 10-5z"/><path d="M6 12v5c0 1.66 2.69 3 6 3s6-1.34 6-3v-5"/></svg> 生徒</span>
231 + #elseif($authorUserRole == 'teacher')
232 + <span class="badge badge-role-teacher"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M4 19.5A2.5 2.5 0 016.5 17H20"/><path d="M6.5 2H20v20H6.5A2.5 2.5 0 014 19.5v-15A2.5 2.5 0 016.5 2z"/></svg> 教員</span>
233 + #elseif($authorUserRole == 'graduate')
234 + <span class="badge badge-role-graduate"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M22 10l-10-5L2 10l10 5 10-5z"/><path d="M6 12v5c0 1.66 2.69 3 6 3s6-1.34 6-3v-5"/></svg> 卒業生</span>
235 + #end
236 + ## 学年（生徒のみ公開）
237 + #if($authorGrade && $authorGrade != '')
238 + <span class="badge badge-grade">$authorGrade</span>
239 + #end
240 + ## 在籍状態（卒業・休学等の場合のみ表示）
241 + #if($authorUserStatus == 'graduated')
242 + <span class="badge badge-status-graduated"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M22 10l-10-5L2 10l10 5 10-5z"/><path d="M6 12v5c0 1.66 2.69 3 6 3s6-1.34 6-3v-5"/></svg> 卒業済み</span>
243 + #elseif($authorUserStatus == 'on_leave')
244 + <span class="badge badge-status-onleave"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="currentColor"><rect x="6" y="4" width="4" height="16" rx="1"/><rect x="14" y="4" width="4" height="16" rx="1"/></svg> 休学中</span>
245 + #elseif($authorUserStatus == 'transferred')
246 + <span class="badge badge-status-transferred"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="23 4 23 10 17 10"/><polyline points="1 20 1 14 7 14"/><path d="M3.51 9a9 9 0 0114.85-3.36L23 10M1 14l4.64 4.36A9 9 0 0020.49 15"/></svg> 転校済み</span>
247 + #end
248 + <span class="badge-info">最終編集: $escapetool.xml($authorDisplayName) ($xwiki.formatDate($doc.date, "yyyy/MM/dd"))</span>
249 +</div>
250 +{{/html}}
304 304  
305 -## --- 編集ボタン（権限があるユーザーのみ表示） ---
306 -#set($canEditSchool = false)
307 -#if(!$isGuest && ($isViewerAdmin || $isSchoolMember))
308 - #set($canEditSchool = true)
309 -#end
310 -#if($canEditSchool)
311 -<div style="text-align:right; margin-bottom:12px;">
312 - <a href="$doc.getURL('view', 'sheet=SeitokaiCode.SchoolEditForm')" class="btn-school-edit"><svg class="ico" viewBox="0 0 24 24"><path d="M11 4H4a2 2 0 00-2 2v14a2 2 0 002 2h14a2 2 0 002-2v-7"/><path d="M18.5 2.5a2.121 2.121 0 013 3L12 15l-4 1 1-4 9.5-9.5z"/></svg> 基本情報を編集</a>
252 +{{html clean="false"}}
253 +
254 +## --- ① 学校基本情報 + 連絡先（左右グリッド・折りたたみ対応） ---
255 +<div class="school-info-grid">
256 + <div class="school-info-card mobile-collapse" id="card-basic-info">
257 + <h2 onclick="toggleInfoCard('card-basic-info')"><span><svg class="ico" style="width:1.1em;height:1.1em;vertical-align:-0.15em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M4 19.5A2.5 2.5 0 016.5 17H20"/><path d="M6.5 2H20v20H6.5A2.5 2.5 0 014 19.5v-15A2.5 2.5 0 016.5 2z"/></svg> 学校基本情報</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2>
258 + <table class="wiki-table school-info-table">
259 + <tr><th>学校コード</th><td>$escapetool.xml($!schoolCode)</td></tr>
260 + <tr><th>学校名</th><td>$escapetool.xml($!schoolName)</td></tr>
261 + <tr><th>所在地</th><td>$escapetool.xml($!prefecture) #if($city && $city != '')$escapetool.xml($city)#end</td></tr>
262 + <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
263 + <tr><th>共学・別学</th><td>$escapetool.xml($!coeducation)</td></tr>
264 + <tr><th>設置者</th><td>$escapetool.xml($!establishment)</td></tr>
265 + <tr><th>学校種</th><td>$escapetool.xml($!schoolLevel)</td></tr>
266 + <tr><th>課程</th><td>$escapetool.xml($!schoolSystem)</td></tr>
267 + <tr><th>公式サイト</th><td>#if($website && $website != '')<a href="$escapetool.xml($website)" target="_blank" rel="noopener">$escapetool.xml($website)</a>#else<span style="color:#9ca3af;">未登録</span>#end</td></tr>
268 + </table>
269 + #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
270 + #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
271 + #if($infoEditDate && $infoEditDate != '')
272 + <div class="info-last-updated"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M11 4H4a2 2 0 00-2 2v14a2 2 0 002 2h14a2 2 0 002-2v-7"/><path d="M18.5 2.5a2.121 2.121 0 013 3L12 15l-4 1 1-4 9.5-9.5z"/></svg> 基本情報の最終更新: $escapetool.xml($infoEditBy) — $escapetool.xml($infoEditDate)</div>
273 + #end
274 + </div>
275 +
276 + <div class="school-info-card mobile-collapse" id="card-contact">
277 + <h2 onclick="toggleInfoCard('card-contact')"><span><svg class="ico" style="width:1.1em;height:1.1em;vertical-align:-0.15em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M22 16.92v3a2 2 0 01-2.18 2 19.79 19.79 0 01-8.63-3.07 19.5 19.5 0 01-6-6 19.79 19.79 0 01-3.07-8.67A2 2 0 014.11 2h3a2 2 0 012 1.72c.127.96.361 1.903.7 2.81a2 2 0 01-.45 2.11L8.09 9.91a16 16 0 006 6l1.27-1.27a2 2 0 012.11-.45c.907.339 1.85.573 2.81.7A2 2 0 0122 16.92z"/></svg> 連絡先・SNS</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2>
278 + <table class="wiki-table school-info-table">
279 + <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$escapetool.xml($contactInfo)#else<span style="color:#9ca3af;">未登録</span>#end</td></tr>
280 + <tr><th>生徒会Web</th><td>#if($seitokaiWebsite && $seitokaiWebsite != '')<a href="$escapetool.xml($seitokaiWebsite)" target="_blank" rel="noopener"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="10"/><path d="M2 12h20"/><path d="M12 2a15.3 15.3 0 014 10 15.3 15.3 0 01-4 10 15.3 15.3 0 01-4-10 15.3 15.3 0 014-10z"/></svg> $escapetool.xml($seitokaiWebsite)</a>#else<span style="color:#9ca3af;">未登録</span>#end</td></tr>
281 + <tr><th>X (Twitter)</th><td>#if($seitokaiTwitter && $seitokaiTwitter != '')<a href="https://x.com/$escapetool.url($seitokaiTwitter)" target="_blank" rel="noopener">𝕏 @$escapetool.xml($seitokaiTwitter)</a>#else<span style="color:#9ca3af;">未登録</span>#end</td></tr>
282 + <tr><th>Instagram</th><td>#if($seitokaiInstagram && $seitokaiInstagram != '')<a href="https://instagram.com/$escapetool.url($seitokaiInstagram)" target="_blank" rel="noopener"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M23 19a2 2 0 01-2 2H3a2 2 0 01-2-2V8a2 2 0 012-2h4l2-3h6l2 3h4a2 2 0 012 2z"/><circle cx="12" cy="13" r="4"/></svg> @$escapetool.xml($seitokaiInstagram)</a>#else<span style="color:#9ca3af;">未登録</span>#end</td></tr>
283 + <tr><th>YouTube</th><td>#if($seitokaiYoutube && $seitokaiYoutube != '')<a href="$escapetool.xml($seitokaiYoutube)" target="_blank" rel="noopener"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polygon points="5 3 19 12 5 21 5 3"/></svg> YouTubeチャンネル</a>#else<span style="color:#9ca3af;">未登録</span>#end</td></tr>
284 + <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$escapetool.xml($seitokaiOtherSns)#else<span style="color:#9ca3af;">未登録</span>#end</td></tr>
285 + </table>
286 + </div>
313 313  </div>
314 -#end
315 315  
316 -## --- 関連校（中高一貫校）バナー ---
317 -#if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
318 - #set($affiliatedPageRef = "Schools.${affiliatedSchoolCode}.WebHome")
319 - #set($affiliatedPageExists = $xwiki.exists($affiliatedPageRef))
320 -<div class="affiliated-school-banner">
321 - <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>
322 - <div>
323 - <strong>中高一貫校</strong>：
324 - #if($affiliatedPageExists)
325 - <a href="$xwiki.getURL($affiliatedPageRef, 'view')">$!escapetool.xml($affiliatedSchoolName)</a>
326 - #else
327 - $!escapetool.xml($affiliatedSchoolName)
289 +## --- 生徒会情報アコーディオン ---
290 +<div style="margin:20px 0 16px;">
291 + <button class="shortcut-btn shortcut-btn-secondary" onclick="var sec=document.getElementById('seitokai-info-section');sec.classList.toggle('open');this.querySelector('.shortcut-arrow').textContent=sec.classList.contains('open')?'▲':'▼';">
292 + <svg class="ico" style="width:1.1em;height:1.1em;vertical-align:-0.15em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/></svg>
293 + 生徒会情報を見る <span class="shortcut-arrow">▼</span>
294 + </button>
295 +</div>
296 +
297 +<div id="seitokai-info-section" class="seitokai-info-accordion">
298 +
299 +## --- ② 組織図 ---
300 +#set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
301 +#if($hasOrgContent)
302 + ## 公開範囲チェック
303 + #set($canViewOrgChart = true)
304 + #if($visibilityOrgChart == 'members' && $isGuest) #set($canViewOrgChart = false)
305 + #elseif($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewOrgChart = false)
306 + #end
307 + #if($canViewOrgChart)
308 +<h2 class="section-title"><svg class="ico" style="width:1.1em;height:1.1em;vertical-align:-0.15em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/><line x1="9" y1="10" x2="9" y2="10.01"/><line x1="15" y1="10" x2="15" y2="10.01"/><line x1="9" y1="14" x2="9" y2="14.01"/><line x1="15" y1="14" x2="15" y2="14.01"/></svg> 組織図 #if($visibilityOrgChart != 'public')<span class="visibility-badge visibility-${visibilityOrgChart}">#if($visibilityOrgChart == 'members')<svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h2>
309 +<div class="school-section-card">
310 + <div class="card-inner">
311 + #if($orgChartImage && $orgChartImage != '')
312 + <div style="margin-bottom:12px;"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" style="max-width:100%; border-radius:8px;" /></div>
328 328   #end
329 - と連携しています
314 + #if($orgChart && $orgChart != '')$escapetool.xml($orgChart)#end
330 330   </div>
331 331  </div>
317 + #else
318 +<div class="visibility-restricted-notice"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 組織図は #if($visibilityOrgChart == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
319 + #end
332 332  #end
333 333  
334 -## --- ① 学校基本情報 ---
335 -<div class="school-info-card collapsed" id="card-basic-info">
336 - <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>
337 - <div class="school-basic-info-layout">
338 - <div class="school-basic-info-table">
339 - <table class="wiki-table school-info-table">
340 - <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
341 - <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
342 - <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
343 - <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
344 - <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
345 - <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
346 - <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
347 - <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
348 - <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>
349 - </table>
322 +## --- ③④⑤ 日常の活動・選挙・定例活動 ---
323 +<div class="school-section-grid">
324 + #if($dailyActivities && $dailyActivities != '')
325 + <div class="school-section-card">
326 + <h3><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z"/><polyline points="14 2 14 8 20 8"/><line x1="16" y1="13" x2="8" y2="13"/><line x1="16" y1="17" x2="8" y2="17"/></svg> 日常の活動</h3>
327 + <div class="card-inner">
328 + <p style="font-size:0.88em; color:#9ca3af; margin-bottom:12px;">活動時間の多い順に上位3つ</p>
329 + <div class="tag-container">
330 + #set($daIdx = 1)
331 + #foreach($da in $dailyActivities.split(","))
332 + <span class="tag tag-accent">${daIdx}. $escapetool.xml($da.trim())</span>
333 + #set($daIdx = $daIdx + 1)
334 + #end
335 + </div>
336 + #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
337 + <div class="free-note">$escapetool.xml($dailyActivitiesNote)</div>
338 + #end
350 350   </div>
351 - #if($schoolPhoto && $schoolPhoto != '')
352 - <div class="school-photo-area">
353 - <img src="$doc.getAttachmentURL($schoolPhoto)" alt="$!escapetool.xml($schoolName)" class="school-photo" />
354 - </div>
355 - #end
356 356   </div>
357 - #if($schoolDescription && $schoolDescription.trim() != '')
358 - <div class="free-note" style="margin-top:var(--sp-4);">$!escapetool.xml($schoolDescription)</div>
359 359   #end
360 360  
343 + #if($electionExists && $electionExists != '')
344 + <div class="school-section-card">
345 + <h3><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="3" width="18" height="18" rx="2"/><path d="M7 13l3 3 7-7"/></svg> 選挙</h3>
346 + <div class="card-inner">
347 + <div class="info-row">
348 + <span class="info-label">役員選挙</span>
349 + <span class="info-value">$escapetool.xml($!electionExists)</span>
350 + </div>
351 + #if($electionType && $electionType != '')
352 + <div class="info-row">
353 + <span class="info-label">直近の選挙方式</span>
354 + <span class="info-value">$escapetool.xml($!electionType)</span>
355 + </div>
356 + #end
357 + #if($electionNote && $electionNote.trim() != '')
358 + <div class="free-note">$escapetool.xml($electionNote)</div>
359 + #end
360 + </div>
361 + </div>
362 + #end
361 361  </div>
362 362  
363 -## --- ② 生徒会基本情報（折りたたみカード） ---
364 -<div class="school-info-card" id="card-seitokai-info">
365 - <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>
366 - <div class="seitokai-info-body">
365 +<div class="school-section-grid">
366 + #if($meetingFrequency && $meetingFrequency != '')
367 + <div class="school-section-card">
368 + <h3><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="4" width="18" height="18" rx="2"/><line x1="16" y1="2" x2="16" y2="6"/><line x1="8" y1="2" x2="8" y2="6"/><line x1="3" y1="10" x2="21" y2="10"/></svg> 定例活動</h3>
369 + <div class="card-inner">
370 + <div class="info-row">
371 + <span class="info-label">役員定例会の頻度</span>
372 + <span class="info-value">$escapetool.xml($!meetingFrequency)</span>
373 + </div>
374 + #if($regularActivitiesNote && $regularActivitiesNote.trim() != '')
375 + <div class="free-note">$escapetool.xml($regularActivitiesNote)</div>
376 + #end
377 + </div>
378 + </div>
379 + #end
367 367  
368 - ## --- 生徒会組織 ---
369 - #set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
370 - #if($hasOrgContent)
371 - #set($canViewOrgChart = true)
372 - #if($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewOrgChart = false)
373 - #elseif($visibilityOrgChart == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewOrgChart = false)
381 + ## --- ⑦ 予算 ---
382 + #set($hasBudget = ($budgetProcess && $budgetProcess != '') || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
383 + #if($hasBudget)
384 + ## 公開範囲チェック
385 + #set($canViewBudget = true)
386 + #if($visibilityBudget == 'members' && $isGuest) #set($canViewBudget = false)
387 + #elseif($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewBudget = false)
388 + #end
389 + #if($canViewBudget)
390 + <div class="school-section-card">
391 + <h3><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><line x1="12" y1="1" x2="12" y2="23"/><path d="M17 5H9.5a3.5 3.5 0 000 7h5a3.5 3.5 0 010 7H6"/></svg> 予算 #if($visibilityBudget != 'public')<span class="visibility-badge visibility-${visibilityBudget}">#if($visibilityBudget == 'members')<svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
392 + <div class="card-inner">
393 + #if($budgetProcess && $budgetProcess != '')
394 + <div class="info-row">
395 + <span class="info-label">作成過程の生徒関与</span>
396 + <span class="info-value">
397 + <div class="selection-display">
398 + #foreach($bp in $budgetProcess.split(","))
399 + <span class="selection-item">$escapetool.xml($bp.trim())</span>
400 + #end
401 + </div>
402 + </span>
403 + </div>
374 374   #end
375 - #if($canViewOrgChart)
376 - <div class="seitokai-subsection">
377 - <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>
378 - <div class="seitokai-subsection-content">
379 - #if($orgChartImage && $orgChartImage != '')
380 - <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
381 - #end
382 - #if($orgChart && $orgChart != '')<div class="free-note">$!escapetool.xml($orgChart)</div>#end
405 + #if($studentFee && $studentFee != '')
406 + <div class="info-row">
407 + <span class="info-label">生徒会費（年額）</span>
408 + <span class="info-value">$escapetool.xml($!studentFee)</span>
383 383   </div>
384 - </div>
385 - #else
386 - <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>
387 387   #end
388 - #end
389 -
390 - ## --- 日常の活動 ---
391 - #if($dailyActivities && !$dailyActivities.isEmpty())
392 - <div class="seitokai-subsection">
393 - <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>
394 - <div class="seitokai-subsection-content">
395 - <p class="activity-hint">活動時間が多い3つ</p>
396 - <div class="tag-container">
397 - #foreach($da in $dailyActivities)
398 - <span class="tag tag-accent">$!escapetool.xml($da.trim())</span>
399 - #end
400 - </div>
401 - #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
402 - <div class="free-note">$!escapetool.xml($dailyActivitiesNote)</div>
403 - #end
411 + #if($budgetScale && $budgetScale != '')
412 + <div class="info-row">
413 + <span class="info-label">予算規模</span>
414 + <span class="info-value">$escapetool.xml($!budgetScale)</span>
404 404   </div>
405 - </div>
406 - #end
407 -
408 - ## --- 選挙 ---
409 - #if($electionExists && $electionExists != '')
410 - <div class="seitokai-subsection">
411 - <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>
412 - <div class="seitokai-subsection-content">
413 - <div class="info-row">
414 - <span class="info-label">役員選挙</span>
415 - <span class="info-value">$!escapetool.xml($!electionExists)</span>
416 - </div>
417 - #if($electionType && $electionType != '')
418 - <div class="info-row">
419 - <span class="info-label">直近の選挙方式</span>
420 - <span class="info-value">$!escapetool.xml($!electionType)</span>
421 - </div>
422 - #end
423 - #if($electionNote && $electionNote.trim() != '')
424 - <div class="free-note">$!escapetool.xml($electionNote)</div>
425 - #end
416 + #end
417 + #if($budgetAllocation && $budgetAllocation != '')
418 + <div class="info-row">
419 + <span class="info-label">主な予算配分</span>
420 + <span class="info-value">
421 + <div class="selection-display">
422 + #foreach($ba in $budgetAllocation.split(","))
423 + <span class="selection-item">$escapetool.xml($ba.trim())</span>
424 + #end
425 + </div>
426 + </span>
426 426   </div>
428 + #end
429 + #if($budgetNote && $budgetNote.trim() != '')
430 + <div class="free-note">$escapetool.xml($budgetNote)</div>
431 + #end
427 427   </div>
433 + </div>
434 + #else
435 + <div class="visibility-restricted-notice"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 予算情報は #if($visibilityBudget == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
428 428   #end
437 + #end
438 +</div>
429 429  
430 - ## --- 定例活動 ---
431 - #if($meetingFrequency && $meetingFrequency != '')
432 - <div class="seitokai-subsection">
433 - <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>
434 - <div class="seitokai-subsection-content">
435 - <div class="info-row">
436 - <span class="info-label">役員定例会の頻度</span>
437 - <span class="info-value">$!escapetool.xml($!meetingFrequency)</span>
440 +## --- ⑧ 校則の見直し ---
441 +#if($ruleReviewStatus && $ruleReviewStatus != '')
442 + ## 公開範囲チェック
443 + #set($canViewRuleReview = true)
444 + #if($visibilityRuleReview == 'members' && $isGuest) #set($canViewRuleReview = false)
445 + #elseif($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewRuleReview = false)
446 + #end
447 + #if($canViewRuleReview)
448 +<h2 class="section-title"><svg class="ico" style="width:1.1em;height:1.1em;vertical-align:-0.15em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M16 4h2a2 2 0 012 2v12a2 2 0 01-2 2h-2"/><path d="M8 4H6a2 2 0 00-2 2v12a2 2 0 002 2h2"/><line x1="12" y1="4" x2="12" y2="8"/><line x1="12" y1="16" x2="12" y2="20"/><line x1="8" y1="8" x2="16" y2="8"/><line x1="8" y1="16" x2="16" y2="16"/></svg> 校則の見直し #if($visibilityRuleReview != 'public')<span class="visibility-badge visibility-${visibilityRuleReview}">#if($visibilityRuleReview == 'members')<svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h2>
449 +<div class="school-section-card">
450 + <div class="card-inner">
451 + <div class="info-row">
452 + <span class="info-label">見直しの有無（3年以内）</span>
453 + <span class="info-value"><span class="tag tag-primary" style="font-size:0.9em;">$escapetool.xml($!ruleReviewStatus)</span></span>
454 + </div>
455 + #if($ruleReviewContent && $ruleReviewContent != '')
456 + <div class="info-row">
457 + <span class="info-label">見直しの内容</span>
458 + <span class="info-value">
459 + <div class="selection-display">
460 + #foreach($rc in $ruleReviewContent.split(","))
461 + <span class="selection-item">$escapetool.xml($rc.trim())</span>
462 + #end
438 438   </div>
439 - #if($regularActivitiesNote && $regularActivitiesNote.trim() != '')
440 - <div class="free-note">$!escapetool.xml($regularActivitiesNote)</div>
441 - #end
442 - </div>
464 + </span>
443 443   </div>
444 444   #end
445 -
446 - ## --- 予算 ---
447 - #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
448 - #if($hasBudget)
449 - #set($canViewBudget = true)
450 - #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewBudget = false)
451 - #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false)
452 - #end
453 - #if($canViewBudget)
454 - <div class="seitokai-subsection">
455 - <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>
456 - <div class="seitokai-subsection-content">
457 - #if($budgetProcess && !$budgetProcess.isEmpty())
458 - <div class="info-row">
459 - <span class="info-label">作成過程の生徒関与</span>
460 - <span class="info-value">
461 - <div class="selection-display">
462 - #foreach($bp in $budgetProcess)
463 - <span class="selection-item">$!escapetool.xml($bp.trim())</span>
464 - #end
465 - </div>
466 - </span>
467 + #if($ruleReviewProposer && $ruleReviewProposer != '')
468 + <div class="info-row">
469 + <span class="info-label">見直しの提案者</span>
470 + <span class="info-value">
471 + <div class="selection-display">
472 + #foreach($rp in $ruleReviewProposer.split(","))
473 + <span class="selection-item">$escapetool.xml($rp.trim())</span>
474 + #end
467 467   </div>
468 - #end
469 - #if($studentFee && $studentFee != '')
470 - <div class="info-row">
471 - <span class="info-label">生徒会費（年額）</span>
472 - <span class="info-value">$!escapetool.xml($!studentFee)</span>
473 - </div>
474 - #end
475 - #if($budgetScale && $budgetScale != '')
476 - <div class="info-row">
477 - <span class="info-label">予算規模</span>
478 - <span class="info-value">$!escapetool.xml($!budgetScale)</span>
479 - </div>
480 - #end
481 - #if($budgetAllocation && !$budgetAllocation.isEmpty())
482 - <div class="info-row">
483 - <span class="info-label">主な予算配分</span>
484 - <span class="info-value">
485 - <div class="selection-display">
486 - #foreach($ba in $budgetAllocation)
487 - <span class="selection-item">$!escapetool.xml($ba.trim())</span>
488 - #end
489 - </div>
490 - </span>
491 - </div>
492 - #end
493 - #if($budgetNote && $budgetNote.trim() != '')
494 - <div class="free-note">$!escapetool.xml($budgetNote)</div>
495 - #end
496 - </div>
476 + </span>
497 497   </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($visibilityBudget == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
500 - #end
501 501   #end
502 -
503 - ## --- 校則の見直し ---
504 - #if($ruleReviewStatus && $ruleReviewStatus != '')
505 - #set($canViewRuleReview = true)
506 - #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewRuleReview = false)
507 - #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false)
508 - #end
509 - #if($canViewRuleReview)
510 - <div class="seitokai-subsection">
511 - <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>
512 - <div class="seitokai-subsection-content">
513 - <div class="info-row">
514 - <span class="info-label">見直しの有無（3年以内）</span>
515 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
479 + #if($ruleReviewImplementer && $ruleReviewImplementer != '')
480 + <div class="info-row">
481 + <span class="info-label">見直しの実施者</span>
482 + <span class="info-value">
483 + <div class="selection-display">
484 + #foreach($ri in $ruleReviewImplementer.split(","))
485 + <span class="selection-item">$escapetool.xml($ri.trim())</span>
486 + #end
516 516   </div>
517 - #if($ruleReviewContent && !$ruleReviewContent.isEmpty())
518 - <div class="info-row">
519 - <span class="info-label">見直しの内容</span>
520 - <span class="info-value">
521 - <div class="selection-display">
522 - #foreach($rc in $ruleReviewContent)
523 - <span class="selection-item">$!escapetool.xml($rc.trim())</span>
524 - #end
525 - </div>
526 - </span>
527 - </div>
528 - #end
529 - #if($ruleReviewProposer && !$ruleReviewProposer.isEmpty())
530 - <div class="info-row">
531 - <span class="info-label">見直しの提案者</span>
532 - <span class="info-value">
533 - <div class="selection-display">
534 - #foreach($rp in $ruleReviewProposer)
535 - <span class="selection-item">$!escapetool.xml($rp.trim())</span>
536 - #end
537 - </div>
538 - </span>
539 - </div>
540 - #end
541 - #if($ruleReviewImplementer && !$ruleReviewImplementer.isEmpty())
542 - <div class="info-row">
543 - <span class="info-label">見直しの実施者</span>
544 - <span class="info-value">
545 - <div class="selection-display">
546 - #foreach($ri in $ruleReviewImplementer)
547 - <span class="selection-item">$!escapetool.xml($ri.trim())</span>
548 - #end
549 - </div>
550 - </span>
551 - </div>
552 - #end
553 - #if($ruleReviewSystem && $ruleReviewSystem != '')
554 - <div class="info-row">
555 - <span class="info-label">見直しの仕組み</span>
556 - <span class="info-value">$!escapetool.xml($!ruleReviewSystem)</span>
557 - </div>
558 - #end
559 - </div>
488 + </span>
560 560   </div>
561 - #else
562 - <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>
563 - #end
564 564   #end
565 -
566 - ## --- 生徒会の課題意識 ---
567 - #if($challenges && $challenges != '')
568 - #set($canViewChallenges = true)
569 - #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewChallenges = false)
570 - #elseif($visibilityChallenges == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewChallenges = false)
571 - #end
572 - #if($canViewChallenges)
573 - <div class="seitokai-subsection">
574 - <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>
575 - <div class="seitokai-subsection-content">
576 - <div class="challenge-text">$!escapetool.xml($challenges)</div>
577 - </div>
491 + #if($ruleReviewSystem && $ruleReviewSystem != '')
492 + <div class="info-row">
493 + <span class="info-label">見直しの仕組み</span>
494 + <span class="info-value">$escapetool.xml($!ruleReviewSystem)</span>
578 578   </div>
579 - #else
580 - <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>
581 - #end
582 582   #end
497 + </div>
498 +</div>
499 + #else
500 +<div class="visibility-restricted-notice"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 校則の見直し情報は #if($visibilityRuleReview == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
501 + #end
502 +#end
583 583  
584 - </div>## seitokai-info-body 終了
585 -</div>## card-seitokai-info 終了
586 -
587 -## --- ③ SNS・連絡先 ---
588 -<div class="school-info-card collapsed" id="card-contact">
589 - <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>
590 - <table class="wiki-table school-info-table">
591 - <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr>
592 - <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>
593 - <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>
594 - <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>
595 - <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>
596 - <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
597 - </table>
598 - #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
599 - #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
600 - #if($infoEditDate && $infoEditDate != '')
601 - <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>
504 +## --- ⑨ 課題 ---
505 +#if($challenges && $challenges != '')
506 + ## 公開範囲チェック
507 + #set($canViewChallenges = true)
508 + #if($visibilityChallenges == 'members' && $isGuest) #set($canViewChallenges = false)
509 + #elseif($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewChallenges = false)
602 602   #end
603 -</div>
511 + #if($canViewChallenges)
512 +<h2 class="section-title">生徒会の課題意識 #if($visibilityChallenges != 'public')<span class="visibility-badge visibility-${visibilityChallenges}">#if($visibilityChallenges == 'members')<svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h2>
513 +<div class="challenge-text">$escapetool.xml($challenges)</div>
514 + #else
515 +<div class="visibility-restricted-notice"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 課題情報は #if($visibilityChallenges == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
516 + #end
517 +#end
604 604  
519 +</div>## seitokai-info-accordion 終了
520 +
605 605  {{/html}}
606 606  
607 -----
608 -
609 609  ## --- ⑩ 活動報告一覧（スレッド型・年度タブ付き） ---
610 -= 活動報告 =
524 += <svg class="ico" style="width:1.1em;height:1.1em;vertical-align:-0.15em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z"/><polyline points="14 2 14 8 20 8"/><line x1="16" y1="13" x2="8" y2="13"/><line x1="16" y1="17" x2="8" y2="17"/></svg> 活動報告 =
611 611  
612 -## --- 年度タブ + 投稿者ステータス凡例 ---
526 +## --- 投稿者ステータス凡例（折りたたみ） ---
613 613  {{html clean="false"}}
528 +<div class="author-legend-wrapper">
529 + <button class="author-legend-toggle" onclick="this.classList.toggle('open');this.nextElementSibling.classList.toggle('open')"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="10"/><path d="M12 16v-4"/><path d="M12 8h.01"/></svg> バッジの見方 <span class="chevron">▼</span></button>
530 + <div class="author-legend-body">
531 + <div class="author-legend">
532 + <span class="author-legend-title">投稿者の信頼度:</span>
533 + <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者</span>
534 + <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み</span>
535 + <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介</span>
536 + <span class="author-legend-item"><span class="bar bar-general"></span> 一般（未承認）</span>
537 + </div>
538 + <div class="author-legend">
539 + <span class="author-legend-title">所属:</span>
540 + <span class="author-legend-item"><span class="badge badge-school-internal-confirmed" style="font-size:0.72em; padding: 1px 7px;"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内（確認済）</span> 承認済み＋同校</span>
541 + <span class="author-legend-item"><span class="badge badge-school-internal" style="font-size:0.72em; padding: 1px 7px;"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内</span> 紹介＋同校</span>
542 + <span class="author-legend-item"><span class="badge badge-school-external" style="font-size:0.72em; padding: 1px 7px;"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="10"/><path d="M2 12h20"/><path d="M12 2a15.3 15.3 0 014 10 15.3 15.3 0 01-4 10 15.3 15.3 0 01-4-10 15.3 15.3 0 014-10z"/></svg> 他校</span> 他校所属</span>
543 + <span class="author-legend-item" style="color:var(--text-light);font-size:0.85em;">※一般アカウントは所属未確認のため非表示</span>
544 + </div>
545 + </div>
546 +</div>
614 614  
615 615  ## --- 年度タブ ---
616 616  ## 全活動から年度一覧を収集
... ... @@ -632,49 +632,14 @@
632 632  #end
633 633  ## ソート（降順にしたいが Velocity にはないので JS で制御）
634 634  
635 -<div class="activity-toolbar">
636 - <div class="activity-fy-tabs">
637 - <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
638 - #foreach($fy in $fySet)
639 - #if($fy != $currentFYStr)
640 - <button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button>
641 - #end
568 +<div class="activity-fy-tabs">
569 + <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
570 + #foreach($fy in $fySet)
571 + #if($fy != $currentFYStr)
572 + <button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button>
642 642   #end
643 - <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
644 - </div>
645 - <div class="activity-toolbar-right">
646 - <button class="btn-view-toggle" id="btnViewToggle" onclick="toggleCompactView()" title="タイトルのみ表示">
647 - <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>
648 - <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>
649 - <span class="toggle-label">一覧表示</span>
650 - </button>
651 - </div>
652 - <div class="author-legend-wrapper">
653 - <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>
654 - <div class="author-legend-body">
655 - <div class="author-legend">
656 - <span class="author-legend-title">投稿者の信頼度:</span>
657 - <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者 <span class="text-hint">— 運営スタッフ</span></span>
658 - <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み <span class="text-hint">— 本人確認済みのユーザー</span></span>
659 - <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介 <span class="text-hint">— 承認済みユーザーからの紹介</span></span>
660 - <span class="author-legend-item"><span class="bar bar-general"></span> 一般 <span class="text-hint">— 一般登録ユーザー</span></span>
661 - </div>
662 - <div class="author-legend">
663 - <span class="author-legend-title">所属:</span>
664 - <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>
665 - <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>
666 - <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>
667 - <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>
668 - <span class="author-legend-item text-hint">※一般アカウントは所属バッジが表示されません</span>
669 - </div>
670 - <div class="author-legend">
671 - <span class="author-legend-title">役割:</span>
672 - <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>
673 - <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>
674 - <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>
675 - </div>
676 - </div>
677 - </div>
574 + #end
575 + <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
678 678  </div>
679 679  
680 680  {{/html}}
... ... @@ -723,49 +723,27 @@
723 723   #set($threadPosts = [])
724 724   #set($discard = $threadPosts.addAll($pinnedPosts))
725 725   #set($discard = $threadPosts.addAll($normalPosts))
726 - ## report/comment カウント
727 - #set($reportCount = 0)
728 - #set($commentCount = 0)
729 - #foreach($tp in $threadPosts)
730 - #set($tpType = $!tp.getValue('postType'))
731 - #if($tpType == 'comment')
732 - #set($commentCount = $commentCount + 1)
733 - #else
734 - #set($reportCount = $reportCount + 1)
735 - #end
736 - #end
737 737  
738 738  {{html clean="false"}}
739 -<div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)">
626 +<div class="activity-thread" data-fiscal-year="$escapetool.xml($actFY)">
740 740   <div class="activity-thread-header">
741 741   <div class="activity-thread-title">
742 - <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>
743 - <div class="activity-meta-line">
744 - <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
745 - #set($actTagsList = $activity.getValue('tags'))
746 - #if($actTagsList && !$actTagsList.isEmpty())
747 - #foreach($tagItem in $actTagsList)
748 - #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end
749 - #end
750 - #end
751 - </div>
629 + <h3 #if($actFeatured == '1')class="featured-title"#end>$escapetool.xml($!actTitle) #if($actFeatured == '1')<svg style="width:14px;height:14px;vertical-align:-1px;margin-left:4px;" viewBox="0 0 24 24" fill="currentColor" stroke="none"><polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"/></svg>#end</h3>
630 + <span class="activity-meta">$escapetool.xml($!actCommittee) | $escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $escapetool.xml($actFY)年度#end</span>
752 752   </div>
753 - <div class="thread-meta-right">
754 - <span class="thread-post-count">${reportCount}件の報告 ・ ${commentCount}件のコメント</span>
632 + <div style="display:flex;align-items:center;gap:8px;">
633 + <span class="thread-post-count">${threadPosts.size()}件の投稿</span>
755 755   #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred')
756 756   #if($actFeatured == '1')
757 - <a href="$doc.getURL('view', "action=unfeature&actObj=${actIdx}&form_token=${services.csrf.getToken()}")" class="btn-featured-toggle btn-unfeature" title="特色ある活動の選定を解除"><svg class="ico ico-fixed-14" viewBox="0 0 24 24" fill="currentColor" stroke="none"><polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"/></svg> 特色解除</a>
636 + <a href="$doc.getURL('view', "action=unfeature&actObj=${actIdx}&form_token=${services.csrf.getToken()}")" class="btn-featured-toggle btn-unfeature" title="特色ある活動の選定を解除"><svg style="width:14px;height:14px;" viewBox="0 0 24 24" fill="currentColor" stroke="none"><polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"/></svg> 特色解除</a>
758 758   #else
759 - <a href="$doc.getURL('view', "action=feature&actObj=${actIdx}&form_token=${services.csrf.getToken()}")" class="btn-featured-toggle btn-feature" title="特色ある活動に選定（最大3件）"><svg class="ico ico-fixed-14" viewBox="0 0 24 24"><polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"/></svg> 特色設定</a>
638 + <a href="$doc.getURL('view', "action=feature&actObj=${actIdx}&form_token=${services.csrf.getToken()}")" class="btn-featured-toggle btn-feature" title="特色ある活動に選定（最大3件）"><svg style="width:14px;height:14px;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"/></svg> 特色設定</a>
760 760   #end
761 761   #end
762 762   </div>
763 763   </div>
764 764  
765 - ## --- 活動報告セクション ---
766 766   #foreach($post in $threadPosts)
767 - #set($thisPostType = $!post.getValue('postType'))
768 - #if($thisPostType != 'comment')
769 769   #set($postContent = $post.getValue('content'))
770 770   #set($postAuthor = $post.getValue('author'))
771 771   #set($postAccountType = $!post.getValue('authorAccountType'))
... ... @@ -773,35 +773,15 @@
773 773   #set($postGrade = $!post.getValue('authorGrade'))
774 774   #set($postSchoolCode = $!post.getValue('authorSchoolCode'))
775 775   #set($postDate = $post.getValue('createdDate'))
776 - ## 論理削除チェック
777 - #set($postDeleted = $!post.getValue('deleted'))
778 - #if($postDeleted == 1 || $postDeleted == '1')
779 - #if($viewerAccountType == 'admin')
780 - <div class="thread-post thread-post-deleted thread-post-admin-deleted">
781 - <div class="thread-post-admin-deleted-content">
782 - <svg class="ico" viewBox="0 0 24 24"><polyline points="3 6 5 6 21 6"/><path d="M19 6v14a2 2 0 01-2 2H7a2 2 0 01-2-2V6m3 0V4a2 2 0 012-2h4a2 2 0 012 2v2"/></svg>
783 - <strong>投稿者により削除済み</strong>（$!post.getValue('deletedAt')）
784 - <div class="thread-post-restored-content">$!escapetool.xml($!postContent)</div>
785 - </div>
786 - </div>
787 - #else
788 - <div class="thread-post thread-post-deleted thread-post-user-deleted">
789 - <div class="thread-post-user-deleted-content">
790 - <svg class="ico" viewBox="0 0 24 24"><polyline points="3 6 5 6 21 6"/><path d="M19 6v14a2 2 0 01-2 2H7a2 2 0 01-2-2V6m3 0V4a2 2 0 012-2h4a2 2 0 012 2v2"/></svg>
791 - この投稿は削除されました
792 - </div>
793 - </div>
794 - #end
795 - #else
796 796   ## 通報による非表示チェック
797 797   #set($postHidden = $!post.getValue('hidden'))
798 798   #if($postHidden == 1 || $postHidden == '1')
799 799   #if($viewerAccountType == 'admin')
800 - <div class="thread-post thread-post-admin-hidden">
801 - <div class="thread-post-admin-hidden-content">
802 - <svg class="ico" viewBox="0 0 24 24"><path d="M10.29 3.86L1.82 18a2 2 0 001.71 3h16.94a2 2 0 001.71-3L13.71 3.86a2 2 0 00-3.42 0z"/><line x1="12" y1="9" x2="12" y2="13"/><line x1="12" y1="17" x2="12.01" y2="17"/></svg>
803 - <strong>通報により非表示中</strong>（理由: $!escapetool.xml($!post.getValue('hiddenReason'))）
804 - <div class="thread-post-restored-content">$!escapetool.xml($!postContent)</div>
656 + <div class="thread-post" style="opacity:0.5;border:2px dashed #dc2626;">
657 + <div style="padding:10px 16px;font-size:0.85em;color:#dc2626;">
658 + <svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M10.29 3.86L1.82 18a2 2 0 001.71 3h16.94a2 2 0 001.71-3L13.71 3.86a2 2 0 00-3.42 0z"/><line x1="12" y1="9" x2="12" y2="13"/><line x1="12" y1="17" x2="12.01" y2="17"/></svg>
659 + <strong>通報により非表示中</strong>（理由: $escapetool.xml($!post.getValue('hiddenReason'))）
660 + <div style="margin-top:4px;font-size:0.92em;color:var(--text-mid);">$escapetool.xml($!postContent)</div>
805 805   </div>
806 806   </div>
807 807   #end
... ... @@ -810,12 +810,12 @@
810 810   #set($postVis = $!post.getValue('visibility'))
811 811   #if(!$postVis || $postVis == '') #set($postVis = 'public') #end
812 812   #set($canViewPost = true)
813 - #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewPost = false)
814 - #elseif($postVis == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPost = false)
669 + #if($postVis == 'members' && $isGuest) #set($canViewPost = false)
670 + #elseif($postVis == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewPost = false)
815 815   #end
816 816   #if(!$canViewPost)
817 817   <div class="thread-post visibility-restricted-post">
818 - <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>
674 + <div class="visibility-restricted-notice" style="margin:8px 0;"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> この投稿は #if($postVis == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
819 819   </div>
820 820   #else
821 821   ## 投稿者のアカウント種別に基づいたCSSクラス
... ... @@ -834,68 +834,53 @@
834 834   <div class="thread-post-content">
835 835   <div class="thread-post-header">
836 836   #if($isPinned == '1')
837 - <span class="pin-badge"><svg class="ico ico-fixed-14" viewBox="0 0 24 24" fill="currentColor" stroke="none"><path d="M16 2l-4 4-2-1-5 5 3 3-6 6h4l4-4 3 3 5-5-1-2 4-4-5-5z"/></svg> 固定</span>
693 + <span class="pin-badge"><svg style="width:12px;height:12px;" viewBox="0 0 24 24" fill="currentColor" stroke="none"><path d="M16 2l-4 4-2-1-5 5 3 3-6 6h4l4-4 3 3 5-5-1-2 4-4-5-5z"/></svg> 固定</span>
838 838   #end
839 839   #set($postAuthorRef = $!post.getValue('authorRef'))
840 840   <span class="thread-post-author">
841 841   #if($postAuthorRef && $postAuthorRef != '')
842 - <a href="$xwiki.getURL('SeitokaiCode.UserProfile', 'view', "user=${escapetool.url($postAuthorRef)}")">$!escapetool.xml($!postAuthor)</a>
698 + <a href="$xwiki.getURL('SeitokaiCode.UserProfile', 'view', "user=${escapetool.url($postAuthorRef)}")">$escapetool.xml($!postAuthor)</a>
843 843   #else
844 - $!escapetool.xml($!postAuthor)
700 + $escapetool.xml($!postAuthor)
845 845   #end
846 846   </span>
847 847   <span class="author-badge">
848 848   #if($postAccountType == 'admin')
849 - <span class="badge badge-admin badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 管理者</span>
705 + <span class="badge badge-admin" style="font-size:0.75em;padding:1px 7px;"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 管理者</span>
850 850   #elseif($postAccountType == 'verified')
851 - <span class="badge badge-verified badge-sm"><svg class="ico" viewBox="0 0 24 24" stroke-width="2.5"><path d="M20 6L9 17l-5-5"/></svg> 承認済み</span>
707 + <span class="badge badge-verified" style="font-size:0.75em;padding:1px 7px;"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"><path d="M20 6L9 17l-5-5"/></svg> 承認済み</span>
852 852   #elseif($postAccountType == 'referred')
853 - <span class="badge badge-referred badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M10 13a5 5 0 007.54.54l3-3a5 5 0 00-7.07-7.07l-1.72 1.71"/><path d="M14 11a5 5 0 00-7.54-.54l-3 3a5 5 0 007.07 7.07l1.71-1.71"/></svg> 紹介</span>
709 + <span class="badge badge-referred" style="font-size:0.75em;padding:1px 7px;"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M10 13a5 5 0 007.54.54l3-3a5 5 0 00-7.07-7.07l-1.72 1.71"/><path d="M14 11a5 5 0 00-7.54-.54l-3 3a5 5 0 007.07 7.07l1.71-1.71"/></svg> 紹介</span>
854 854   #else
855 - <span class="badge badge-general badge-sm">一般</span>
711 + <span class="badge badge-general" style="font-size:0.75em;padding:1px 7px;">一般</span>
856 856   #end
857 857   ## 所属バッジ（投稿者の学校コードとページの学校コードを比較）
858 - #set($postIsSchoolMatch = ($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode)))
859 859   #if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general')
860 - #if($postUserRole == 'graduate' && $postIsSchoolMatch)
861 - <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>
862 - #elseif($postIsSchoolMatch && $postUserRole != 'graduate')
715 + #if($postSchoolCode == $schoolCode)
863 863   #if($postAccountType == 'verified' || $postAccountType == 'admin')
864 - <span class="badge badge-school-internal-confirmed badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内（確認済）</span>
717 + <span class="badge badge-school-internal-confirmed" style="font-size:0.75em;padding:1px 7px;"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内（確認済）</span>
865 865   #else
866 - <span class="badge badge-school-internal badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内</span>
719 + <span class="badge badge-school-internal" style="font-size:0.75em;padding:1px 7px;"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内</span>
867 867   #end
868 868   #else
869 - <span class="badge badge-school-external badge-sm"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M2 12h20"/><path d="M12 2a15.3 15.3 0 014 10 15.3 15.3 0 01-4 10 15.3 15.3 0 01-4-10 15.3 15.3 0 014-10z"/></svg> 他校</span>
722 + <span class="badge badge-school-external" style="font-size:0.75em;padding:1px 7px;"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="10"/><path d="M2 12h20"/><path d="M12 2a15.3 15.3 0 014 10 15.3 15.3 0 01-4 10 15.3 15.3 0 01-4-10 15.3 15.3 0 014-10z"/></svg> 他校</span>
870 870   #end
871 871   #end
872 872   #if($postUserRole == 'student')
873 - <span class="badge badge-role-student badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M22 10l-10-5L2 10l10 5 10-5z"/><path d="M6 12v5c0 1.66 2.69 3 6 3s6-1.34 6-3v-5"/></svg> 生徒</span>
874 - #set($postIsOfficer = $!post.getValue('authorIsOfficer'))
875 - #if($postIsOfficer == 'true')
876 - <span class="badge badge-role-officer badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M12 2l3.09 6.26L22 9.27l-5 4.87 1.18 6.88L12 17.77l-6.18 3.25L7 14.14 2 9.27l6.91-1.01L12 2z"/></svg> 役員</span>
877 - #end
726 + <span class="badge badge-role-student" style="font-size:0.75em;padding:1px 7px;"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M22 10l-10-5L2 10l10 5 10-5z"/><path d="M6 12v5c0 1.66 2.69 3 6 3s6-1.34 6-3v-5"/></svg> 生徒</span>
878 878   #elseif($postUserRole == 'teacher')
879 - <span class="badge badge-role-teacher badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M4 19.5A2.5 2.5 0 016.5 17H20"/><path d="M6.5 2H20v20H6.5A2.5 2.5 0 014 19.5v-15A2.5 2.5 0 016.5 2z"/></svg> 教員</span>
728 + <span class="badge badge-role-teacher" style="font-size:0.75em;padding:1px 7px;"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M4 19.5A2.5 2.5 0 016.5 17H20"/><path d="M6.5 2H20v20H6.5A2.5 2.5 0 014 19.5v-15A2.5 2.5 0 016.5 2z"/></svg> 教員</span>
880 880   #elseif($postUserRole == 'graduate')
881 - <span class="badge badge-role-graduate badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M22 10l-10-5L2 10l10 5 10-5z"/><path d="M6 12v5c0 1.66 2.69 3 6 3s6-1.34 6-3v-5"/></svg> 卒業生</span>
730 + <span class="badge badge-role-graduate" style="font-size:0.75em;padding:1px 7px;"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M22 10l-10-5L2 10l10 5 10-5z"/><path d="M6 12v5c0 1.66 2.69 3 6 3s6-1.34 6-3v-5"/></svg> 卒業生</span>
882 882   #end
732 + #if($postGrade && $postGrade != '')
733 + <span class="badge badge-grade" style="font-size:0.75em;padding:1px 7px;">$postGrade</span>
734 + #end
883 883   </span>
884 884   <span class="thread-post-date">$!postDate</span>
885 - #set($postEdited = $!post.getValue('edited'))
886 - #if($postEdited == 1 || $postEdited == '1')
887 - <span class="post-edited-label">（編集済み）</span>
888 - #end
889 - #set($postAuthorRefH = $!post.getValue('authorRef'))
890 - #set($postObjNumH = $post.number)
891 - #if(!$isGuest && $xcontext.user != $postAuthorRefH)
892 - <button type="button" class="btn-post-report btn-post-report-header" onclick="openReportDialog(this, '${doc.fullName}', $postObjNumH, '${services.csrf.getToken()}')" title="この投稿を通報">
893 - <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> 通報
894 - </button>
895 - #end
896 896   </div>
897 897   <div class="thread-post-body">
898 - $!escapetool.xml($!postContent)
739 + $escapetool.xml($!postContent)
899 899   #set($postImages = $!post.getValue('images'))
900 900   #if($postImages && $postImages.trim() != '')
901 901   <div class="post-images">
... ... @@ -909,7 +909,7 @@
909 909   #if($imgName != '')
910 910   <div class="post-image-item">
911 911   <a href="$doc.getAttachmentURL($imgName)" target="_blank">
912 - <img src="$doc.getAttachmentURL($imgName)" alt="$!escapetool.xml($imgName)" loading="lazy"/>
753 + <img src="$doc.getAttachmentURL($imgName)" alt="$escapetool.xml($imgName)" loading="lazy"/>
913 913   </a>
914 914   </div>
915 915   #end
... ... @@ -940,14 +940,14 @@
940 940   #set($displayName = $fName.replaceFirst('file_\d{14}_\d+_', ''))
941 941   #end
942 942   <div class="post-file-item">
943 - <a href="$doc.getAttachmentURL($fName)" target="_blank" download="$!escapetool.xml($displayName)">
944 - #if($fIcon == 'pdf')<svg class="ico ico-md" style="color:${fColor};" viewBox="0 0 24 24"><path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z"/><polyline points="14 2 14 8 20 8"/><path d="M9 15v-2h1.5a1.5 1.5 0 010 3H9"/></svg>
945 - #elseif($fIcon == 'word')<svg class="ico ico-md" style="color:${fColor};" viewBox="0 0 24 24"><path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z"/><polyline points="14 2 14 8 20 8"/><path d="M8 15l1.5-5 1.5 5 1.5-5 1.5 5"/></svg>
946 - #elseif($fIcon == 'excel')<svg class="ico ico-md" style="color:${fColor};" viewBox="0 0 24 24"><path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z"/><polyline points="14 2 14 8 20 8"/><line x1="8" y1="13" x2="16" y2="13"/><line x1="8" y1="17" x2="16" y2="17"/><line x1="12" y1="13" x2="12" y2="17"/></svg>
947 - #elseif($fIcon == 'ppt')<svg class="ico ico-md" style="color:${fColor};" viewBox="0 0 24 24"><path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z"/><polyline points="14 2 14 8 20 8"/><rect x="8" y="12" width="8" height="6" rx="1"/></svg>
948 - #else<svg class="ico ico-md" style="color:${fColor};" viewBox="0 0 24 24"><path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z"/><polyline points="14 2 14 8 20 8"/></svg>
784 + <a href="$doc.getAttachmentURL($fName)" target="_blank" download="$escapetool.xml($displayName)">
785 + #if($fIcon == 'pdf')<svg class="ico" style="width:1.1em;height:1.1em;vertical-align:-0.15em;color:${fColor};" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z"/><polyline points="14 2 14 8 20 8"/><path d="M9 15v-2h1.5a1.5 1.5 0 010 3H9"/></svg>
786 + #elseif($fIcon == 'word')<svg class="ico" style="width:1.1em;height:1.1em;vertical-align:-0.15em;color:${fColor};" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z"/><polyline points="14 2 14 8 20 8"/><path d="M8 15l1.5-5 1.5 5 1.5-5 1.5 5"/></svg>
787 + #elseif($fIcon == 'excel')<svg class="ico" style="width:1.1em;height:1.1em;vertical-align:-0.15em;color:${fColor};" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z"/><polyline points="14 2 14 8 20 8"/><line x1="8" y1="13" x2="16" y2="13"/><line x1="8" y1="17" x2="16" y2="17"/><line x1="12" y1="13" x2="12" y2="17"/></svg>
788 + #elseif($fIcon == 'ppt')<svg class="ico" style="width:1.1em;height:1.1em;vertical-align:-0.15em;color:${fColor};" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z"/><polyline points="14 2 14 8 20 8"/><rect x="8" y="12" width="8" height="6" rx="1"/></svg>
789 + #else<svg class="ico" style="width:1.1em;height:1.1em;vertical-align:-0.15em;color:${fColor};" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z"/><polyline points="14 2 14 8 20 8"/></svg>
949 949   #end
950 - <span class="post-file-name">$!escapetool.xml($displayName)</span>
791 + <span class="post-file-name">$escapetool.xml($displayName)</span>
951 951   </a>
952 952   </div>
953 953   #end
... ... @@ -957,45 +957,21 @@
957 957   #end
958 958   </div>
959 959   #if($postVis != 'public')
960 - <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>
801 + <div class="visibility-badge visibility-${postVis}" style="margin-top:6px;font-size:0.75em;">#if($postVis == 'members')<svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</div>
961 961   #end
962 - ## 固定/編集/削除/通報/非表示ボタン（横並び）
963 - #set($postAuthorRef = $!post.getValue('authorRef'))
964 - #set($postObjNumED = $post.number)
965 - #set($showPinBtn = ($viewerAccountType == 'admin' || $viewerAccountType == 'verified'))
966 - #set($showEditDeleteBtn = ($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin'))
967 - #set($showHideBtn = ($viewerAccountType == 'admin'))
968 - #if($showPinBtn || $showEditDeleteBtn || $showHideBtn)
969 - <div class="post-edit-actions post-action-mt">
970 - #if($showPinBtn)
971 - #set($postObjNum = $post.number)
803 + ## 固定/解除ボタン（承認済み・管理者のみ）
804 + #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
805 + #set($postObjNum = $post.number)
806 + <div class="post-pin-action" style="margin-top:6px;">
972 972   #if($isPinned == '1')
973 973   <a href="$doc.getURL('view', "action=unpin&postObj=${postObjNum}&form_token=${services.csrf.getToken()}")" class="btn-pin-toggle btn-unpin" title="固定を解除">
974 - <svg class="ico ico-fixed-14" viewBox="0 0 24 24" fill="currentColor" stroke="none"><path d="M16 2l-4 4-2-1-5 5 3 3-6 6h4l4-4 3 3 5-5-1-2 4-4-5-5z"/></svg> 固定を解除
809 + <svg style="width:13px;height:13px;" viewBox="0 0 24 24" fill="currentColor" stroke="none"><path d="M16 2l-4 4-2-1-5 5 3 3-6 6h4l4-4 3 3 5-5-1-2 4-4-5-5z"/></svg> 固定を解除
975 975   </a>
976 976   #else
977 977   <a href="$doc.getURL('view', "action=pin&postObj=${postObjNum}&form_token=${services.csrf.getToken()}")" class="btn-pin-toggle btn-pin" title="この投稿を固定">
978 - <svg class="ico ico-fixed-14" viewBox="0 0 24 24"><path d="M16 2l-4 4-2-1-5 5 3 3-6 6h4l4-4 3 3 5-5-1-2 4-4-5-5z"/></svg> 固定する
813 + <svg style="width:13px;height:13px;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M16 2l-4 4-2-1-5 5 3 3-6 6h4l4-4 3 3 5-5-1-2 4-4-5-5z"/></svg> 固定する
979 979   </a>
980 980   #end
981 - #end
982 - #if($showEditDeleteBtn)
983 - #if($xcontext.user == $postAuthorRef)
984 - #set($editImages = $!post.getValue('images'))
985 - #set($editFiles = $!post.getValue('files'))
986 - <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="この投稿を編集">
987 - <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> 編集
988 - </button>
989 - #end
990 - <button type="button" class="btn-post-delete" onclick="confirmDeletePost('${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を削除">
991 - <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> 削除
992 - </button>
993 - #end
994 - #if($showHideBtn)
995 - <button type="button" class="btn-post-hide" onclick="openHideDialog(this, '${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を非表示にする">
996 - <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> 非表示
997 - </button>
998 - #end
999 999   </div>
1000 1000   #end
1001 1001   </div>
... ... @@ -1002,56 +1002,15 @@
1002 1002   </div>
1003 1003   #end## /canViewPost
1004 1004   #end## /postHidden
1005 - #end## /postDeleted
1006 - #end## /postType != comment
1007 - #end## /foreach reports
1008 -
1009 - ## --- コメントセクション（折りたたみ） ---
1010 - #if($commentCount > 0)
1011 - <details class="thread-comments-section">
1012 - <summary class="thread-comments-toggle">
1013 - <svg class="ico" viewBox="0 0 24 24"><path d="M21 15a2 2 0 01-2 2H7l-4 4V5a2 2 0 012-2h14a2 2 0 012 2z"/></svg> ${commentCount}件のコメント
1014 - </summary>
1015 - #foreach($post in $threadPosts)
1016 - #set($thisPostType = $!post.getValue('postType'))
1017 - #if($thisPostType == 'comment')
1018 - #set($postContent = $post.getValue('content'))
1019 - #set($postAuthor = $post.getValue('author'))
1020 - #set($postAccountType = $!post.getValue('authorAccountType'))
1021 - #set($postDate = $post.getValue('createdDate'))
1022 - #set($postDeleted = $!post.getValue('deleted'))
1023 - #if($postDeleted == 1 || $postDeleted == '1')
1024 - <div class="thread-comment thread-comment-deleted">
1025 - <span class="thread-comment-meta">このコメントは削除されました</span>
1026 - </div>
1027 - #else
1028 - #set($postHidden = $!post.getValue('hidden'))
1029 - #if($postHidden == 1 || $postHidden == '1')
1030 - <div class="thread-comment thread-comment-hidden">
1031 - <span class="thread-comment-meta">このコメントは非表示にされました</span>
1032 - </div>
1033 - #else
1034 - <div class="thread-comment">
1035 - <span class="thread-comment-author">$!escapetool.xml($postAuthor)</span>
1036 - <span class="thread-comment-date">$!postDate</span>
1037 - <div class="thread-comment-body">$!escapetool.xml($postContent)</div>
1038 - </div>
1039 - #end
1040 - #end
1041 - #end
1042 - #end
1043 - </details>
1044 1044   #end
1045 1045  
1046 1046   #if($xcontext.user != "XWiki.XWikiGuest")
1047 1047   <div class="thread-add-post">
1048 - #if($isSchoolMember || $isViewerAdmin)
1049 - <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
826 + <a href="/xwiki/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
1050 1050   ＋ 活動報告を追加
1051 1051   </a>
1052 - #end
1053 - <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
1054 - <svg class="ico" viewBox="0 0 24 24"><path d="M21 15a2 2 0 01-2 2H7l-4 4V5a2 2 0 012-2h14a2 2 0 012 2z"/></svg> コメントを書く
829 + <a href="/xwiki/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
830 + <svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M21 15a2 2 0 01-2 2H7l-4 4V5a2 2 0 012-2h14a2 2 0 012 2z"/></svg> コメントを書く
1055 1055   </a>
1056 1056   </div>
1057 1057   #end
... ... @@ -1061,7 +1061,7 @@
1061 1061  #else
1062 1062  {{html clean="false"}}
1063 1063  <div class="empty-state">
1064 - <div class="empty-state-icon"><svg class="ico" viewBox="0 0 24 24" stroke-width="1.5"><path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z"/><polyline points="14 2 14 8 20 8"/><line x1="16" y1="13" x2="8" y2="13"/><line x1="16" y1="17" x2="8" y2="17"/></svg></div>
840 + <div class="empty-state-icon"><svg style="width:1em;height:1em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z"/><polyline points="14 2 14 8 20 8"/><line x1="16" y1="13" x2="8" y2="13"/><line x1="16" y1="17" x2="8" y2="17"/></svg></div>
1065 1065   <div class="empty-state-title">活動報告はまだありません</div>
1066 1066   <div class="empty-state-desc">この学校の活動を記録して、他校と共有しましょう。<br>「活動を追加」ボタンから最初の活動を作成できます。</div>
1067 1067  </div>
... ... @@ -1072,45 +1072,69 @@
1072 1072  #if($xcontext.user != "XWiki.XWikiGuest")
1073 1073  {{html clean="false"}}
1074 1074  <div class="activity-add-section">
1075 - <a href="/bin/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$!escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity">
1076 - <svg class="ico" viewBox="0 0 24 24" stroke-width="2.5"><line x1="12" y1="5" x2="12" y2="19"/><line x1="5" y1="12" x2="19" y2="12"/></svg> 活動を追加
851 + <a href="/xwiki/bin/view/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity">
852 + <svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round"><line x1="12" y1="5" x2="12" y2="19"/><line x1="5" y1="12" x2="19" y2="12"/></svg> 活動を追加
1077 1077   </a>
1078 1078  </div>
1079 1079  {{/html}}
1080 1080  #end
1081 1081  
1082 -## --- 年度タブ切り替え JavaScript ---
858 +## --- 年度アーカイブ セクション ---
1083 1083  {{html clean="false"}}
1084 -<script>
1085 -// コンパクト表示（タイトルのみ）トグル
1086 -function toggleCompactView() {
1087 - var container = document.querySelector('.xwiki-content') || document.body;
1088 - var isCompact = container.classList.toggle('activity-compact-view');
1089 - var btn = document.getElementById('btnViewToggle');
1090 - if (btn) {
1091 - btn.querySelector('.toggle-label').textContent = isCompact ? '詳細表示' : '一覧表示';
1092 - btn.title = isCompact ? '詳細表示に戻す' : 'タイトルのみ表示';
1093 - }
1094 - // コンパクトモードでは各スレッドヘッダーをクリックで個別展開可能にする
1095 - document.querySelectorAll('.activity-thread').forEach(function(thread) {
1096 - if (isCompact) {
1097 - thread.classList.remove('compact-expanded');
1098 - }
1099 - });
1100 -}
860 +<div class="school-section-card" style="margin-top:24px;">
861 + <h2 style="font-size:1.05em;font-weight:700;margin:0 0 12px;display:flex;align-items:center;gap:6px;">
862 + <svg style="width:1.1em;height:1.1em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M19 21H5a2 2 0 01-2-2V5a2 2 0 012-2h11l5 5v11a2 2 0 01-2 2z"/><polyline points="17 21 17 13 7 13 7 21"/><polyline points="7 3 7 8 15 8"/></svg>
863 + 年度アーカイブ
864 + </h2>
865 + <div style="font-size:0.88em;color:var(--text-mid);margin-bottom:12px;">
866 + 現在のページ: <strong>${pageFiscalYear}年度</strong>
867 + #set($lyud = $!doc.getValue('lastYearUpdateDate'))
868 + #if($lyud && $lyud != '')
869 + | 最終年度更新: $escapetool.xml($lyud) ($escapetool.xml($!doc.getValue('lastYearUpdateBy')))
870 + #end
871 + </div>
1101 1101  
1102 -// コンパクトモードで個別スレッドを展開/折りたたみ
1103 -function toggleThreadExpand(e) {
1104 - var container = document.querySelector('.xwiki-content') || document.body;
1105 - if (!container.classList.contains('activity-compact-view')) return;
1106 - // リンクやボタンのクリックはスルー
1107 - if (e.target.closest('a, button, .btn-featured-toggle')) return;
1108 - var thread = e.target.closest('.activity-thread');
1109 - if (thread) {
1110 - thread.classList.toggle('compact-expanded');
1111 - }
1112 -}
873 + ## 過去アーカイブの検索
874 + #set($archiveQuery = $services.query.hql("where doc.fullName like :pattern and doc.fullName like '%Archive_%' order by doc.fullName desc").bindValue("pattern", "${doc.fullName}.Archive_%").setLimit(20))
875 + #set($archivePages = $archiveQuery.execute())
1113 1113  
877 + #if($archivePages && $archivePages.size() > 0)
878 + <div style="margin-bottom:12px;">
879 + <div style="font-weight:600;font-size:0.9em;margin-bottom:8px;">過去の年度アーカイブ</div>
880 + <div style="display:flex;flex-wrap:wrap;gap:8px;">
881 + #foreach($archPage in $archivePages)
882 + #set($archPageDoc = $xwiki.getDocument($archPage))
883 + #set($archPageObj = $archPageDoc.getObject('SeitokaiCode.SchoolClass'))
884 + #if($archPageObj)
885 + #set($archPageFY = $!archPageObj.getValue('fiscalYear'))
886 + <a href="$archPageDoc.getURL('view')" style="display:inline-flex;align-items:center;gap:5px;padding:8px 14px;background:#e0e7ff;border:1px solid #c7d2fe;border-radius:8px;color:#4338ca;text-decoration:none;font-size:0.9em;font-weight:600;transition:all 0.15s;">
887 + <svg style="width:1em;height:1em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M19 21H5a2 2 0 01-2-2V5a2 2 0 012-2h11l5 5v11a2 2 0 01-2 2z"/><polyline points="17 21 17 13 7 13 7 21"/><polyline points="7 3 7 8 15 8"/></svg>
888 + ${archPageFY}年度
889 + </a>
890 + #end
891 + #end
892 + </div>
893 + </div>
894 + #else
895 + <div style="font-size:0.88em;color:var(--text-light);margin-bottom:12px;">過去のアーカイブはまだありません</div>
896 + #end
897 +
898 + ## 新年度に移行ボタン（承認済み・管理者のみ）
899 + #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
900 + <div style="margin-top:12px;padding-top:12px;border-top:1px solid #e2e8f0;">
901 + <a href="/xwiki/bin/view/SeitokaiCode/YearArchiveAction?schoolPage=${doc.fullName}" style="display:inline-flex;align-items:center;gap:6px;padding:8px 18px;background:#4f46e5;color:white;border-radius:8px;text-decoration:none;font-size:0.9em;font-weight:600;">
902 + <svg style="width:1em;height:1em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"><path d="M19 21H5a2 2 0 01-2-2V5a2 2 0 012-2h11l5 5v11a2 2 0 01-2 2z"/><polyline points="17 21 17 13 7 13 7 21"/><polyline points="7 3 7 8 15 8"/></svg>
903 + ${pageFiscalYear}年度をアーカイブして新年度に移行
904 + </a>
905 + <div style="font-size:0.8em;color:var(--text-light);margin-top:6px;">現在の学校情報を${pageFiscalYear}年度として保存し、新しい年度に移行します。</div>
906 + </div>
907 + #end
908 +</div>
909 +{{/html}}
910 +
911 +## --- 年度タブ切り替え JavaScript ---
912 +{{html clean="false"}}
913 +<script>
1114 1114  function switchActivityFY(fy, btn) {
1115 1115   // タブのアクティブ状態を切り替え
1116 1116   document.querySelectorAll('.activity-fy-tab').forEach(function(t) { t.classList.remove('active'); });
... ... @@ -1117,40 +1117,29 @@
1117 1117   btn.classList.add('active');
1118 1118   // 活動スレッドの表示切り替え
1119 1119   document.querySelectorAll('.activity-thread[data-fiscal-year]').forEach(function(thread) {
1120 - if (fy === 'all' || thread.getAttribute('data-fiscal-year') === fy) {
1121 - thread.classList.remove('fy-hidden');
920 + if (fy === 'all') {
921 + thread.style.display = '';
922 + } else if (thread.getAttribute('data-fiscal-year') === fy) {
923 + thread.style.display = '';
1122 1122   } else {
1123 - thread.classList.add('fy-hidden');
925 + thread.style.display = 'none';
1124 1124   }
1125 1125   });
1126 1126  }
1127 -// ページ読み込み時の初期化
929 +// ページ読み込み時にデフォルトで現在の年度を表示
1128 1128  document.addEventListener('DOMContentLoaded', function() {
1129 - // 年度タブを降順にソート（「全期間」タブは末尾に固定）
1130 - var tabContainer = document.querySelector('.activity-fy-tabs');
1131 - if (tabContainer) {
1132 - var tabs = Array.from(tabContainer.querySelectorAll('.activity-fy-tab'));
1133 - var allTab = null;
1134 - var fyTabs = [];
1135 - tabs.forEach(function(t) {
1136 - var onclickStr = t.getAttribute('onclick') || '';
1137 - if (onclickStr.indexOf("'all'") !== -1) { allTab = t; }
1138 - else { fyTabs.push(t); }
1139 - });
1140 - // 年度タブを数値の降順でソート
1141 - fyTabs.sort(function(a, b) {
1142 - var aYear = parseInt(a.textContent) || 0;
1143 - var bYear = parseInt(b.textContent) || 0;
1144 - return bYear - aYear;
1145 - });
1146 - // DOM再配置
1147 - fyTabs.forEach(function(t) { tabContainer.appendChild(t); });
1148 - if (allTab) { tabContainer.appendChild(allTab); }
1149 - }
1150 - // デフォルトで現在の年度を表示
1151 1151   var defaultTab = document.querySelector('.activity-fy-tab.active');
1152 1152   if (defaultTab) { defaultTab.click(); }
933 + // モバイルでは基本情報・連絡先をデフォルト折りたたみ
934 + if (window.innerWidth <= 768) {
935 + document.querySelectorAll('.school-info-card.mobile-collapse').forEach(function(card) {
936 + card.classList.add('collapsed');
937 + });
938 + }
1153 1153   // 保存成功時のトースト通知
940 + if (window.location.search.indexOf('archived=1') !== -1) {
941 + showToast('年度アーカイブを作成しました', 'success');
942 + }
1154 1154   if (window.location.search.indexOf('saved=1') !== -1) {
1155 1155   showToast('学校情報を保存しました', 'success');
1156 1156   // URLパラメータをクリーンアップ（リロード時に再表示されないよう）
... ... @@ -1158,30 +1158,6 @@
1158 1158   window.history.replaceState({}, document.title, window.location.pathname);
1159 1159   }
1160 1160   }
1161 - // コンパクトモード: スレッドヘッダークリックで個別展開
1162 - document.querySelectorAll('.activity-thread-header').forEach(function(header) {
1163 - header.addEventListener('click', toggleThreadExpand);
1164 - });
1165 - // 長文投稿の折りたたみ初期化（max-height: 12em 超で省略）
1166 - document.querySelectorAll('.thread-post-body').forEach(function(body) {
1167 - // pre-wrapのまま高さを測定し、max-height(12em ≒ ~200px)を超える場合に折りたたむ
1168 - var fullH = body.scrollHeight;
1169 - // 12em を px に変換（font-size × line-height × 行数 の近似値ではなくCSSと同じ値を取得）
1170 - body.classList.add('truncated');
1171 - var maxH = body.clientHeight; // max-height: 12em 適用後の高さ
1172 - body.classList.remove('truncated');
1173 - if (fullH > maxH + 30) {
1174 - body.classList.add('truncated');
1175 - var btn = document.createElement('button');
1176 - btn.className = 'btn-read-more';
1177 - btn.textContent = '広げて読む ▼';
1178 - btn.addEventListener('click', function() {
1179 - var isExpanded = body.classList.toggle('expanded');
1180 - btn.textContent = isExpanded ? '折りたたむ ▲' : '広げて読む ▼';
1181 - });
1182 - body.parentNode.insertBefore(btn, body.nextSibling);
1183 - }
1184 - });
1185 1185  });
1186 1186  
1187 1187  // トースト通知表示
... ... @@ -1195,8 +1195,8 @@
1195 1195   document.body.appendChild(container);
1196 1196   }
1197 1197   var icons = {
1198 - success: '<svg class="ico ico-md" viewBox="0 0 24 24" stroke-width="2.5"><path d="M20 6L9 17l-5-5"/></svg>',
1199 - error: '<svg class="ico ico-md" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><line x1="15" y1="9" x2="9" y2="15"/><line x1="9" y1="9" x2="15" y2="15"/></svg>'
963 + success: '<svg style="width:1.1em;height:1.1em;flex-shrink:0;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"><path d="M20 6L9 17l-5-5"/></svg>',
964 + error: '<svg style="width:1.1em;height:1.1em;flex-shrink:0;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="10"/><line x1="15" y1="9" x2="9" y2="15"/><line x1="9" y1="9" x2="15" y2="15"/></svg>'
1200 1200   };
1201 1201   var toast = document.createElement('div');
1202 1202   toast.className = 'toast toast-' + type;
... ... @@ -1210,247 +1210,8 @@
1210 1210   var card = document.getElementById(cardId);
1211 1211   if (!card) return;
1212 1212   card.classList.toggle('collapsed');
1213 - var isCollapsed = card.classList.contains('collapsed');
1214 - var h2 = card.querySelector('h2[role="button"]');
1215 - if (h2) h2.setAttribute('aria-expanded', !isCollapsed);
978 + card.classList.remove('mobile-collapse');
1216 1216  }
1217 -
1218 -// 投稿の編集（インライン編集フォームを開く）
1219 -function openEditPost(btn) {
1220 - var postEl = btn.closest('.thread-post');
1221 - if (!postEl) return;
1222 - var existing = postEl.querySelector('.post-edit-form');
1223 - if (existing) { existing.remove(); return; }
1224 - var bodyEl = postEl.querySelector('.thread-post-body');
1225 - if (!bodyEl) return;
1226 -
1227 - var schoolPage = btn.getAttribute('data-school');
1228 - var postObjNum = btn.getAttribute('data-obj');
1229 - var currentContent = btn.getAttribute('data-content') || '';
1230 - var currentImages = btn.getAttribute('data-images') || '';
1231 - var currentFiles = btn.getAttribute('data-files') || '';
1232 - var postType = btn.getAttribute('data-post-type') || 'report';
1233 -
1234 - var form = document.createElement('div');
1235 - form.className = 'post-edit-form';
1236 - form.setAttribute('data-school', schoolPage);
1237 - form.setAttribute('data-obj', postObjNum);
1238 -
1239 - var html = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>';
1240 -
1241 - // コメント以外は添付ファイル編集を表示
1242 - if (postType !== 'comment') {
1243 - // 既存画像
1244 - html += '<div class="edit-attachments">';
1245 - if (currentImages.trim()) {
1246 - html += '<div class="edit-attach-section"><span class="edit-attach-label">画像</span>';
1247 - var imgs = currentImages.trim().split('\n');
1248 - for (var i = 0; i < imgs.length; i++) {
1249 - var img = imgs[i].trim();
1250 - if (!img) continue;
1251 - html += '<div class="edit-attach-item" data-name="' + img.replace(/"/g,'&quot;') + '">' +
1252 - '<img src="/xwiki/bin/download/' + schoolPage.replace(/\./g,'/') + '/' + encodeURIComponent(img) + '" class="edit-attach-thumb" />' +
1253 - '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1254 - '<input type="hidden" name="keepImages" value="' + img.replace(/"/g,'&quot;') + '" />' +
1255 - '</div>';
1256 - }
1257 - html += '</div>';
1258 - }
1259 - // 既存ファイル
1260 - if (currentFiles.trim()) {
1261 - html += '<div class="edit-attach-section"><span class="edit-attach-label">ファイル</span>';
1262 - var files = currentFiles.trim().split('\n');
1263 - for (var j = 0; j < files.length; j++) {
1264 - var f = files[j].trim();
1265 - if (!f) continue;
1266 - var displayName = f;
1267 - if (/^file_\d{14}_\d+_/.test(f)) displayName = f.replace(/^file_\d{14}_\d+_/, '');
1268 - html += '<div class="edit-attach-item" data-name="' + f.replace(/"/g,'&quot;') + '">' +
1269 - '<span class="edit-attach-fname">' + displayName.replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</span>' +
1270 - '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1271 - '<input type="hidden" name="keepFiles" value="' + f.replace(/"/g,'&quot;') + '" />' +
1272 - '</div>';
1273 - }
1274 - html += '</div>';
1275 - }
1276 - // 新規追加
1277 - html += '<div class="edit-attach-add">' +
1278 - '<label class="form-label-sm">画像を追加（最大4枚まで）</label>' +
1279 - '<input type="file" name="editNewImages" accept="image/*" multiple class="form-file-input-sm" />' +
1280 - '<div class="form-hint">JPEG / PNG / GIF / WebP、各5MBまで</div>' +
1281 - '<label class="form-label-sm" style="margin-top:8px;">ファイルを追加（最大2つまで）</label>' +
1282 - '<input type="file" name="editNewFiles" accept=".pdf,.docx,.xlsx,.pptx" multiple class="form-file-input-sm" />' +
1283 - '<div class="form-hint">PDF / Word / Excel / PowerPoint、各10MBまで</div>' +
1284 - '</div>';
1285 - html += '</div>';
1286 - }
1287 -
1288 - html += '<div class="post-edit-form-actions">' +
1289 - '<button type="button" class="btn-cancel-edit" onclick="this.closest(\'.post-edit-form\').remove()">キャンセル</button>' +
1290 - '<button type="button" class="btn-save" onclick="saveEditPost(this)">保存</button>' +
1291 - '</div>';
1292 -
1293 - form.innerHTML = html;
1294 - bodyEl.parentNode.insertBefore(form, bodyEl.nextSibling);
1295 - form.querySelector('textarea').focus();
1296 -}
1297 -
1298 -function removeEditAttach(btn) {
1299 - var item = btn.closest('.edit-attach-item');
1300 - if (item) item.remove();
1301 -}
1302 -
1303 -// 投稿の編集を保存
1304 -function saveEditPost(btn) {
1305 - var formEl = btn.closest('.post-edit-form');
1306 - if (!formEl) return;
1307 - var schoolPage = formEl.getAttribute('data-school');
1308 - var postObjNum = formEl.getAttribute('data-obj');
1309 - var textarea = formEl.querySelector('textarea');
1310 - if (!textarea) return;
1311 - var newContent = textarea.value.trim();
1312 - if (!newContent) { alert('投稿内容を入力してください'); return; }
1313 -
1314 - var csrfEl = document.querySelector('input[name="form_token"]');
1315 - var csrfToken = csrfEl ? csrfEl.value : '';
1316 -
1317 - var fd = new FormData();
1318 - fd.append('schoolPage', schoolPage);
1319 - fd.append('postObj', postObjNum);
1320 - fd.append('newContent', newContent);
1321 - fd.append('form_token', csrfToken);
1322 -
1323 - // 残す画像・ファイル
1324 - formEl.querySelectorAll('input[name="keepImages"]').forEach(function(el) { fd.append('keepImages', el.value); });
1325 - formEl.querySelectorAll('input[name="keepFiles"]').forEach(function(el) { fd.append('keepFiles', el.value); });
1326 -
1327 - // 新規画像
1328 - var newImgInput = formEl.querySelector('input[name="editNewImages"]');
1329 - if (newImgInput && newImgInput.files) {
1330 - for (var i = 0; i < newImgInput.files.length; i++) { fd.append('editNewImages', newImgInput.files[i]); }
1331 - }
1332 - // 新規ファイル
1333 - var newFileInput = formEl.querySelector('input[name="editNewFiles"]');
1334 - if (newFileInput && newFileInput.files) {
1335 - for (var j = 0; j < newFileInput.files.length; j++) { fd.append('editNewFiles', newFileInput.files[j]); }
1336 - }
1337 -
1338 - btn.disabled = true;
1339 - btn.textContent = '保存中...';
1340 -
1341 - var xhr = new XMLHttpRequest();
1342 - xhr.open('POST', '/bin/get/SeitokaiCode/EditPost?outputSyntax=plain', true);
1343 - xhr.onload = function() {
1344 - try {
1345 - var res = JSON.parse(xhr.responseText);
1346 - if (res.success) {
1347 - showToast('投稿を更新しました', 'success');
1348 - setTimeout(function() { location.reload(); }, 800);
1349 - } else {
1350 - btn.disabled = false; btn.textContent = '保存';
1351 - alert('編集に失敗しました: ' + (res.error || ''));
1352 - }
1353 - } catch(e) { btn.disabled = false; btn.textContent = '保存'; alert('編集に失敗しました'); }
1354 - };
1355 - xhr.onerror = function() { btn.disabled = false; btn.textContent = '保存'; alert('通信エラーが発生しました'); };
1356 - xhr.send(fd);
1357 -}
1358 -
1359 -// 投稿の削除（確認ダイアログ付き）
1360 -function confirmDeletePost(schoolPage, postObjNum, token) {
1361 - if (!confirm('この投稿を削除しますか？\\n削除後は「この投稿は削除されました」と表示されます。')) return;
1362 - var xhr = new XMLHttpRequest();
1363 - xhr.open('POST', '/bin/get/SeitokaiCode/DeletePost?outputSyntax=plain', true);
1364 - xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1365 - var deletePostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token);
1366 - xhr.onload = function() {
1367 - try {
1368 - var res = JSON.parse(xhr.responseText);
1369 - if (res.success) {
1370 - showToast('投稿を削除しました', 'success');
1371 - setTimeout(function() { location.reload(); }, 800);
1372 - } else {
1373 - alert('削除に失敗しました: ' + (res.error || ''));
1374 - }
1375 - } catch(e) { alert('削除に失敗しました'); }
1376 - };
1377 - xhr.onerror = function() { alert('通信エラーが発生しました'); };
1378 - xhr.send(deletePostData);
1379 -}
1380 -
1381 -/* --- 通報ダイアログ --- */
1382 -function openReportDialog(btn, targetPage, postObjNum, token) {
1383 - if (document.getElementById('report-dialog-overlay')) return;
1384 - var reasons = ['宣伝・スパム','不適切な内容','個人情報の露出','誹謗中傷','誤情報','その他'];
1385 - var overlay = document.createElement('div');
1386 - overlay.id = 'report-dialog-overlay';
1387 - 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;';
1388 - var dialog = document.createElement('div');
1389 - dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;max-height:80vh;overflow-y:auto;';
1390 - var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を通報</h3>';
1391 - html += '<p style="margin:0 0 12px;font-size:0.9em;color:#4b5563;">通報された投稿は管理者が確認するまで一時的に非表示になります。</p>';
1392 - html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">通報理由</label>';
1393 - html += '<select id="report-reason" style="width:100%;padding:8px;border:1px solid #d1d5db;border-radius:8px;margin-bottom:12px;font-size:0.9em;">';
1394 - for (var i=0; i<reasons.length; i++) html += '<option value="'+reasons[i]+'">'+reasons[i]+'</option>';
1395 - html += '</select>';
1396 - html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">補足コメント（任意）</label>';
1397 - 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>';
1398 - html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
1399 - html += '<button type="button" id="report-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
1400 - 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>';
1401 - html += '</div>';
1402 - dialog.innerHTML = html;
1403 - overlay.appendChild(dialog);
1404 - document.body.appendChild(overlay);
1405 - overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
1406 - document.getElementById('report-cancel-btn').addEventListener('click', function() { overlay.remove(); });
1407 - document.getElementById('report-submit-btn').addEventListener('click', function() {
1408 - var reason = document.getElementById('report-reason').value;
1409 - var detail = document.getElementById('report-detail').value;
1410 - var submitBtn = document.getElementById('report-submit-btn');
1411 - submitBtn.disabled = true; submitBtn.textContent = '送信中...';
1412 - var xhr = new XMLHttpRequest();
1413 - xhr.open('POST', '/bin/get/SeitokaiCode/ReportAction?outputSyntax=plain', true);
1414 - xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1415 - var data = 'targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&detail=' + encodeURIComponent(detail) + '&form_token=' + encodeURIComponent(token);
1416 - xhr.onload = function() {
1417 - overlay.remove();
1418 - showToast('通報を受け付けました', 'success');
1419 - setTimeout(function() { location.reload(); }, 1000);
1420 - };
1421 - xhr.onerror = function() { overlay.remove(); alert('通信エラーが発生しました'); };
1422 - xhr.send(data);
1423 - });
1424 -}
1425 -
1426 -/* --- 非表示ダイアログ（管理者用） --- */
1427 -function openHideDialog(btn, targetPage, postObjNum, token) {
1428 - if (document.getElementById('hide-dialog-overlay')) return;
1429 - var overlay = document.createElement('div');
1430 - overlay.id = 'hide-dialog-overlay';
1431 - 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;';
1432 - var dialog = document.createElement('div');
1433 - dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;';
1434 - var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を非表示にする</h3>';
1435 - html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">非表示の理由</label>';
1436 - 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="理由を入力" />';
1437 - html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
1438 - html += '<button type="button" id="hide-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
1439 - 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>';
1440 - 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>';
1441 - html += '</div>';
1442 - dialog.innerHTML = html;
1443 - overlay.appendChild(dialog);
1444 - document.body.appendChild(overlay);
1445 - overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
1446 - document.getElementById('hide-cancel-btn').addEventListener('click', function() { overlay.remove(); });
1447 - function doHide(action) {
1448 - var reason = document.getElementById('hide-reason').value || '管理者判断';
1449 - window.location.href = '/bin/view/SeitokaiCode/ModerationAction?action=' + action + '&targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&form_token=' + encodeURIComponent(token);
1450 - }
1451 - document.getElementById('hide-submit-btn').addEventListener('click', function() { doHide('hide'); });
1452 - document.getElementById('hide-warn-btn').addEventListener('click', function() { doHide('hide-warn'); });
1453 -}
1454 1454  </script>
1455 1455  {{/html}}
1456 1456  {{/velocity}}