Skip to Content
Last modified by Super Admin on 2026/04/05 18:59
From version Icon 24.1 Icon
edited by Super Admin
on 2026/03/09 12:10
Change comment: There is no comment for this version
To version Icon 46.1 Icon
edited by Super Admin
on 2026/03/13 14:24
Change comment: There is no comment for this version

Summary

Details

Icon Page properties
Content
... ... @@ -1,10 +1,21 @@
1 1  {{velocity}}
2 2  ## ===== 学校ページ テンプレート =====
3 -## このテンプレートは学校ページの表示と入力フォームを制御します。
4 -
5 -## メンテナンスバナー
6 -{{include reference="SeitokaiCode.MaintenanceBannerInclude" /}}
7 -
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
8 8  ## --- 学校基本情報フィールド ---
9 9  #set($schoolCode = $doc.getValue('schoolCode'))
10 10  #set($schoolName = $doc.getValue('schoolName'))
... ... @@ -54,9 +54,7 @@
54 54  #set($seitokaiYoutube = $doc.getValue('seitokaiYoutube'))
55 55  #set($seitokaiOtherSns = $doc.getValue('seitokaiOtherSns'))
56 56  
57 -## --- 年度アーカイブ ---
58 -#set($pageFiscalYear = $!doc.getValue('fiscalYear'))
59 -## 現在の年度を計算（4月始まり）
68 +## --- 現在の年度を計算（4月始まり） ---
60 60  #set($nowFY = $datetool.date)
61 61  #set($currentFYMonth = $mathtool.toInteger($datetool.format('MM', $nowFY)))
62 62  #set($currentFYYear = $mathtool.toInteger($datetool.format('yyyy', $nowFY)))
... ... @@ -65,10 +65,6 @@
65 65  #else
66 66   #set($currentFiscalYear = $mathtool.sub($currentFYYear, 1))
67 67  #end
68 -## fiscalYear 未設定時はデフォルトとして現在の年度を使う
69 -#if(!$pageFiscalYear || $pageFiscalYear == '')
70 - #set($pageFiscalYear = $currentFiscalYear.toString())
71 -#end
72 72  
73 73  ## --- 公開範囲フィールド ---
74 74  #set($visibilityOrgChart = $!doc.getValue('visibilityOrgChart'))
... ... @@ -97,8 +97,12 @@
97 97  
98 98  ## --- 投稿固定/解除処理 ---
99 99  #set($pinAction = $!request.action)
100 -#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || $viewerAccountType == 'verified') && $services.csrf.isTokenValid($request.form_token))
101 - #set($postObjNum = $mathtool.toInteger($!request.postObj))
105 +#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token))
106 + #set($pinPostObjStr = $!request.postObj)
107 + #if(!$pinPostObjStr.matches('^\d+$'))
108 + ## 不正な値 → 無視
109 + #else
110 + #set($postObjNum = $mathtool.toInteger($pinPostObjStr))
102 102   #set($postObj = $doc.getObject('SeitokaiCode.ActivityPostClass', $postObjNum))
103 103   #if($postObj)
104 104   #if($pinAction == 'pin')
... ... @@ -118,12 +118,15 @@
118 118   $response.sendRedirect($doc.getURL('view'))
119 119   #stop
120 120   #end
130 + #end## /matches
121 121  #end
122 122  
123 123  ## --- 特色ある活動 選定/解除処理 ---
124 124  #set($featAction = $!request.action)
125 -#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $services.csrf.isTokenValid($request.form_token))
126 - #set($actObjNum = $mathtool.toInteger($!request.actObj))
135 +#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token))
136 + #set($featActObjStr = $!request.actObj)
137 + #if($featActObjStr.matches('^\d+$'))
138 + #set($actObjNum = $mathtool.toInteger($featActObjStr))
127 127   #set($actObj = $doc.getObject('SeitokaiCode.ActivityClass', $actObjNum))
128 128   #if($actObj)
129 129   #if($featAction == 'feature')
... ... @@ -155,12 +155,13 @@
155 155   $response.sendRedirect($doc.getURL('view'))
156 156   #stop
157 157   #end
170 + #end## /matches
158 158  #end
159 159  
160 160  ## --- ユーザー情報取得 ---
161 161  ## displayName: Wiki上の表示名（ニックネーム）。本名(firstName/lastName)は管理者のみ閲覧可能。
162 162  #set($lastAuthor = $doc.author)
163 -#set($lastAuthorDoc = $xwiki.getDocument("XWiki.${lastAuthor}"))
176 +#set($lastAuthorDoc = $xwiki.getDocument($lastAuthor))
164 164  #set($authorAccountType = '')
165 165  #set($authorUserRole = '')
166 166  #set($authorUserStatus = '')
... ... @@ -174,7 +174,8 @@
174 174   #set($authorEnrollmentYear = $!lastAuthorDoc.getValue('enrollmentYear'))
175 175   #set($authorDisplayName = $!lastAuthorDoc.getValue('displayName'))
176 176   #if(!$authorDisplayName || $authorDisplayName == '')
177 - #set($authorDisplayName = $xwiki.getUserName($doc.author))
190 + ## false引数でプレーンテキスト（HTMLリンクなし）を取得
191 + #set($authorDisplayName = $xwiki.getUserName($doc.author, false))
178 178   #end
179 179   ## --- 学年の動的計算（学校種別対応） ---
180 180   ## 日本の学校年度: 4月始まり。currentSchoolYear = (月>=4) ? 今年 : 去年
... ... @@ -212,53 +212,27 @@
212 212   #end
213 213  #end
214 214  
215 -## --- 信頼性バッジ + ユーザー情報 ---
216 -{{html clean="false"}}
217 -<div class="seitokai-badge-container">
218 - ## 承認バッジ
219 - #if($authorAccountType == 'admin')
220 - <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>
221 - #elseif($authorAccountType == 'verified')
222 - <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>
223 - #elseif($authorAccountType == 'referred')
224 - <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>
225 - #else
226 - <span class="badge badge-general">一般</span>
227 - #end
228 - ## 役割バッジ
229 - #if($authorUserRole == 'student')
230 - <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>
231 - #set($authorIsOfficer = $!lastAuthorDoc.getValue('isOfficer'))
232 - #if($authorIsOfficer == 'true')
233 - <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>
234 - #end
235 - #elseif($authorUserRole == 'teacher')
236 - <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>
237 - #elseif($authorUserRole == 'graduate')
238 - <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>
239 - #end
240 - ## 学年（生徒のみ公開）
241 - #if($authorGrade && $authorGrade != '')
242 - <span class="badge badge-grade">$authorGrade</span>
243 - #end
244 - ## 在籍状態（卒業・休学等の場合のみ表示）
245 - #if($authorUserStatus == 'graduated')
246 - <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>
247 - #elseif($authorUserStatus == 'on_leave')
248 - <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>
249 - #elseif($authorUserStatus == 'transferred')
250 - <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>
251 - #end
252 - <span class="badge-info">最終編集: $!escapetool.xml($authorDisplayName) ($xwiki.formatDate($doc.date, "yyyy/MM/dd"))</span>
229 +## --- 学校名見出し（XWikiデフォルトタイトルを非表示にし、学校名を表示） ---
230 +#if($schoolName && $schoolName != '')
231 +<style>.document-header { display: none !important; }</style>
232 +<h1 class="school-page-title">$!escapetool.xml($schoolName)</h1>
233 +#end
234 +
235 +## --- 編集ボタン（権限があるユーザーのみ表示） ---
236 +#set($canEditSchool = false)
237 +#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode))
238 + #set($canEditSchool = true)
239 +#end
240 +#if($canEditSchool)
241 +<div style="text-align:right; margin-bottom:12px;">
242 + <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>
253 253  </div>
254 -{{/html}}
244 +#end
255 255  
256 -{{html clean="false"}}
257 -
258 258  ## --- ① 学校基本情報 + 連絡先（左右グリッド・折りたたみ対応） ---
259 259  <div class="school-info-grid">
260 - <div class="school-info-card mobile-collapse" id="card-basic-info">
261 - <h2 onclick="toggleInfoCard('card-basic-info')"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M4 19.5A2.5 2.5 0 016.5 17H20"/><path d="M6.5 2H20v20H6.5A2.5 2.5 0 014 19.5v-15A2.5 2.5 0 016.5 2z"/></svg> 学校基本情報</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2>
248 + <div class="school-info-card collapsed" id="card-basic-info">
249 + <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>
262 262   <table class="wiki-table school-info-table">
263 263   <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
264 264   <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
... ... @@ -267,7 +267,7 @@
267 267   <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
268 268   <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
269 269   <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
270 - <tr><th>課程</th><td>$!escapetool.xml($!schoolSystem)</td></tr>
258 + <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
271 271   <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>
272 272   </table>
273 273   #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
... ... @@ -277,8 +277,8 @@
277 277   #end
278 278   </div>
279 279  
280 - <div class="school-info-card mobile-collapse" id="card-contact">
281 - <h2 onclick="toggleInfoCard('card-contact')"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M22 16.92v3a2 2 0 01-2.18 2 19.79 19.79 0 01-8.63-3.07 19.5 19.5 0 01-6-6 19.79 19.79 0 01-3.07-8.67A2 2 0 014.11 2h3a2 2 0 012 1.72c.127.96.361 1.903.7 2.81a2 2 0 01-.45 2.11L8.09 9.91a16 16 0 006 6l1.27-1.27a2 2 0 012.11-.45c.907.339 1.85.573 2.81.7A2 2 0 0122 16.92z"/></svg> 連絡先・SNS</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2>
268 + <div class="school-info-card collapsed" id="card-contact">
269 + <h2 role="button" tabindex="0" aria-expanded="false" onclick="toggleInfoCard('card-contact')" onkeydown="if(event.key==='Enter'||event.key===' '){event.preventDefault();toggleInfoCard('card-contact')}"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M22 16.92v3a2 2 0 01-2.18 2 19.79 19.79 0 01-8.63-3.07 19.5 19.5 0 01-6-6 19.79 19.79 0 01-3.07-8.67A2 2 0 014.11 2h3a2 2 0 012 1.72c.127.96.361 1.903.7 2.81a2 2 0 01-.45 2.11L8.09 9.91a16 16 0 006 6l1.27-1.27a2 2 0 012.11-.45c.907.339 1.85.573 2.81.7A2 2 0 0122 16.92z"/></svg> 連絡先・SNS</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2>
282 282   <table class="wiki-table school-info-table">
283 283   <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr>
284 284   <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>
... ... @@ -325,7 +325,7 @@
325 325  
326 326  ## --- ③④⑤ 日常の活動・選挙・定例活動 ---
327 327  <div class="school-section-grid">
328 - #if($dailyActivities && $dailyActivities != '')
316 + #if($dailyActivities && !$dailyActivities.isEmpty())
329 329   <div class="school-section-card">
330 330   <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>
331 331   <div class="card-inner">
... ... @@ -332,7 +332,7 @@
332 332   <p class="activity-hint">活動時間の多い順に上位3つ</p>
333 333   <div class="tag-container">
334 334   #set($daIdx = 1)
335 - #foreach($da in $dailyActivities.split(","))
323 + #foreach($da in $dailyActivities)
336 336   <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
337 337   #set($daIdx = $daIdx + 1)
338 338   #end
... ... @@ -383,7 +383,7 @@
383 383   #end
384 384  
385 385   ## --- ⑦ 予算 ---
386 - #set($hasBudget = ($budgetProcess && $budgetProcess != '') || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
374 + #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
387 387   #if($hasBudget)
388 388   ## 公開範囲チェック
389 389   #set($canViewBudget = true)
... ... @@ -394,12 +394,12 @@
394 394   <div class="school-section-card">
395 395   <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>
396 396   <div class="card-inner">
397 - #if($budgetProcess && $budgetProcess != '')
385 + #if($budgetProcess && !$budgetProcess.isEmpty())
398 398   <div class="info-row">
399 399   <span class="info-label">作成過程の生徒関与</span>
400 400   <span class="info-value">
401 401   <div class="selection-display">
402 - #foreach($bp in $budgetProcess.split(","))
390 + #foreach($bp in $budgetProcess)
403 403   <span class="selection-item">$!escapetool.xml($bp.trim())</span>
404 404   #end
405 405   </div>
... ... @@ -418,12 +418,12 @@
418 418   <span class="info-value">$!escapetool.xml($!budgetScale)</span>
419 419   </div>
420 420   #end
421 - #if($budgetAllocation && $budgetAllocation != '')
409 + #if($budgetAllocation && !$budgetAllocation.isEmpty())
422 422   <div class="info-row">
423 423   <span class="info-label">主な予算配分</span>
424 424   <span class="info-value">
425 425   <div class="selection-display">
426 - #foreach($ba in $budgetAllocation.split(","))
414 + #foreach($ba in $budgetAllocation)
427 427   <span class="selection-item">$!escapetool.xml($ba.trim())</span>
428 428   #end
429 429   </div>
... ... @@ -456,12 +456,12 @@
456 456   <span class="info-label">見直しの有無（3年以内）</span>
457 457   <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
458 458   </div>
459 - #if($ruleReviewContent && $ruleReviewContent != '')
447 + #if($ruleReviewContent && !$ruleReviewContent.isEmpty())
460 460   <div class="info-row">
461 461   <span class="info-label">見直しの内容</span>
462 462   <span class="info-value">
463 463   <div class="selection-display">
464 - #foreach($rc in $ruleReviewContent.split(","))
452 + #foreach($rc in $ruleReviewContent)
465 465   <span class="selection-item">$!escapetool.xml($rc.trim())</span>
466 466   #end
467 467   </div>
... ... @@ -468,12 +468,12 @@
468 468   </span>
469 469   </div>
470 470   #end
471 - #if($ruleReviewProposer && $ruleReviewProposer != '')
459 + #if($ruleReviewProposer && !$ruleReviewProposer.isEmpty())
472 472   <div class="info-row">
473 473   <span class="info-label">見直しの提案者</span>
474 474   <span class="info-value">
475 475   <div class="selection-display">
476 - #foreach($rp in $ruleReviewProposer.split(","))
464 + #foreach($rp in $ruleReviewProposer)
477 477   <span class="selection-item">$!escapetool.xml($rp.trim())</span>
478 478   #end
479 479   </div>
... ... @@ -480,12 +480,12 @@
480 480   </span>
481 481   </div>
482 482   #end
483 - #if($ruleReviewImplementer && $ruleReviewImplementer != '')
471 + #if($ruleReviewImplementer && !$ruleReviewImplementer.isEmpty())
484 484   <div class="info-row">
485 485   <span class="info-label">見直しの実施者</span>
486 486   <span class="info-value">
487 487   <div class="selection-display">
488 - #foreach($ri in $ruleReviewImplementer.split(","))
476 + #foreach($ri in $ruleReviewImplementer)
489 489   <span class="selection-item">$!escapetool.xml($ri.trim())</span>
490 490   #end
491 491   </div>
... ... @@ -647,7 +647,7 @@
647 647  <div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)">
648 648   <div class="activity-thread-header">
649 649   <div class="activity-thread-title">
650 - <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>
638 + <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>
651 651   <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
652 652   </div>
653 653   <div class="thread-meta-row">
... ... @@ -929,10 +929,10 @@
929 929  
930 930   #if($xcontext.user != "XWiki.XWikiGuest")
931 931   <div class="thread-add-post">
932 - <a href="/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
920 + <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
933 933   ＋ 活動報告を追加
934 934   </a>
935 - <a href="/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
923 + <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
936 936   <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> コメントを書く
937 937   </a>
938 938   </div>
... ... @@ -954,7 +954,7 @@
954 954  #if($xcontext.user != "XWiki.XWikiGuest")
955 955  {{html clean="false"}}
956 956  <div class="activity-add-section">
957 - <a href="/bin/view/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$!escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity">
945 + <a href="/bin/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$!escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity">
958 958   <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> 活動を追加
959 959   </a>
960 960  </div>
... ... @@ -961,59 +961,6 @@
961 961  {{/html}}
962 962  #end
963 963  
964 -## --- 年度アーカイブ セクション ---
965 -{{html clean="false"}}
966 -<div class="school-section-card school-archive-card">
967 - <h2 class="archive-section-title">
968 - <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>
969 - 年度アーカイブ
970 - </h2>
971 - <div class="archive-meta">
972 - 現在のページ: <strong>${pageFiscalYear}年度</strong>
973 - #set($lyud = $!doc.getValue('lastYearUpdateDate'))
974 - #if($lyud && $lyud != '')
975 - | 最終年度更新: $!escapetool.xml($lyud) ($!escapetool.xml($!doc.getValue('lastYearUpdateBy')))
976 - #end
977 - </div>
978 -
979 - ## 過去アーカイブの検索
980 - #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))
981 - #set($archivePages = $archiveQuery.execute())
982 -
983 - #if($archivePages && $archivePages.size() > 0)
984 - <div class="archive-card-field-lg">
985 - <div class="archive-list-label">過去の年度アーカイブ</div>
986 - <div class="archive-list">
987 - #foreach($archPage in $archivePages)
988 - #set($archPageDoc = $xwiki.getDocument($archPage))
989 - #set($archPageObj = $archPageDoc.getObject('SeitokaiCode.SchoolClass'))
990 - #if($archPageObj)
991 - #set($archPageFY = $!archPageObj.getValue('fiscalYear'))
992 - <a href="$archPageDoc.getURL('view')" class="archive-link">
993 - <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>
994 - ${archPageFY}年度
995 - </a>
996 - #end
997 - #end
998 - </div>
999 - </div>
1000 - #else
1001 - <div class="archive-empty">過去のアーカイブはまだありません</div>
1002 - #end
1003 -
1004 - ## 新年度に移行ボタン（承認済み・管理者のみ）
1005 - #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
1006 - <div class="archive-action">
1007 - <a href="/bin/view/SeitokaiCode/YearArchiveAction?schoolPage=${doc.fullName}" class="btn-accent">
1008 - <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>
1009 - ${pageFiscalYear}年度をアーカイブして新年度に移行
1010 - </a>
1011 - <div class="archive-action-hint">現在の学校情報を${pageFiscalYear}年度として保存し、新しい年度に移行します。</div>
1012 - </div>
1013 - #end
1014 -</div>
1015 -{{/html}}
1016 -
1017 1017  ## --- 年度タブ切り替え JavaScript ---
1018 1018  {{html clean="false"}}
1019 1019  <script>
... ... @@ -1030,20 +1030,12 @@
1030 1030   }
1031 1031   });
1032 1032  }
1033 -// ページ読み込み時にデフォルトで現在の年度を表示
968 +// ページ読み込み時の初期化
1034 1034  document.addEventListener('DOMContentLoaded', function() {
970 + // デフォルトで現在の年度を表示
1035 1035   var defaultTab = document.querySelector('.activity-fy-tab.active');
1036 1036   if (defaultTab) { defaultTab.click(); }
1037 - // モバイルでは基本情報・連絡先をデフォルト折りたたみ
1038 - if (window.innerWidth <= 768) {
1039 - document.querySelectorAll('.school-info-card.mobile-collapse').forEach(function(card) {
1040 - card.classList.add('collapsed');
1041 - });
1042 - }
1043 1043   // 保存成功時のトースト通知
1044 - if (window.location.search.indexOf('archived=1') !== -1) {
1045 - showToast('年度アーカイブを作成しました', 'success');
1046 - }
1047 1047   if (window.location.search.indexOf('saved=1') !== -1) {
1048 1048   showToast('学校情報を保存しました', 'success');
1049 1049   // URLパラメータをクリーンアップ（リロード時に再表示されないよう）
... ... @@ -1079,7 +1079,9 @@
1079 1079   var card = document.getElementById(cardId);
1080 1080   if (!card) return;
1081 1081   card.classList.toggle('collapsed');
1082 - card.classList.remove('mobile-collapse');
1009 + var isCollapsed = card.classList.contains('collapsed');
1010 + var h2 = card.querySelector('h2[role="button"]');
1011 + if (h2) h2.setAttribute('aria-expanded', !isCollapsed);
1083 1083  }
1084 1084  
1085 1085  // 投稿の編集（インライン編集フォームを開く）
... ... @@ -1111,7 +1111,9 @@
1111 1111   var csrfEl = document.querySelector('input[name="form_token"]');
1112 1112   var csrfToken = csrfEl ? csrfEl.value : '';
1113 1113   var xhr = new XMLHttpRequest();
1114 - xhr.open('GET', '/bin/view/SeitokaiCode/EditPost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken), true);
1043 + xhr.open('POST', '/bin/SeitokaiCode/EditPost?outputSyntax=plain', true);
1044 + xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1045 + var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken);
1115 1115   xhr.onload = function() {
1116 1116   try {
1117 1117   var res = JSON.parse(xhr.responseText);
... ... @@ -1124,7 +1124,7 @@
1124 1124   } catch(e) { alert('編集に失敗しました'); }
1125 1125   };
1126 1126   xhr.onerror = function() { alert('通信エラーが発生しました'); };
1127 - xhr.send();
1058 + xhr.send(editPostData);
1128 1128  }
1129 1129  
1130 1130  // 投稿の削除（確認ダイアログ付き）
... ... @@ -1131,7 +1131,9 @@
1131 1131  function confirmDeletePost(schoolPage, postObjNum, token) {
1132 1132   if (!confirm('この投稿を削除しますか？\\n削除後は「この投稿は削除されました」と表示されます。')) return;
1133 1133   var xhr = new XMLHttpRequest();
1134 - xhr.open('GET', '/bin/view/SeitokaiCode/DeletePost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token), true);
1065 + xhr.open('POST', '/bin/SeitokaiCode/DeletePost?outputSyntax=plain', true);
1066 + xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1067 + var deletePostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token);
1135 1135   xhr.onload = function() {
1136 1136   try {
1137 1137   var res = JSON.parse(xhr.responseText);
... ... @@ -1144,7 +1144,7 @@
1144 1144   } catch(e) { alert('削除に失敗しました'); }
1145 1145   };
1146 1146   xhr.onerror = function() { alert('通信エラーが発生しました'); };
1147 - xhr.send();
1080 + xhr.send(deletePostData);
1148 1148  }
1149 1149  </script>
1150 1150  {{/html}}