Skip to Content
Last modified by Super Admin on 2026/04/05 18:59
From version Icon 43.1 Icon
edited by Super Admin
on 2026/03/12 17:54
Change comment: There is no comment for this version
To version Icon 55.1 Icon
edited by Super Admin
on 2026/03/15 01:20
Change comment: There is no comment for this version

Summary

Details

Icon Page properties
Content
... ... @@ -100,10 +100,45 @@
100 100   #end
101 101  #end
102 102  
103 +## --- 学校ページ非表示チェック ---
104 +#set($schoolHidden = $doc.getValue('hidden'))
105 +#if($schoolHidden == 1)
106 + #if($isViewerAdmin)
107 + ## 管理者: 黄色バナー + ページ内容は通常表示（プレビュー）
108 +<div class="school-hidden-banner admin">
109 + <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>
110 + <div>
111 + <strong>このページは非表示になっています</strong>（管理者のみ閲覧可能）
112 + #set($hBy = $!doc.getValue('hiddenBy'))
113 + #set($hAt = $!doc.getValue('hiddenAt'))
114 + #set($hReason = $!doc.getValue('hiddenReason'))
115 + <div class="school-hidden-detail">
116 + 非表示: $!escapetool.xml($hAt) / $!escapetool.xml($hBy)
117 + #if($hReason && $hReason != '') ・ 理由: $!escapetool.xml($hReason)#end
118 + </div>
119 + <a href="$xwiki.getURL('SeitokaiAdmin.SchoolManagement', 'view')" style="color:#92400e;text-decoration:underline">学校ページ管理へ</a>
120 + </div>
121 +</div>
122 + #else
123 + ## 一般ユーザー・ゲスト: 非公開メッセージを表示して停止
124 +<div class="school-hidden-public">
125 + <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>
126 + <h2>このページは現在公開されていません</h2>
127 + <p>このページは管理者により非公開に設定されています。</p>
128 + <a href="$xwiki.getURL('Schools.WebHome', 'view')" class="btn-back-list">学校一覧に戻る</a>
129 +</div>
130 +#stop
131 + #end
132 +#end
133 +
103 103  ## --- 投稿固定/解除処理 ---
104 104  #set($pinAction = $!request.action)
105 -#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || $viewerAccountType == 'verified') && $services.csrf.isTokenValid($request.form_token))
106 - #set($postObjNum = $mathtool.toInteger($!request.postObj))
136 +#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token))
137 + #set($pinPostObjStr = $!request.postObj)
138 + #if(!$pinPostObjStr.matches('^\d+$'))
139 + ## 不正な値 → 無視
140 + #else
141 + #set($postObjNum = $mathtool.toInteger($pinPostObjStr))
107 107   #set($postObj = $doc.getObject('SeitokaiCode.ActivityPostClass', $postObjNum))
108 108   #if($postObj)
109 109   #if($pinAction == 'pin')
... ... @@ -123,12 +123,15 @@
123 123   $response.sendRedirect($doc.getURL('view'))
124 124   #stop
125 125   #end
161 + #end## /matches
126 126  #end
127 127  
128 128  ## --- 特色ある活動 選定/解除処理 ---
129 129  #set($featAction = $!request.action)
130 -#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $services.csrf.isTokenValid($request.form_token))
131 - #set($actObjNum = $mathtool.toInteger($!request.actObj))
166 +#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token))
167 + #set($featActObjStr = $!request.actObj)
168 + #if($featActObjStr.matches('^\d+$'))
169 + #set($actObjNum = $mathtool.toInteger($featActObjStr))
132 132   #set($actObj = $doc.getObject('SeitokaiCode.ActivityClass', $actObjNum))
133 133   #if($actObj)
134 134   #if($featAction == 'feature')
... ... @@ -160,6 +160,7 @@
160 160   $response.sendRedirect($doc.getURL('view'))
161 161   #stop
162 162   #end
201 + #end## /matches
163 163  #end
164 164  
165 165  ## --- ユーザー情報取得 ---
... ... @@ -235,305 +235,275 @@
235 235  </div>
236 236  #end
237 237  
238 -## --- ① 学校基本情報 + 連絡先（左右グリッド・折りたたみ対応） ---
239 -<div class="school-info-grid">
240 - <div class="school-info-card collapsed" id="card-basic-info">
241 - <h2 onclick="toggleInfoCard('card-basic-info')"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M4 19.5A2.5 2.5 0 016.5 17H20"/><path d="M6.5 2H20v20H6.5A2.5 2.5 0 014 19.5v-15A2.5 2.5 0 016.5 2z"/></svg> 学校基本情報</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2>
242 - <table class="wiki-table school-info-table">
243 - <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
244 - <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
245 - <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
246 - <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
247 - <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
248 - <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
249 - <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
250 - <tr><th>課程</th><td>#if($schoolSystem && $schoolSystem != '' && $schoolSystem != '[]')$!escapetool.xml($!schoolSystem)#end</td></tr>
251 - <tr><th>公式サイト</th><td>#if($website && $website != '')<a href="$!escapetool.xml($website)" target="_blank" rel="noopener">$!escapetool.xml($website)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
252 - </table>
253 - #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
254 - #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
255 - #if($infoEditDate && $infoEditDate != '')
256 - <div class="info-last-updated"><svg class="ico" viewBox="0 0 24 24"><path d="M11 4H4a2 2 0 00-2 2v14a2 2 0 002 2h14a2 2 0 002-2v-7"/><path d="M18.5 2.5a2.121 2.121 0 013 3L12 15l-4 1 1-4 9.5-9.5z"/></svg> 基本情報の最終更新: $!escapetool.xml($infoEditBy) — $!escapetool.xml($infoEditDate)</div>
257 - #end
258 - </div>
259 -
260 - <div class="school-info-card collapsed" id="card-contact">
261 - <h2 onclick="toggleInfoCard('card-contact')"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M22 16.92v3a2 2 0 01-2.18 2 19.79 19.79 0 01-8.63-3.07 19.5 19.5 0 01-6-6 19.79 19.79 0 01-3.07-8.67A2 2 0 014.11 2h3a2 2 0 012 1.72c.127.96.361 1.903.7 2.81a2 2 0 01-.45 2.11L8.09 9.91a16 16 0 006 6l1.27-1.27a2 2 0 012.11-.45c.907.339 1.85.573 2.81.7A2 2 0 0122 16.92z"/></svg> 連絡先・SNS</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2>
262 - <table class="wiki-table school-info-table">
263 - <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr>
264 - <tr><th>生徒会Web</th><td>#if($seitokaiWebsite && $seitokaiWebsite != '')<a href="$!escapetool.xml($seitokaiWebsite)" target="_blank" rel="noopener"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M2 12h20"/><path d="M12 2a15.3 15.3 0 014 10 15.3 15.3 0 01-4 10 15.3 15.3 0 01-4-10 15.3 15.3 0 014-10z"/></svg> $!escapetool.xml($seitokaiWebsite)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
265 - <tr><th>X (Twitter)</th><td>#if($seitokaiTwitter && $seitokaiTwitter != '')<a href="https://x.com/$!escapetool.url($seitokaiTwitter)" target="_blank" rel="noopener">𝕏 @$!escapetool.xml($seitokaiTwitter)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
266 - <tr><th>Instagram</th><td>#if($seitokaiInstagram && $seitokaiInstagram != '')<a href="https://instagram.com/$!escapetool.url($seitokaiInstagram)" target="_blank" rel="noopener"><svg class="ico" viewBox="0 0 24 24"><path d="M23 19a2 2 0 01-2 2H3a2 2 0 01-2-2V8a2 2 0 012-2h4l2-3h6l2 3h4a2 2 0 012 2z"/><circle cx="12" cy="13" r="4"/></svg> @$!escapetool.xml($seitokaiInstagram)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
267 - <tr><th>YouTube</th><td>#if($seitokaiYoutube && $seitokaiYoutube != '')<a href="$!escapetool.xml($seitokaiYoutube)" target="_blank" rel="noopener"><svg class="ico" viewBox="0 0 24 24"><polygon points="5 3 19 12 5 21 5 3"/></svg> YouTubeチャンネル</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
268 - <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
269 - </table>
270 - </div>
277 +## --- ① 学校基本情報 ---
278 +<div class="school-info-card collapsed" id="card-basic-info">
279 + <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>
280 + <table class="wiki-table school-info-table">
281 + <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
282 + <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
283 + <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
284 + <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
285 + <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
286 + <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
287 + <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
288 + <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
289 + <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>
290 + </table>
291 + #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
292 + #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
293 + #if($infoEditDate && $infoEditDate != '')
294 + <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>
295 + #end
271 271  </div>
272 272  
273 -## --- 生徒会情報アコーディオン ---
274 -<div class="school-section-divider">
275 - <button class="shortcut-btn shortcut-btn-secondary" onclick="var sec=document.getElementById('seitokai-info-section');sec.classList.toggle('open');this.querySelector('.shortcut-arrow').textContent=sec.classList.contains('open')?'▲':'▼';">
276 - <svg class="ico ico-md" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/></svg>
277 - 生徒会情報を見る <span class="shortcut-arrow">▼</span>
278 - </button>
279 -</div>
298 +## --- ② 生徒会基本情報（折りたたみカード） ---
299 +<div class="school-info-card" id="card-seitokai-info">
300 + <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>
301 + <div class="seitokai-info-body">
280 280  
281 -<div id="seitokai-info-section" class="seitokai-info-accordion">
282 -
283 -## --- ② 組織図 ---
284 -#set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
285 -#if($hasOrgContent)
286 - ## 公開範囲チェック
287 - #set($canViewOrgChart = true)
288 - #if($visibilityOrgChart == 'members' && $isGuest) #set($canViewOrgChart = false)
289 - #elseif($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewOrgChart = false)
290 - #end
291 - #if($canViewOrgChart)
292 -<h2 class="section-title"><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/><line x1="9" y1="10" x2="9" y2="10.01"/><line x1="15" y1="10" x2="15" y2="10.01"/><line x1="9" y1="14" x2="9" y2="14.01"/><line x1="15" y1="14" x2="15" y2="14.01"/></svg> 組織図 #if($visibilityOrgChart != 'public')<span class="visibility-badge visibility-${visibilityOrgChart}">#if($visibilityOrgChart == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h2>
293 -<div class="school-section-card">
294 - <div class="card-inner">
295 - #if($orgChartImage && $orgChartImage != '')
296 - <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
303 + ## --- 組織図 ---
304 + #set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
305 + #if($hasOrgContent)
306 + #set($canViewOrgChart = true)
307 + #if($visibilityOrgChart == 'members' && $isGuest) #set($canViewOrgChart = false)
308 + #elseif($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewOrgChart = false)
309 + #end
310 + #if($canViewOrgChart)
311 + <div class="seitokai-subsection">
312 + <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 == '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>
313 + <div class="seitokai-subsection-content">
314 + #if($orgChartImage && $orgChartImage != '')
315 + <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
316 + #end
317 + #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end
318 + </div>
319 + </div>
320 + #else
321 + <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>
322 + #end
297 297   #end
298 - #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end
299 - </div>
300 -</div>
301 - #else
302 -<div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 組織図は #if($visibilityOrgChart == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
303 - #end
304 -#end
305 305  
306 -## --- ③④⑤ 日常の活動・選挙・定例活動 ---
307 -<div class="school-section-grid">
308 - #if($dailyActivities && $dailyActivities != '')
309 - <div class="school-section-card">
310 - <h3><svg class="ico" viewBox="0 0 24 24"><path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z"/><polyline points="14 2 14 8 20 8"/><line x1="16" y1="13" x2="8" y2="13"/><line x1="16" y1="17" x2="8" y2="17"/></svg> 日常の活動</h3>
311 - <div class="card-inner">
312 - <p class="activity-hint">活動時間の多い順に上位3つ</p>
313 - <div class="tag-container">
314 - #set($daIdx = 1)
315 - #foreach($da in $dailyActivities.split(","))
316 - <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
317 - #set($daIdx = $daIdx + 1)
325 + ## --- 日常の活動 ---
326 + #if($dailyActivities && !$dailyActivities.isEmpty())
327 + <div class="seitokai-subsection">
328 + <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>
329 + <div class="seitokai-subsection-content">
330 + <p class="activity-hint">活動時間の多い順に上位3つ</p>
331 + <div class="tag-container">
332 + #set($daIdx = 1)
333 + #foreach($da in $dailyActivities)
334 + <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
335 + #set($daIdx = $daIdx + 1)
336 + #end
337 + </div>
338 + #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
339 + <div class="free-note">$!escapetool.xml($dailyActivitiesNote)</div>
318 318   #end
319 319   </div>
320 - #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
321 - <div class="free-note">$!escapetool.xml($dailyActivitiesNote)</div>
322 - #end
323 323   </div>
324 - </div>
325 - #end
343 + #end
326 326  
327 - #if($electionExists && $electionExists != '')
328 - <div class="school-section-card">
329 - <h3><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="3" width="18" height="18" rx="2"/><path d="M7 13l3 3 7-7"/></svg> 選挙</h3>
330 - <div class="card-inner">
331 - <div class="info-row">
332 - <span class="info-label">役員選挙</span>
333 - <span class="info-value">$!escapetool.xml($!electionExists)</span>
345 + ## --- 選挙 ---
346 + #if($electionExists && $electionExists != '')
347 + <div class="seitokai-subsection">
348 + <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>
349 + <div class="seitokai-subsection-content">
350 + <div class="info-row">
351 + <span class="info-label">役員選挙</span>
352 + <span class="info-value">$!escapetool.xml($!electionExists)</span>
353 + </div>
354 + #if($electionType && $electionType != '')
355 + <div class="info-row">
356 + <span class="info-label">直近の選挙方式</span>
357 + <span class="info-value">$!escapetool.xml($!electionType)</span>
358 + </div>
359 + #end
360 + #if($electionNote && $electionNote.trim() != '')
361 + <div class="free-note">$!escapetool.xml($electionNote)</div>
362 + #end
334 334   </div>
335 - #if($electionType && $electionType != '')
336 - <div class="info-row">
337 - <span class="info-label">直近の選挙方式</span>
338 - <span class="info-value">$!escapetool.xml($!electionType)</span>
339 - </div>
340 - #end
341 - #if($electionNote && $electionNote.trim() != '')
342 - <div class="free-note">$!escapetool.xml($electionNote)</div>
343 - #end
344 344   </div>
345 - </div>
346 - #end
347 -</div>
365 + #end
348 348  
349 -<div class="school-section-grid">
350 - #if($meetingFrequency && $meetingFrequency != '')
351 - <div class="school-section-card">
352 - <h3><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="4" width="18" height="18" rx="2"/><line x1="16" y1="2" x2="16" y2="6"/><line x1="8" y1="2" x2="8" y2="6"/><line x1="3" y1="10" x2="21" y2="10"/></svg> 定例活動</h3>
353 - <div class="card-inner">
354 - <div class="info-row">
355 - <span class="info-label">役員定例会の頻度</span>
356 - <span class="info-value">$!escapetool.xml($!meetingFrequency)</span>
367 + ## --- 定例活動 ---
368 + #if($meetingFrequency && $meetingFrequency != '')
369 + <div class="seitokai-subsection">
370 + <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>
371 + <div class="seitokai-subsection-content">
372 + <div class="info-row">
373 + <span class="info-label">役員定例会の頻度</span>
374 + <span class="info-value">$!escapetool.xml($!meetingFrequency)</span>
375 + </div>
376 + #if($regularActivitiesNote && $regularActivitiesNote.trim() != '')
377 + <div class="free-note">$!escapetool.xml($regularActivitiesNote)</div>
378 + #end
357 357   </div>
358 - #if($regularActivitiesNote && $regularActivitiesNote.trim() != '')
359 - <div class="free-note">$!escapetool.xml($regularActivitiesNote)</div>
360 - #end
361 361   </div>
362 - </div>
363 - #end
364 -
365 - ## --- ⑦ 予算 ---
366 - #set($hasBudget = ($budgetProcess && $budgetProcess != '') || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
367 - #if($hasBudget)
368 - ## 公開範囲チェック
369 - #set($canViewBudget = true)
370 - #if($visibilityBudget == 'members' && $isGuest) #set($canViewBudget = false)
371 - #elseif($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewBudget = false)
372 372   #end
373 - #if($canViewBudget)
374 - <div class="school-section-card">
375 - <h3><svg class="ico" viewBox="0 0 24 24"><line x1="12" y1="1" x2="12" y2="23"/><path d="M17 5H9.5a3.5 3.5 0 000 7h5a3.5 3.5 0 010 7H6"/></svg> 予算 #if($visibilityBudget != 'public')<span class="visibility-badge visibility-${visibilityBudget}">#if($visibilityBudget == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
376 - <div class="card-inner">
377 - #if($budgetProcess && $budgetProcess != '')
378 - <div class="info-row">
379 - <span class="info-label">作成過程の生徒関与</span>
380 - <span class="info-value">
381 - <div class="selection-display">
382 - #foreach($bp in $budgetProcess.split(","))
383 - <span class="selection-item">$!escapetool.xml($bp.trim())</span>
384 - #end
385 - </div>
386 - </span>
387 - </div>
382 +
383 + ## --- 予算 ---
384 + #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
385 + #if($hasBudget)
386 + #set($canViewBudget = true)
387 + #if($visibilityBudget == 'members' && $isGuest) #set($canViewBudget = false)
388 + #elseif($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewBudget = false)
388 388   #end
389 - #if($studentFee && $studentFee != '')
390 - <div class="info-row">
391 - <span class="info-label">生徒会費（年額）</span>
392 - <span class="info-value">$!escapetool.xml($!studentFee)</span>
390 + #if($canViewBudget)
391 + <div class="seitokai-subsection">
392 + <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 == '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>
393 + <div class="seitokai-subsection-content">
394 + #if($budgetProcess && !$budgetProcess.isEmpty())
395 + <div class="info-row">
396 + <span class="info-label">作成過程の生徒関与</span>
397 + <span class="info-value">
398 + <div class="selection-display">
399 + #foreach($bp in $budgetProcess)
400 + <span class="selection-item">$!escapetool.xml($bp.trim())</span>
401 + #end
402 + </div>
403 + </span>
404 + </div>
405 + #end
406 + #if($studentFee && $studentFee != '')
407 + <div class="info-row">
408 + <span class="info-label">生徒会費（年額）</span>
409 + <span class="info-value">$!escapetool.xml($!studentFee)</span>
410 + </div>
411 + #end
412 + #if($budgetScale && $budgetScale != '')
413 + <div class="info-row">
414 + <span class="info-label">予算規模</span>
415 + <span class="info-value">$!escapetool.xml($!budgetScale)</span>
416 + </div>
417 + #end
418 + #if($budgetAllocation && !$budgetAllocation.isEmpty())
419 + <div class="info-row">
420 + <span class="info-label">主な予算配分</span>
421 + <span class="info-value">
422 + <div class="selection-display">
423 + #foreach($ba in $budgetAllocation)
424 + <span class="selection-item">$!escapetool.xml($ba.trim())</span>
425 + #end
426 + </div>
427 + </span>
428 + </div>
429 + #end
430 + #if($budgetNote && $budgetNote.trim() != '')
431 + <div class="free-note">$!escapetool.xml($budgetNote)</div>
432 + #end
393 393   </div>
394 - #end
395 - #if($budgetScale && $budgetScale != '')
396 - <div class="info-row">
397 - <span class="info-label">予算規模</span>
398 - <span class="info-value">$!escapetool.xml($!budgetScale)</span>
399 - </div>
400 - #end
401 - #if($budgetAllocation && $budgetAllocation != '')
402 - <div class="info-row">
403 - <span class="info-label">主な予算配分</span>
404 - <span class="info-value">
405 - <div class="selection-display">
406 - #foreach($ba in $budgetAllocation.split(","))
407 - <span class="selection-item">$!escapetool.xml($ba.trim())</span>
408 - #end
409 - </div>
410 - </span>
411 - </div>
412 - #end
413 - #if($budgetNote && $budgetNote.trim() != '')
414 - <div class="free-note">$!escapetool.xml($budgetNote)</div>
415 - #end
416 416   </div>
417 - </div>
418 - #else
419 - <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 予算情報は #if($visibilityBudget == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
435 + #else
436 + <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>
437 + #end
420 420   #end
421 - #end
422 -</div>
423 423  
424 -## --- ⑧ 校則の見直し ---
425 -#if($ruleReviewStatus && $ruleReviewStatus != '')
426 - ## 公開範囲チェック
427 - #set($canViewRuleReview = true)
428 - #if($visibilityRuleReview == 'members' && $isGuest) #set($canViewRuleReview = false)
429 - #elseif($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewRuleReview = false)
430 - #end
431 - #if($canViewRuleReview)
432 -<h2 class="section-title"><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M16 4h2a2 2 0 012 2v12a2 2 0 01-2 2h-2"/><path d="M8 4H6a2 2 0 00-2 2v12a2 2 0 002 2h2"/><line x1="12" y1="4" x2="12" y2="8"/><line x1="12" y1="16" x2="12" y2="20"/><line x1="8" y1="8" x2="16" y2="8"/><line x1="8" y1="16" x2="16" y2="16"/></svg> 校則の見直し #if($visibilityRuleReview != 'public')<span class="visibility-badge visibility-${visibilityRuleReview}">#if($visibilityRuleReview == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h2>
433 -<div class="school-section-card">
434 - <div class="card-inner">
435 - <div class="info-row">
436 - <span class="info-label">見直しの有無（3年以内）</span>
437 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
438 - </div>
439 - #if($ruleReviewContent && $ruleReviewContent != '')
440 - <div class="info-row">
441 - <span class="info-label">見直しの内容</span>
442 - <span class="info-value">
443 - <div class="selection-display">
444 - #foreach($rc in $ruleReviewContent.split(","))
445 - <span class="selection-item">$!escapetool.xml($rc.trim())</span>
446 - #end
440 + ## --- 校則の見直し ---
441 + #if($ruleReviewStatus && $ruleReviewStatus != '')
442 + #set($canViewRuleReview = true)
443 + #if($visibilityRuleReview == 'members' && $isGuest) #set($canViewRuleReview = false)
444 + #elseif($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewRuleReview = false)
445 + #end
446 + #if($canViewRuleReview)
447 + <div class="seitokai-subsection">
448 + <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 == '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>
449 + <div class="seitokai-subsection-content">
450 + <div class="info-row">
451 + <span class="info-label">見直しの有無（3年以内）</span>
452 + <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
447 447   </div>
448 - </span>
449 - </div>
450 - #end
451 - #if($ruleReviewProposer && $ruleReviewProposer != '')
452 - <div class="info-row">
453 - <span class="info-label">見直しの提案者</span>
454 - <span class="info-value">
455 - <div class="selection-display">
456 - #foreach($rp in $ruleReviewProposer.split(","))
457 - <span class="selection-item">$!escapetool.xml($rp.trim())</span>
458 - #end
454 + #if($ruleReviewContent && !$ruleReviewContent.isEmpty())
455 + <div class="info-row">
456 + <span class="info-label">見直しの内容</span>
457 + <span class="info-value">
458 + <div class="selection-display">
459 + #foreach($rc in $ruleReviewContent)
460 + <span class="selection-item">$!escapetool.xml($rc.trim())</span>
461 + #end
462 + </div>
463 + </span>
459 459   </div>
460 - </span>
461 - </div>
462 - #end
463 - #if($ruleReviewImplementer && $ruleReviewImplementer != '')
464 - <div class="info-row">
465 - <span class="info-label">見直しの実施者</span>
466 - <span class="info-value">
467 - <div class="selection-display">
468 - #foreach($ri in $ruleReviewImplementer.split(","))
469 - <span class="selection-item">$!escapetool.xml($ri.trim())</span>
470 - #end
465 + #end
466 + #if($ruleReviewProposer && !$ruleReviewProposer.isEmpty())
467 + <div class="info-row">
468 + <span class="info-label">見直しの提案者</span>
469 + <span class="info-value">
470 + <div class="selection-display">
471 + #foreach($rp in $ruleReviewProposer)
472 + <span class="selection-item">$!escapetool.xml($rp.trim())</span>
473 + #end
474 + </div>
475 + </span>
471 471   </div>
472 - </span>
477 + #end
478 + #if($ruleReviewImplementer && !$ruleReviewImplementer.isEmpty())
479 + <div class="info-row">
480 + <span class="info-label">見直しの実施者</span>
481 + <span class="info-value">
482 + <div class="selection-display">
483 + #foreach($ri in $ruleReviewImplementer)
484 + <span class="selection-item">$!escapetool.xml($ri.trim())</span>
485 + #end
486 + </div>
487 + </span>
488 + </div>
489 + #end
490 + #if($ruleReviewSystem && $ruleReviewSystem != '')
491 + <div class="info-row">
492 + <span class="info-label">見直しの仕組み</span>
493 + <span class="info-value">$!escapetool.xml($!ruleReviewSystem)</span>
494 + </div>
495 + #end
496 + </div>
473 473   </div>
498 + #else
499 + <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 校則の見直し情報は #if($visibilityRuleReview == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
500 + #end
474 474   #end
475 - #if($ruleReviewSystem && $ruleReviewSystem != '')
476 - <div class="info-row">
477 - <span class="info-label">見直しの仕組み</span>
478 - <span class="info-value">$!escapetool.xml($!ruleReviewSystem)</span>
502 +
503 + ## --- 生徒会の課題意識 ---
504 + #if($challenges && $challenges != '')
505 + #set($canViewChallenges = true)
506 + #if($visibilityChallenges == 'members' && $isGuest) #set($canViewChallenges = false)
507 + #elseif($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewChallenges = false)
508 + #end
509 + #if($canViewChallenges)
510 + <div class="seitokai-subsection">
511 + <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 == '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>
512 + <div class="seitokai-subsection-content">
513 + <div class="challenge-text">$!escapetool.xml($challenges)</div>
514 + </div>
479 479   </div>
516 + #else
517 + <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>
518 + #end
480 480   #end
481 - </div>
482 -</div>
483 - #else
484 -<div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 校則の見直し情報は #if($visibilityRuleReview == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
485 - #end
486 -#end
487 487  
488 -## --- ⑨ 課題 ---
489 -#if($challenges && $challenges != '')
490 - ## 公開範囲チェック
491 - #set($canViewChallenges = true)
492 - #if($visibilityChallenges == 'members' && $isGuest) #set($canViewChallenges = false)
493 - #elseif($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewChallenges = false)
494 - #end
495 - #if($canViewChallenges)
496 -<h2 class="section-title">生徒会の課題意識 #if($visibilityChallenges != 'public')<span class="visibility-badge visibility-${visibilityChallenges}">#if($visibilityChallenges == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h2>
497 -<div class="challenge-text">$!escapetool.xml($challenges)</div>
498 - #else
499 -<div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 課題情報は #if($visibilityChallenges == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
500 - #end
501 -#end
521 + </div>## seitokai-info-body 終了
522 +</div>## card-seitokai-info 終了
502 502  
503 -</div>## seitokai-info-accordion 終了
524 +## --- ③ SNS・連絡先 ---
525 +<div class="school-info-card collapsed" id="card-contact">
526 + <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>
527 + <table class="wiki-table school-info-table">
528 + <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr>
529 + <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>
530 + <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>
531 + <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>
532 + <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>
533 + <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
534 + </table>
535 +</div>
504 504  
505 505  {{/html}}
506 506  
539 +----
540 +
507 507  ## --- ⑩ 活動報告一覧（スレッド型・年度タブ付き） ---
508 508  = 活動報告 =
509 509  
510 -## --- 投稿者ステータス凡例（折りたたみ） ---
544 +## --- 年度タブ + 投稿者ステータス凡例 ---
511 511  {{html clean="false"}}
512 -<div class="author-legend-wrapper">
513 - <button class="author-legend-toggle" onclick="this.classList.toggle('open');this.nextElementSibling.classList.toggle('open')"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M12 16v-4"/><path d="M12 8h.01"/></svg> バッジの見方 <span class="chevron">▼</span></button>
514 - <div class="author-legend-body">
515 - <div class="author-legend">
516 - <span class="author-legend-title">投稿者の信頼度:</span>
517 - <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者</span>
518 - <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み</span>
519 - <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介</span>
520 - <span class="author-legend-item"><span class="bar bar-general"></span> 一般（未承認）</span>
521 - </div>
522 - <div class="author-legend">
523 - <span class="author-legend-title">所属:</span>
524 - <span class="author-legend-item"><span class="badge badge-school-internal-confirmed badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内（確認済）</span> 承認済み＋同校</span>
525 - <span class="author-legend-item"><span class="badge badge-school-internal badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内</span> 紹介＋同校</span>
526 - <span class="author-legend-item"><span class="badge badge-school-external badge-sm"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M2 12h20"/><path d="M12 2a15.3 15.3 0 014 10 15.3 15.3 0 01-4 10 15.3 15.3 0 01-4-10 15.3 15.3 0 014-10z"/></svg> 他校</span> 他校所属</span>
527 - <span class="author-legend-item text-hint">※一般アカウントは所属未確認のため非表示</span>
528 - </div>
529 - <div class="author-legend">
530 - <span class="author-legend-title">役割:</span>
531 - <span class="author-legend-item"><span class="badge badge-role-student badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M22 10v6M2 10l10-5 10 5-10 5z"/><path d="M6 12v5c0 2 4 3 6 3s6-1 6-3v-5"/></svg> 生徒</span></span>
532 - <span class="author-legend-item"><span class="badge badge-role-officer badge-sm"><svg class="ico" viewBox="0 0 24 24"><polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"/></svg> 役員</span></span>
533 - <span class="author-legend-item"><span class="badge badge-role-teacher badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M20 21v-2a4 4 0 00-4-4H8a4 4 0 00-4 4v2"/><circle cx="12" cy="7" r="4"/></svg> 教員</span></span>
534 - </div>
535 - </div>
536 -</div>
537 537  
538 538  ## --- 年度タブ ---
539 539  ## 全活動から年度一覧を収集
... ... @@ -555,14 +555,41 @@
555 555  #end
556 556  ## ソート（降順にしたいが Velocity にはないので JS で制御）
557 557  
558 -<div class="activity-fy-tabs">
559 - <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
560 - #foreach($fy in $fySet)
561 - #if($fy != $currentFYStr)
562 - <button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button>
567 +<div class="activity-toolbar">
568 + <div class="activity-fy-tabs">
569 + <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
570 + #foreach($fy in $fySet)
571 + #if($fy != $currentFYStr)
572 + <button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button>
573 + #end
563 563   #end
564 - #end
565 - <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
575 + <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
576 + </div>
577 + <div class="author-legend-wrapper">
578 + <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>
579 + <div class="author-legend-body">
580 + <div class="author-legend">
581 + <span class="author-legend-title">投稿者の信頼度:</span>
582 + <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者</span>
583 + <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み</span>
584 + <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介</span>
585 + <span class="author-legend-item"><span class="bar bar-general"></span> 一般（未承認）</span>
586 + </div>
587 + <div class="author-legend">
588 + <span class="author-legend-title">所属:</span>
589 + <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>
590 + <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>
591 + <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>
592 + <span class="author-legend-item text-hint">※一般アカウントは所属未確認のため非表示</span>
593 + </div>
594 + <div class="author-legend">
595 + <span class="author-legend-title">役割:</span>
596 + <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>
597 + <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>
598 + <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>
599 + </div>
600 + </div>
601 + </div>
566 566  </div>
567 567  
568 568  {{/html}}
... ... @@ -627,7 +627,7 @@
627 627  <div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)">
628 628   <div class="activity-thread-header">
629 629   <div class="activity-thread-title">
630 - <h3 #if($actFeatured == '1')class="featured-title"#end>$!escapetool.xml($!actTitle) #if($actFeatured == '1')<svg class="ico ico-fixed-14" viewBox="0 0 24 24" fill="currentColor" stroke="none" class="ico-star-offset"><polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"/></svg>#end</h3>
666 + <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>
631 631   <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
632 632   </div>
633 633   <div class="thread-meta-row">
... ... @@ -757,9 +757,6 @@
757 757   #elseif($postUserRole == 'graduate')
758 758   <span class="badge badge-role-graduate badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M22 10l-10-5L2 10l10 5 10-5z"/><path d="M6 12v5c0 1.66 2.69 3 6 3s6-1.34 6-3v-5"/></svg> 卒業生</span>
759 759   #end
760 - #if($postGrade && $postGrade != '')
761 - <span class="badge badge-grade badge-sm">$postGrade</span>
762 - #end
763 763   </span>
764 764   <span class="thread-post-date">$!postDate</span>
765 765   #set($postEdited = $!post.getValue('edited'))
... ... @@ -998,6 +998,9 @@
998 998   var card = document.getElementById(cardId);
999 999   if (!card) return;
1000 1000   card.classList.toggle('collapsed');
1034 + var isCollapsed = card.classList.contains('collapsed');
1035 + var h2 = card.querySelector('h2[role="button"]');
1036 + if (h2) h2.setAttribute('aria-expanded', !isCollapsed);
1001 1001  }
1002 1002  
1003 1003  // 投稿の編集（インライン編集フォームを開く）