Skip to Content
Last modified by Super Admin on 2026/04/05 18:59
From version Icon 34.1 Icon
edited by Super Admin
on 2026/03/10 14:35
Change comment: There is no comment for this version
To version Icon 70.1 Icon
edited by Super Admin
on 2026/03/18 18:54
Change comment: There is no comment for this version

Summary

Details

Icon Page properties
Content
... ... @@ -1,5 +1,11 @@
1 1  {{velocity}}
2 2  ## ===== 学校ページ テンプレート =====
3 +## ゲストが ?sheet= 付きURL（編集フォーム等）に直接アクセスした場合、ログインページへリダイレクト
4 +#if($xcontext.user == 'XWiki.XWikiGuest' && $request.sheet && $request.sheet != '')
5 + #set($currentUrl = $doc.getURL('view', "sheet=${request.sheet}"))
6 + $response.sendRedirect("/bin/login/XWiki/XWikiLogin?srid=$escapetool.url($currentUrl)")
7 + #stop
8 +#end
3 3  {{html clean="false"}}
4 4  ## メンテナンスバナー（{{include}}ではなくインラインで記述し、<p>タグ挿入を回避）
5 5  #set($bannerDoc = $xwiki.getDocument('SeitokaiAdmin.MaintenanceBanner'))
... ... @@ -19,10 +19,6 @@
19 19  ## --- 学校基本情報フィールド ---
20 20  #set($schoolCode = $doc.getValue('schoolCode'))
21 21  #set($schoolName = $doc.getValue('schoolName'))
22 -## ページタイトルを学校名に設定（デフォルトでは学校コードが表示されるため）
23 -#if($schoolName && $schoolName != '')
24 -$!doc.setTitle($schoolName)
25 -#end
26 26  #set($prefecture = $doc.getValue('prefecture'))
27 27  #set($city = $doc.getValue('city'))
28 28  #set($classCount = $doc.getValue('classCount'))
... ... @@ -69,9 +69,7 @@
69 69  #set($seitokaiYoutube = $doc.getValue('seitokaiYoutube'))
70 70  #set($seitokaiOtherSns = $doc.getValue('seitokaiOtherSns'))
71 71  
72 -## --- 年度アーカイブ ---
73 -#set($pageFiscalYear = $!doc.getValue('fiscalYear'))
74 -## 現在の年度を計算（4月始まり）
74 +## --- 現在の年度を計算（4月始まり） ---
75 75  #set($nowFY = $datetool.date)
76 76  #set($currentFYMonth = $mathtool.toInteger($datetool.format('MM', $nowFY)))
77 77  #set($currentFYYear = $mathtool.toInteger($datetool.format('yyyy', $nowFY)))
... ... @@ -80,10 +80,6 @@
80 80  #else
81 81   #set($currentFiscalYear = $mathtool.sub($currentFYYear, 1))
82 82  #end
83 -## fiscalYear 未設定時はデフォルトとして現在の年度を使う
84 -#if(!$pageFiscalYear || $pageFiscalYear == '')
85 - #set($pageFiscalYear = $currentFiscalYear.toString())
86 -#end
87 87  
88 88  ## --- 公開範囲フィールド ---
89 89  #set($visibilityOrgChart = $!doc.getValue('visibilityOrgChart'))
... ... @@ -110,10 +110,53 @@
110 110   #end
111 111  #end
112 112  
109 +## --- 関連校（中高一貫校）情報 ---
110 +#set($affiliatedSchoolCode = $!doc.getValue('affiliatedSchoolCode'))
111 +#set($affiliatedSchoolName = $!doc.getValue('affiliatedSchoolName'))
112 +#set($isAffiliated = false)
113 +#if($affiliatedSchoolCode && $affiliatedSchoolCode != '' && $viewerSchoolCode == $affiliatedSchoolCode)
114 + #set($isAffiliated = true)
115 +#end
116 +
117 +## --- 学校ページ非表示チェック ---
118 +#set($schoolHidden = $doc.getValue('hidden'))
119 +#if($schoolHidden == 1)
120 + #if($isViewerAdmin)
121 + ## 管理者: 黄色バナー + ページ内容は通常表示（プレビュー）
122 +<div class="school-hidden-banner admin">
123 + <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>
124 + <div>
125 + <strong>このページは非表示になっています</strong>（管理者のみ閲覧可能）
126 + #set($hBy = $!doc.getValue('hiddenBy'))
127 + #set($hAt = $!doc.getValue('hiddenAt'))
128 + #set($hReason = $!doc.getValue('hiddenReason'))
129 + <div class="school-hidden-detail">
130 + 非表示: $!escapetool.xml($hAt) / $!escapetool.xml($hBy)
131 + #if($hReason && $hReason != '') ・ 理由: $!escapetool.xml($hReason)#end
132 + </div>
133 + <a href="$xwiki.getURL('SeitokaiAdmin.SchoolManagement', 'view')" style="color:#92400e;text-decoration:underline">学校ページ管理へ</a>
134 + </div>
135 +</div>
136 + #else
137 + ## 一般ユーザー・ゲスト: 非公開メッセージを表示して停止
138 +<div class="school-hidden-public">
139 + <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>
140 + <h2>このページは現在公開されていません</h2>
141 + <p>このページは管理者により非公開に設定されています。</p>
142 + <a href="$xwiki.getURL('Schools.WebHome', 'view')" class="btn-back-list">学校一覧に戻る</a>
143 +</div>
144 +#stop
145 + #end
146 +#end
147 +
113 113  ## --- 投稿固定/解除処理 ---
114 114  #set($pinAction = $!request.action)
115 -#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || $viewerAccountType == 'verified') && $services.csrf.isTokenValid($request.form_token))
116 - #set($postObjNum = $mathtool.toInteger($!request.postObj))
150 +#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && ($viewerSchoolCode == $schoolCode || $isAffiliated))) && $services.csrf.isTokenValid($request.form_token))
151 + #set($pinPostObjStr = $!request.postObj)
152 + #if(!$pinPostObjStr.matches('^\d+$'))
153 + ## 不正な値 → 無視
154 + #else
155 + #set($postObjNum = $mathtool.toInteger($pinPostObjStr))
117 117   #set($postObj = $doc.getObject('SeitokaiCode.ActivityPostClass', $postObjNum))
118 118   #if($postObj)
119 119   #if($pinAction == 'pin')
... ... @@ -133,12 +133,15 @@
133 133   $response.sendRedirect($doc.getURL('view'))
134 134   #stop
135 135   #end
175 + #end## /matches
136 136  #end
137 137  
138 138  ## --- 特色ある活動 選定/解除処理 ---
139 139  #set($featAction = $!request.action)
140 -#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $services.csrf.isTokenValid($request.form_token))
141 - #set($actObjNum = $mathtool.toInteger($!request.actObj))
180 +#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token))
181 + #set($featActObjStr = $!request.actObj)
182 + #if($featActObjStr.matches('^\d+$'))
183 + #set($actObjNum = $mathtool.toInteger($featActObjStr))
142 142   #set($actObj = $doc.getObject('SeitokaiCode.ActivityClass', $actObjNum))
143 143   #if($actObj)
144 144   #if($featAction == 'feature')
... ... @@ -170,6 +170,7 @@
170 170   $response.sendRedirect($doc.getURL('view'))
171 171   #stop
172 172   #end
215 + #end## /matches
173 173  #end
174 174  
175 175  ## --- ユーザー情報取得 ---
... ... @@ -228,9 +228,15 @@
228 228   #end
229 229  #end
230 230  
274 +## --- 学校名見出し（XWikiデフォルトタイトルを非表示にし、学校名を表示） ---
275 +#if($schoolName && $schoolName != '')
276 +<style>.document-header { display: none !important; }</style>
277 +<h1 class="school-page-title">$!escapetool.xml($schoolName)</h1>
278 +#end
279 +
231 231  ## --- 編集ボタン（権限があるユーザーのみ表示） ---
232 232  #set($canEditSchool = false)
233 -#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode))
282 +#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode || $isAffiliated))
234 234   #set($canEditSchool = true)
235 235  #end
236 236  #if($canEditSchool)
... ... @@ -239,305 +239,293 @@
239 239  </div>
240 240  #end
241 241  
242 -## --- ① 学校基本情報 + 連絡先（左右グリッド・折りたたみ対応） ---
243 -<div class="school-info-grid">
244 - <div class="school-info-card collapsed" id="card-basic-info">
245 - <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>
246 - <table class="wiki-table school-info-table">
247 - <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
248 - <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
249 - <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
250 - <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
251 - <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
252 - <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
253 - <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
254 - <tr><th>課程</th><td>#if($schoolSystem && $schoolSystem != '' && $schoolSystem != '[]')$!escapetool.xml($!schoolSystem)#end</td></tr>
255 - <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>
256 - </table>
257 - #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
258 - #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
259 - #if($infoEditDate && $infoEditDate != '')
260 - <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>
291 +## --- 関連校（中高一貫校）バナー ---
292 +#if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
293 + #set($affiliatedPageRef = "Schools.${affiliatedSchoolCode}.WebHome")
294 + #set($affiliatedPageExists = $xwiki.exists($affiliatedPageRef))
295 +<div class="affiliated-school-banner">
296 + <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>
297 + <div>
298 + <strong>中高一貫校</strong>：
299 + #if($affiliatedPageExists)
300 + <a href="$xwiki.getURL($affiliatedPageRef, 'view')">$!escapetool.xml($affiliatedSchoolName)</a>
301 + #else
302 + $!escapetool.xml($affiliatedSchoolName)
261 261   #end
304 + と連携しています
262 262   </div>
263 -
264 - <div class="school-info-card collapsed" id="card-contact">
265 - <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>
266 - <table class="wiki-table school-info-table">
267 - <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr>
268 - <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>
269 - <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>
270 - <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>
271 - <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>
272 - <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
273 - </table>
274 - </div>
275 275  </div>
307 +#end
276 276  
277 -## --- 生徒会情報アコーディオン ---
278 -<div class="school-section-divider">
279 - <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')?'▲':'▼';">
280 - <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>
281 - 生徒会情報を見る <span class="shortcut-arrow">▼</span>
282 - </button>
309 +## --- ① 学校基本情報 ---
310 +<div class="school-info-card collapsed" id="card-basic-info">
311 + <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>
312 + <table class="wiki-table school-info-table">
313 + <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
314 + <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
315 + <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
316 + <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
317 + <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
318 + <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
319 + <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
320 + <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
321 + <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>
322 + </table>
323 + #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
324 + #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
325 + #if($infoEditDate && $infoEditDate != '')
326 + <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 + #end
283 283  </div>
284 284  
285 -<div id="seitokai-info-section" class="seitokai-info-accordion">
330 +## --- ② 生徒会基本情報（折りたたみカード） ---
331 +<div class="school-info-card" id="card-seitokai-info">
332 + <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>
333 + <div class="seitokai-info-body">
286 286  
287 -## --- ② 組織図 ---
288 -#set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
289 -#if($hasOrgContent)
290 - ## 公開範囲チェック
291 - #set($canViewOrgChart = true)
292 - #if($visibilityOrgChart == 'members' && $isGuest) #set($canViewOrgChart = false)
293 - #elseif($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewOrgChart = false)
294 - #end
295 - #if($canViewOrgChart)
296 -<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>
297 -<div class="school-section-card">
298 - <div class="card-inner">
299 - #if($orgChartImage && $orgChartImage != '')
300 - <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
335 + ## --- 組織図 ---
336 + #set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
337 + #if($hasOrgContent)
338 + #set($canViewOrgChart = true)
339 + #if($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewOrgChart = false)
340 + #elseif($visibilityOrgChart == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewOrgChart = false)
341 + #end
342 + #if($canViewOrgChart)
343 + <div class="seitokai-subsection">
344 + <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>
345 + <div class="seitokai-subsection-content">
346 + #if($orgChartImage && $orgChartImage != '')
347 + <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
348 + #end
349 + #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end
350 + </div>
351 + </div>
352 + #else
353 + <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>
354 + #end
301 301   #end
302 - #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end
303 - </div>
304 -</div>
305 - #else
306 -<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>
307 - #end
308 -#end
309 309  
310 -## --- ③④⑤ 日常の活動・選挙・定例活動 ---
311 -<div class="school-section-grid">
312 - #if($dailyActivities && $dailyActivities != '')
313 - <div class="school-section-card">
314 - <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>
315 - <div class="card-inner">
316 - <p class="activity-hint">活動時間の多い順に上位3つ</p>
317 - <div class="tag-container">
318 - #set($daIdx = 1)
319 - #foreach($da in $dailyActivities.split(","))
320 - <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
321 - #set($daIdx = $daIdx + 1)
357 + ## --- 日常の活動 ---
358 + #if($dailyActivities && !$dailyActivities.isEmpty())
359 + <div class="seitokai-subsection">
360 + <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>
361 + <div class="seitokai-subsection-content">
362 + <p class="activity-hint">活動時間の多い順に上位3つ</p>
363 + <div class="tag-container">
364 + #set($daIdx = 1)
365 + #foreach($da in $dailyActivities)
366 + <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
367 + #set($daIdx = $daIdx + 1)
368 + #end
369 + </div>
370 + #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
371 + <div class="free-note">$!escapetool.xml($dailyActivitiesNote)</div>
322 322   #end
323 323   </div>
324 - #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
325 - <div class="free-note">$!escapetool.xml($dailyActivitiesNote)</div>
326 - #end
327 327   </div>
328 - </div>
329 - #end
375 + #end
330 330  
331 - #if($electionExists && $electionExists != '')
332 - <div class="school-section-card">
333 - <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>
334 - <div class="card-inner">
335 - <div class="info-row">
336 - <span class="info-label">役員選挙</span>
337 - <span class="info-value">$!escapetool.xml($!electionExists)</span>
377 + ## --- 選挙 ---
378 + #if($electionExists && $electionExists != '')
379 + <div class="seitokai-subsection">
380 + <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>
381 + <div class="seitokai-subsection-content">
382 + <div class="info-row">
383 + <span class="info-label">役員選挙</span>
384 + <span class="info-value">$!escapetool.xml($!electionExists)</span>
385 + </div>
386 + #if($electionType && $electionType != '')
387 + <div class="info-row">
388 + <span class="info-label">直近の選挙方式</span>
389 + <span class="info-value">$!escapetool.xml($!electionType)</span>
390 + </div>
391 + #end
392 + #if($electionNote && $electionNote.trim() != '')
393 + <div class="free-note">$!escapetool.xml($electionNote)</div>
394 + #end
338 338   </div>
339 - #if($electionType && $electionType != '')
340 - <div class="info-row">
341 - <span class="info-label">直近の選挙方式</span>
342 - <span class="info-value">$!escapetool.xml($!electionType)</span>
343 - </div>
344 - #end
345 - #if($electionNote && $electionNote.trim() != '')
346 - <div class="free-note">$!escapetool.xml($electionNote)</div>
347 - #end
348 348   </div>
349 - </div>
350 - #end
351 -</div>
397 + #end
352 352  
353 -<div class="school-section-grid">
354 - #if($meetingFrequency && $meetingFrequency != '')
355 - <div class="school-section-card">
356 - <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>
357 - <div class="card-inner">
358 - <div class="info-row">
359 - <span class="info-label">役員定例会の頻度</span>
360 - <span class="info-value">$!escapetool.xml($!meetingFrequency)</span>
399 + ## --- 定例活動 ---
400 + #if($meetingFrequency && $meetingFrequency != '')
401 + <div class="seitokai-subsection">
402 + <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>
403 + <div class="seitokai-subsection-content">
404 + <div class="info-row">
405 + <span class="info-label">役員定例会の頻度</span>
406 + <span class="info-value">$!escapetool.xml($!meetingFrequency)</span>
407 + </div>
408 + #if($regularActivitiesNote && $regularActivitiesNote.trim() != '')
409 + <div class="free-note">$!escapetool.xml($regularActivitiesNote)</div>
410 + #end
361 361   </div>
362 - #if($regularActivitiesNote && $regularActivitiesNote.trim() != '')
363 - <div class="free-note">$!escapetool.xml($regularActivitiesNote)</div>
364 - #end
365 365   </div>
366 - </div>
367 - #end
368 -
369 - ## --- ⑦ 予算 ---
370 - #set($hasBudget = ($budgetProcess && $budgetProcess != '') || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
371 - #if($hasBudget)
372 - ## 公開範囲チェック
373 - #set($canViewBudget = true)
374 - #if($visibilityBudget == 'members' && $isGuest) #set($canViewBudget = false)
375 - #elseif($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewBudget = false)
376 376   #end
377 - #if($canViewBudget)
378 - <div class="school-section-card">
379 - <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>
380 - <div class="card-inner">
381 - #if($budgetProcess && $budgetProcess != '')
382 - <div class="info-row">
383 - <span class="info-label">作成過程の生徒関与</span>
384 - <span class="info-value">
385 - <div class="selection-display">
386 - #foreach($bp in $budgetProcess.split(","))
387 - <span class="selection-item">$!escapetool.xml($bp.trim())</span>
388 - #end
389 - </div>
390 - </span>
391 - </div>
414 +
415 + ## --- 予算 ---
416 + #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
417 + #if($hasBudget)
418 + #set($canViewBudget = true)
419 + #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewBudget = false)
420 + #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false)
392 392   #end
393 - #if($studentFee && $studentFee != '')
394 - <div class="info-row">
395 - <span class="info-label">生徒会費（年額）</span>
396 - <span class="info-value">$!escapetool.xml($!studentFee)</span>
422 + #if($canViewBudget)
423 + <div class="seitokai-subsection">
424 + <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>
425 + <div class="seitokai-subsection-content">
426 + #if($budgetProcess && !$budgetProcess.isEmpty())
427 + <div class="info-row">
428 + <span class="info-label">作成過程の生徒関与</span>
429 + <span class="info-value">
430 + <div class="selection-display">
431 + #foreach($bp in $budgetProcess)
432 + <span class="selection-item">$!escapetool.xml($bp.trim())</span>
433 + #end
434 + </div>
435 + </span>
436 + </div>
437 + #end
438 + #if($studentFee && $studentFee != '')
439 + <div class="info-row">
440 + <span class="info-label">生徒会費（年額）</span>
441 + <span class="info-value">$!escapetool.xml($!studentFee)</span>
442 + </div>
443 + #end
444 + #if($budgetScale && $budgetScale != '')
445 + <div class="info-row">
446 + <span class="info-label">予算規模</span>
447 + <span class="info-value">$!escapetool.xml($!budgetScale)</span>
448 + </div>
449 + #end
450 + #if($budgetAllocation && !$budgetAllocation.isEmpty())
451 + <div class="info-row">
452 + <span class="info-label">主な予算配分</span>
453 + <span class="info-value">
454 + <div class="selection-display">
455 + #foreach($ba in $budgetAllocation)
456 + <span class="selection-item">$!escapetool.xml($ba.trim())</span>
457 + #end
458 + </div>
459 + </span>
460 + </div>
461 + #end
462 + #if($budgetNote && $budgetNote.trim() != '')
463 + <div class="free-note">$!escapetool.xml($budgetNote)</div>
464 + #end
397 397   </div>
398 - #end
399 - #if($budgetScale && $budgetScale != '')
400 - <div class="info-row">
401 - <span class="info-label">予算規模</span>
402 - <span class="info-value">$!escapetool.xml($!budgetScale)</span>
403 - </div>
404 - #end
405 - #if($budgetAllocation && $budgetAllocation != '')
406 - <div class="info-row">
407 - <span class="info-label">主な予算配分</span>
408 - <span class="info-value">
409 - <div class="selection-display">
410 - #foreach($ba in $budgetAllocation.split(","))
411 - <span class="selection-item">$!escapetool.xml($ba.trim())</span>
412 - #end
413 - </div>
414 - </span>
415 - </div>
416 - #end
417 - #if($budgetNote && $budgetNote.trim() != '')
418 - <div class="free-note">$!escapetool.xml($budgetNote)</div>
419 - #end
420 420   </div>
421 - </div>
422 - #else
423 - <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 予算情報は #if($visibilityBudget == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
467 + #else
468 + <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>
469 + #end
424 424   #end
425 - #end
426 -</div>
427 427  
428 -## --- ⑧ 校則の見直し ---
429 -#if($ruleReviewStatus && $ruleReviewStatus != '')
430 - ## 公開範囲チェック
431 - #set($canViewRuleReview = true)
432 - #if($visibilityRuleReview == 'members' && $isGuest) #set($canViewRuleReview = false)
433 - #elseif($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewRuleReview = false)
434 - #end
435 - #if($canViewRuleReview)
436 -<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>
437 -<div class="school-section-card">
438 - <div class="card-inner">
439 - <div class="info-row">
440 - <span class="info-label">見直しの有無（3年以内）</span>
441 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
442 - </div>
443 - #if($ruleReviewContent && $ruleReviewContent != '')
444 - <div class="info-row">
445 - <span class="info-label">見直しの内容</span>
446 - <span class="info-value">
447 - <div class="selection-display">
448 - #foreach($rc in $ruleReviewContent.split(","))
449 - <span class="selection-item">$!escapetool.xml($rc.trim())</span>
450 - #end
472 + ## --- 校則の見直し ---
473 + #if($ruleReviewStatus && $ruleReviewStatus != '')
474 + #set($canViewRuleReview = true)
475 + #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewRuleReview = false)
476 + #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false)
477 + #end
478 + #if($canViewRuleReview)
479 + <div class="seitokai-subsection">
480 + <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>
481 + <div class="seitokai-subsection-content">
482 + <div class="info-row">
483 + <span class="info-label">見直しの有無（3年以内）</span>
484 + <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
451 451   </div>
452 - </span>
453 - </div>
454 - #end
455 - #if($ruleReviewProposer && $ruleReviewProposer != '')
456 - <div class="info-row">
457 - <span class="info-label">見直しの提案者</span>
458 - <span class="info-value">
459 - <div class="selection-display">
460 - #foreach($rp in $ruleReviewProposer.split(","))
461 - <span class="selection-item">$!escapetool.xml($rp.trim())</span>
462 - #end
486 + #if($ruleReviewContent && !$ruleReviewContent.isEmpty())
487 + <div class="info-row">
488 + <span class="info-label">見直しの内容</span>
489 + <span class="info-value">
490 + <div class="selection-display">
491 + #foreach($rc in $ruleReviewContent)
492 + <span class="selection-item">$!escapetool.xml($rc.trim())</span>
493 + #end
494 + </div>
495 + </span>
463 463   </div>
464 - </span>
465 - </div>
466 - #end
467 - #if($ruleReviewImplementer && $ruleReviewImplementer != '')
468 - <div class="info-row">
469 - <span class="info-label">見直しの実施者</span>
470 - <span class="info-value">
471 - <div class="selection-display">
472 - #foreach($ri in $ruleReviewImplementer.split(","))
473 - <span class="selection-item">$!escapetool.xml($ri.trim())</span>
474 - #end
497 + #end
498 + #if($ruleReviewProposer && !$ruleReviewProposer.isEmpty())
499 + <div class="info-row">
500 + <span class="info-label">見直しの提案者</span>
501 + <span class="info-value">
502 + <div class="selection-display">
503 + #foreach($rp in $ruleReviewProposer)
504 + <span class="selection-item">$!escapetool.xml($rp.trim())</span>
505 + #end
506 + </div>
507 + </span>
475 475   </div>
476 - </span>
509 + #end
510 + #if($ruleReviewImplementer && !$ruleReviewImplementer.isEmpty())
511 + <div class="info-row">
512 + <span class="info-label">見直しの実施者</span>
513 + <span class="info-value">
514 + <div class="selection-display">
515 + #foreach($ri in $ruleReviewImplementer)
516 + <span class="selection-item">$!escapetool.xml($ri.trim())</span>
517 + #end
518 + </div>
519 + </span>
520 + </div>
521 + #end
522 + #if($ruleReviewSystem && $ruleReviewSystem != '')
523 + <div class="info-row">
524 + <span class="info-label">見直しの仕組み</span>
525 + <span class="info-value">$!escapetool.xml($!ruleReviewSystem)</span>
526 + </div>
527 + #end
528 + </div>
477 477   </div>
530 + #else
531 + <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>
532 + #end
478 478   #end
479 - #if($ruleReviewSystem && $ruleReviewSystem != '')
480 - <div class="info-row">
481 - <span class="info-label">見直しの仕組み</span>
482 - <span class="info-value">$!escapetool.xml($!ruleReviewSystem)</span>
534 +
535 + ## --- 生徒会の課題意識 ---
536 + #if($challenges && $challenges != '')
537 + #set($canViewChallenges = true)
538 + #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewChallenges = false)
539 + #elseif($visibilityChallenges == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewChallenges = false)
540 + #end
541 + #if($canViewChallenges)
542 + <div class="seitokai-subsection">
543 + <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>
544 + <div class="seitokai-subsection-content">
545 + <div class="challenge-text">$!escapetool.xml($challenges)</div>
546 + </div>
483 483   </div>
548 + #else
549 + <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>
550 + #end
484 484   #end
485 - </div>
486 -</div>
487 - #else
488 -<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>
489 - #end
490 -#end
491 491  
492 -## --- ⑨ 課題 ---
493 -#if($challenges && $challenges != '')
494 - ## 公開範囲チェック
495 - #set($canViewChallenges = true)
496 - #if($visibilityChallenges == 'members' && $isGuest) #set($canViewChallenges = false)
497 - #elseif($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewChallenges = false)
498 - #end
499 - #if($canViewChallenges)
500 -<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>
501 -<div class="challenge-text">$!escapetool.xml($challenges)</div>
502 - #else
503 -<div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 課題情報は #if($visibilityChallenges == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
504 - #end
505 -#end
553 + </div>## seitokai-info-body 終了
554 +</div>## card-seitokai-info 終了
506 506  
507 -</div>## seitokai-info-accordion 終了
556 +## --- ③ SNS・連絡先 ---
557 +<div class="school-info-card collapsed" id="card-contact">
558 + <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>
559 + <table class="wiki-table school-info-table">
560 + <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr>
561 + <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>
562 + <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>
563 + <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>
564 + <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>
565 + <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
566 + </table>
567 +</div>
508 508  
509 509  {{/html}}
510 510  
571 +----
572 +
511 511  ## --- ⑩ 活動報告一覧（スレッド型・年度タブ付き） ---
512 512  = 活動報告 =
513 513  
514 -## --- 投稿者ステータス凡例（折りたたみ） ---
576 +## --- 年度タブ + 投稿者ステータス凡例 ---
515 515  {{html clean="false"}}
516 -<div class="author-legend-wrapper">
517 - <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>
518 - <div class="author-legend-body">
519 - <div class="author-legend">
520 - <span class="author-legend-title">投稿者の信頼度:</span>
521 - <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者</span>
522 - <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み</span>
523 - <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介</span>
524 - <span class="author-legend-item"><span class="bar bar-general"></span> 一般（未承認）</span>
525 - </div>
526 - <div class="author-legend">
527 - <span class="author-legend-title">所属:</span>
528 - <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>
529 - <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>
530 - <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>
531 - <span class="author-legend-item text-hint">※一般アカウントは所属未確認のため非表示</span>
532 - </div>
533 - <div class="author-legend">
534 - <span class="author-legend-title">役割:</span>
535 - <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>
536 - <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>
537 - <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>
538 - </div>
539 - </div>
540 -</div>
541 541  
542 542  ## --- 年度タブ ---
543 543  ## 全活動から年度一覧を収集
... ... @@ -559,14 +559,48 @@
559 559  #end
560 560  ## ソート（降順にしたいが Velocity にはないので JS で制御）
561 561  
562 -<div class="activity-fy-tabs">
563 - <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
564 - #foreach($fy in $fySet)
565 - #if($fy != $currentFYStr)
566 - <button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button>
599 +<div class="activity-toolbar">
600 + <div class="activity-fy-tabs">
601 + <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
602 + #foreach($fy in $fySet)
603 + #if($fy != $currentFYStr)
604 + <button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button>
605 + #end
567 567   #end
568 - #end
569 - <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
607 + <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
608 + </div>
609 + <div class="activity-toolbar-right">
610 + <button class="btn-view-toggle" id="btnViewToggle" onclick="toggleCompactView()" title="タイトルのみ表示">
611 + <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>
612 + <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>
613 + <span class="toggle-label">一覧表示</span>
614 + </button>
615 + </div>
616 + <div class="author-legend-wrapper">
617 + <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>
618 + <div class="author-legend-body">
619 + <div class="author-legend">
620 + <span class="author-legend-title">投稿者の信頼度:</span>
621 + <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者 <span class="text-hint">— 運営スタッフ</span></span>
622 + <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み <span class="text-hint">— 本人確認済みのユーザー</span></span>
623 + <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介 <span class="text-hint">— 承認済みユーザーからの紹介</span></span>
624 + <span class="author-legend-item"><span class="bar bar-general"></span> 一般 <span class="text-hint">— 一般登録ユーザー</span></span>
625 + </div>
626 + <div class="author-legend">
627 + <span class="author-legend-title">所属:</span>
628 + <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>
629 + <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>
630 + <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>
631 + <span class="author-legend-item text-hint">※一般アカウントは所属バッジが表示されません</span>
632 + </div>
633 + <div class="author-legend">
634 + <span class="author-legend-title">役割:</span>
635 + <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>
636 + <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>
637 + <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>
638 + </div>
639 + </div>
640 + </div>
570 570  </div>
571 571  
572 572  {{/html}}
... ... @@ -631,8 +631,14 @@
631 631  <div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)">
632 632   <div class="activity-thread-header">
633 633   <div class="activity-thread-title">
634 - <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>
705 + <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>
635 635   <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
707 + #set($actTagsList = $activity.getValue('tags'))
708 + #if($actTagsList && !$actTagsList.isEmpty())
709 + #foreach($tagItem in $actTagsList)
710 + #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end
711 + #end
712 + #end
636 636   </div>
637 637   <div class="thread-meta-row">
638 638   <span class="thread-post-count">${reportCount}件の報告 ・ ${commentCount}件のコメント</span>
... ... @@ -694,12 +694,12 @@
694 694   #set($postVis = $!post.getValue('visibility'))
695 695   #if(!$postVis || $postVis == '') #set($postVis = 'public') #end
696 696   #set($canViewPost = true)
697 - #if($postVis == 'members' && $isGuest) #set($canViewPost = false)
698 - #elseif($postVis == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewPost = false)
774 + #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewPost = false)
775 + #elseif($postVis == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPost = false)
699 699   #end
700 700   #if(!$canViewPost)
701 701   <div class="thread-post visibility-restricted-post">
702 - <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>
779 + <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>
703 703   </div>
704 704   #else
705 705   ## 投稿者のアカウント種別に基づいたCSSクラス
... ... @@ -740,7 +740,7 @@
740 740   #end
741 741   ## 所属バッジ（投稿者の学校コードとページの学校コードを比較）
742 742   #if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general')
743 - #if($postSchoolCode == $schoolCode)
820 + #if($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode))
744 744   #if($postAccountType == 'verified' || $postAccountType == 'admin')
745 745   <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>
746 746   #else
... ... @@ -761,9 +761,6 @@
761 761   #elseif($postUserRole == 'graduate')
762 762   <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>
763 763   #end
764 - #if($postGrade && $postGrade != '')
765 - <span class="badge badge-grade badge-sm">$postGrade</span>
766 - #end
767 767   </span>
768 768   <span class="thread-post-date">$!postDate</span>
769 769   #set($postEdited = $!post.getValue('edited'))
... ... @@ -834,7 +834,7 @@
834 834   #end
835 835   </div>
836 836   #if($postVis != 'public')
837 - <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>
911 + <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 838   #end
839 839   ## 固定/解除ボタン（承認済み・管理者のみ）
840 840   #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
... ... @@ -913,10 +913,10 @@
913 913  
914 914   #if($xcontext.user != "XWiki.XWikiGuest")
915 915   <div class="thread-add-post">
916 - <a href="/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
990 + <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
917 917   ＋ 活動報告を追加
918 918   </a>
919 - <a href="/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
993 + <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
920 920   <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> コメントを書く
921 921   </a>
922 922   </div>
... ... @@ -938,7 +938,7 @@
938 938  #if($xcontext.user != "XWiki.XWikiGuest")
939 939  {{html clean="false"}}
940 940  <div class="activity-add-section">
941 - <a href="/bin/view/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$!escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity">
1015 + <a href="/bin/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$!escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity">
942 942   <svg class="ico" viewBox="0 0 24 24" stroke-width="2.5"><line x1="12" y1="5" x2="12" y2="19"/><line x1="5" y1="12" x2="19" y2="12"/></svg> 活動を追加
943 943   </a>
944 944  </div>
... ... @@ -945,62 +945,38 @@
945 945  {{/html}}
946 946  #end
947 947  
948 -## --- 年度アーカイブ セクション ---
949 -{{html clean="false"}}
950 -<div class="school-section-card school-archive-card">
951 - <h2 class="archive-section-title">
952 - <svg class="ico ico-md" viewBox="0 0 24 24"><path d="M19 21H5a2 2 0 01-2-2V5a2 2 0 012-2h11l5 5v11a2 2 0 01-2 2z"/><polyline points="17 21 17 13 7 13 7 21"/><polyline points="7 3 7 8 15 8"/></svg>
953 - 年度アーカイブ
954 - </h2>
955 - <div class="archive-meta">
956 - 現在のページ: <strong>${pageFiscalYear}年度</strong>
957 - #set($lyud = $!doc.getValue('lastYearUpdateDate'))
958 - #if($lyud && $lyud != '')
959 - | 最終年度更新: $!escapetool.xml($lyud) ($!escapetool.xml($!doc.getValue('lastYearUpdateBy')))
960 - #end
961 - </div>
962 -
963 - ## 過去アーカイブの検索
964 - #set($archiveQuery = $services.query.hql("where doc.fullName like :pattern and doc.fullName like '%Archive_%' order by doc.fullName desc").bindValue("pattern", "${doc.fullName}.Archive_%").setLimit(20))
965 - #set($archivePages = $archiveQuery.execute())
966 -
967 - #if($archivePages && $archivePages.size() > 0)
968 - <div class="archive-card-field-lg">
969 - <div class="archive-list-label">過去の年度アーカイブ</div>
970 - <div class="archive-list">
971 - #foreach($archPage in $archivePages)
972 - #set($archPageDoc = $xwiki.getDocument($archPage))
973 - #set($archPageObj = $archPageDoc.getObject('SeitokaiCode.SchoolClass'))
974 - #if($archPageObj)
975 - #set($archPageFY = $!archPageObj.getValue('fiscalYear'))
976 - <a href="$archPageDoc.getURL('view')" class="archive-link">
977 - <svg class="ico" viewBox="0 0 24 24"><path d="M19 21H5a2 2 0 01-2-2V5a2 2 0 012-2h11l5 5v11a2 2 0 01-2 2z"/><polyline points="17 21 17 13 7 13 7 21"/><polyline points="7 3 7 8 15 8"/></svg>
978 - ${archPageFY}年度
979 - </a>
980 - #end
981 - #end
982 - </div>
983 - </div>
984 - #else
985 - <div class="archive-empty">過去のアーカイブはまだありません</div>
986 - #end
987 -
988 - ## 新年度に移行ボタン（承認済み・管理者のみ）
989 - #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
990 - <div class="archive-action">
991 - <a href="/bin/view/SeitokaiCode/YearArchiveAction?schoolPage=${doc.fullName}" class="btn-accent">
992 - <svg class="ico" viewBox="0 0 24 24" stroke-width="2.5"><path d="M19 21H5a2 2 0 01-2-2V5a2 2 0 012-2h11l5 5v11a2 2 0 01-2 2z"/><polyline points="17 21 17 13 7 13 7 21"/><polyline points="7 3 7 8 15 8"/></svg>
993 - ${pageFiscalYear}年度をアーカイブして新年度に移行
994 - </a>
995 - <div class="archive-action-hint">現在の学校情報を${pageFiscalYear}年度として保存し、新しい年度に移行します。</div>
996 - </div>
997 - #end
998 -</div>
999 -{{/html}}
1000 -
1001 1001  ## --- 年度タブ切り替え JavaScript ---
1002 1002  {{html clean="false"}}
1003 1003  <script>
1025 +// コンパクト表示（タイトルのみ）トグル
1026 +function toggleCompactView() {
1027 + var container = document.querySelector('.xwiki-content') || document.body;
1028 + var isCompact = container.classList.toggle('activity-compact-view');
1029 + var btn = document.getElementById('btnViewToggle');
1030 + if (btn) {
1031 + btn.querySelector('.toggle-label').textContent = isCompact ? '詳細表示' : '一覧表示';
1032 + btn.title = isCompact ? '詳細表示に戻す' : 'タイトルのみ表示';
1033 + }
1034 + // コンパクトモードでは各スレッドヘッダーをクリックで個別展開可能にする
1035 + document.querySelectorAll('.activity-thread').forEach(function(thread) {
1036 + if (isCompact) {
1037 + thread.classList.remove('compact-expanded');
1038 + }
1039 + });
1040 +}
1041 +
1042 +// コンパクトモードで個別スレッドを展開/折りたたみ
1043 +function toggleThreadExpand(e) {
1044 + var container = document.querySelector('.xwiki-content') || document.body;
1045 + if (!container.classList.contains('activity-compact-view')) return;
1046 + // リンクやボタンのクリックはスルー
1047 + if (e.target.closest('a, button, .btn-featured-toggle')) return;
1048 + var thread = e.target.closest('.activity-thread');
1049 + if (thread) {
1050 + thread.classList.toggle('compact-expanded');
1051 + }
1052 +}
1053 +
1004 1004  function switchActivityFY(fy, btn) {
1005 1005   // タブのアクティブ状態を切り替え
1006 1006   document.querySelectorAll('.activity-fy-tab').forEach(function(t) { t.classList.remove('active'); });
... ... @@ -1014,14 +1014,12 @@
1014 1014   }
1015 1015   });
1016 1016  }
1017 -// ページ読み込み時にデフォルトで現在の年度を表示
1067 +// ページ読み込み時の初期化
1018 1018  document.addEventListener('DOMContentLoaded', function() {
1069 + // デフォルトで現在の年度を表示
1019 1019   var defaultTab = document.querySelector('.activity-fy-tab.active');
1020 1020   if (defaultTab) { defaultTab.click(); }
1021 1021   // 保存成功時のトースト通知
1022 - if (window.location.search.indexOf('archived=1') !== -1) {
1023 - showToast('年度アーカイブを作成しました', 'success');
1024 - }
1025 1025   if (window.location.search.indexOf('saved=1') !== -1) {
1026 1026   showToast('学校情報を保存しました', 'success');
1027 1027   // URLパラメータをクリーンアップ（リロード時に再表示されないよう）
... ... @@ -1029,6 +1029,30 @@
1029 1029   window.history.replaceState({}, document.title, window.location.pathname);
1030 1030   }
1031 1031   }
1080 + // コンパクトモード: スレッドヘッダークリックで個別展開
1081 + document.querySelectorAll('.activity-thread-header').forEach(function(header) {
1082 + header.addEventListener('click', toggleThreadExpand);
1083 + });
1084 + // 長文投稿の折りたたみ初期化（max-height: 12em 超で省略）
1085 + document.querySelectorAll('.thread-post-body').forEach(function(body) {
1086 + // pre-wrapのまま高さを測定し、max-height(12em ≒ ~200px)を超える場合に折りたたむ
1087 + var fullH = body.scrollHeight;
1088 + // 12em を px に変換（font-size × line-height × 行数 の近似値ではなくCSSと同じ値を取得）
1089 + body.classList.add('truncated');
1090 + var maxH = body.clientHeight; // max-height: 12em 適用後の高さ
1091 + body.classList.remove('truncated');
1092 + if (fullH > maxH + 30) {
1093 + body.classList.add('truncated');
1094 + var btn = document.createElement('button');
1095 + btn.className = 'btn-read-more';
1096 + btn.textContent = '広げて読む ▼';
1097 + btn.addEventListener('click', function() {
1098 + var isExpanded = body.classList.toggle('expanded');
1099 + btn.textContent = isExpanded ? '折りたたむ ▲' : '広げて読む ▼';
1100 + });
1101 + body.parentNode.insertBefore(btn, body.nextSibling);
1102 + }
1103 + });
1032 1032  });
1033 1033  
1034 1034  // トースト通知表示
... ... @@ -1057,6 +1057,9 @@
1057 1057   var card = document.getElementById(cardId);
1058 1058   if (!card) return;
1059 1059   card.classList.toggle('collapsed');
1132 + var isCollapsed = card.classList.contains('collapsed');
1133 + var h2 = card.querySelector('h2[role="button"]');
1134 + if (h2) h2.setAttribute('aria-expanded', !isCollapsed);
1060 1060  }
1061 1061  
1062 1062  // 投稿の編集（インライン編集フォームを開く）
... ... @@ -1088,7 +1088,9 @@
1088 1088   var csrfEl = document.querySelector('input[name="form_token"]');
1089 1089   var csrfToken = csrfEl ? csrfEl.value : '';
1090 1090   var xhr = new XMLHttpRequest();
1091 - xhr.open('GET', '/bin/view/SeitokaiCode/EditPost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken), true);
1166 + xhr.open('POST', '/bin/get/SeitokaiCode/EditPost?outputSyntax=plain', true);
1167 + xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1168 + var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken);
1092 1092   xhr.onload = function() {
1093 1093   try {
1094 1094   var res = JSON.parse(xhr.responseText);
... ... @@ -1101,7 +1101,7 @@
1101 1101   } catch(e) { alert('編集に失敗しました'); }
1102 1102   };
1103 1103   xhr.onerror = function() { alert('通信エラーが発生しました'); };
1104 - xhr.send();
1181 + xhr.send(editPostData);
1105 1105  }
1106 1106  
1107 1107  // 投稿の削除（確認ダイアログ付き）
... ... @@ -1108,7 +1108,9 @@
1108 1108  function confirmDeletePost(schoolPage, postObjNum, token) {
1109 1109   if (!confirm('この投稿を削除しますか？\\n削除後は「この投稿は削除されました」と表示されます。')) return;
1110 1110   var xhr = new XMLHttpRequest();
1111 - xhr.open('GET', '/bin/view/SeitokaiCode/DeletePost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token), true);
1188 + xhr.open('POST', '/bin/get/SeitokaiCode/DeletePost?outputSyntax=plain', true);
1189 + xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1190 + var deletePostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token);
1112 1112   xhr.onload = function() {
1113 1113   try {
1114 1114   var res = JSON.parse(xhr.responseText);
... ... @@ -1121,7 +1121,7 @@
1121 1121   } catch(e) { alert('削除に失敗しました'); }
1122 1122   };
1123 1123   xhr.onerror = function() { alert('通信エラーが発生しました'); };
1124 - xhr.send();
1203 + xhr.send(deletePostData);
1125 1125  }
1126 1126  </script>
1127 1127  {{/html}}