Skip to Content
Last modified by Super Admin on 2026/04/05 18:59
From version Icon 40.1 Icon
edited by XWikiGuest
on 2026/03/10 22:20
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
Author
... ... @@ -1,1 +1,1 @@
1 -XWiki.XWikiGuest
1 +XWiki.superadmin
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'))
... ... @@ -65,9 +65,7 @@
65 65  #set($seitokaiYoutube = $doc.getValue('seitokaiYoutube'))
66 66  #set($seitokaiOtherSns = $doc.getValue('seitokaiOtherSns'))
67 67  
68 -## --- 年度アーカイブ ---
69 -#set($pageFiscalYear = $!doc.getValue('fiscalYear'))
70 -## 現在の年度を計算（4月始まり）
74 +## --- 現在の年度を計算（4月始まり） ---
71 71  #set($nowFY = $datetool.date)
72 72  #set($currentFYMonth = $mathtool.toInteger($datetool.format('MM', $nowFY)))
73 73  #set($currentFYYear = $mathtool.toInteger($datetool.format('yyyy', $nowFY)))
... ... @@ -76,10 +76,6 @@
76 76  #else
77 77   #set($currentFiscalYear = $mathtool.sub($currentFYYear, 1))
78 78  #end
79 -## fiscalYear 未設定時はデフォルトとして現在の年度を使う
80 -#if(!$pageFiscalYear || $pageFiscalYear == '')
81 - #set($pageFiscalYear = $currentFiscalYear.toString())
82 -#end
83 83  
84 84  ## --- 公開範囲フィールド ---
85 85  #set($visibilityOrgChart = $!doc.getValue('visibilityOrgChart'))
... ... @@ -106,10 +106,53 @@
106 106   #end
107 107  #end
108 108  
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 +
109 109  ## --- 投稿固定/解除処理 ---
110 110  #set($pinAction = $!request.action)
111 -#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || $viewerAccountType == 'verified') && $services.csrf.isTokenValid($request.form_token))
112 - #set($postObjNum = $mathtool.toInteger($!request.postObj))
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))
113 113   #set($postObj = $doc.getObject('SeitokaiCode.ActivityPostClass', $postObjNum))
114 114   #if($postObj)
115 115   #if($pinAction == 'pin')
... ... @@ -129,12 +129,15 @@
129 129   $response.sendRedirect($doc.getURL('view'))
130 130   #stop
131 131   #end
175 + #end## /matches
132 132  #end
133 133  
134 134  ## --- 特色ある活動 選定/解除処理 ---
135 135  #set($featAction = $!request.action)
136 -#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $services.csrf.isTokenValid($request.form_token))
137 - #set($actObjNum = $mathtool.toInteger($!request.actObj))
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))
138 138   #set($actObj = $doc.getObject('SeitokaiCode.ActivityClass', $actObjNum))
139 139   #if($actObj)
140 140   #if($featAction == 'feature')
... ... @@ -166,6 +166,7 @@
166 166   $response.sendRedirect($doc.getURL('view'))
167 167   #stop
168 168   #end
215 + #end## /matches
169 169  #end
170 170  
171 171  ## --- ユーザー情報取得 ---
... ... @@ -232,7 +232,7 @@
232 232  
233 233  ## --- 編集ボタン（権限があるユーザーのみ表示） ---
234 234  #set($canEditSchool = false)
235 -#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode))
282 +#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode || $isAffiliated))
236 236   #set($canEditSchool = true)
237 237  #end
238 238  #if($canEditSchool)
... ... @@ -241,305 +241,293 @@
241 241  </div>
242 242  #end
243 243  
244 -## --- ① 学校基本情報 + 連絡先（左右グリッド・折りたたみ対応） ---
245 -<div class="school-info-grid">
246 - <div class="school-info-card collapsed" id="card-basic-info">
247 - <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>
248 - <table class="wiki-table school-info-table">
249 - <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
250 - <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
251 - <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
252 - <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
253 - <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
254 - <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
255 - <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
256 - <tr><th>課程</th><td>#if($schoolSystem && $schoolSystem != '' && $schoolSystem != '[]')$!escapetool.xml($!schoolSystem)#end</td></tr>
257 - <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>
258 - </table>
259 - #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
260 - #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
261 - #if($infoEditDate && $infoEditDate != '')
262 - <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)
263 263   #end
304 + と連携しています
264 264   </div>
265 -
266 - <div class="school-info-card collapsed" id="card-contact">
267 - <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>
268 - <table class="wiki-table school-info-table">
269 - <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr>
270 - <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>
271 - <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>
272 - <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>
273 - <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>
274 - <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
275 - </table>
276 - </div>
277 277  </div>
307 +#end
278 278  
279 -## --- 生徒会情報アコーディオン ---
280 -<div class="school-section-divider">
281 - <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')?'▲':'▼';">
282 - <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>
283 - 生徒会情報を見る <span class="shortcut-arrow">▼</span>
284 - </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
285 285  </div>
286 286  
287 -<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">
288 288  
289 -## --- ② 組織図 ---
290 -#set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
291 -#if($hasOrgContent)
292 - ## 公開範囲チェック
293 - #set($canViewOrgChart = true)
294 - #if($visibilityOrgChart == 'members' && $isGuest) #set($canViewOrgChart = false)
295 - #elseif($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewOrgChart = false)
296 - #end
297 - #if($canViewOrgChart)
298 -<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>
299 -<div class="school-section-card">
300 - <div class="card-inner">
301 - #if($orgChartImage && $orgChartImage != '')
302 - <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
303 303   #end
304 - #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end
305 - </div>
306 -</div>
307 - #else
308 -<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>
309 - #end
310 -#end
311 311  
312 -## --- ③④⑤ 日常の活動・選挙・定例活動 ---
313 -<div class="school-section-grid">
314 - #if($dailyActivities && $dailyActivities != '')
315 - <div class="school-section-card">
316 - <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>
317 - <div class="card-inner">
318 - <p class="activity-hint">活動時間の多い順に上位3つ</p>
319 - <div class="tag-container">
320 - #set($daIdx = 1)
321 - #foreach($da in $dailyActivities.split(","))
322 - <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
323 - #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>
324 324   #end
325 325   </div>
326 - #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
327 - <div class="free-note">$!escapetool.xml($dailyActivitiesNote)</div>
328 - #end
329 329   </div>
330 - </div>
331 - #end
375 + #end
332 332  
333 - #if($electionExists && $electionExists != '')
334 - <div class="school-section-card">
335 - <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>
336 - <div class="card-inner">
337 - <div class="info-row">
338 - <span class="info-label">役員選挙</span>
339 - <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
340 340   </div>
341 - #if($electionType && $electionType != '')
342 - <div class="info-row">
343 - <span class="info-label">直近の選挙方式</span>
344 - <span class="info-value">$!escapetool.xml($!electionType)</span>
345 - </div>
346 - #end
347 - #if($electionNote && $electionNote.trim() != '')
348 - <div class="free-note">$!escapetool.xml($electionNote)</div>
349 - #end
350 350   </div>
351 - </div>
352 - #end
353 -</div>
397 + #end
354 354  
355 -<div class="school-section-grid">
356 - #if($meetingFrequency && $meetingFrequency != '')
357 - <div class="school-section-card">
358 - <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>
359 - <div class="card-inner">
360 - <div class="info-row">
361 - <span class="info-label">役員定例会の頻度</span>
362 - <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
363 363   </div>
364 - #if($regularActivitiesNote && $regularActivitiesNote.trim() != '')
365 - <div class="free-note">$!escapetool.xml($regularActivitiesNote)</div>
366 - #end
367 367   </div>
368 - </div>
369 - #end
370 -
371 - ## --- ⑦ 予算 ---
372 - #set($hasBudget = ($budgetProcess && $budgetProcess != '') || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
373 - #if($hasBudget)
374 - ## 公開範囲チェック
375 - #set($canViewBudget = true)
376 - #if($visibilityBudget == 'members' && $isGuest) #set($canViewBudget = false)
377 - #elseif($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewBudget = false)
378 378   #end
379 - #if($canViewBudget)
380 - <div class="school-section-card">
381 - <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>
382 - <div class="card-inner">
383 - #if($budgetProcess && $budgetProcess != '')
384 - <div class="info-row">
385 - <span class="info-label">作成過程の生徒関与</span>
386 - <span class="info-value">
387 - <div class="selection-display">
388 - #foreach($bp in $budgetProcess.split(","))
389 - <span class="selection-item">$!escapetool.xml($bp.trim())</span>
390 - #end
391 - </div>
392 - </span>
393 - </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)
394 394   #end
395 - #if($studentFee && $studentFee != '')
396 - <div class="info-row">
397 - <span class="info-label">生徒会費（年額）</span>
398 - <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
399 399   </div>
400 - #end
401 - #if($budgetScale && $budgetScale != '')
402 - <div class="info-row">
403 - <span class="info-label">予算規模</span>
404 - <span class="info-value">$!escapetool.xml($!budgetScale)</span>
405 - </div>
406 - #end
407 - #if($budgetAllocation && $budgetAllocation != '')
408 - <div class="info-row">
409 - <span class="info-label">主な予算配分</span>
410 - <span class="info-value">
411 - <div class="selection-display">
412 - #foreach($ba in $budgetAllocation.split(","))
413 - <span class="selection-item">$!escapetool.xml($ba.trim())</span>
414 - #end
415 - </div>
416 - </span>
417 - </div>
418 - #end
419 - #if($budgetNote && $budgetNote.trim() != '')
420 - <div class="free-note">$!escapetool.xml($budgetNote)</div>
421 - #end
422 422   </div>
423 - </div>
424 - #else
425 - <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
426 426   #end
427 - #end
428 -</div>
429 429  
430 -## --- ⑧ 校則の見直し ---
431 -#if($ruleReviewStatus && $ruleReviewStatus != '')
432 - ## 公開範囲チェック
433 - #set($canViewRuleReview = true)
434 - #if($visibilityRuleReview == 'members' && $isGuest) #set($canViewRuleReview = false)
435 - #elseif($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewRuleReview = false)
436 - #end
437 - #if($canViewRuleReview)
438 -<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>
439 -<div class="school-section-card">
440 - <div class="card-inner">
441 - <div class="info-row">
442 - <span class="info-label">見直しの有無（3年以内）</span>
443 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
444 - </div>
445 - #if($ruleReviewContent && $ruleReviewContent != '')
446 - <div class="info-row">
447 - <span class="info-label">見直しの内容</span>
448 - <span class="info-value">
449 - <div class="selection-display">
450 - #foreach($rc in $ruleReviewContent.split(","))
451 - <span class="selection-item">$!escapetool.xml($rc.trim())</span>
452 - #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>
453 453   </div>
454 - </span>
455 - </div>
456 - #end
457 - #if($ruleReviewProposer && $ruleReviewProposer != '')
458 - <div class="info-row">
459 - <span class="info-label">見直しの提案者</span>
460 - <span class="info-value">
461 - <div class="selection-display">
462 - #foreach($rp in $ruleReviewProposer.split(","))
463 - <span class="selection-item">$!escapetool.xml($rp.trim())</span>
464 - #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>
465 465   </div>
466 - </span>
467 - </div>
468 - #end
469 - #if($ruleReviewImplementer && $ruleReviewImplementer != '')
470 - <div class="info-row">
471 - <span class="info-label">見直しの実施者</span>
472 - <span class="info-value">
473 - <div class="selection-display">
474 - #foreach($ri in $ruleReviewImplementer.split(","))
475 - <span class="selection-item">$!escapetool.xml($ri.trim())</span>
476 - #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>
477 477   </div>
478 - </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>
479 479   </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
480 480   #end
481 - #if($ruleReviewSystem && $ruleReviewSystem != '')
482 - <div class="info-row">
483 - <span class="info-label">見直しの仕組み</span>
484 - <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>
485 485   </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
486 486   #end
487 - </div>
488 -</div>
489 - #else
490 -<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>
491 - #end
492 -#end
493 493  
494 -## --- ⑨ 課題 ---
495 -#if($challenges && $challenges != '')
496 - ## 公開範囲チェック
497 - #set($canViewChallenges = true)
498 - #if($visibilityChallenges == 'members' && $isGuest) #set($canViewChallenges = false)
499 - #elseif($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewChallenges = false)
500 - #end
501 - #if($canViewChallenges)
502 -<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>
503 -<div class="challenge-text">$!escapetool.xml($challenges)</div>
504 - #else
505 -<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>
506 - #end
507 -#end
553 + </div>## seitokai-info-body 終了
554 +</div>## card-seitokai-info 終了
508 508  
509 -</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>
510 510  
511 511  {{/html}}
512 512  
571 +----
572 +
513 513  ## --- ⑩ 活動報告一覧（スレッド型・年度タブ付き） ---
514 514  = 活動報告 =
515 515  
516 -## --- 投稿者ステータス凡例（折りたたみ） ---
576 +## --- 年度タブ + 投稿者ステータス凡例 ---
517 517  {{html clean="false"}}
518 -<div class="author-legend-wrapper">
519 - <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>
520 - <div class="author-legend-body">
521 - <div class="author-legend">
522 - <span class="author-legend-title">投稿者の信頼度:</span>
523 - <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者</span>
524 - <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み</span>
525 - <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介</span>
526 - <span class="author-legend-item"><span class="bar bar-general"></span> 一般（未承認）</span>
527 - </div>
528 - <div class="author-legend">
529 - <span class="author-legend-title">所属:</span>
530 - <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>
531 - <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>
532 - <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>
533 - <span class="author-legend-item text-hint">※一般アカウントは所属未確認のため非表示</span>
534 - </div>
535 - <div class="author-legend">
536 - <span class="author-legend-title">役割:</span>
537 - <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>
538 - <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>
539 - <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>
540 - </div>
541 - </div>
542 -</div>
543 543  
544 544  ## --- 年度タブ ---
545 545  ## 全活動から年度一覧を収集
... ... @@ -561,14 +561,48 @@
561 561  #end
562 562  ## ソート（降順にしたいが Velocity にはないので JS で制御）
563 563  
564 -<div class="activity-fy-tabs">
565 - <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
566 - #foreach($fy in $fySet)
567 - #if($fy != $currentFYStr)
568 - <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
569 569   #end
570 - #end
571 - <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>
572 572  </div>
573 573  
574 574  {{/html}}
... ... @@ -633,8 +633,14 @@
633 633  <div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)">
634 634   <div class="activity-thread-header">
635 635   <div class="activity-thread-title">
636 - <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>
637 637   <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
638 638   </div>
639 639   <div class="thread-meta-row">
640 640   <span class="thread-post-count">${reportCount}件の報告 ・ ${commentCount}件のコメント</span>
... ... @@ -696,12 +696,12 @@
696 696   #set($postVis = $!post.getValue('visibility'))
697 697   #if(!$postVis || $postVis == '') #set($postVis = 'public') #end
698 698   #set($canViewPost = true)
699 - #if($postVis == 'members' && $isGuest) #set($canViewPost = false)
700 - #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)
701 701   #end
702 702   #if(!$canViewPost)
703 703   <div class="thread-post visibility-restricted-post">
704 - <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>
705 705   </div>
706 706   #else
707 707   ## 投稿者のアカウント種別に基づいたCSSクラス
... ... @@ -742,7 +742,7 @@
742 742   #end
743 743   ## 所属バッジ（投稿者の学校コードとページの学校コードを比較）
744 744   #if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general')
745 - #if($postSchoolCode == $schoolCode)
820 + #if($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode))
746 746   #if($postAccountType == 'verified' || $postAccountType == 'admin')
747 747   <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>
748 748   #else
... ... @@ -763,9 +763,6 @@
763 763   #elseif($postUserRole == 'graduate')
764 764   <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>
765 765   #end
766 - #if($postGrade && $postGrade != '')
767 - <span class="badge badge-grade badge-sm">$postGrade</span>
768 - #end
769 769   </span>
770 770   <span class="thread-post-date">$!postDate</span>
771 771   #set($postEdited = $!post.getValue('edited'))
... ... @@ -836,7 +836,7 @@
836 836   #end
837 837   </div>
838 838   #if($postVis != 'public')
839 - <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>
840 840   #end
841 841   ## 固定/解除ボタン（承認済み・管理者のみ）
842 842   #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
... ... @@ -947,62 +947,38 @@
947 947  {{/html}}
948 948  #end
949 949  
950 -## --- 年度アーカイブ セクション ---
951 -{{html clean="false"}}
952 -<div class="school-section-card school-archive-card">
953 - <h2 class="archive-section-title">
954 - <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>
955 - 年度アーカイブ
956 - </h2>
957 - <div class="archive-meta">
958 - 現在のページ: <strong>${pageFiscalYear}年度</strong>
959 - #set($lyud = $!doc.getValue('lastYearUpdateDate'))
960 - #if($lyud && $lyud != '')
961 - | 最終年度更新: $!escapetool.xml($lyud) ($!escapetool.xml($!doc.getValue('lastYearUpdateBy')))
962 - #end
963 - </div>
964 -
965 - ## 過去アーカイブの検索
966 - #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))
967 - #set($archivePages = $archiveQuery.execute())
968 -
969 - #if($archivePages && $archivePages.size() > 0)
970 - <div class="archive-card-field-lg">
971 - <div class="archive-list-label">過去の年度アーカイブ</div>
972 - <div class="archive-list">
973 - #foreach($archPage in $archivePages)
974 - #set($archPageDoc = $xwiki.getDocument($archPage))
975 - #set($archPageObj = $archPageDoc.getObject('SeitokaiCode.SchoolClass'))
976 - #if($archPageObj)
977 - #set($archPageFY = $!archPageObj.getValue('fiscalYear'))
978 - <a href="$archPageDoc.getURL('view')" class="archive-link">
979 - <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>
980 - ${archPageFY}年度
981 - </a>
982 - #end
983 - #end
984 - </div>
985 - </div>
986 - #else
987 - <div class="archive-empty">過去のアーカイブはまだありません</div>
988 - #end
989 -
990 - ## 新年度に移行ボタン（承認済み・管理者のみ）
991 - #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
992 - <div class="archive-action">
993 - <a href="/bin/SeitokaiCode/YearArchiveAction?schoolPage=${doc.fullName}" class="btn-accent">
994 - <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>
995 - ${pageFiscalYear}年度をアーカイブして新年度に移行
996 - </a>
997 - <div class="archive-action-hint">現在の学校情報を${pageFiscalYear}年度として保存し、新しい年度に移行します。</div>
998 - </div>
999 - #end
1000 -</div>
1001 -{{/html}}
1002 -
1003 1003  ## --- 年度タブ切り替え JavaScript ---
1004 1004  {{html clean="false"}}
1005 1005  <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 +
1006 1006  function switchActivityFY(fy, btn) {
1007 1007   // タブのアクティブ状態を切り替え
1008 1008   document.querySelectorAll('.activity-fy-tab').forEach(function(t) { t.classList.remove('active'); });
... ... @@ -1022,9 +1022,6 @@
1022 1022   var defaultTab = document.querySelector('.activity-fy-tab.active');
1023 1023   if (defaultTab) { defaultTab.click(); }
1024 1024   // 保存成功時のトースト通知
1025 - if (window.location.search.indexOf('archived=1') !== -1) {
1026 - showToast('年度アーカイブを作成しました', 'success');
1027 - }
1028 1028   if (window.location.search.indexOf('saved=1') !== -1) {
1029 1029   showToast('学校情報を保存しました', 'success');
1030 1030   // URLパラメータをクリーンアップ（リロード時に再表示されないよう）
... ... @@ -1032,6 +1032,30 @@
1032 1032   window.history.replaceState({}, document.title, window.location.pathname);
1033 1033   }
1034 1034   }
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 + });
1035 1035  });
1036 1036  
1037 1037  // トースト通知表示
... ... @@ -1060,6 +1060,9 @@
1060 1060   var card = document.getElementById(cardId);
1061 1061   if (!card) return;
1062 1062   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);
1063 1063  }
1064 1064  
1065 1065  // 投稿の編集（インライン編集フォームを開く）
... ... @@ -1091,7 +1091,9 @@
1091 1091   var csrfEl = document.querySelector('input[name="form_token"]');
1092 1092   var csrfToken = csrfEl ? csrfEl.value : '';
1093 1093   var xhr = new XMLHttpRequest();
1094 - xhr.open('GET', '/bin/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);
1095 1095   xhr.onload = function() {
1096 1096   try {
1097 1097   var res = JSON.parse(xhr.responseText);
... ... @@ -1104,7 +1104,7 @@
1104 1104   } catch(e) { alert('編集に失敗しました'); }
1105 1105   };
1106 1106   xhr.onerror = function() { alert('通信エラーが発生しました'); };
1107 - xhr.send();
1181 + xhr.send(editPostData);
1108 1108  }
1109 1109  
1110 1110  // 投稿の削除（確認ダイアログ付き）
... ... @@ -1111,7 +1111,9 @@
1111 1111  function confirmDeletePost(schoolPage, postObjNum, token) {
1112 1112   if (!confirm('この投稿を削除しますか？\\n削除後は「この投稿は削除されました」と表示されます。')) return;
1113 1113   var xhr = new XMLHttpRequest();
1114 - xhr.open('GET', '/bin/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);
1115 1115   xhr.onload = function() {
1116 1116   try {
1117 1117   var res = JSON.parse(xhr.responseText);
... ... @@ -1124,7 +1124,7 @@
1124 1124   } catch(e) { alert('削除に失敗しました'); }
1125 1125   };
1126 1126   xhr.onerror = function() { alert('通信エラーが発生しました'); };
1127 - xhr.send();
1203 + xhr.send(deletePostData);
1128 1128  }
1129 1129  </script>
1130 1130  {{/html}}