Skip to Content
Last modified by Super Admin on 2026/04/05 18:59
From version Icon 77.1 Icon
edited by Super Admin
on 2026/03/19 15:12
Change comment: There is no comment for this version
To version Icon 47.1 Icon
edited by Super Admin
on 2026/03/13 16:19
Change comment: There is no comment for this version

Summary

Details

Icon Page properties
Content
... ... @@ -1,11 +1,5 @@
1 1  {{velocity}}
2 2  ## ===== 学校ページ テンプレート =====
3 -## ゲストが ?sheet= 付きURL（編集フォーム等）に直接アクセスした場合、ログインページへリダイレクト
4 -#if($xcontext.user == 'XWiki.XWikiGuest' && $request.sheet && $request.sheet != '')
5 - #set($currentUrl = $doc.getURL('view', "sheet=${request.sheet}"))
6 - $response.sendRedirect("/bin/login/XWiki/XWikiLogin?srid=$escapetool.url($currentUrl)")
7 - #stop
8 -#end
9 9  {{html clean="false"}}
10 10  ## メンテナンスバナー（{{include}}ではなくインラインで記述し、<p>タグ挿入を回避）
11 11  #set($bannerDoc = $xwiki.getDocument('SeitokaiAdmin.MaintenanceBanner'))
... ... @@ -34,7 +34,6 @@
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 38  
39 39  ## --- 組織図 ---
40 40  #set($orgChart = $doc.getValue('orgChart'))
... ... @@ -102,76 +102,14 @@
102 102   #set($viewerDoc = $xwiki.getDocument($viewerUser))
103 103   #set($viewerAccountType = $!viewerDoc.getValue('accountType'))
104 104   #set($viewerSchoolCode = $!viewerDoc.getValue('schoolCode'))
105 - #set($viewerSecondarySchoolCode = $!viewerDoc.getValue('secondarySchoolCode'))
106 - #set($viewerUserRole = $!viewerDoc.getValue('userRole'))
107 107   #if($viewerAccountType == 'admin')
108 108   #set($isViewerAdmin = true)
109 109   #end
110 110  #end
111 111  
112 -## --- 関連校（中高一貫校）情報 ---
113 -#set($affiliatedSchoolCode = $!doc.getValue('affiliatedSchoolCode'))
114 -#set($affiliatedSchoolName = $!doc.getValue('affiliatedSchoolName'))
115 -#set($isAffiliated = false)
116 -#if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
117 - #if($viewerSchoolCode == $affiliatedSchoolCode)
118 - #set($isAffiliated = true)
119 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode)
120 - #set($isAffiliated = true)
121 - #end
122 -#end
123 -
124 -## --- 校内判定（卒業生を除外、secondarySchoolCodeも含む） ---
125 -#set($isSchoolMember = false)
126 -#if(!$isGuest && $viewerUserRole != 'graduate')
127 - #if($viewerSchoolCode == $schoolCode || $isAffiliated)
128 - #set($isSchoolMember = true)
129 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode)
130 - #set($isSchoolMember = true)
131 - #end
132 -#end
133 -## 卒業生の母校判定（投稿バッジ用）
134 -#set($isAlumniOfSchool = false)
135 -#if(!$isGuest && $viewerUserRole == 'graduate')
136 - #if($viewerSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $viewerSchoolCode == $affiliatedSchoolCode))
137 - #set($isAlumniOfSchool = true)
138 - #end
139 -#end
140 -
141 -## --- 学校ページ非表示チェック ---
142 -#set($schoolHidden = $doc.getValue('hidden'))
143 -#if($schoolHidden == 1)
144 - #if($isViewerAdmin)
145 - ## 管理者: 黄色バナー + ページ内容は通常表示（プレビュー）
146 -<div class="school-hidden-banner admin">
147 - <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>
148 - <div>
149 - <strong>このページは非表示になっています</strong>（管理者のみ閲覧可能）
150 - #set($hBy = $!doc.getValue('hiddenBy'))
151 - #set($hAt = $!doc.getValue('hiddenAt'))
152 - #set($hReason = $!doc.getValue('hiddenReason'))
153 - <div class="school-hidden-detail">
154 - 非表示: $!escapetool.xml($hAt) / $!escapetool.xml($hBy)
155 - #if($hReason && $hReason != '') ・ 理由: $!escapetool.xml($hReason)#end
156 - </div>
157 - <a href="$xwiki.getURL('SeitokaiAdmin.SchoolManagement', 'view')" style="color:#92400e;text-decoration:underline">学校ページ管理へ</a>
158 - </div>
159 -</div>
160 - #else
161 - ## 一般ユーザー・ゲスト: 非公開メッセージを表示して停止
162 -<div class="school-hidden-public">
163 - <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>
164 - <h2>このページは現在公開されていません</h2>
165 - <p>このページは管理者により非公開に設定されています。</p>
166 - <a href="$xwiki.getURL('Schools.WebHome', 'view')" class="btn-back-list">学校一覧に戻る</a>
167 -</div>
168 -#stop
169 - #end
170 -#end
171 -
172 172  ## --- 投稿固定/解除処理 ---
173 173  #set($pinAction = $!request.action)
174 -#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $isSchoolMember)) && $services.csrf.isTokenValid($request.form_token))
105 +#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token))
175 175   #set($pinPostObjStr = $!request.postObj)
176 176   #if(!$pinPostObjStr.matches('^\d+$'))
177 177   ## 不正な値 → 無視
... ... @@ -201,7 +201,7 @@
201 201  
202 202  ## --- 特色ある活動 選定/解除処理 ---
203 203  #set($featAction = $!request.action)
204 -#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $isSchoolMember)) && $services.csrf.isTokenValid($request.form_token))
135 +#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token))
205 205   #set($featActObjStr = $!request.actObj)
206 206   #if($featActObjStr.matches('^\d+$'))
207 207   #set($actObjNum = $mathtool.toInteger($featActObjStr))
... ... @@ -303,7 +303,7 @@
303 303  
304 304  ## --- 編集ボタン（権限があるユーザーのみ表示） ---
305 305  #set($canEditSchool = false)
306 -#if(!$isGuest && ($isViewerAdmin || $isSchoolMember))
237 +#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode))
307 307   #set($canEditSchool = true)
308 308  #end
309 309  #if($canEditSchool)
... ... @@ -312,302 +312,305 @@
312 312  </div>
313 313  #end
314 314  
315 -## --- 関連校（中高一貫校）バナー ---
316 -#if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
317 - #set($affiliatedPageRef = "Schools.${affiliatedSchoolCode}.WebHome")
318 - #set($affiliatedPageExists = $xwiki.exists($affiliatedPageRef))
319 -<div class="affiliated-school-banner">
320 - <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>
321 - <div>
322 - <strong>中高一貫校</strong>：
323 - #if($affiliatedPageExists)
324 - <a href="$xwiki.getURL($affiliatedPageRef, 'view')">$!escapetool.xml($affiliatedSchoolName)</a>
325 - #else
326 - $!escapetool.xml($affiliatedSchoolName)
246 +## --- ① 学校基本情報 + 連絡先（左右グリッド・折りたたみ対応） ---
247 +<div class="school-info-grid">
248 + <div class="school-info-card collapsed" id="card-basic-info">
249 + <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>
250 + <table class="wiki-table school-info-table">
251 + <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
252 + <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
253 + <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
254 + <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
255 + <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
256 + <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
257 + <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
258 + <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
259 + <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>
260 + </table>
261 + #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
262 + #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
263 + #if($infoEditDate && $infoEditDate != '')
264 + <div class="info-last-updated"><svg class="ico" viewBox="0 0 24 24"><path d="M11 4H4a2 2 0 00-2 2v14a2 2 0 002 2h14a2 2 0 002-2v-7"/><path d="M18.5 2.5a2.121 2.121 0 013 3L12 15l-4 1 1-4 9.5-9.5z"/></svg> 基本情報の最終更新: $!escapetool.xml($infoEditBy) — $!escapetool.xml($infoEditDate)</div>
327 327   #end
328 - と連携しています
329 329   </div>
267 +
268 + <div class="school-info-card collapsed" id="card-contact">
269 + <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>
270 + <table class="wiki-table school-info-table">
271 + <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr>
272 + <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>
273 + <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>
274 + <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>
275 + <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>
276 + <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
277 + </table>
278 + </div>
330 330  </div>
331 -#end
332 332  
333 -## --- ① 学校基本情報 ---
334 -<div class="school-info-card collapsed" id="card-basic-info">
335 - <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>
336 - <div class="school-basic-info-layout">
337 - <div class="school-basic-info-table">
338 - <table class="wiki-table school-info-table">
339 - <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
340 - <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
341 - <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
342 - <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
343 - <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
344 - <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
345 - <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
346 - <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
347 - <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>
348 - </table>
349 - </div>
350 - #if($schoolPhoto && $schoolPhoto != '')
351 - <div class="school-photo-area">
352 - <img src="$doc.getAttachmentURL($schoolPhoto)" alt="$!escapetool.xml($schoolName)" class="school-photo" />
353 - </div>
281 +## --- 生徒会情報アコーディオン ---
282 +<div class="school-section-divider">
283 + <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')?'▲':'▼';">
284 + <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>
285 + 生徒会情報を見る <span class="shortcut-arrow">▼</span>
286 + </button>
287 +</div>
288 +
289 +<div id="seitokai-info-section" class="seitokai-info-accordion">
290 +
291 +## --- ② 組織図 ---
292 +#set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
293 +#if($hasOrgContent)
294 + ## 公開範囲チェック
295 + #set($canViewOrgChart = true)
296 + #if($visibilityOrgChart == 'members' && $isGuest) #set($canViewOrgChart = false)
297 + #elseif($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewOrgChart = false)
298 + #end
299 + #if($canViewOrgChart)
300 +<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>
301 +<div class="school-section-card">
302 + <div class="card-inner">
303 + #if($orgChartImage && $orgChartImage != '')
304 + <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
354 354   #end
306 + #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end
355 355   </div>
356 - #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
357 - #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
358 - #if($infoEditDate && $infoEditDate != '')
359 - <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>
360 - #end
361 361  </div>
309 + #else
310 +<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>
311 + #end
312 +#end
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">
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)
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>
314 +## --- ③④⑤ 日常の活動・選挙・定例活動 ---
315 +<div class="school-section-grid">
316 + #if($dailyActivities && !$dailyActivities.isEmpty())
317 + <div class="school-section-card">
318 + <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>
319 + <div class="card-inner">
320 + <p class="activity-hint">活動時間の多い順に上位3つ</p>
321 + <div class="tag-container">
322 + #set($daIdx = 1)
323 + #foreach($da in $dailyActivities)
324 + <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
325 + #set($daIdx = $daIdx + 1)
381 381   #end
382 - #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end
383 383   </div>
328 + #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
329 + <div class="free-note">$!escapetool.xml($dailyActivitiesNote)</div>
330 + #end
384 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>
332 + </div>
333 + #end
334 +
335 + #if($electionExists && $electionExists != '')
336 + <div class="school-section-card">
337 + <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>
338 + <div class="card-inner">
339 + <div class="info-row">
340 + <span class="info-label">役員選挙</span>
341 + <span class="info-value">$!escapetool.xml($!electionExists)</span>
342 + </div>
343 + #if($electionType && $electionType != '')
344 + <div class="info-row">
345 + <span class="info-label">直近の選挙方式</span>
346 + <span class="info-value">$!escapetool.xml($!electionType)</span>
347 + </div>
387 387   #end
388 - #end
349 + #if($electionNote && $electionNote.trim() != '')
350 + <div class="free-note">$!escapetool.xml($electionNote)</div>
351 + #end
352 + </div>
353 + </div>
354 + #end
355 +</div>
389 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 - #set($daIdx = 1)
398 - #foreach($da in $dailyActivities)
399 - <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
400 - #set($daIdx = $daIdx + 1)
401 - #end
402 - </div>
403 - #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
404 - <div class="free-note">$!escapetool.xml($dailyActivitiesNote)</div>
405 - #end
357 +<div class="school-section-grid">
358 + #if($meetingFrequency && $meetingFrequency != '')
359 + <div class="school-section-card">
360 + <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>
361 + <div class="card-inner">
362 + <div class="info-row">
363 + <span class="info-label">役員定例会の頻度</span>
364 + <span class="info-value">$!escapetool.xml($!meetingFrequency)</span>
406 406   </div>
366 + #if($regularActivitiesNote && $regularActivitiesNote.trim() != '')
367 + <div class="free-note">$!escapetool.xml($regularActivitiesNote)</div>
368 + #end
407 407   </div>
408 - #end
370 + </div>
371 + #end
409 409  
410 - ## --- 選挙 ---
411 - #if($electionExists && $electionExists != '')
412 - <div class="seitokai-subsection">
413 - <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>
414 - <div class="seitokai-subsection-content">
415 - <div class="info-row">
416 - <span class="info-label">役員選挙</span>
417 - <span class="info-value">$!escapetool.xml($!electionExists)</span>
418 - </div>
419 - #if($electionType && $electionType != '')
420 - <div class="info-row">
421 - <span class="info-label">直近の選挙方式</span>
422 - <span class="info-value">$!escapetool.xml($!electionType)</span>
423 - </div>
424 - #end
425 - #if($electionNote && $electionNote.trim() != '')
426 - <div class="free-note">$!escapetool.xml($electionNote)</div>
427 - #end
373 + ## --- ⑦ 予算 ---
374 + #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
375 + #if($hasBudget)
376 + ## 公開範囲チェック
377 + #set($canViewBudget = true)
378 + #if($visibilityBudget == 'members' && $isGuest) #set($canViewBudget = false)
379 + #elseif($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewBudget = false)
380 + #end
381 + #if($canViewBudget)
382 + <div class="school-section-card">
383 + <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>
384 + <div class="card-inner">
385 + #if($budgetProcess && !$budgetProcess.isEmpty())
386 + <div class="info-row">
387 + <span class="info-label">作成過程の生徒関与</span>
388 + <span class="info-value">
389 + <div class="selection-display">
390 + #foreach($bp in $budgetProcess)
391 + <span class="selection-item">$!escapetool.xml($bp.trim())</span>
392 + #end
393 + </div>
394 + </span>
428 428   </div>
396 + #end
397 + #if($studentFee && $studentFee != '')
398 + <div class="info-row">
399 + <span class="info-label">生徒会費（年額）</span>
400 + <span class="info-value">$!escapetool.xml($!studentFee)</span>
401 + </div>
402 + #end
403 + #if($budgetScale && $budgetScale != '')
404 + <div class="info-row">
405 + <span class="info-label">予算規模</span>
406 + <span class="info-value">$!escapetool.xml($!budgetScale)</span>
407 + </div>
408 + #end
409 + #if($budgetAllocation && !$budgetAllocation.isEmpty())
410 + <div class="info-row">
411 + <span class="info-label">主な予算配分</span>
412 + <span class="info-value">
413 + <div class="selection-display">
414 + #foreach($ba in $budgetAllocation)
415 + <span class="selection-item">$!escapetool.xml($ba.trim())</span>
416 + #end
417 + </div>
418 + </span>
419 + </div>
420 + #end
421 + #if($budgetNote && $budgetNote.trim() != '')
422 + <div class="free-note">$!escapetool.xml($budgetNote)</div>
423 + #end
429 429   </div>
425 + </div>
426 + #else
427 + <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>
430 430   #end
429 + #end
430 +</div>
431 431  
432 - ## --- 定例活動 ---
433 - #if($meetingFrequency && $meetingFrequency != '')
434 - <div class="seitokai-subsection">
435 - <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>
436 - <div class="seitokai-subsection-content">
437 - <div class="info-row">
438 - <span class="info-label">役員定例会の頻度</span>
439 - <span class="info-value">$!escapetool.xml($!meetingFrequency)</span>
432 +## --- ⑧ 校則の見直し ---
433 +#if($ruleReviewStatus && $ruleReviewStatus != '')
434 + ## 公開範囲チェック
435 + #set($canViewRuleReview = true)
436 + #if($visibilityRuleReview == 'members' && $isGuest) #set($canViewRuleReview = false)
437 + #elseif($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewRuleReview = false)
438 + #end
439 + #if($canViewRuleReview)
440 +<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>
441 +<div class="school-section-card">
442 + <div class="card-inner">
443 + <div class="info-row">
444 + <span class="info-label">見直しの有無（3年以内）</span>
445 + <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
446 + </div>
447 + #if($ruleReviewContent && !$ruleReviewContent.isEmpty())
448 + <div class="info-row">
449 + <span class="info-label">見直しの内容</span>
450 + <span class="info-value">
451 + <div class="selection-display">
452 + #foreach($rc in $ruleReviewContent)
453 + <span class="selection-item">$!escapetool.xml($rc.trim())</span>
454 + #end
440 440   </div>
441 - #if($regularActivitiesNote && $regularActivitiesNote.trim() != '')
442 - <div class="free-note">$!escapetool.xml($regularActivitiesNote)</div>
443 - #end
444 - </div>
456 + </span>
445 445   </div>
446 446   #end
447 -
448 - ## --- 予算 ---
449 - #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
450 - #if($hasBudget)
451 - #set($canViewBudget = true)
452 - #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewBudget = false)
453 - #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false)
454 - #end
455 - #if($canViewBudget)
456 - <div class="seitokai-subsection">
457 - <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>
458 - <div class="seitokai-subsection-content">
459 - #if($budgetProcess && !$budgetProcess.isEmpty())
460 - <div class="info-row">
461 - <span class="info-label">作成過程の生徒関与</span>
462 - <span class="info-value">
463 - <div class="selection-display">
464 - #foreach($bp in $budgetProcess)
465 - <span class="selection-item">$!escapetool.xml($bp.trim())</span>
466 - #end
467 - </div>
468 - </span>
459 + #if($ruleReviewProposer && !$ruleReviewProposer.isEmpty())
460 + <div class="info-row">
461 + <span class="info-label">見直しの提案者</span>
462 + <span class="info-value">
463 + <div class="selection-display">
464 + #foreach($rp in $ruleReviewProposer)
465 + <span class="selection-item">$!escapetool.xml($rp.trim())</span>
466 + #end
469 469   </div>
470 - #end
471 - #if($studentFee && $studentFee != '')
472 - <div class="info-row">
473 - <span class="info-label">生徒会費（年額）</span>
474 - <span class="info-value">$!escapetool.xml($!studentFee)</span>
475 - </div>
476 - #end
477 - #if($budgetScale && $budgetScale != '')
478 - <div class="info-row">
479 - <span class="info-label">予算規模</span>
480 - <span class="info-value">$!escapetool.xml($!budgetScale)</span>
481 - </div>
482 - #end
483 - #if($budgetAllocation && !$budgetAllocation.isEmpty())
484 - <div class="info-row">
485 - <span class="info-label">主な予算配分</span>
486 - <span class="info-value">
487 - <div class="selection-display">
488 - #foreach($ba in $budgetAllocation)
489 - <span class="selection-item">$!escapetool.xml($ba.trim())</span>
490 - #end
491 - </div>
492 - </span>
493 - </div>
494 - #end
495 - #if($budgetNote && $budgetNote.trim() != '')
496 - <div class="free-note">$!escapetool.xml($budgetNote)</div>
497 - #end
498 - </div>
468 + </span>
499 499   </div>
500 - #else
501 - <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>
502 - #end
503 503   #end
504 -
505 - ## --- 校則の見直し ---
506 - #if($ruleReviewStatus && $ruleReviewStatus != '')
507 - #set($canViewRuleReview = true)
508 - #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewRuleReview = false)
509 - #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false)
510 - #end
511 - #if($canViewRuleReview)
512 - <div class="seitokai-subsection">
513 - <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>
514 - <div class="seitokai-subsection-content">
515 - <div class="info-row">
516 - <span class="info-label">見直しの有無（3年以内）</span>
517 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
471 + #if($ruleReviewImplementer && !$ruleReviewImplementer.isEmpty())
472 + <div class="info-row">
473 + <span class="info-label">見直しの実施者</span>
474 + <span class="info-value">
475 + <div class="selection-display">
476 + #foreach($ri in $ruleReviewImplementer)
477 + <span class="selection-item">$!escapetool.xml($ri.trim())</span>
478 + #end
518 518   </div>
519 - #if($ruleReviewContent && !$ruleReviewContent.isEmpty())
520 - <div class="info-row">
521 - <span class="info-label">見直しの内容</span>
522 - <span class="info-value">
523 - <div class="selection-display">
524 - #foreach($rc in $ruleReviewContent)
525 - <span class="selection-item">$!escapetool.xml($rc.trim())</span>
526 - #end
527 - </div>
528 - </span>
529 - </div>
530 - #end
531 - #if($ruleReviewProposer && !$ruleReviewProposer.isEmpty())
532 - <div class="info-row">
533 - <span class="info-label">見直しの提案者</span>
534 - <span class="info-value">
535 - <div class="selection-display">
536 - #foreach($rp in $ruleReviewProposer)
537 - <span class="selection-item">$!escapetool.xml($rp.trim())</span>
538 - #end
539 - </div>
540 - </span>
541 - </div>
542 - #end
543 - #if($ruleReviewImplementer && !$ruleReviewImplementer.isEmpty())
544 - <div class="info-row">
545 - <span class="info-label">見直しの実施者</span>
546 - <span class="info-value">
547 - <div class="selection-display">
548 - #foreach($ri in $ruleReviewImplementer)
549 - <span class="selection-item">$!escapetool.xml($ri.trim())</span>
550 - #end
551 - </div>
552 - </span>
553 - </div>
554 - #end
555 - #if($ruleReviewSystem && $ruleReviewSystem != '')
556 - <div class="info-row">
557 - <span class="info-label">見直しの仕組み</span>
558 - <span class="info-value">$!escapetool.xml($!ruleReviewSystem)</span>
559 - </div>
560 - #end
561 - </div>
480 + </span>
562 562   </div>
563 - #else
564 - <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>
565 - #end
566 566   #end
567 -
568 - ## --- 生徒会の課題意識 ---
569 - #if($challenges && $challenges != '')
570 - #set($canViewChallenges = true)
571 - #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewChallenges = false)
572 - #elseif($visibilityChallenges == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewChallenges = false)
573 - #end
574 - #if($canViewChallenges)
575 - <div class="seitokai-subsection">
576 - <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>
577 - <div class="seitokai-subsection-content">
578 - <div class="challenge-text">$!escapetool.xml($challenges)</div>
579 - </div>
483 + #if($ruleReviewSystem && $ruleReviewSystem != '')
484 + <div class="info-row">
485 + <span class="info-label">見直しの仕組み</span>
486 + <span class="info-value">$!escapetool.xml($!ruleReviewSystem)</span>
580 580   </div>
581 - #else
582 - <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>
583 - #end
584 584   #end
489 + </div>
490 +</div>
491 + #else
492 +<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>
493 + #end
494 +#end
585 585  
586 - </div>## seitokai-info-body 終了
587 -</div>## card-seitokai-info 終了
496 +## --- ⑨ 課題 ---
497 +#if($challenges && $challenges != '')
498 + ## 公開範囲チェック
499 + #set($canViewChallenges = true)
500 + #if($visibilityChallenges == 'members' && $isGuest) #set($canViewChallenges = false)
501 + #elseif($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewChallenges = false)
502 + #end
503 + #if($canViewChallenges)
504 +<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>
505 +<div class="challenge-text">$!escapetool.xml($challenges)</div>
506 + #else
507 +<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>
508 + #end
509 +#end
588 588  
589 -## --- ③ SNS・連絡先 ---
590 -<div class="school-info-card collapsed" id="card-contact">
591 - <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>
592 - <table class="wiki-table school-info-table">
593 - <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr>
594 - <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>
595 - <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>
596 - <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>
597 - <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>
598 - <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
599 - </table>
600 -</div>
511 +</div>## seitokai-info-accordion 終了
601 601  
602 602  {{/html}}
603 603  
604 -----
605 -
606 606  ## --- ⑩ 活動報告一覧（スレッド型・年度タブ付き） ---
607 607  = 活動報告 =
608 608  
609 -## --- 年度タブ + 投稿者ステータス凡例 ---
518 +## --- 投稿者ステータス凡例（折りたたみ） ---
610 610  {{html clean="false"}}
520 +<div class="author-legend-wrapper">
521 + <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>
522 + <div class="author-legend-body">
523 + <div class="author-legend">
524 + <span class="author-legend-title">投稿者の信頼度:</span>
525 + <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者</span>
526 + <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み</span>
527 + <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介</span>
528 + <span class="author-legend-item"><span class="bar bar-general"></span> 一般（未承認）</span>
529 + </div>
530 + <div class="author-legend">
531 + <span class="author-legend-title">所属:</span>
532 + <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>
533 + <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>
534 + <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>
535 + <span class="author-legend-item text-hint">※一般アカウントは所属未確認のため非表示</span>
536 + </div>
537 + <div class="author-legend">
538 + <span class="author-legend-title">役割:</span>
539 + <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>
540 + <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>
541 + <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>
542 + </div>
543 + </div>
544 +</div>
611 611  
612 612  ## --- 年度タブ ---
613 613  ## 全活動から年度一覧を収集
... ... @@ -629,49 +629,14 @@
629 629  #end
630 630  ## ソート（降順にしたいが Velocity にはないので JS で制御）
631 631  
632 -<div class="activity-toolbar">
633 - <div class="activity-fy-tabs">
634 - <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
635 - #foreach($fy in $fySet)
636 - #if($fy != $currentFYStr)
637 - <button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button>
638 - #end
566 +<div class="activity-fy-tabs">
567 + <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
568 + #foreach($fy in $fySet)
569 + #if($fy != $currentFYStr)
570 + <button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button>
639 639   #end
640 - <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
641 - </div>
642 - <div class="activity-toolbar-right">
643 - <button class="btn-view-toggle" id="btnViewToggle" onclick="toggleCompactView()" title="タイトルのみ表示">
644 - <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>
645 - <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>
646 - <span class="toggle-label">一覧表示</span>
647 - </button>
648 - </div>
649 - <div class="author-legend-wrapper">
650 - <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>
651 - <div class="author-legend-body">
652 - <div class="author-legend">
653 - <span class="author-legend-title">投稿者の信頼度:</span>
654 - <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者 <span class="text-hint">— 運営スタッフ</span></span>
655 - <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み <span class="text-hint">— 本人確認済みのユーザー</span></span>
656 - <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介 <span class="text-hint">— 承認済みユーザーからの紹介</span></span>
657 - <span class="author-legend-item"><span class="bar bar-general"></span> 一般 <span class="text-hint">— 一般登録ユーザー</span></span>
658 - </div>
659 - <div class="author-legend">
660 - <span class="author-legend-title">所属:</span>
661 - <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>
662 - <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>
663 - <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>
664 - <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>
665 - <span class="author-legend-item text-hint">※一般アカウントは所属バッジが表示されません</span>
666 - </div>
667 - <div class="author-legend">
668 - <span class="author-legend-title">役割:</span>
669 - <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>
670 - <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>
671 - <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>
672 - </div>
673 - </div>
674 - </div>
572 + #end
573 + <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
675 675  </div>
676 676  
677 677  {{/html}}
... ... @@ -738,12 +738,6 @@
738 738   <div class="activity-thread-title">
739 739   <h3 #if($actFeatured == '1')class="featured-title"#end>$!escapetool.xml($!actTitle) #if($actFeatured == '1')<svg class="ico ico-fixed-14 ico-star-offset" viewBox="0 0 24 24" fill="currentColor" stroke="none"><polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"/></svg>#end</h3>
740 740   <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
741 - #set($actTagsList = $activity.getValue('tags'))
742 - #if($actTagsList && !$actTagsList.isEmpty())
743 - #foreach($tagItem in $actTagsList)
744 - #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end
745 - #end
746 - #end
747 747   </div>
748 748   <div class="thread-meta-row">
749 749   <span class="thread-post-count">${reportCount}件の報告 ・ ${commentCount}件のコメント</span>
... ... @@ -805,12 +805,12 @@
805 805   #set($postVis = $!post.getValue('visibility'))
806 806   #if(!$postVis || $postVis == '') #set($postVis = 'public') #end
807 807   #set($canViewPost = true)
808 - #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewPost = false)
809 - #elseif($postVis == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPost = false)
701 + #if($postVis == 'members' && $isGuest) #set($canViewPost = false)
702 + #elseif($postVis == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewPost = false)
810 810   #end
811 811   #if(!$canViewPost)
812 812   <div class="thread-post visibility-restricted-post">
813 - <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>
706 + <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>
814 814   </div>
815 815   #else
816 816   ## 投稿者のアカウント種別に基づいたCSSクラス
... ... @@ -850,11 +850,8 @@
850 850   <span class="badge badge-general badge-sm">一般</span>
851 851   #end
852 852   ## 所属バッジ（投稿者の学校コードとページの学校コードを比較）
853 - #set($postIsSchoolMatch = ($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode)))
854 854   #if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general')
855 - #if($postUserRole == 'graduate' && $postIsSchoolMatch)
856 - <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>
857 - #elseif($postIsSchoolMatch && $postUserRole != 'graduate')
747 + #if($postSchoolCode == $schoolCode)
858 858   #if($postAccountType == 'verified' || $postAccountType == 'admin')
859 859   <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>
860 860   #else
... ... @@ -881,13 +881,6 @@
881 881   #if($postEdited == 1 || $postEdited == '1')
882 882   <span class="post-edited-label">（編集済み）</span>
883 883   #end
884 - #set($postAuthorRefH = $!post.getValue('authorRef'))
885 - #set($postObjNumH = $post.number)
886 - #if(!$isGuest && $xcontext.user != $postAuthorRefH)
887 - <button type="button" class="btn-post-report btn-post-report-header" onclick="openReportDialog(this, '${doc.fullName}', $postObjNumH, '${services.csrf.getToken()}')" title="この投稿を通報">
888 - <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> 通報
889 - </button>
890 - #end
891 891   </div>
892 892   <div class="thread-post-body">
893 893   $!escapetool.xml($!postContent)
... ... @@ -952,18 +952,12 @@
952 952   #end
953 953   </div>
954 954   #if($postVis != 'public')
955 - <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>
838 + <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>
956 956   #end
957 - ## 固定/編集/削除/通報/非表示ボタン（横並び）
958 - #set($postAuthorRef = $!post.getValue('authorRef'))
959 - #set($postObjNumED = $post.number)
960 - #set($showPinBtn = ($viewerAccountType == 'admin' || $viewerAccountType == 'verified'))
961 - #set($showEditDeleteBtn = ($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin'))
962 - #set($showHideBtn = ($viewerAccountType == 'admin'))
963 - #if($showPinBtn || $showEditDeleteBtn || $showHideBtn)
964 - <div class="post-edit-actions post-action-mt">
965 - #if($showPinBtn)
966 - #set($postObjNum = $post.number)
840 + ## 固定/解除ボタン（承認済み・管理者のみ）
841 + #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
842 + #set($postObjNum = $post.number)
843 + <div class="post-pin-action post-action-mt">
967 967   #if($isPinned == '1')
968 968   <a href="$doc.getURL('view', "action=unpin&postObj=${postObjNum}&form_token=${services.csrf.getToken()}")" class="btn-pin-toggle btn-unpin" title="固定を解除">
969 969   <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> 固定を解除
... ... @@ -973,8 +973,13 @@
973 973   <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> 固定する
974 974   </a>
975 975   #end
976 - #end
977 - #if($showEditDeleteBtn)
853 + </div>
854 + #end
855 + ## 編集・削除ボタン（投稿者本人 or 管理者）
856 + #set($postAuthorRef = $!post.getValue('authorRef'))
857 + #set($postObjNumED = $post.number)
858 + #if($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin')
859 + <div class="post-edit-actions post-action-mt">
978 978   #if($xcontext.user == $postAuthorRef)
979 979   <button type="button" class="btn-post-edit" onclick="openEditPost(this, '${doc.fullName}', $postObjNumED, '$!escapetool.javascript($!postContent)')" title="この投稿を編集">
980 980   <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> 編集
... ... @@ -983,12 +983,6 @@
983 983   <button type="button" class="btn-post-delete" onclick="confirmDeletePost('${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を削除">
984 984   <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> 削除
985 985   </button>
986 - #end
987 - #if($showHideBtn)
988 - <button type="button" class="btn-post-hide" onclick="openHideDialog(this, '${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を非表示にする">
989 - <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> 非表示
990 - </button>
991 - #end
992 992   </div>
993 993   #end
994 994   </div>
... ... @@ -1038,11 +1038,9 @@
1038 1038  
1039 1039   #if($xcontext.user != "XWiki.XWikiGuest")
1040 1040   <div class="thread-add-post">
1041 - #if($isSchoolMember || $isViewerAdmin)
1042 1042   <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
1043 1043   ＋ 活動報告を追加
1044 1044   </a>
1045 - #end
1046 1046   <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
1047 1047   <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> コメントを書く
1048 1048   </a>
... ... @@ -1075,35 +1075,6 @@
1075 1075  ## --- 年度タブ切り替え JavaScript ---
1076 1076  {{html clean="false"}}
1077 1077  <script>
1078 -// コンパクト表示（タイトルのみ）トグル
1079 -function toggleCompactView() {
1080 - var container = document.querySelector('.xwiki-content') || document.body;
1081 - var isCompact = container.classList.toggle('activity-compact-view');
1082 - var btn = document.getElementById('btnViewToggle');
1083 - if (btn) {
1084 - btn.querySelector('.toggle-label').textContent = isCompact ? '詳細表示' : '一覧表示';
1085 - btn.title = isCompact ? '詳細表示に戻す' : 'タイトルのみ表示';
1086 - }
1087 - // コンパクトモードでは各スレッドヘッダーをクリックで個別展開可能にする
1088 - document.querySelectorAll('.activity-thread').forEach(function(thread) {
1089 - if (isCompact) {
1090 - thread.classList.remove('compact-expanded');
1091 - }
1092 - });
1093 -}
1094 -
1095 -// コンパクトモードで個別スレッドを展開/折りたたみ
1096 -function toggleThreadExpand(e) {
1097 - var container = document.querySelector('.xwiki-content') || document.body;
1098 - if (!container.classList.contains('activity-compact-view')) return;
1099 - // リンクやボタンのクリックはスルー
1100 - if (e.target.closest('a, button, .btn-featured-toggle')) return;
1101 - var thread = e.target.closest('.activity-thread');
1102 - if (thread) {
1103 - thread.classList.toggle('compact-expanded');
1104 - }
1105 -}
1106 -
1107 1107  function switchActivityFY(fy, btn) {
1108 1108   // タブのアクティブ状態を切り替え
1109 1109   document.querySelectorAll('.activity-fy-tab').forEach(function(t) { t.classList.remove('active'); });
... ... @@ -1119,27 +1119,6 @@
1119 1119  }
1120 1120  // ページ読み込み時の初期化
1121 1121  document.addEventListener('DOMContentLoaded', function() {
1122 - // 年度タブを降順にソート（「全期間」タブは末尾に固定）
1123 - var tabContainer = document.querySelector('.activity-fy-tabs');
1124 - if (tabContainer) {
1125 - var tabs = Array.from(tabContainer.querySelectorAll('.activity-fy-tab'));
1126 - var allTab = null;
1127 - var fyTabs = [];
1128 - tabs.forEach(function(t) {
1129 - var onclickStr = t.getAttribute('onclick') || '';
1130 - if (onclickStr.indexOf("'all'") !== -1) { allTab = t; }
1131 - else { fyTabs.push(t); }
1132 - });
1133 - // 年度タブを数値の降順でソート
1134 - fyTabs.sort(function(a, b) {
1135 - var aYear = parseInt(a.textContent) || 0;
1136 - var bYear = parseInt(b.textContent) || 0;
1137 - return bYear - aYear;
1138 - });
1139 - // DOM再配置
1140 - fyTabs.forEach(function(t) { tabContainer.appendChild(t); });
1141 - if (allTab) { tabContainer.appendChild(allTab); }
1142 - }
1143 1143   // デフォルトで現在の年度を表示
1144 1144   var defaultTab = document.querySelector('.activity-fy-tab.active');
1145 1145   if (defaultTab) { defaultTab.click(); }
... ... @@ -1151,30 +1151,6 @@
1151 1151   window.history.replaceState({}, document.title, window.location.pathname);
1152 1152   }
1153 1153   }
1154 - // コンパクトモード: スレッドヘッダークリックで個別展開
1155 - document.querySelectorAll('.activity-thread-header').forEach(function(header) {
1156 - header.addEventListener('click', toggleThreadExpand);
1157 - });
1158 - // 長文投稿の折りたたみ初期化（max-height: 12em 超で省略）
1159 - document.querySelectorAll('.thread-post-body').forEach(function(body) {
1160 - // pre-wrapのまま高さを測定し、max-height(12em ≒ ~200px)を超える場合に折りたたむ
1161 - var fullH = body.scrollHeight;
1162 - // 12em を px に変換（font-size × line-height × 行数 の近似値ではなくCSSと同じ値を取得）
1163 - body.classList.add('truncated');
1164 - var maxH = body.clientHeight; // max-height: 12em 適用後の高さ
1165 - body.classList.remove('truncated');
1166 - if (fullH > maxH + 30) {
1167 - body.classList.add('truncated');
1168 - var btn = document.createElement('button');
1169 - btn.className = 'btn-read-more';
1170 - btn.textContent = '広げて読む ▼';
1171 - btn.addEventListener('click', function() {
1172 - var isExpanded = body.classList.toggle('expanded');
1173 - btn.textContent = isExpanded ? '折りたたむ ▲' : '広げて読む ▼';
1174 - });
1175 - body.parentNode.insertBefore(btn, body.nextSibling);
1176 - }
1177 - });
1178 1178  });
1179 1179  
1180 1180  // トースト通知表示
... ... @@ -1237,7 +1237,7 @@
1237 1237   var csrfEl = document.querySelector('input[name="form_token"]');
1238 1238   var csrfToken = csrfEl ? csrfEl.value : '';
1239 1239   var xhr = new XMLHttpRequest();
1240 - xhr.open('POST', '/bin/get/SeitokaiCode/EditPost?outputSyntax=plain', true);
1040 + xhr.open('POST', '/bin/SeitokaiCode/EditPost?outputSyntax=plain', true);
1241 1241   xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1242 1242   var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken);
1243 1243   xhr.onload = function() {
... ... @@ -1259,7 +1259,7 @@
1259 1259  function confirmDeletePost(schoolPage, postObjNum, token) {
1260 1260   if (!confirm('この投稿を削除しますか？\\n削除後は「この投稿は削除されました」と表示されます。')) return;
1261 1261   var xhr = new XMLHttpRequest();
1262 - xhr.open('POST', '/bin/get/SeitokaiCode/DeletePost?outputSyntax=plain', true);
1062 + xhr.open('POST', '/bin/SeitokaiCode/DeletePost?outputSyntax=plain', true);
1263 1263   xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1264 1264   var deletePostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token);
1265 1265   xhr.onload = function() {
... ... @@ -1276,80 +1276,6 @@
1276 1276   xhr.onerror = function() { alert('通信エラーが発生しました'); };
1277 1277   xhr.send(deletePostData);
1278 1278  }
1279 -
1280 -/* --- 通報ダイアログ --- */
1281 -function openReportDialog(btn, targetPage, postObjNum, token) {
1282 - if (document.getElementById('report-dialog-overlay')) return;
1283 - var reasons = ['宣伝・スパム','不適切な内容','個人情報の露出','誹謗中傷','誤情報','その他'];
1284 - var overlay = document.createElement('div');
1285 - overlay.id = 'report-dialog-overlay';
1286 - 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;';
1287 - var dialog = document.createElement('div');
1288 - dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;max-height:80vh;overflow-y:auto;';
1289 - var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を通報</h3>';
1290 - html += '<p style="margin:0 0 12px;font-size:0.9em;color:#4b5563;">通報された投稿は管理者が確認するまで一時的に非表示になります。</p>';
1291 - html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">通報理由</label>';
1292 - html += '<select id="report-reason" style="width:100%;padding:8px;border:1px solid #d1d5db;border-radius:8px;margin-bottom:12px;font-size:0.9em;">';
1293 - for (var i=0; i<reasons.length; i++) html += '<option value="'+reasons[i]+'">'+reasons[i]+'</option>';
1294 - html += '</select>';
1295 - html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">補足コメント（任意）</label>';
1296 - 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>';
1297 - html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
1298 - html += '<button type="button" id="report-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
1299 - 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>';
1300 - html += '</div>';
1301 - dialog.innerHTML = html;
1302 - overlay.appendChild(dialog);
1303 - document.body.appendChild(overlay);
1304 - overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
1305 - document.getElementById('report-cancel-btn').addEventListener('click', function() { overlay.remove(); });
1306 - document.getElementById('report-submit-btn').addEventListener('click', function() {
1307 - var reason = document.getElementById('report-reason').value;
1308 - var detail = document.getElementById('report-detail').value;
1309 - var submitBtn = document.getElementById('report-submit-btn');
1310 - submitBtn.disabled = true; submitBtn.textContent = '送信中...';
1311 - var xhr = new XMLHttpRequest();
1312 - xhr.open('POST', '/bin/get/SeitokaiCode/ReportAction?outputSyntax=plain', true);
1313 - xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1314 - var data = 'targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&detail=' + encodeURIComponent(detail) + '&form_token=' + encodeURIComponent(token);
1315 - xhr.onload = function() {
1316 - overlay.remove();
1317 - showToast('通報を受け付けました', 'success');
1318 - setTimeout(function() { location.reload(); }, 1000);
1319 - };
1320 - xhr.onerror = function() { overlay.remove(); alert('通信エラーが発生しました'); };
1321 - xhr.send(data);
1322 - });
1323 -}
1324 -
1325 -/* --- 非表示ダイアログ（管理者用） --- */
1326 -function openHideDialog(btn, targetPage, postObjNum, token) {
1327 - if (document.getElementById('hide-dialog-overlay')) return;
1328 - var overlay = document.createElement('div');
1329 - overlay.id = 'hide-dialog-overlay';
1330 - 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;';
1331 - var dialog = document.createElement('div');
1332 - dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;';
1333 - var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を非表示にする</h3>';
1334 - html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">非表示の理由</label>';
1335 - 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="理由を入力" />';
1336 - html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
1337 - html += '<button type="button" id="hide-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
1338 - 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>';
1339 - 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>';
1340 - html += '</div>';
1341 - dialog.innerHTML = html;
1342 - overlay.appendChild(dialog);
1343 - document.body.appendChild(overlay);
1344 - overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
1345 - document.getElementById('hide-cancel-btn').addEventListener('click', function() { overlay.remove(); });
1346 - function doHide(action) {
1347 - var reason = document.getElementById('hide-reason').value || '管理者判断';
1348 - window.location.href = '/bin/view/SeitokaiCode/ModerationAction?action=' + action + '&targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&form_token=' + encodeURIComponent(token);
1349 - }
1350 - document.getElementById('hide-submit-btn').addEventListener('click', function() { doHide('hide'); });
1351 - document.getElementById('hide-warn-btn').addEventListener('click', function() { doHide('hide-warn'); });
1352 -}
1353 1353  </script>
1354 1354  {{/html}}
1355 1355  {{/velocity}}