Skip to Content
Last modified by Super Admin on 2026/04/05 18:59
From version Icon 36.1 Icon
edited by Super Admin
on 2026/03/10 14:40
Change comment: There is no comment for this version
To version Icon 50.1 Icon
edited by Super Admin
on 2026/03/14 15:31
Change comment: There is no comment for this version

Summary

Details

Icon Page properties
Content
... ... @@ -1,13 +1,5 @@
1 1  {{velocity}}
2 2  ## ===== 学校ページ テンプレート =====
3 -## ページタイトルを学校名に設定（{{html}}ブロックの前で実行する必要あり）
4 -#set($__titleObj = $doc.getObject('SeitokaiCode.SchoolClass'))
5 -#if($__titleObj)
6 - #set($__titleName = $__titleObj.getValue('schoolName'))
7 - #if($__titleName && $__titleName != '')
8 - $doc.setTitle($__titleName)
9 - #end
10 -#end
11 11  {{html clean="false"}}
12 12  ## メンテナンスバナー（{{include}}ではなくインラインで記述し、<p>タグ挿入を回避）
13 13  #set($bannerDoc = $xwiki.getDocument('SeitokaiAdmin.MaintenanceBanner'))
... ... @@ -73,9 +73,7 @@
73 73  #set($seitokaiYoutube = $doc.getValue('seitokaiYoutube'))
74 74  #set($seitokaiOtherSns = $doc.getValue('seitokaiOtherSns'))
75 75  
76 -## --- 年度アーカイブ ---
77 -#set($pageFiscalYear = $!doc.getValue('fiscalYear'))
78 -## 現在の年度を計算（4月始まり）
68 +## --- 現在の年度を計算（4月始まり） ---
79 79  #set($nowFY = $datetool.date)
80 80  #set($currentFYMonth = $mathtool.toInteger($datetool.format('MM', $nowFY)))
81 81  #set($currentFYYear = $mathtool.toInteger($datetool.format('yyyy', $nowFY)))
... ... @@ -84,10 +84,6 @@
84 84  #else
85 85   #set($currentFiscalYear = $mathtool.sub($currentFYYear, 1))
86 86  #end
87 -## fiscalYear 未設定時はデフォルトとして現在の年度を使う
88 -#if(!$pageFiscalYear || $pageFiscalYear == '')
89 - #set($pageFiscalYear = $currentFiscalYear.toString())
90 -#end
91 91  
92 92  ## --- 公開範囲フィールド ---
93 93  #set($visibilityOrgChart = $!doc.getValue('visibilityOrgChart'))
... ... @@ -114,10 +114,45 @@
114 114   #end
115 115  #end
116 116  
103 +## --- 学校ページ非表示チェック ---
104 +#set($schoolHidden = $doc.getValue('hidden'))
105 +#if($schoolHidden == 1)
106 + #if($isViewerAdmin)
107 + ## 管理者: 黄色バナー + ページ内容は通常表示（プレビュー）
108 +<div class="school-hidden-banner admin">
109 + <svg class="ico" viewBox="0 0 24 24"><path d="M17.94 17.94A10.07 10.07 0 0112 20c-7 0-11-8-11-8a18.45 18.45 0 015.06-5.94M9.9 4.24A9.12 9.12 0 0112 4c7 0 11 8 11 8a18.5 18.5 0 01-2.16 3.19m-6.72-1.07a3 3 0 01-4.24-4.24"/><line x1="1" y1="1" x2="23" y2="23"/></svg>
110 + <div>
111 + <strong>このページは非表示になっています</strong>（管理者のみ閲覧可能）
112 + #set($hBy = $!doc.getValue('hiddenBy'))
113 + #set($hAt = $!doc.getValue('hiddenAt'))
114 + #set($hReason = $!doc.getValue('hiddenReason'))
115 + <div class="school-hidden-detail">
116 + 非表示: $!escapetool.xml($hAt) / $!escapetool.xml($hBy)
117 + #if($hReason && $hReason != '') ・ 理由: $!escapetool.xml($hReason)#end
118 + </div>
119 + <a href="$xwiki.getURL('SeitokaiAdmin.SchoolManagement', 'view')" style="color:#92400e;text-decoration:underline">学校ページ管理へ</a>
120 + </div>
121 +</div>
122 + #else
123 + ## 一般ユーザー・ゲスト: 非公開メッセージを表示して停止
124 +<div class="school-hidden-public">
125 + <svg class="ico" viewBox="0 0 24 24" style="width:2.5em;height:2.5em"><path d="M17.94 17.94A10.07 10.07 0 0112 20c-7 0-11-8-11-8a18.45 18.45 0 015.06-5.94M9.9 4.24A9.12 9.12 0 0112 4c7 0 11 8 11 8a18.5 18.5 0 01-2.16 3.19m-6.72-1.07a3 3 0 01-4.24-4.24"/><line x1="1" y1="1" x2="23" y2="23"/></svg>
126 + <h2>このページは現在公開されていません</h2>
127 + <p>このページは管理者により非公開に設定されています。</p>
128 + <a href="$xwiki.getURL('Schools.WebHome', 'view')" class="btn-back-list">学校一覧に戻る</a>
129 +</div>
130 +#stop
131 + #end
132 +#end
133 +
117 117  ## --- 投稿固定/解除処理 ---
118 118  #set($pinAction = $!request.action)
119 -#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || $viewerAccountType == 'verified') && $services.csrf.isTokenValid($request.form_token))
120 - #set($postObjNum = $mathtool.toInteger($!request.postObj))
136 +#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token))
137 + #set($pinPostObjStr = $!request.postObj)
138 + #if(!$pinPostObjStr.matches('^\d+$'))
139 + ## 不正な値 → 無視
140 + #else
141 + #set($postObjNum = $mathtool.toInteger($pinPostObjStr))
121 121   #set($postObj = $doc.getObject('SeitokaiCode.ActivityPostClass', $postObjNum))
122 122   #if($postObj)
123 123   #if($pinAction == 'pin')
... ... @@ -137,12 +137,15 @@
137 137   $response.sendRedirect($doc.getURL('view'))
138 138   #stop
139 139   #end
161 + #end## /matches
140 140  #end
141 141  
142 142  ## --- 特色ある活動 選定/解除処理 ---
143 143  #set($featAction = $!request.action)
144 -#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $services.csrf.isTokenValid($request.form_token))
145 - #set($actObjNum = $mathtool.toInteger($!request.actObj))
166 +#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token))
167 + #set($featActObjStr = $!request.actObj)
168 + #if($featActObjStr.matches('^\d+$'))
169 + #set($actObjNum = $mathtool.toInteger($featActObjStr))
146 146   #set($actObj = $doc.getObject('SeitokaiCode.ActivityClass', $actObjNum))
147 147   #if($actObj)
148 148   #if($featAction == 'feature')
... ... @@ -174,6 +174,7 @@
174 174   $response.sendRedirect($doc.getURL('view'))
175 175   #stop
176 176   #end
201 + #end## /matches
177 177  #end
178 178  
179 179  ## --- ユーザー情報取得 ---
... ... @@ -232,6 +232,12 @@
232 232   #end
233 233  #end
234 234  
260 +## --- 学校名見出し（XWikiデフォルトタイトルを非表示にし、学校名を表示） ---
261 +#if($schoolName && $schoolName != '')
262 +<style>.document-header { display: none !important; }</style>
263 +<h1 class="school-page-title">$!escapetool.xml($schoolName)</h1>
264 +#end
265 +
235 235  ## --- 編集ボタン（権限があるユーザーのみ表示） ---
236 236  #set($canEditSchool = false)
237 237  #if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode))
... ... @@ -243,273 +243,266 @@
243 243  </div>
244 244  #end
245 245  
246 -## --- ① 学校基本情報 + 連絡先（左右グリッド・折りたたみ対応） ---
247 -<div class="school-info-grid">
248 - <div class="school-info-card collapsed" id="card-basic-info">
249 - <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>
250 - <table class="wiki-table school-info-table">
251 - <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
252 - <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
253 - <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
254 - <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
255 - <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
256 - <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
257 - <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
258 - <tr><th>課程</th><td>#if($schoolSystem && $schoolSystem != '' && $schoolSystem != '[]')$!escapetool.xml($!schoolSystem)#end</td></tr>
259 - <tr><th>公式サイト</th><td>#if($website && $website != '')<a href="$!escapetool.xml($website)" target="_blank" rel="noopener">$!escapetool.xml($website)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
260 - </table>
261 - #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
262 - #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
263 - #if($infoEditDate && $infoEditDate != '')
264 - <div class="info-last-updated"><svg class="ico" viewBox="0 0 24 24"><path d="M11 4H4a2 2 0 00-2 2v14a2 2 0 002 2h14a2 2 0 002-2v-7"/><path d="M18.5 2.5a2.121 2.121 0 013 3L12 15l-4 1 1-4 9.5-9.5z"/></svg> 基本情報の最終更新: $!escapetool.xml($infoEditBy) — $!escapetool.xml($infoEditDate)</div>
265 - #end
266 - </div>
267 -
268 - <div class="school-info-card collapsed" id="card-contact">
269 - <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>
270 - <table class="wiki-table school-info-table">
271 - <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr>
272 - <tr><th>生徒会Web</th><td>#if($seitokaiWebsite && $seitokaiWebsite != '')<a href="$!escapetool.xml($seitokaiWebsite)" target="_blank" rel="noopener"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M2 12h20"/><path d="M12 2a15.3 15.3 0 014 10 15.3 15.3 0 01-4 10 15.3 15.3 0 01-4-10 15.3 15.3 0 014-10z"/></svg> $!escapetool.xml($seitokaiWebsite)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
273 - <tr><th>X (Twitter)</th><td>#if($seitokaiTwitter && $seitokaiTwitter != '')<a href="https://x.com/$!escapetool.url($seitokaiTwitter)" target="_blank" rel="noopener">𝕏 @$!escapetool.xml($seitokaiTwitter)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
274 - <tr><th>Instagram</th><td>#if($seitokaiInstagram && $seitokaiInstagram != '')<a href="https://instagram.com/$!escapetool.url($seitokaiInstagram)" target="_blank" rel="noopener"><svg class="ico" viewBox="0 0 24 24"><path d="M23 19a2 2 0 01-2 2H3a2 2 0 01-2-2V8a2 2 0 012-2h4l2-3h6l2 3h4a2 2 0 012 2z"/><circle cx="12" cy="13" r="4"/></svg> @$!escapetool.xml($seitokaiInstagram)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
275 - <tr><th>YouTube</th><td>#if($seitokaiYoutube && $seitokaiYoutube != '')<a href="$!escapetool.xml($seitokaiYoutube)" target="_blank" rel="noopener"><svg class="ico" viewBox="0 0 24 24"><polygon points="5 3 19 12 5 21 5 3"/></svg> YouTubeチャンネル</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
276 - <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
277 - </table>
278 - </div>
277 +## --- ① 学校基本情報 ---
278 +<div class="school-info-card collapsed" id="card-basic-info">
279 + <h2 role="button" tabindex="0" aria-expanded="false" onclick="toggleInfoCard('card-basic-info')" onkeydown="if(event.key==='Enter'||event.key===' '){event.preventDefault();toggleInfoCard('card-basic-info')}"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M4 19.5A2.5 2.5 0 016.5 17H20"/><path d="M6.5 2H20v20H6.5A2.5 2.5 0 014 19.5v-15A2.5 2.5 0 016.5 2z"/></svg> 学校基本情報</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2>
280 + <table class="wiki-table school-info-table">
281 + <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
282 + <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
283 + <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
284 + <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
285 + <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
286 + <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
287 + <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
288 + <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
289 + <tr><th>公式サイト</th><td>#if($website && $website != '')<a href="$!escapetool.xml($website)" target="_blank" rel="noopener">$!escapetool.xml($website)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
290 + </table>
291 + #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
292 + #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
293 + #if($infoEditDate && $infoEditDate != '')
294 + <div class="info-last-updated"><svg class="ico" viewBox="0 0 24 24"><path d="M11 4H4a2 2 0 00-2 2v14a2 2 0 002 2h14a2 2 0 002-2v-7"/><path d="M18.5 2.5a2.121 2.121 0 013 3L12 15l-4 1 1-4 9.5-9.5z"/></svg> 基本情報の最終更新: $!escapetool.xml($infoEditBy) — $!escapetool.xml($infoEditDate)</div>
295 + #end
279 279  </div>
280 280  
281 -## --- 生徒会情報アコーディオン ---
282 -<div class="school-section-divider">
283 - <button class="shortcut-btn shortcut-btn-secondary" onclick="var sec=document.getElementById('seitokai-info-section');sec.classList.toggle('open');this.querySelector('.shortcut-arrow').textContent=sec.classList.contains('open')?'▲':'▼';">
284 - <svg class="ico ico-md" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/></svg>
285 - 生徒会情報を見る <span class="shortcut-arrow">▼</span>
286 - </button>
298 +## --- ② 連絡先 ---
299 +<div class="school-info-card collapsed" id="card-contact">
300 + <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> 連絡先</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2>
301 + <table class="wiki-table school-info-table">
302 + <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr>
303 + <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>
304 + <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>
305 + <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>
306 + <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>
307 + <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
308 + </table>
287 287  </div>
288 288  
289 -<div id="seitokai-info-section" class="seitokai-info-accordion">
311 +## --- ③ 生徒会基本情報（折りたたみカード） ---
312 +<div class="school-info-card collapsed" id="card-seitokai-info">
313 + <h2 role="button" tabindex="0" aria-expanded="false" 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>
314 + <div class="seitokai-info-body">
290 290  
291 -## --- ② 組織図 ---
292 -#set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
293 -#if($hasOrgContent)
294 - ## 公開範囲チェック
295 - #set($canViewOrgChart = true)
296 - #if($visibilityOrgChart == 'members' && $isGuest) #set($canViewOrgChart = false)
297 - #elseif($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewOrgChart = false)
298 - #end
299 - #if($canViewOrgChart)
300 -<h2 class="section-title"><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/><line x1="9" y1="10" x2="9" y2="10.01"/><line x1="15" y1="10" x2="15" y2="10.01"/><line x1="9" y1="14" x2="9" y2="14.01"/><line x1="15" y1="14" x2="15" y2="14.01"/></svg> 組織図 #if($visibilityOrgChart != 'public')<span class="visibility-badge visibility-${visibilityOrgChart}">#if($visibilityOrgChart == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h2>
301 -<div class="school-section-card">
302 - <div class="card-inner">
303 - #if($orgChartImage && $orgChartImage != '')
304 - <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
316 + ## --- 組織図 ---
317 + #set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
318 + #if($hasOrgContent)
319 + #set($canViewOrgChart = true)
320 + #if($visibilityOrgChart == 'members' && $isGuest) #set($canViewOrgChart = false)
321 + #elseif($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewOrgChart = false)
322 + #end
323 + #if($canViewOrgChart)
324 + <div class="seitokai-subsection">
325 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/><line x1="9" y1="10" x2="9" y2="10.01"/><line x1="15" y1="10" x2="15" y2="10.01"/><line x1="9" y1="14" x2="9" y2="14.01"/><line x1="15" y1="14" x2="15" y2="14.01"/></svg> 組織図 #if($visibilityOrgChart != 'public')<span class="visibility-badge visibility-${visibilityOrgChart}">#if($visibilityOrgChart == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
326 + <div class="seitokai-subsection-content">
327 + #if($orgChartImage && $orgChartImage != '')
328 + <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
329 + #end
330 + #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end
331 + </div>
332 + </div>
333 + #else
334 + <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>
335 + #end
305 305   #end
306 - #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end
307 - </div>
308 -</div>
309 - #else
310 -<div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 組織図は #if($visibilityOrgChart == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
311 - #end
312 -#end
313 313  
314 -## --- ③④⑤ 日常の活動・選挙・定例活動 ---
315 -<div class="school-section-grid">
316 - #if($dailyActivities && $dailyActivities != '')
317 - <div class="school-section-card">
318 - <h3><svg class="ico" viewBox="0 0 24 24"><path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z"/><polyline points="14 2 14 8 20 8"/><line x1="16" y1="13" x2="8" y2="13"/><line x1="16" y1="17" x2="8" y2="17"/></svg> 日常の活動</h3>
319 - <div class="card-inner">
320 - <p class="activity-hint">活動時間の多い順に上位3つ</p>
321 - <div class="tag-container">
322 - #set($daIdx = 1)
323 - #foreach($da in $dailyActivities.split(","))
324 - <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
325 - #set($daIdx = $daIdx + 1)
338 + ## --- 日常の活動 ---
339 + #if($dailyActivities && !$dailyActivities.isEmpty())
340 + <div class="seitokai-subsection">
341 + <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>
342 + <div class="seitokai-subsection-content">
343 + <p class="activity-hint">活動時間の多い順に上位3つ</p>
344 + <div class="tag-container">
345 + #set($daIdx = 1)
346 + #foreach($da in $dailyActivities)
347 + <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
348 + #set($daIdx = $daIdx + 1)
349 + #end
350 + </div>
351 + #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
352 + <div class="free-note">$!escapetool.xml($dailyActivitiesNote)</div>
326 326   #end
327 327   </div>
328 - #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
329 - <div class="free-note">$!escapetool.xml($dailyActivitiesNote)</div>
330 - #end
331 331   </div>
332 - </div>
333 - #end
356 + #end
334 334  
335 - #if($electionExists && $electionExists != '')
336 - <div class="school-section-card">
337 - <h3><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="3" width="18" height="18" rx="2"/><path d="M7 13l3 3 7-7"/></svg> 選挙</h3>
338 - <div class="card-inner">
339 - <div class="info-row">
340 - <span class="info-label">役員選挙</span>
341 - <span class="info-value">$!escapetool.xml($!electionExists)</span>
358 + ## --- 選挙 ---
359 + #if($electionExists && $electionExists != '')
360 + <div class="seitokai-subsection">
361 + <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>
362 + <div class="seitokai-subsection-content">
363 + <div class="info-row">
364 + <span class="info-label">役員選挙</span>
365 + <span class="info-value">$!escapetool.xml($!electionExists)</span>
366 + </div>
367 + #if($electionType && $electionType != '')
368 + <div class="info-row">
369 + <span class="info-label">直近の選挙方式</span>
370 + <span class="info-value">$!escapetool.xml($!electionType)</span>
371 + </div>
372 + #end
373 + #if($electionNote && $electionNote.trim() != '')
374 + <div class="free-note">$!escapetool.xml($electionNote)</div>
375 + #end
342 342   </div>
343 - #if($electionType && $electionType != '')
344 - <div class="info-row">
345 - <span class="info-label">直近の選挙方式</span>
346 - <span class="info-value">$!escapetool.xml($!electionType)</span>
347 - </div>
348 - #end
349 - #if($electionNote && $electionNote.trim() != '')
350 - <div class="free-note">$!escapetool.xml($electionNote)</div>
351 - #end
352 352   </div>
353 - </div>
354 - #end
355 -</div>
378 + #end
356 356  
357 -<div class="school-section-grid">
358 - #if($meetingFrequency && $meetingFrequency != '')
359 - <div class="school-section-card">
360 - <h3><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="4" width="18" height="18" rx="2"/><line x1="16" y1="2" x2="16" y2="6"/><line x1="8" y1="2" x2="8" y2="6"/><line x1="3" y1="10" x2="21" y2="10"/></svg> 定例活動</h3>
361 - <div class="card-inner">
362 - <div class="info-row">
363 - <span class="info-label">役員定例会の頻度</span>
364 - <span class="info-value">$!escapetool.xml($!meetingFrequency)</span>
380 + ## --- 定例活動 ---
381 + #if($meetingFrequency && $meetingFrequency != '')
382 + <div class="seitokai-subsection">
383 + <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>
384 + <div class="seitokai-subsection-content">
385 + <div class="info-row">
386 + <span class="info-label">役員定例会の頻度</span>
387 + <span class="info-value">$!escapetool.xml($!meetingFrequency)</span>
388 + </div>
389 + #if($regularActivitiesNote && $regularActivitiesNote.trim() != '')
390 + <div class="free-note">$!escapetool.xml($regularActivitiesNote)</div>
391 + #end
365 365   </div>
366 - #if($regularActivitiesNote && $regularActivitiesNote.trim() != '')
367 - <div class="free-note">$!escapetool.xml($regularActivitiesNote)</div>
368 - #end
369 369   </div>
370 - </div>
371 - #end
372 -
373 - ## --- ⑦ 予算 ---
374 - #set($hasBudget = ($budgetProcess && $budgetProcess != '') || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
375 - #if($hasBudget)
376 - ## 公開範囲チェック
377 - #set($canViewBudget = true)
378 - #if($visibilityBudget == 'members' && $isGuest) #set($canViewBudget = false)
379 - #elseif($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewBudget = false)
380 380   #end
381 - #if($canViewBudget)
382 - <div class="school-section-card">
383 - <h3><svg class="ico" viewBox="0 0 24 24"><line x1="12" y1="1" x2="12" y2="23"/><path d="M17 5H9.5a3.5 3.5 0 000 7h5a3.5 3.5 0 010 7H6"/></svg> 予算 #if($visibilityBudget != 'public')<span class="visibility-badge visibility-${visibilityBudget}">#if($visibilityBudget == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
384 - <div class="card-inner">
385 - #if($budgetProcess && $budgetProcess != '')
386 - <div class="info-row">
387 - <span class="info-label">作成過程の生徒関与</span>
388 - <span class="info-value">
389 - <div class="selection-display">
390 - #foreach($bp in $budgetProcess.split(","))
391 - <span class="selection-item">$!escapetool.xml($bp.trim())</span>
392 - #end
393 - </div>
394 - </span>
395 - </div>
395 +
396 + ## --- 予算 ---
397 + #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
398 + #if($hasBudget)
399 + #set($canViewBudget = true)
400 + #if($visibilityBudget == 'members' && $isGuest) #set($canViewBudget = false)
401 + #elseif($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewBudget = false)
396 396   #end
397 - #if($studentFee && $studentFee != '')
398 - <div class="info-row">
399 - <span class="info-label">生徒会費（年額）</span>
400 - <span class="info-value">$!escapetool.xml($!studentFee)</span>
403 + #if($canViewBudget)
404 + <div class="seitokai-subsection">
405 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><line x1="12" y1="1" x2="12" y2="23"/><path d="M17 5H9.5a3.5 3.5 0 000 7h5a3.5 3.5 0 010 7H6"/></svg> 予算 #if($visibilityBudget != 'public')<span class="visibility-badge visibility-${visibilityBudget}">#if($visibilityBudget == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
406 + <div class="seitokai-subsection-content">
407 + #if($budgetProcess && !$budgetProcess.isEmpty())
408 + <div class="info-row">
409 + <span class="info-label">作成過程の生徒関与</span>
410 + <span class="info-value">
411 + <div class="selection-display">
412 + #foreach($bp in $budgetProcess)
413 + <span class="selection-item">$!escapetool.xml($bp.trim())</span>
414 + #end
415 + </div>
416 + </span>
417 + </div>
418 + #end
419 + #if($studentFee && $studentFee != '')
420 + <div class="info-row">
421 + <span class="info-label">生徒会費（年額）</span>
422 + <span class="info-value">$!escapetool.xml($!studentFee)</span>
423 + </div>
424 + #end
425 + #if($budgetScale && $budgetScale != '')
426 + <div class="info-row">
427 + <span class="info-label">予算規模</span>
428 + <span class="info-value">$!escapetool.xml($!budgetScale)</span>
429 + </div>
430 + #end
431 + #if($budgetAllocation && !$budgetAllocation.isEmpty())
432 + <div class="info-row">
433 + <span class="info-label">主な予算配分</span>
434 + <span class="info-value">
435 + <div class="selection-display">
436 + #foreach($ba in $budgetAllocation)
437 + <span class="selection-item">$!escapetool.xml($ba.trim())</span>
438 + #end
439 + </div>
440 + </span>
441 + </div>
442 + #end
443 + #if($budgetNote && $budgetNote.trim() != '')
444 + <div class="free-note">$!escapetool.xml($budgetNote)</div>
445 + #end
401 401   </div>
402 - #end
403 - #if($budgetScale && $budgetScale != '')
404 - <div class="info-row">
405 - <span class="info-label">予算規模</span>
406 - <span class="info-value">$!escapetool.xml($!budgetScale)</span>
407 - </div>
408 - #end
409 - #if($budgetAllocation && $budgetAllocation != '')
410 - <div class="info-row">
411 - <span class="info-label">主な予算配分</span>
412 - <span class="info-value">
413 - <div class="selection-display">
414 - #foreach($ba in $budgetAllocation.split(","))
415 - <span class="selection-item">$!escapetool.xml($ba.trim())</span>
416 - #end
417 - </div>
418 - </span>
419 - </div>
420 - #end
421 - #if($budgetNote && $budgetNote.trim() != '')
422 - <div class="free-note">$!escapetool.xml($budgetNote)</div>
423 - #end
424 424   </div>
425 - </div>
426 - #else
427 - <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 予算情報は #if($visibilityBudget == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
448 + #else
449 + <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>
450 + #end
428 428   #end
429 - #end
430 -</div>
431 431  
432 -## --- ⑧ 校則の見直し ---
433 -#if($ruleReviewStatus && $ruleReviewStatus != '')
434 - ## 公開範囲チェック
435 - #set($canViewRuleReview = true)
436 - #if($visibilityRuleReview == 'members' && $isGuest) #set($canViewRuleReview = false)
437 - #elseif($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewRuleReview = false)
438 - #end
439 - #if($canViewRuleReview)
440 -<h2 class="section-title"><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M16 4h2a2 2 0 012 2v12a2 2 0 01-2 2h-2"/><path d="M8 4H6a2 2 0 00-2 2v12a2 2 0 002 2h2"/><line x1="12" y1="4" x2="12" y2="8"/><line x1="12" y1="16" x2="12" y2="20"/><line x1="8" y1="8" x2="16" y2="8"/><line x1="8" y1="16" x2="16" y2="16"/></svg> 校則の見直し #if($visibilityRuleReview != 'public')<span class="visibility-badge visibility-${visibilityRuleReview}">#if($visibilityRuleReview == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h2>
441 -<div class="school-section-card">
442 - <div class="card-inner">
443 - <div class="info-row">
444 - <span class="info-label">見直しの有無（3年以内）</span>
445 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
446 - </div>
447 - #if($ruleReviewContent && $ruleReviewContent != '')
448 - <div class="info-row">
449 - <span class="info-label">見直しの内容</span>
450 - <span class="info-value">
451 - <div class="selection-display">
452 - #foreach($rc in $ruleReviewContent.split(","))
453 - <span class="selection-item">$!escapetool.xml($rc.trim())</span>
454 - #end
453 + ## --- 校則の見直し ---
454 + #if($ruleReviewStatus && $ruleReviewStatus != '')
455 + #set($canViewRuleReview = true)
456 + #if($visibilityRuleReview == 'members' && $isGuest) #set($canViewRuleReview = false)
457 + #elseif($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewRuleReview = false)
458 + #end
459 + #if($canViewRuleReview)
460 + <div class="seitokai-subsection">
461 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M16 4h2a2 2 0 012 2v12a2 2 0 01-2 2h-2"/><path d="M8 4H6a2 2 0 00-2 2v12a2 2 0 002 2h2"/><line x1="12" y1="4" x2="12" y2="8"/><line x1="12" y1="16" x2="12" y2="20"/><line x1="8" y1="8" x2="16" y2="8"/><line x1="8" y1="16" x2="16" y2="16"/></svg> 校則の見直し #if($visibilityRuleReview != 'public')<span class="visibility-badge visibility-${visibilityRuleReview}">#if($visibilityRuleReview == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
462 + <div class="seitokai-subsection-content">
463 + <div class="info-row">
464 + <span class="info-label">見直しの有無（3年以内）</span>
465 + <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
455 455   </div>
456 - </span>
457 - </div>
458 - #end
459 - #if($ruleReviewProposer && $ruleReviewProposer != '')
460 - <div class="info-row">
461 - <span class="info-label">見直しの提案者</span>
462 - <span class="info-value">
463 - <div class="selection-display">
464 - #foreach($rp in $ruleReviewProposer.split(","))
465 - <span class="selection-item">$!escapetool.xml($rp.trim())</span>
466 - #end
467 + #if($ruleReviewContent && !$ruleReviewContent.isEmpty())
468 + <div class="info-row">
469 + <span class="info-label">見直しの内容</span>
470 + <span class="info-value">
471 + <div class="selection-display">
472 + #foreach($rc in $ruleReviewContent)
473 + <span class="selection-item">$!escapetool.xml($rc.trim())</span>
474 + #end
475 + </div>
476 + </span>
467 467   </div>
468 - </span>
469 - </div>
470 - #end
471 - #if($ruleReviewImplementer && $ruleReviewImplementer != '')
472 - <div class="info-row">
473 - <span class="info-label">見直しの実施者</span>
474 - <span class="info-value">
475 - <div class="selection-display">
476 - #foreach($ri in $ruleReviewImplementer.split(","))
477 - <span class="selection-item">$!escapetool.xml($ri.trim())</span>
478 - #end
478 + #end
479 + #if($ruleReviewProposer && !$ruleReviewProposer.isEmpty())
480 + <div class="info-row">
481 + <span class="info-label">見直しの提案者</span>
482 + <span class="info-value">
483 + <div class="selection-display">
484 + #foreach($rp in $ruleReviewProposer)
485 + <span class="selection-item">$!escapetool.xml($rp.trim())</span>
486 + #end
487 + </div>
488 + </span>
479 479   </div>
480 - </span>
490 + #end
491 + #if($ruleReviewImplementer && !$ruleReviewImplementer.isEmpty())
492 + <div class="info-row">
493 + <span class="info-label">見直しの実施者</span>
494 + <span class="info-value">
495 + <div class="selection-display">
496 + #foreach($ri in $ruleReviewImplementer)
497 + <span class="selection-item">$!escapetool.xml($ri.trim())</span>
498 + #end
499 + </div>
500 + </span>
501 + </div>
502 + #end
503 + #if($ruleReviewSystem && $ruleReviewSystem != '')
504 + <div class="info-row">
505 + <span class="info-label">見直しの仕組み</span>
506 + <span class="info-value">$!escapetool.xml($!ruleReviewSystem)</span>
507 + </div>
508 + #end
509 + </div>
481 481   </div>
511 + #else
512 + <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>
513 + #end
482 482   #end
483 - #if($ruleReviewSystem && $ruleReviewSystem != '')
484 - <div class="info-row">
485 - <span class="info-label">見直しの仕組み</span>
486 - <span class="info-value">$!escapetool.xml($!ruleReviewSystem)</span>
515 +
516 + ## --- 生徒会の課題意識 ---
517 + #if($challenges && $challenges != '')
518 + #set($canViewChallenges = true)
519 + #if($visibilityChallenges == 'members' && $isGuest) #set($canViewChallenges = false)
520 + #elseif($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewChallenges = false)
521 + #end
522 + #if($canViewChallenges)
523 + <div class="seitokai-subsection">
524 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M12 16v-4"/><path d="M12 8h.01"/></svg> 生徒会の課題意識 #if($visibilityChallenges != 'public')<span class="visibility-badge visibility-${visibilityChallenges}">#if($visibilityChallenges == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
525 + <div class="seitokai-subsection-content">
526 + <div class="challenge-text">$!escapetool.xml($challenges)</div>
527 + </div>
487 487   </div>
529 + #else
530 + <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>
531 + #end
488 488   #end
489 - </div>
490 -</div>
491 - #else
492 -<div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 校則の見直し情報は #if($visibilityRuleReview == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
493 - #end
494 -#end
495 495  
496 -## --- ⑨ 課題 ---
497 -#if($challenges && $challenges != '')
498 - ## 公開範囲チェック
499 - #set($canViewChallenges = true)
500 - #if($visibilityChallenges == 'members' && $isGuest) #set($canViewChallenges = false)
501 - #elseif($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewChallenges = false)
502 - #end
503 - #if($canViewChallenges)
504 -<h2 class="section-title">生徒会の課題意識 #if($visibilityChallenges != 'public')<span class="visibility-badge visibility-${visibilityChallenges}">#if($visibilityChallenges == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h2>
505 -<div class="challenge-text">$!escapetool.xml($challenges)</div>
506 - #else
507 -<div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 課題情報は #if($visibilityChallenges == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
508 - #end
509 -#end
534 + </div>## seitokai-info-body 終了
535 +</div>## card-seitokai-info 終了
510 510  
511 -</div>## seitokai-info-accordion 終了
512 -
513 513  {{/html}}
514 514  
515 515  ## --- ⑩ 活動報告一覧（スレッド型・年度タブ付き） ---
... ... @@ -635,7 +635,7 @@
635 635  <div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)">
636 636   <div class="activity-thread-header">
637 637   <div class="activity-thread-title">
638 - <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>
662 + <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>
639 639   <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
640 640   </div>
641 641   <div class="thread-meta-row">
... ... @@ -765,9 +765,6 @@
765 765   #elseif($postUserRole == 'graduate')
766 766   <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>
767 767   #end
768 - #if($postGrade && $postGrade != '')
769 - <span class="badge badge-grade badge-sm">$postGrade</span>
770 - #end
771 771   </span>
772 772   <span class="thread-post-date">$!postDate</span>
773 773   #set($postEdited = $!post.getValue('edited'))
... ... @@ -917,10 +917,10 @@
917 917  
918 918   #if($xcontext.user != "XWiki.XWikiGuest")
919 919   <div class="thread-add-post">
920 - <a href="/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
941 + <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
921 921   ＋ 活動報告を追加
922 922   </a>
923 - <a href="/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
944 + <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
924 924   <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> コメントを書く
925 925   </a>
926 926   </div>
... ... @@ -942,7 +942,7 @@
942 942  #if($xcontext.user != "XWiki.XWikiGuest")
943 943  {{html clean="false"}}
944 944  <div class="activity-add-section">
945 - <a href="/bin/view/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$!escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity">
966 + <a href="/bin/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$!escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity">
946 946   <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> 活動を追加
947 947   </a>
948 948  </div>
... ... @@ -949,59 +949,6 @@
949 949  {{/html}}
950 950  #end
951 951  
952 -## --- 年度アーカイブ セクション ---
953 -{{html clean="false"}}
954 -<div class="school-section-card school-archive-card">
955 - <h2 class="archive-section-title">
956 - <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>
957 - 年度アーカイブ
958 - </h2>
959 - <div class="archive-meta">
960 - 現在のページ: <strong>${pageFiscalYear}年度</strong>
961 - #set($lyud = $!doc.getValue('lastYearUpdateDate'))
962 - #if($lyud && $lyud != '')
963 - | 最終年度更新: $!escapetool.xml($lyud) ($!escapetool.xml($!doc.getValue('lastYearUpdateBy')))
964 - #end
965 - </div>
966 -
967 - ## 過去アーカイブの検索
968 - #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))
969 - #set($archivePages = $archiveQuery.execute())
970 -
971 - #if($archivePages && $archivePages.size() > 0)
972 - <div class="archive-card-field-lg">
973 - <div class="archive-list-label">過去の年度アーカイブ</div>
974 - <div class="archive-list">
975 - #foreach($archPage in $archivePages)
976 - #set($archPageDoc = $xwiki.getDocument($archPage))
977 - #set($archPageObj = $archPageDoc.getObject('SeitokaiCode.SchoolClass'))
978 - #if($archPageObj)
979 - #set($archPageFY = $!archPageObj.getValue('fiscalYear'))
980 - <a href="$archPageDoc.getURL('view')" class="archive-link">
981 - <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>
982 - ${archPageFY}年度
983 - </a>
984 - #end
985 - #end
986 - </div>
987 - </div>
988 - #else
989 - <div class="archive-empty">過去のアーカイブはまだありません</div>
990 - #end
991 -
992 - ## 新年度に移行ボタン（承認済み・管理者のみ）
993 - #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
994 - <div class="archive-action">
995 - <a href="/bin/view/SeitokaiCode/YearArchiveAction?schoolPage=${doc.fullName}" class="btn-accent">
996 - <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>
997 - ${pageFiscalYear}年度をアーカイブして新年度に移行
998 - </a>
999 - <div class="archive-action-hint">現在の学校情報を${pageFiscalYear}年度として保存し、新しい年度に移行します。</div>
1000 - </div>
1001 - #end
1002 -</div>
1003 -{{/html}}
1004 -
1005 1005  ## --- 年度タブ切り替え JavaScript ---
1006 1006  {{html clean="false"}}
1007 1007  <script>
... ... @@ -1024,9 +1024,6 @@
1024 1024   var defaultTab = document.querySelector('.activity-fy-tab.active');
1025 1025   if (defaultTab) { defaultTab.click(); }
1026 1026   // 保存成功時のトースト通知
1027 - if (window.location.search.indexOf('archived=1') !== -1) {
1028 - showToast('年度アーカイブを作成しました', 'success');
1029 - }
1030 1030   if (window.location.search.indexOf('saved=1') !== -1) {
1031 1031   showToast('学校情報を保存しました', 'success');
1032 1032   // URLパラメータをクリーンアップ（リロード時に再表示されないよう）
... ... @@ -1062,6 +1062,9 @@
1062 1062   var card = document.getElementById(cardId);
1063 1063   if (!card) return;
1064 1064   card.classList.toggle('collapsed');
1030 + var isCollapsed = card.classList.contains('collapsed');
1031 + var h2 = card.querySelector('h2[role="button"]');
1032 + if (h2) h2.setAttribute('aria-expanded', !isCollapsed);
1065 1065  }
1066 1066  
1067 1067  // 投稿の編集（インライン編集フォームを開く）
... ... @@ -1093,7 +1093,9 @@
1093 1093   var csrfEl = document.querySelector('input[name="form_token"]');
1094 1094   var csrfToken = csrfEl ? csrfEl.value : '';
1095 1095   var xhr = new XMLHttpRequest();
1096 - xhr.open('GET', '/bin/view/SeitokaiCode/EditPost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken), true);
1064 + xhr.open('POST', '/bin/SeitokaiCode/EditPost?outputSyntax=plain', true);
1065 + xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1066 + var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken);
1097 1097   xhr.onload = function() {
1098 1098   try {
1099 1099   var res = JSON.parse(xhr.responseText);
... ... @@ -1106,7 +1106,7 @@
1106 1106   } catch(e) { alert('編集に失敗しました'); }
1107 1107   };
1108 1108   xhr.onerror = function() { alert('通信エラーが発生しました'); };
1109 - xhr.send();
1079 + xhr.send(editPostData);
1110 1110  }
1111 1111  
1112 1112  // 投稿の削除（確認ダイアログ付き）
... ... @@ -1113,7 +1113,9 @@
1113 1113  function confirmDeletePost(schoolPage, postObjNum, token) {
1114 1114   if (!confirm('この投稿を削除しますか？\\n削除後は「この投稿は削除されました」と表示されます。')) return;
1115 1115   var xhr = new XMLHttpRequest();
1116 - xhr.open('GET', '/bin/view/SeitokaiCode/DeletePost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token), true);
1086 + xhr.open('POST', '/bin/SeitokaiCode/DeletePost?outputSyntax=plain', true);
1087 + xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1088 + var deletePostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token);
1117 1117   xhr.onload = function() {
1118 1118   try {
1119 1119   var res = JSON.parse(xhr.responseText);
... ... @@ -1126,7 +1126,7 @@
1126 1126   } catch(e) { alert('削除に失敗しました'); }
1127 1127   };
1128 1128   xhr.onerror = function() { alert('通信エラーが発生しました'); };
1129 - xhr.send();
1101 + xhr.send(deletePostData);
1130 1130  }
1131 1131  </script>
1132 1132  {{/html}}