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

Summary

Details

Icon Page properties
Content
... ... @@ -1,21 +1,9 @@
1 1  {{velocity}}
2 2  ## ===== 学校ページ テンプレート =====
3 -{{html clean="false"}}
4 -## メンテナンスバナー（{{include}}ではなくインラインで記述し、<p>タグ挿入を回避）
5 -#set($bannerDoc = $xwiki.getDocument('SeitokaiAdmin.MaintenanceBanner'))
6 -#set($bannerObj = $bannerDoc.getObject('SeitokaiCode.MaintenanceBannerClass'))
7 -#if($bannerObj && $bannerObj.getValue('enabled') == 1)
8 -#set($bannerMsg = $bannerObj.getValue('message'))
9 -#set($bannerLevel = $bannerObj.getValue('level'))
10 -#if(!$bannerLevel || $bannerLevel == '')#set($bannerLevel = 'warning')#end
11 -<div class="maintenance-banner active maintenance-${bannerLevel}" id="maintenance-banner">
12 - <div class="maintenance-banner-inner">
13 - <span class="maintenance-icon">#if($bannerLevel == 'urgent')<svg class="ico-banner" viewBox="0 0 24 24"><path d="M10.29 3.86L1.82 18a2 2 0 001.71 3h16.94a2 2 0 001.71-3L13.71 3.86a2 2 0 00-3.42 0z"/><line x1="12" y1="9" x2="12" y2="13"/><line x1="12" y1="17" x2="12.01" y2="17"/></svg>#elseif($bannerLevel == 'info')<svg class="ico-banner" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><line x1="12" y1="16" x2="12" y2="12"/><line x1="12" y1="8" x2="12.01" y2="8"/></svg>#else<svg class="ico-banner" viewBox="0 0 24 24"><path d="M14.7 6.3a1 1 0 000 1.4l1.6 1.6a1 1 0 001.4 0l3.77-3.77a6 6 0 01-7.94 7.94l-6.91 6.91a2.12 2.12 0 01-3-3l6.91-6.91a6 6 0 017.94-7.94l-3.76 3.76z"/></svg>#end</span>
14 - <span class="maintenance-text">$!escapetool.xml($bannerMsg)</span>
15 - <button class="maintenance-close" onclick="document.getElementById('maintenance-banner').style.display='none'">&times;</button>
16 - </div>
17 -</div>
18 -#end
3 +## このテンプレートは学校ページの表示と入力フォームを制御します。
4 +
5 +## メンテナンスバナー
6 +{{include reference="SeitokaiCode.MaintenanceBannerInclude" /}}{{html clean="false"}}
19 19  ## --- 学校基本情報フィールド ---
20 20  #set($schoolCode = $doc.getValue('schoolCode'))
21 21  #set($schoolName = $doc.getValue('schoolName'))
... ... @@ -65,7 +65,9 @@
65 65  #set($seitokaiYoutube = $doc.getValue('seitokaiYoutube'))
66 66  #set($seitokaiOtherSns = $doc.getValue('seitokaiOtherSns'))
67 67  
68 -## --- 現在の年度を計算（4月始まり） ---
56 +## --- 年度アーカイブ ---
57 +#set($pageFiscalYear = $!doc.getValue('fiscalYear'))
58 +## 現在の年度を計算（4月始まり）
69 69  #set($nowFY = $datetool.date)
70 70  #set($currentFYMonth = $mathtool.toInteger($datetool.format('MM', $nowFY)))
71 71  #set($currentFYYear = $mathtool.toInteger($datetool.format('yyyy', $nowFY)))
... ... @@ -74,6 +74,10 @@
74 74  #else
75 75   #set($currentFiscalYear = $mathtool.sub($currentFYYear, 1))
76 76  #end
67 +## fiscalYear 未設定時はデフォルトとして現在の年度を使う
68 +#if(!$pageFiscalYear || $pageFiscalYear == '')
69 + #set($pageFiscalYear = $currentFiscalYear.toString())
70 +#end
77 77  
78 78  ## --- 公開範囲フィールド ---
79 79  #set($visibilityOrgChart = $!doc.getValue('visibilityOrgChart'))
... ... @@ -100,45 +100,10 @@
100 100   #end
101 101  #end
102 102  
103 -## --- 学校ページ非表示チェック ---
104 -#set($schoolHidden = $doc.getValue('hidden'))
105 -#if($schoolHidden == 1)
106 - #if($isViewerAdmin)
107 - ## 管理者: 黄色バナー + ページ内容は通常表示（プレビュー）
108 -<div class="school-hidden-banner admin">
109 - <svg class="ico" viewBox="0 0 24 24"><path d="M17.94 17.94A10.07 10.07 0 0112 20c-7 0-11-8-11-8a18.45 18.45 0 015.06-5.94M9.9 4.24A9.12 9.12 0 0112 4c7 0 11 8 11 8a18.5 18.5 0 01-2.16 3.19m-6.72-1.07a3 3 0 01-4.24-4.24"/><line x1="1" y1="1" x2="23" y2="23"/></svg>
110 - <div>
111 - <strong>このページは非表示になっています</strong>（管理者のみ閲覧可能）
112 - #set($hBy = $!doc.getValue('hiddenBy'))
113 - #set($hAt = $!doc.getValue('hiddenAt'))
114 - #set($hReason = $!doc.getValue('hiddenReason'))
115 - <div class="school-hidden-detail">
116 - 非表示: $!escapetool.xml($hAt) / $!escapetool.xml($hBy)
117 - #if($hReason && $hReason != '') ・ 理由: $!escapetool.xml($hReason)#end
118 - </div>
119 - <a href="$xwiki.getURL('SeitokaiAdmin.SchoolManagement', 'view')" style="color:#92400e;text-decoration:underline">学校ページ管理へ</a>
120 - </div>
121 -</div>
122 - #else
123 - ## 一般ユーザー・ゲスト: 非公開メッセージを表示して停止
124 -<div class="school-hidden-public">
125 - <svg class="ico" viewBox="0 0 24 24" style="width:2.5em;height:2.5em"><path d="M17.94 17.94A10.07 10.07 0 0112 20c-7 0-11-8-11-8a18.45 18.45 0 015.06-5.94M9.9 4.24A9.12 9.12 0 0112 4c7 0 11 8 11 8a18.5 18.5 0 01-2.16 3.19m-6.72-1.07a3 3 0 01-4.24-4.24"/><line x1="1" y1="1" x2="23" y2="23"/></svg>
126 - <h2>このページは現在公開されていません</h2>
127 - <p>このページは管理者により非公開に設定されています。</p>
128 - <a href="$xwiki.getURL('Schools.WebHome', 'view')" class="btn-back-list">学校一覧に戻る</a>
129 -</div>
130 -#stop
131 - #end
132 -#end
133 -
134 134  ## --- 投稿固定/解除処理 ---
135 135  #set($pinAction = $!request.action)
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))
99 +#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || $viewerAccountType == 'verified') && $services.csrf.isTokenValid($request.form_token))
100 + #set($postObjNum = $mathtool.toInteger($!request.postObj))
142 142   #set($postObj = $doc.getObject('SeitokaiCode.ActivityPostClass', $postObjNum))
143 143   #if($postObj)
144 144   #if($pinAction == 'pin')
... ... @@ -158,15 +158,12 @@
158 158   $response.sendRedirect($doc.getURL('view'))
159 159   #stop
160 160   #end
161 - #end## /matches
162 162  #end
163 163  
164 164  ## --- 特色ある活動 選定/解除処理 ---
165 165  #set($featAction = $!request.action)
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))
124 +#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $services.csrf.isTokenValid($request.form_token))
125 + #set($actObjNum = $mathtool.toInteger($!request.actObj))
170 170   #set($actObj = $doc.getObject('SeitokaiCode.ActivityClass', $actObjNum))
171 171   #if($actObj)
172 172   #if($featAction == 'feature')
... ... @@ -198,13 +198,12 @@
198 198   $response.sendRedirect($doc.getURL('view'))
199 199   #stop
200 200   #end
201 - #end## /matches
202 202  #end
203 203  
204 204  ## --- ユーザー情報取得 ---
205 205  ## displayName: Wiki上の表示名（ニックネーム）。本名(firstName/lastName)は管理者のみ閲覧可能。
206 206  #set($lastAuthor = $doc.author)
207 -#set($lastAuthorDoc = $xwiki.getDocument($lastAuthor))
162 +#set($lastAuthorDoc = $xwiki.getDocument("XWiki.${lastAuthor}"))
208 208  #set($authorAccountType = '')
209 209  #set($authorUserRole = '')
210 210  #set($authorUserStatus = '')
... ... @@ -257,283 +257,312 @@
257 257   #end
258 258  #end
259 259  
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 -
266 -## --- 編集ボタン（権限があるユーザーのみ表示） ---
267 -#set($canEditSchool = false)
268 -#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode))
269 - #set($canEditSchool = true)
270 -#end
271 -#if($canEditSchool)
272 -<div style="text-align:right; margin-bottom:12px;">
273 - <a href="$doc.getURL('view', 'sheet=SeitokaiCode.SchoolEditForm')" class="btn-school-edit"><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> 基本情報を編集</a>
215 +## --- 信頼性バッジ + ユーザー情報 ---
216 +<div class="seitokai-badge-container">
217 + ## 承認バッジ
218 + #if($authorAccountType == 'admin')
219 + <span class="badge badge-admin"><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> 管理者</span>
220 + #elseif($authorAccountType == 'verified')
221 + <span class="badge badge-verified"><svg class="ico" viewBox="0 0 24 24" stroke-width="2.5"><path d="M20 6L9 17l-5-5"/></svg> 承認済み</span>
222 + #elseif($authorAccountType == 'referred')
223 + <span class="badge badge-referred"><svg class="ico" viewBox="0 0 24 24"><path d="M10 13a5 5 0 007.54.54l3-3a5 5 0 00-7.07-7.07l-1.72 1.71"/><path d="M14 11a5 5 0 00-7.54-.54l-3 3a5 5 0 007.07 7.07l1.71-1.71"/></svg> 紹介</span>
224 + #else
225 + <span class="badge badge-general">一般</span>
226 + #end
227 + ## 役割バッジ
228 + #if($authorUserRole == 'student')
229 + <span class="badge badge-role-student"><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>
230 + #set($authorIsOfficer = $!lastAuthorDoc.getValue('isOfficer'))
231 + #if($authorIsOfficer == 'true')
232 + <span class="badge badge-role-officer"><svg class="ico" viewBox="0 0 24 24"><path d="M12 2l3.09 6.26L22 9.27l-5 4.87 1.18 6.88L12 17.77l-6.18 3.25L7 14.14 2 9.27l6.91-1.01L12 2z"/></svg> 役員</span>
233 + #end
234 + #elseif($authorUserRole == 'teacher')
235 + <span class="badge badge-role-teacher"><svg class="ico" 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>
236 + #elseif($authorUserRole == 'graduate')
237 + <span class="badge badge-role-graduate"><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>
238 + #end
239 + ## 学年（生徒のみ公開）
240 + #if($authorGrade && $authorGrade != '')
241 + <span class="badge badge-grade">$authorGrade</span>
242 + #end
243 + ## 在籍状態（卒業・休学等の場合のみ表示）
244 + #if($authorUserStatus == 'graduated')
245 + <span class="badge badge-status-graduated"><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>
246 + #elseif($authorUserStatus == 'on_leave')
247 + <span class="badge badge-status-onleave"><svg class="ico" viewBox="0 0 24 24" fill="currentColor"><rect x="6" y="4" width="4" height="16" rx="1"/><rect x="14" y="4" width="4" height="16" rx="1"/></svg> 休学中</span>
248 + #elseif($authorUserStatus == 'transferred')
249 + <span class="badge badge-status-transferred"><svg class="ico" viewBox="0 0 24 24"><polyline points="23 4 23 10 17 10"/><polyline points="1 20 1 14 7 14"/><path d="M3.51 9a9 9 0 0114.85-3.36L23 10M1 14l4.64 4.36A9 9 0 0020.49 15"/></svg> 転校済み</span>
250 + #end
251 + <span class="badge-info">最終編集: $!escapetool.xml($authorDisplayName) ($xwiki.formatDate($doc.date, "yyyy/MM/dd"))</span>
274 274  </div>
275 -#end
276 276  
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
254 +## --- ① 学校基本情報 + 連絡先（左右グリッド・折りたたみ対応） ---
255 +<div class="school-info-grid">
256 + <div class="school-info-card mobile-collapse" id="card-basic-info">
257 + <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>
258 + <table class="wiki-table school-info-table">
259 + <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
260 + <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
261 + <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
262 + <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
263 + <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
264 + <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
265 + <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
266 + <tr><th>課程</th><td>#if($schoolSystem && $schoolSystem != '' && $schoolSystem != '[]')$!escapetool.xml($!schoolSystem)#end</td></tr>
267 + <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>
268 + </table>
269 + #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
270 + #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
271 + #if($infoEditDate && $infoEditDate != '')
272 + <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>
273 + #end
274 + </div>
275 +
276 + <div class="school-info-card mobile-collapse" id="card-contact">
277 + <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>
278 + <table class="wiki-table school-info-table">
279 + <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr>
280 + <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>
281 + <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>
282 + <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>
283 + <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>
284 + <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
285 + </table>
286 + </div>
296 296  </div>
297 297  
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>
289 +## --- 生徒会情報アコーディオン ---
290 +<div class="school-section-divider">
291 + <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')?'▲':'▼';">
292 + <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>
293 + 生徒会情報を見る <span class="shortcut-arrow">▼</span>
294 + </button>
309 309  </div>
310 310  
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">
297 +<div id="seitokai-info-section" class="seitokai-info-accordion">
315 315  
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
299 +## --- ② 組織図 ---
300 +#set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
301 +#if($hasOrgContent)
302 + ## 公開範囲チェック
303 + #set($canViewOrgChart = true)
304 + #if($visibilityOrgChart == 'members' && $isGuest) #set($canViewOrgChart = false)
305 + #elseif($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewOrgChart = false)
306 + #end
307 + #if($canViewOrgChart)
308 +<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>
309 +<div class="school-section-card">
310 + <div class="card-inner">
311 + #if($orgChartImage && $orgChartImage != '')
312 + <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
336 336   #end
314 + #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end
315 + </div>
316 +</div>
317 + #else
318 +<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>
319 + #end
320 +#end
337 337  
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>
322 +## --- ③④⑤ 日常の活動・選挙・定例活動 ---
323 +<div class="school-section-grid">
324 + #if($dailyActivities && $dailyActivities != '')
325 + <div class="school-section-card">
326 + <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>
327 + <div class="card-inner">
328 + <p class="activity-hint">活動時間の多い順に上位3つ</p>
329 + <div class="tag-container">
330 + #set($daIdx = 1)
331 + #foreach($da in $dailyActivities.split(","))
332 + <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
333 + #set($daIdx = $daIdx + 1)
353 353   #end
354 354   </div>
336 + #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
337 + <div class="free-note">$!escapetool.xml($dailyActivitiesNote)</div>
338 + #end
355 355   </div>
356 - #end
340 + </div>
341 + #end
357 357  
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
343 + #if($electionExists && $electionExists != '')
344 + <div class="school-section-card">
345 + <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>
346 + <div class="card-inner">
347 + <div class="info-row">
348 + <span class="info-label">役員選挙</span>
349 + <span class="info-value">$!escapetool.xml($!electionExists)</span>
376 376   </div>
351 + #if($electionType && $electionType != '')
352 + <div class="info-row">
353 + <span class="info-label">直近の選挙方式</span>
354 + <span class="info-value">$!escapetool.xml($!electionType)</span>
355 + </div>
356 + #end
357 + #if($electionNote && $electionNote.trim() != '')
358 + <div class="free-note">$!escapetool.xml($electionNote)</div>
359 + #end
377 377   </div>
378 - #end
361 + </div>
362 + #end
363 +</div>
379 379  
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 +<div class="school-section-grid">
366 + #if($meetingFrequency && $meetingFrequency != '')
367 + <div class="school-section-card">
368 + <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>
369 + <div class="card-inner">
370 + <div class="info-row">
371 + <span class="info-label">役員定例会の頻度</span>
372 + <span class="info-value">$!escapetool.xml($!meetingFrequency)</span>
392 392   </div>
374 + #if($regularActivitiesNote && $regularActivitiesNote.trim() != '')
375 + <div class="free-note">$!escapetool.xml($regularActivitiesNote)</div>
376 + #end
393 393   </div>
394 - #end
378 + </div>
379 + #end
395 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)
381 + ## --- ⑦ 予算 ---
382 + #set($hasBudget = ($budgetProcess && $budgetProcess != '') || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
383 + #if($hasBudget)
384 + ## 公開範囲チェック
385 + #set($canViewBudget = true)
386 + #if($visibilityBudget == 'members' && $isGuest) #set($canViewBudget = false)
387 + #elseif($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewBudget = false)
388 + #end
389 + #if($canViewBudget)
390 + <div class="school-section-card">
391 + <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>
392 + <div class="card-inner">
393 + #if($budgetProcess && $budgetProcess != '')
394 + <div class="info-row">
395 + <span class="info-label">作成過程の生徒関与</span>
396 + <span class="info-value">
397 + <div class="selection-display">
398 + #foreach($bp in $budgetProcess.split(","))
399 + <span class="selection-item">$!escapetool.xml($bp.trim())</span>
400 + #end
401 + </div>
402 + </span>
403 + </div>
402 402   #end
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
405 + #if($studentFee && $studentFee != '')
406 + <div class="info-row">
407 + <span class="info-label">生徒会費（年額）</span>
408 + <span class="info-value">$!escapetool.xml($!studentFee)</span>
446 446   </div>
447 - </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 450   #end
411 + #if($budgetScale && $budgetScale != '')
412 + <div class="info-row">
413 + <span class="info-label">予算規模</span>
414 + <span class="info-value">$!escapetool.xml($!budgetScale)</span>
415 + </div>
416 + #end
417 + #if($budgetAllocation && $budgetAllocation != '')
418 + <div class="info-row">
419 + <span class="info-label">主な予算配分</span>
420 + <span class="info-value">
421 + <div class="selection-display">
422 + #foreach($ba in $budgetAllocation.split(","))
423 + <span class="selection-item">$!escapetool.xml($ba.trim())</span>
424 + #end
425 + </div>
426 + </span>
427 + </div>
428 + #end
429 + #if($budgetNote && $budgetNote.trim() != '')
430 + <div class="free-note">$!escapetool.xml($budgetNote)</div>
431 + #end
432 + </div>
433 + </div>
434 + #else
435 + <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>
451 451   #end
437 + #end
438 +</div>
452 452  
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>
440 +## --- ⑧ 校則の見直し ---
441 +#if($ruleReviewStatus && $ruleReviewStatus != '')
442 + ## 公開範囲チェック
443 + #set($canViewRuleReview = true)
444 + #if($visibilityRuleReview == 'members' && $isGuest) #set($canViewRuleReview = false)
445 + #elseif($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewRuleReview = false)
446 + #end
447 + #if($canViewRuleReview)
448 +<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>
449 +<div class="school-section-card">
450 + <div class="card-inner">
451 + <div class="info-row">
452 + <span class="info-label">見直しの有無（3年以内）</span>
453 + <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
454 + </div>
455 + #if($ruleReviewContent && $ruleReviewContent != '')
456 + <div class="info-row">
457 + <span class="info-label">見直しの内容</span>
458 + <span class="info-value">
459 + <div class="selection-display">
460 + #foreach($rc in $ruleReviewContent.split(","))
461 + <span class="selection-item">$!escapetool.xml($rc.trim())</span>
462 + #end
466 466   </div>
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>
464 + </span>
465 + </div>
466 + #end
467 + #if($ruleReviewProposer && $ruleReviewProposer != '')
468 + <div class="info-row">
469 + <span class="info-label">見直しの提案者</span>
470 + <span class="info-value">
471 + <div class="selection-display">
472 + #foreach($rp in $ruleReviewProposer.split(","))
473 + <span class="selection-item">$!escapetool.xml($rp.trim())</span>
474 + #end
477 477   </div>
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>
476 + </span>
477 + </div>
478 + #end
479 + #if($ruleReviewImplementer && $ruleReviewImplementer != '')
480 + <div class="info-row">
481 + <span class="info-label">見直しの実施者</span>
482 + <span class="info-value">
483 + <div class="selection-display">
484 + #foreach($ri in $ruleReviewImplementer.split(","))
485 + <span class="selection-item">$!escapetool.xml($ri.trim())</span>
486 + #end
489 489   </div>
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>
488 + </span>
510 510   </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
514 514   #end
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>
491 + #if($ruleReviewSystem && $ruleReviewSystem != '')
492 + <div class="info-row">
493 + <span class="info-label">見直しの仕組み</span>
494 + <span class="info-value">$!escapetool.xml($!ruleReviewSystem)</span>
528 528   </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
532 532   #end
497 + </div>
498 +</div>
499 + #else
500 +<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>
501 + #end
502 +#end
533 533  
534 - </div>## seitokai-info-body 終了
535 -</div>## card-seitokai-info 終了
504 +## --- ⑨ 課題 ---
505 +#if($challenges && $challenges != '')
506 + ## 公開範囲チェック
507 + #set($canViewChallenges = true)
508 + #if($visibilityChallenges == 'members' && $isGuest) #set($canViewChallenges = false)
509 + #elseif($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewChallenges = false)
510 + #end
511 + #if($canViewChallenges)
512 +<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>
513 +<div class="challenge-text">$!escapetool.xml($challenges)</div>
514 + #else
515 +<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>
516 + #end
517 +#end
536 536  
519 +</div>## seitokai-info-accordion 終了
520 +
537 537  {{/html}}
538 538  
539 539  ## --- ⑩ 活動報告一覧（スレッド型・年度タブ付き） ---
... ... @@ -659,7 +659,7 @@
659 659  <div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)">
660 660   <div class="activity-thread-header">
661 661   <div class="activity-thread-title">
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>
646 + <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>
663 663   <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
664 664   </div>
665 665   <div class="thread-meta-row">
... ... @@ -789,6 +789,9 @@
789 789   #elseif($postUserRole == 'graduate')
790 790   <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>
791 791   #end
776 + #if($postGrade && $postGrade != '')
777 + <span class="badge badge-grade badge-sm">$postGrade</span>
778 + #end
792 792   </span>
793 793   <span class="thread-post-date">$!postDate</span>
794 794   #set($postEdited = $!post.getValue('edited'))
... ... @@ -938,10 +938,10 @@
938 938  
939 939   #if($xcontext.user != "XWiki.XWikiGuest")
940 940   <div class="thread-add-post">
941 - <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
928 + <a href="/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
942 942   ＋ 活動報告を追加
943 943   </a>
944 - <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
931 + <a href="/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
945 945   <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> コメントを書く
946 946   </a>
947 947   </div>
... ... @@ -963,7 +963,7 @@
963 963  #if($xcontext.user != "XWiki.XWikiGuest")
964 964  {{html clean="false"}}
965 965  <div class="activity-add-section">
966 - <a href="/bin/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$!escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity">
953 + <a href="/bin/view/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$!escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity">
967 967   <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> 活動を追加
968 968   </a>
969 969  </div>
... ... @@ -970,6 +970,59 @@
970 970  {{/html}}
971 971  #end
972 972  
960 +## --- 年度アーカイブ セクション ---
961 +{{html clean="false"}}
962 +<div class="school-section-card school-archive-card">
963 + <h2 class="archive-section-title">
964 + <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>
965 + 年度アーカイブ
966 + </h2>
967 + <div class="archive-meta">
968 + 現在のページ: <strong>${pageFiscalYear}年度</strong>
969 + #set($lyud = $!doc.getValue('lastYearUpdateDate'))
970 + #if($lyud && $lyud != '')
971 + | 最終年度更新: $!escapetool.xml($lyud) ($!escapetool.xml($!doc.getValue('lastYearUpdateBy')))
972 + #end
973 + </div>
974 +
975 + ## 過去アーカイブの検索
976 + #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))
977 + #set($archivePages = $archiveQuery.execute())
978 +
979 + #if($archivePages && $archivePages.size() > 0)
980 + <div class="archive-card-field-lg">
981 + <div class="archive-list-label">過去の年度アーカイブ</div>
982 + <div class="archive-list">
983 + #foreach($archPage in $archivePages)
984 + #set($archPageDoc = $xwiki.getDocument($archPage))
985 + #set($archPageObj = $archPageDoc.getObject('SeitokaiCode.SchoolClass'))
986 + #if($archPageObj)
987 + #set($archPageFY = $!archPageObj.getValue('fiscalYear'))
988 + <a href="$archPageDoc.getURL('view')" class="archive-link">
989 + <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>
990 + ${archPageFY}年度
991 + </a>
992 + #end
993 + #end
994 + </div>
995 + </div>
996 + #else
997 + <div class="archive-empty">過去のアーカイブはまだありません</div>
998 + #end
999 +
1000 + ## 新年度に移行ボタン（承認済み・管理者のみ）
1001 + #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
1002 + <div class="archive-action">
1003 + <a href="/bin/view/SeitokaiCode/YearArchiveAction?schoolPage=${doc.fullName}" class="btn-accent">
1004 + <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>
1005 + ${pageFiscalYear}年度をアーカイブして新年度に移行
1006 + </a>
1007 + <div class="archive-action-hint">現在の学校情報を${pageFiscalYear}年度として保存し、新しい年度に移行します。</div>
1008 + </div>
1009 + #end
1010 +</div>
1011 +{{/html}}
1012 +
973 973  ## --- 年度タブ切り替え JavaScript ---
974 974  {{html clean="false"}}
975 975  <script>
... ... @@ -986,12 +986,20 @@
986 986   }
987 987   });
988 988  }
989 -// ページ読み込み時の初期化
1029 +// ページ読み込み時にデフォルトで現在の年度を表示
990 990  document.addEventListener('DOMContentLoaded', function() {
991 - // デフォルトで現在の年度を表示
992 992   var defaultTab = document.querySelector('.activity-fy-tab.active');
993 993   if (defaultTab) { defaultTab.click(); }
1033 + // モバイルでは基本情報・連絡先をデフォルト折りたたみ
1034 + if (window.innerWidth <= 768) {
1035 + document.querySelectorAll('.school-info-card.mobile-collapse').forEach(function(card) {
1036 + card.classList.add('collapsed');
1037 + });
1038 + }
994 994   // 保存成功時のトースト通知
1040 + if (window.location.search.indexOf('archived=1') !== -1) {
1041 + showToast('年度アーカイブを作成しました', 'success');
1042 + }
995 995   if (window.location.search.indexOf('saved=1') !== -1) {
996 996   showToast('学校情報を保存しました', 'success');
997 997   // URLパラメータをクリーンアップ（リロード時に再表示されないよう）
... ... @@ -1027,9 +1027,7 @@
1027 1027   var card = document.getElementById(cardId);
1028 1028   if (!card) return;
1029 1029   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);
1078 + card.classList.remove('mobile-collapse');
1033 1033  }
1034 1034  
1035 1035  // 投稿の編集（インライン編集フォームを開く）
... ... @@ -1061,9 +1061,7 @@
1061 1061   var csrfEl = document.querySelector('input[name="form_token"]');
1062 1062   var csrfToken = csrfEl ? csrfEl.value : '';
1063 1063   var xhr = new XMLHttpRequest();
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);
1110 + xhr.open('GET', '/bin/view/SeitokaiCode/EditPost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken), true);
1067 1067   xhr.onload = function() {
1068 1068   try {
1069 1069   var res = JSON.parse(xhr.responseText);
... ... @@ -1076,7 +1076,7 @@
1076 1076   } catch(e) { alert('編集に失敗しました'); }
1077 1077   };
1078 1078   xhr.onerror = function() { alert('通信エラーが発生しました'); };
1079 - xhr.send(editPostData);
1123 + xhr.send();
1080 1080  }
1081 1081  
1082 1082  // 投稿の削除（確認ダイアログ付き）
... ... @@ -1083,9 +1083,7 @@
1083 1083  function confirmDeletePost(schoolPage, postObjNum, token) {
1084 1084   if (!confirm('この投稿を削除しますか？\\n削除後は「この投稿は削除されました」と表示されます。')) return;
1085 1085   var xhr = new XMLHttpRequest();
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);
1130 + xhr.open('GET', '/bin/view/SeitokaiCode/DeletePost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token), true);
1089 1089   xhr.onload = function() {
1090 1090   try {
1091 1091   var res = JSON.parse(xhr.responseText);
... ... @@ -1098,7 +1098,7 @@
1098 1098   } catch(e) { alert('削除に失敗しました'); }
1099 1099   };
1100 1100   xhr.onerror = function() { alert('通信エラーが発生しました'); };
1101 - xhr.send(deletePostData);
1143 + xhr.send();
1102 1102  }
1103 1103  </script>
1104 1104  {{/html}}