Skip to Content
Last modified by Super Admin on 2026/04/05 18:59
From version Icon 27.1 Icon
edited by Super Admin
on 2026/03/09 12:42
Change comment: There is no comment for this version
To version Icon 47.1 Icon
edited by Super Admin
on 2026/03/13 16:19
Change comment: There is no comment for this version

Summary

Details

Icon Page properties
Content
... ... @@ -65,9 +65,7 @@
65 65  #set($seitokaiYoutube = $doc.getValue('seitokaiYoutube'))
66 66  #set($seitokaiOtherSns = $doc.getValue('seitokaiOtherSns'))
67 67  
68 -## --- 年度アーカイブ ---
69 -#set($pageFiscalYear = $!doc.getValue('fiscalYear'))
70 -## 現在の年度を計算（4月始まり）
68 +## --- 現在の年度を計算（4月始まり） ---
71 71  #set($nowFY = $datetool.date)
72 72  #set($currentFYMonth = $mathtool.toInteger($datetool.format('MM', $nowFY)))
73 73  #set($currentFYYear = $mathtool.toInteger($datetool.format('yyyy', $nowFY)))
... ... @@ -76,10 +76,6 @@
76 76  #else
77 77   #set($currentFiscalYear = $mathtool.sub($currentFYYear, 1))
78 78  #end
79 -## fiscalYear 未設定時はデフォルトとして現在の年度を使う
80 -#if(!$pageFiscalYear || $pageFiscalYear == '')
81 - #set($pageFiscalYear = $currentFiscalYear.toString())
82 -#end
83 83  
84 84  ## --- 公開範囲フィールド ---
85 85  #set($visibilityOrgChart = $!doc.getValue('visibilityOrgChart'))
... ... @@ -108,8 +108,12 @@
108 108  
109 109  ## --- 投稿固定/解除処理 ---
110 110  #set($pinAction = $!request.action)
111 -#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || $viewerAccountType == 'verified') && $services.csrf.isTokenValid($request.form_token))
112 - #set($postObjNum = $mathtool.toInteger($!request.postObj))
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))
113 113   #set($postObj = $doc.getObject('SeitokaiCode.ActivityPostClass', $postObjNum))
114 114   #if($postObj)
115 115   #if($pinAction == 'pin')
... ... @@ -129,12 +129,15 @@
129 129   $response.sendRedirect($doc.getURL('view'))
130 130   #stop
131 131   #end
130 + #end## /matches
132 132  #end
133 133  
134 134  ## --- 特色ある活動 選定/解除処理 ---
135 135  #set($featAction = $!request.action)
136 -#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $services.csrf.isTokenValid($request.form_token))
137 - #set($actObjNum = $mathtool.toInteger($!request.actObj))
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))
138 138   #set($actObj = $doc.getObject('SeitokaiCode.ActivityClass', $actObjNum))
139 139   #if($actObj)
140 140   #if($featAction == 'feature')
... ... @@ -166,12 +166,13 @@
166 166   $response.sendRedirect($doc.getURL('view'))
167 167   #stop
168 168   #end
170 + #end## /matches
169 169  #end
170 170  
171 171  ## --- ユーザー情報取得 ---
172 172  ## displayName: Wiki上の表示名（ニックネーム）。本名(firstName/lastName)は管理者のみ閲覧可能。
173 173  #set($lastAuthor = $doc.author)
174 -#set($lastAuthorDoc = $xwiki.getDocument("XWiki.${lastAuthor}"))
176 +#set($lastAuthorDoc = $xwiki.getDocument($lastAuthor))
175 175  #set($authorAccountType = '')
176 176  #set($authorUserRole = '')
177 177  #set($authorUserStatus = '')
... ... @@ -224,49 +224,27 @@
224 224   #end
225 225  #end
226 226  
227 -## --- 信頼性バッジ + ユーザー情報 ---
228 -<div class="seitokai-badge-container">
229 - ## 承認バッジ
230 - #if($authorAccountType == 'admin')
231 - <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>
232 - #elseif($authorAccountType == 'verified')
233 - <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>
234 - #elseif($authorAccountType == 'referred')
235 - <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>
236 - #else
237 - <span class="badge badge-general">一般</span>
238 - #end
239 - ## 役割バッジ
240 - #if($authorUserRole == 'student')
241 - <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>
242 - #set($authorIsOfficer = $!lastAuthorDoc.getValue('isOfficer'))
243 - #if($authorIsOfficer == 'true')
244 - <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>
245 - #end
246 - #elseif($authorUserRole == 'teacher')
247 - <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>
248 - #elseif($authorUserRole == 'graduate')
249 - <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>
250 - #end
251 - ## 学年（生徒のみ公開）
252 - #if($authorGrade && $authorGrade != '')
253 - <span class="badge badge-grade">$authorGrade</span>
254 - #end
255 - ## 在籍状態（卒業・休学等の場合のみ表示）
256 - #if($authorUserStatus == 'graduated')
257 - <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>
258 - #elseif($authorUserStatus == 'on_leave')
259 - <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>
260 - #elseif($authorUserStatus == 'transferred')
261 - <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>
262 - #end
263 - <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>
264 264  </div>
244 +#end
265 265  
266 266  ## --- ① 学校基本情報 + 連絡先（左右グリッド・折りたたみ対応） ---
267 267  <div class="school-info-grid">
268 - <div class="school-info-card mobile-collapse" id="card-basic-info">
269 - <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>
270 270   <table class="wiki-table school-info-table">
271 271   <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
272 272   <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
... ... @@ -275,7 +275,7 @@
275 275   <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
276 276   <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
277 277   <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
278 - <tr><th>課程</th><td>#if($schoolSystem && $schoolSystem != '' && $schoolSystem != '[]')$!escapetool.xml($!schoolSystem)#end</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>
279 279   <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>
280 280   </table>
281 281   #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
... ... @@ -285,8 +285,8 @@
285 285   #end
286 286   </div>
287 287  
288 - <div class="school-info-card mobile-collapse" id="card-contact">
289 - <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>
290 290   <table class="wiki-table school-info-table">
291 291   <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr>
292 292   <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>
... ... @@ -333,7 +333,7 @@
333 333  
334 334  ## --- ③④⑤ 日常の活動・選挙・定例活動 ---
335 335  <div class="school-section-grid">
336 - #if($dailyActivities && $dailyActivities != '')
316 + #if($dailyActivities && !$dailyActivities.isEmpty())
337 337   <div class="school-section-card">
338 338   <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>
339 339   <div class="card-inner">
... ... @@ -340,7 +340,7 @@
340 340   <p class="activity-hint">活動時間の多い順に上位3つ</p>
341 341   <div class="tag-container">
342 342   #set($daIdx = 1)
343 - #foreach($da in $dailyActivities.split(","))
323 + #foreach($da in $dailyActivities)
344 344   <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
345 345   #set($daIdx = $daIdx + 1)
346 346   #end
... ... @@ -391,7 +391,7 @@
391 391   #end
392 392  
393 393   ## --- ⑦ 予算 ---
394 - #set($hasBudget = ($budgetProcess && $budgetProcess != '') || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
374 + #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
395 395   #if($hasBudget)
396 396   ## 公開範囲チェック
397 397   #set($canViewBudget = true)
... ... @@ -402,12 +402,12 @@
402 402   <div class="school-section-card">
403 403   <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>
404 404   <div class="card-inner">
405 - #if($budgetProcess && $budgetProcess != '')
385 + #if($budgetProcess && !$budgetProcess.isEmpty())
406 406   <div class="info-row">
407 407   <span class="info-label">作成過程の生徒関与</span>
408 408   <span class="info-value">
409 409   <div class="selection-display">
410 - #foreach($bp in $budgetProcess.split(","))
390 + #foreach($bp in $budgetProcess)
411 411   <span class="selection-item">$!escapetool.xml($bp.trim())</span>
412 412   #end
413 413   </div>
... ... @@ -426,12 +426,12 @@
426 426   <span class="info-value">$!escapetool.xml($!budgetScale)</span>
427 427   </div>
428 428   #end
429 - #if($budgetAllocation && $budgetAllocation != '')
409 + #if($budgetAllocation && !$budgetAllocation.isEmpty())
430 430   <div class="info-row">
431 431   <span class="info-label">主な予算配分</span>
432 432   <span class="info-value">
433 433   <div class="selection-display">
434 - #foreach($ba in $budgetAllocation.split(","))
414 + #foreach($ba in $budgetAllocation)
435 435   <span class="selection-item">$!escapetool.xml($ba.trim())</span>
436 436   #end
437 437   </div>
... ... @@ -464,12 +464,12 @@
464 464   <span class="info-label">見直しの有無（3年以内）</span>
465 465   <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
466 466   </div>
467 - #if($ruleReviewContent && $ruleReviewContent != '')
447 + #if($ruleReviewContent && !$ruleReviewContent.isEmpty())
468 468   <div class="info-row">
469 469   <span class="info-label">見直しの内容</span>
470 470   <span class="info-value">
471 471   <div class="selection-display">
472 - #foreach($rc in $ruleReviewContent.split(","))
452 + #foreach($rc in $ruleReviewContent)
473 473   <span class="selection-item">$!escapetool.xml($rc.trim())</span>
474 474   #end
475 475   </div>
... ... @@ -476,12 +476,12 @@
476 476   </span>
477 477   </div>
478 478   #end
479 - #if($ruleReviewProposer && $ruleReviewProposer != '')
459 + #if($ruleReviewProposer && !$ruleReviewProposer.isEmpty())
480 480   <div class="info-row">
481 481   <span class="info-label">見直しの提案者</span>
482 482   <span class="info-value">
483 483   <div class="selection-display">
484 - #foreach($rp in $ruleReviewProposer.split(","))
464 + #foreach($rp in $ruleReviewProposer)
485 485   <span class="selection-item">$!escapetool.xml($rp.trim())</span>
486 486   #end
487 487   </div>
... ... @@ -488,12 +488,12 @@
488 488   </span>
489 489   </div>
490 490   #end
491 - #if($ruleReviewImplementer && $ruleReviewImplementer != '')
471 + #if($ruleReviewImplementer && !$ruleReviewImplementer.isEmpty())
492 492   <div class="info-row">
493 493   <span class="info-label">見直しの実施者</span>
494 494   <span class="info-value">
495 495   <div class="selection-display">
496 - #foreach($ri in $ruleReviewImplementer.split(","))
476 + #foreach($ri in $ruleReviewImplementer)
497 497   <span class="selection-item">$!escapetool.xml($ri.trim())</span>
498 498   #end
499 499   </div>
... ... @@ -655,7 +655,7 @@
655 655  <div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)">
656 656   <div class="activity-thread-header">
657 657   <div class="activity-thread-title">
658 - <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>
659 659   <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
660 660   </div>
661 661   <div class="thread-meta-row">
... ... @@ -785,9 +785,6 @@
785 785   #elseif($postUserRole == 'graduate')
786 786   <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>
787 787   #end
788 - #if($postGrade && $postGrade != '')
789 - <span class="badge badge-grade badge-sm">$postGrade</span>
790 - #end
791 791   </span>
792 792   <span class="thread-post-date">$!postDate</span>
793 793   #set($postEdited = $!post.getValue('edited'))
... ... @@ -937,10 +937,10 @@
937 937  
938 938   #if($xcontext.user != "XWiki.XWikiGuest")
939 939   <div class="thread-add-post">
940 - <a href="/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
917 + <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
941 941   ＋ 活動報告を追加
942 942   </a>
943 - <a href="/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
920 + <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
944 944   <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> コメントを書く
945 945   </a>
946 946   </div>
... ... @@ -962,7 +962,7 @@
962 962  #if($xcontext.user != "XWiki.XWikiGuest")
963 963  {{html clean="false"}}
964 964  <div class="activity-add-section">
965 - <a href="/bin/view/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$!escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity">
942 + <a href="/bin/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$!escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity">
966 966   <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> 活動を追加
967 967   </a>
968 968  </div>
... ... @@ -969,59 +969,6 @@
969 969  {{/html}}
970 970  #end
971 971  
972 -## --- 年度アーカイブ セクション ---
973 -{{html clean="false"}}
974 -<div class="school-section-card school-archive-card">
975 - <h2 class="archive-section-title">
976 - <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>
977 - 年度アーカイブ
978 - </h2>
979 - <div class="archive-meta">
980 - 現在のページ: <strong>${pageFiscalYear}年度</strong>
981 - #set($lyud = $!doc.getValue('lastYearUpdateDate'))
982 - #if($lyud && $lyud != '')
983 - | 最終年度更新: $!escapetool.xml($lyud) ($!escapetool.xml($!doc.getValue('lastYearUpdateBy')))
984 - #end
985 - </div>
986 -
987 - ## 過去アーカイブの検索
988 - #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))
989 - #set($archivePages = $archiveQuery.execute())
990 -
991 - #if($archivePages && $archivePages.size() > 0)
992 - <div class="archive-card-field-lg">
993 - <div class="archive-list-label">過去の年度アーカイブ</div>
994 - <div class="archive-list">
995 - #foreach($archPage in $archivePages)
996 - #set($archPageDoc = $xwiki.getDocument($archPage))
997 - #set($archPageObj = $archPageDoc.getObject('SeitokaiCode.SchoolClass'))
998 - #if($archPageObj)
999 - #set($archPageFY = $!archPageObj.getValue('fiscalYear'))
1000 - <a href="$archPageDoc.getURL('view')" class="archive-link">
1001 - <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>
1002 - ${archPageFY}年度
1003 - </a>
1004 - #end
1005 - #end
1006 - </div>
1007 - </div>
1008 - #else
1009 - <div class="archive-empty">過去のアーカイブはまだありません</div>
1010 - #end
1011 -
1012 - ## 新年度に移行ボタン（承認済み・管理者のみ）
1013 - #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
1014 - <div class="archive-action">
1015 - <a href="/bin/view/SeitokaiCode/YearArchiveAction?schoolPage=${doc.fullName}" class="btn-accent">
1016 - <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>
1017 - ${pageFiscalYear}年度をアーカイブして新年度に移行
1018 - </a>
1019 - <div class="archive-action-hint">現在の学校情報を${pageFiscalYear}年度として保存し、新しい年度に移行します。</div>
1020 - </div>
1021 - #end
1022 -</div>
1023 -{{/html}}
1024 -
1025 1025  ## --- 年度タブ切り替え JavaScript ---
1026 1026  {{html clean="false"}}
1027 1027  <script>
... ... @@ -1038,20 +1038,12 @@
1038 1038   }
1039 1039   });
1040 1040  }
1041 -// ページ読み込み時にデフォルトで現在の年度を表示
965 +// ページ読み込み時の初期化
1042 1042  document.addEventListener('DOMContentLoaded', function() {
967 + // デフォルトで現在の年度を表示
1043 1043   var defaultTab = document.querySelector('.activity-fy-tab.active');
1044 1044   if (defaultTab) { defaultTab.click(); }
1045 - // モバイルでは基本情報・連絡先をデフォルト折りたたみ
1046 - if (window.innerWidth <= 768) {
1047 - document.querySelectorAll('.school-info-card.mobile-collapse').forEach(function(card) {
1048 - card.classList.add('collapsed');
1049 - });
1050 - }
1051 1051   // 保存成功時のトースト通知
1052 - if (window.location.search.indexOf('archived=1') !== -1) {
1053 - showToast('年度アーカイブを作成しました', 'success');
1054 - }
1055 1055   if (window.location.search.indexOf('saved=1') !== -1) {
1056 1056   showToast('学校情報を保存しました', 'success');
1057 1057   // URLパラメータをクリーンアップ（リロード時に再表示されないよう）
... ... @@ -1087,7 +1087,9 @@
1087 1087   var card = document.getElementById(cardId);
1088 1088   if (!card) return;
1089 1089   card.classList.toggle('collapsed');
1090 - card.classList.remove('mobile-collapse');
1006 + var isCollapsed = card.classList.contains('collapsed');
1007 + var h2 = card.querySelector('h2[role="button"]');
1008 + if (h2) h2.setAttribute('aria-expanded', !isCollapsed);
1091 1091  }
1092 1092  
1093 1093  // 投稿の編集（インライン編集フォームを開く）
... ... @@ -1119,7 +1119,9 @@
1119 1119   var csrfEl = document.querySelector('input[name="form_token"]');
1120 1120   var csrfToken = csrfEl ? csrfEl.value : '';
1121 1121   var xhr = new XMLHttpRequest();
1122 - xhr.open('GET', '/bin/view/SeitokaiCode/EditPost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken), true);
1040 + xhr.open('POST', '/bin/SeitokaiCode/EditPost?outputSyntax=plain', true);
1041 + xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1042 + var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken);
1123 1123   xhr.onload = function() {
1124 1124   try {
1125 1125   var res = JSON.parse(xhr.responseText);
... ... @@ -1132,7 +1132,7 @@
1132 1132   } catch(e) { alert('編集に失敗しました'); }
1133 1133   };
1134 1134   xhr.onerror = function() { alert('通信エラーが発生しました'); };
1135 - xhr.send();
1055 + xhr.send(editPostData);
1136 1136  }
1137 1137  
1138 1138  // 投稿の削除（確認ダイアログ付き）
... ... @@ -1139,7 +1139,9 @@
1139 1139  function confirmDeletePost(schoolPage, postObjNum, token) {
1140 1140   if (!confirm('この投稿を削除しますか？\\n削除後は「この投稿は削除されました」と表示されます。')) return;
1141 1141   var xhr = new XMLHttpRequest();
1142 - xhr.open('GET', '/bin/view/SeitokaiCode/DeletePost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token), true);
1062 + xhr.open('POST', '/bin/SeitokaiCode/DeletePost?outputSyntax=plain', true);
1063 + xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1064 + var deletePostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token);
1143 1143   xhr.onload = function() {
1144 1144   try {
1145 1145   var res = JSON.parse(xhr.responseText);
... ... @@ -1152,7 +1152,7 @@
1152 1152   } catch(e) { alert('削除に失敗しました'); }
1153 1153   };
1154 1154   xhr.onerror = function() { alert('通信エラーが発生しました'); };
1155 - xhr.send();
1077 + xhr.send(deletePostData);
1156 1156  }
1157 1157  </script>
1158 1158  {{/html}}