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

Summary

Details

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