Skip to Content
Last modified by Super Admin on 2026/04/05 18:59
From version Icon 34.1 Icon
edited by Super Admin
on 2026/03/10 14:35
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
... ... @@ -19,10 +19,6 @@
19 19  ## --- 学校基本情報フィールド ---
20 20  #set($schoolCode = $doc.getValue('schoolCode'))
21 21  #set($schoolName = $doc.getValue('schoolName'))
22 -## ページタイトルを学校名に設定（デフォルトでは学校コードが表示されるため）
23 -#if($schoolName && $schoolName != '')
24 -$!doc.setTitle($schoolName)
25 -#end
26 26  #set($prefecture = $doc.getValue('prefecture'))
27 27  #set($city = $doc.getValue('city'))
28 28  #set($classCount = $doc.getValue('classCount'))
... ... @@ -69,9 +69,7 @@
69 69  #set($seitokaiYoutube = $doc.getValue('seitokaiYoutube'))
70 70  #set($seitokaiOtherSns = $doc.getValue('seitokaiOtherSns'))
71 71  
72 -## --- 年度アーカイブ ---
73 -#set($pageFiscalYear = $!doc.getValue('fiscalYear'))
74 -## 現在の年度を計算（4月始まり）
68 +## --- 現在の年度を計算（4月始まり） ---
75 75  #set($nowFY = $datetool.date)
76 76  #set($currentFYMonth = $mathtool.toInteger($datetool.format('MM', $nowFY)))
77 77  #set($currentFYYear = $mathtool.toInteger($datetool.format('yyyy', $nowFY)))
... ... @@ -80,10 +80,6 @@
80 80  #else
81 81   #set($currentFiscalYear = $mathtool.sub($currentFYYear, 1))
82 82  #end
83 -## fiscalYear 未設定時はデフォルトとして現在の年度を使う
84 -#if(!$pageFiscalYear || $pageFiscalYear == '')
85 - #set($pageFiscalYear = $currentFiscalYear.toString())
86 -#end
87 87  
88 88  ## --- 公開範囲フィールド ---
89 89  #set($visibilityOrgChart = $!doc.getValue('visibilityOrgChart'))
... ... @@ -112,8 +112,12 @@
112 112  
113 113  ## --- 投稿固定/解除処理 ---
114 114  #set($pinAction = $!request.action)
115 -#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || $viewerAccountType == 'verified') && $services.csrf.isTokenValid($request.form_token))
116 - #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))
117 117   #set($postObj = $doc.getObject('SeitokaiCode.ActivityPostClass', $postObjNum))
118 118   #if($postObj)
119 119   #if($pinAction == 'pin')
... ... @@ -133,12 +133,15 @@
133 133   $response.sendRedirect($doc.getURL('view'))
134 134   #stop
135 135   #end
130 + #end## /matches
136 136  #end
137 137  
138 138  ## --- 特色ある活動 選定/解除処理 ---
139 139  #set($featAction = $!request.action)
140 -#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $services.csrf.isTokenValid($request.form_token))
141 - #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))
142 142   #set($actObj = $doc.getObject('SeitokaiCode.ActivityClass', $actObjNum))
143 143   #if($actObj)
144 144   #if($featAction == 'feature')
... ... @@ -170,6 +170,7 @@
170 170   $response.sendRedirect($doc.getURL('view'))
171 171   #stop
172 172   #end
170 + #end## /matches
173 173  #end
174 174  
175 175  ## --- ユーザー情報取得 ---
... ... @@ -228,6 +228,12 @@
228 228   #end
229 229  #end
230 230  
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 +
231 231  ## --- 編集ボタン（権限があるユーザーのみ表示） ---
232 232  #set($canEditSchool = false)
233 233  #if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode))
... ... @@ -242,7 +242,7 @@
242 242  ## --- ① 学校基本情報 + 連絡先（左右グリッド・折りたたみ対応） ---
243 243  <div class="school-info-grid">
244 244   <div class="school-info-card collapsed" id="card-basic-info">
245 - <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>
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>
246 246   <table class="wiki-table school-info-table">
247 247   <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
248 248   <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
... ... @@ -251,7 +251,7 @@
251 251   <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
252 252   <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
253 253   <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
254 - <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>
255 255   <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>
256 256   </table>
257 257   #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
... ... @@ -262,7 +262,7 @@
262 262   </div>
263 263  
264 264   <div class="school-info-card collapsed" id="card-contact">
265 - <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>
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>
266 266   <table class="wiki-table school-info-table">
267 267   <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr>
268 268   <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>
... ... @@ -309,7 +309,7 @@
309 309  
310 310  ## --- ③④⑤ 日常の活動・選挙・定例活動 ---
311 311  <div class="school-section-grid">
312 - #if($dailyActivities && $dailyActivities != '')
316 + #if($dailyActivities && !$dailyActivities.isEmpty())
313 313   <div class="school-section-card">
314 314   <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>
315 315   <div class="card-inner">
... ... @@ -316,7 +316,7 @@
316 316   <p class="activity-hint">活動時間の多い順に上位3つ</p>
317 317   <div class="tag-container">
318 318   #set($daIdx = 1)
319 - #foreach($da in $dailyActivities.split(","))
323 + #foreach($da in $dailyActivities)
320 320   <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
321 321   #set($daIdx = $daIdx + 1)
322 322   #end
... ... @@ -367,7 +367,7 @@
367 367   #end
368 368  
369 369   ## --- ⑦ 予算 ---
370 - #set($hasBudget = ($budgetProcess && $budgetProcess != '') || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
374 + #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
371 371   #if($hasBudget)
372 372   ## 公開範囲チェック
373 373   #set($canViewBudget = true)
... ... @@ -378,12 +378,12 @@
378 378   <div class="school-section-card">
379 379   <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>
380 380   <div class="card-inner">
381 - #if($budgetProcess && $budgetProcess != '')
385 + #if($budgetProcess && !$budgetProcess.isEmpty())
382 382   <div class="info-row">
383 383   <span class="info-label">作成過程の生徒関与</span>
384 384   <span class="info-value">
385 385   <div class="selection-display">
386 - #foreach($bp in $budgetProcess.split(","))
390 + #foreach($bp in $budgetProcess)
387 387   <span class="selection-item">$!escapetool.xml($bp.trim())</span>
388 388   #end
389 389   </div>
... ... @@ -402,12 +402,12 @@
402 402   <span class="info-value">$!escapetool.xml($!budgetScale)</span>
403 403   </div>
404 404   #end
405 - #if($budgetAllocation && $budgetAllocation != '')
409 + #if($budgetAllocation && !$budgetAllocation.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($ba in $budgetAllocation.split(","))
414 + #foreach($ba in $budgetAllocation)
411 411   <span class="selection-item">$!escapetool.xml($ba.trim())</span>
412 412   #end
413 413   </div>
... ... @@ -440,12 +440,12 @@
440 440   <span class="info-label">見直しの有無（3年以内）</span>
441 441   <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
442 442   </div>
443 - #if($ruleReviewContent && $ruleReviewContent != '')
447 + #if($ruleReviewContent && !$ruleReviewContent.isEmpty())
444 444   <div class="info-row">
445 445   <span class="info-label">見直しの内容</span>
446 446   <span class="info-value">
447 447   <div class="selection-display">
448 - #foreach($rc in $ruleReviewContent.split(","))
452 + #foreach($rc in $ruleReviewContent)
449 449   <span class="selection-item">$!escapetool.xml($rc.trim())</span>
450 450   #end
451 451   </div>
... ... @@ -452,12 +452,12 @@
452 452   </span>
453 453   </div>
454 454   #end
455 - #if($ruleReviewProposer && $ruleReviewProposer != '')
459 + #if($ruleReviewProposer && !$ruleReviewProposer.isEmpty())
456 456   <div class="info-row">
457 457   <span class="info-label">見直しの提案者</span>
458 458   <span class="info-value">
459 459   <div class="selection-display">
460 - #foreach($rp in $ruleReviewProposer.split(","))
464 + #foreach($rp in $ruleReviewProposer)
461 461   <span class="selection-item">$!escapetool.xml($rp.trim())</span>
462 462   #end
463 463   </div>
... ... @@ -464,12 +464,12 @@
464 464   </span>
465 465   </div>
466 466   #end
467 - #if($ruleReviewImplementer && $ruleReviewImplementer != '')
471 + #if($ruleReviewImplementer && !$ruleReviewImplementer.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($ri in $ruleReviewImplementer.split(","))
476 + #foreach($ri in $ruleReviewImplementer)
473 473   <span class="selection-item">$!escapetool.xml($ri.trim())</span>
474 474   #end
475 475   </div>
... ... @@ -631,7 +631,7 @@
631 631  <div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)">
632 632   <div class="activity-thread-header">
633 633   <div class="activity-thread-title">
634 - <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>
635 635   <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
636 636   </div>
637 637   <div class="thread-meta-row">
... ... @@ -761,9 +761,6 @@
761 761   #elseif($postUserRole == 'graduate')
762 762   <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>
763 763   #end
764 - #if($postGrade && $postGrade != '')
765 - <span class="badge badge-grade badge-sm">$postGrade</span>
766 - #end
767 767   </span>
768 768   <span class="thread-post-date">$!postDate</span>
769 769   #set($postEdited = $!post.getValue('edited'))
... ... @@ -913,10 +913,10 @@
913 913  
914 914   #if($xcontext.user != "XWiki.XWikiGuest")
915 915   <div class="thread-add-post">
916 - <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">
917 917   ＋ 活動報告を追加
918 918   </a>
919 - <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">
920 920   <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> コメントを書く
921 921   </a>
922 922   </div>
... ... @@ -938,7 +938,7 @@
938 938  #if($xcontext.user != "XWiki.XWikiGuest")
939 939  {{html clean="false"}}
940 940  <div class="activity-add-section">
941 - <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">
942 942   <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> 活動を追加
943 943   </a>
944 944  </div>
... ... @@ -945,59 +945,6 @@
945 945  {{/html}}
946 946  #end
947 947  
948 -## --- 年度アーカイブ セクション ---
949 -{{html clean="false"}}
950 -<div class="school-section-card school-archive-card">
951 - <h2 class="archive-section-title">
952 - <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>
953 - 年度アーカイブ
954 - </h2>
955 - <div class="archive-meta">
956 - 現在のページ: <strong>${pageFiscalYear}年度</strong>
957 - #set($lyud = $!doc.getValue('lastYearUpdateDate'))
958 - #if($lyud && $lyud != '')
959 - | 最終年度更新: $!escapetool.xml($lyud) ($!escapetool.xml($!doc.getValue('lastYearUpdateBy')))
960 - #end
961 - </div>
962 -
963 - ## 過去アーカイブの検索
964 - #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))
965 - #set($archivePages = $archiveQuery.execute())
966 -
967 - #if($archivePages && $archivePages.size() > 0)
968 - <div class="archive-card-field-lg">
969 - <div class="archive-list-label">過去の年度アーカイブ</div>
970 - <div class="archive-list">
971 - #foreach($archPage in $archivePages)
972 - #set($archPageDoc = $xwiki.getDocument($archPage))
973 - #set($archPageObj = $archPageDoc.getObject('SeitokaiCode.SchoolClass'))
974 - #if($archPageObj)
975 - #set($archPageFY = $!archPageObj.getValue('fiscalYear'))
976 - <a href="$archPageDoc.getURL('view')" class="archive-link">
977 - <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>
978 - ${archPageFY}年度
979 - </a>
980 - #end
981 - #end
982 - </div>
983 - </div>
984 - #else
985 - <div class="archive-empty">過去のアーカイブはまだありません</div>
986 - #end
987 -
988 - ## 新年度に移行ボタン（承認済み・管理者のみ）
989 - #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
990 - <div class="archive-action">
991 - <a href="/bin/view/SeitokaiCode/YearArchiveAction?schoolPage=${doc.fullName}" class="btn-accent">
992 - <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>
993 - ${pageFiscalYear}年度をアーカイブして新年度に移行
994 - </a>
995 - <div class="archive-action-hint">現在の学校情報を${pageFiscalYear}年度として保存し、新しい年度に移行します。</div>
996 - </div>
997 - #end
998 -</div>
999 -{{/html}}
1000 -
1001 1001  ## --- 年度タブ切り替え JavaScript ---
1002 1002  {{html clean="false"}}
1003 1003  <script>
... ... @@ -1014,14 +1014,12 @@
1014 1014   }
1015 1015   });
1016 1016  }
1017 -// ページ読み込み時にデフォルトで現在の年度を表示
965 +// ページ読み込み時の初期化
1018 1018  document.addEventListener('DOMContentLoaded', function() {
967 + // デフォルトで現在の年度を表示
1019 1019   var defaultTab = document.querySelector('.activity-fy-tab.active');
1020 1020   if (defaultTab) { defaultTab.click(); }
1021 1021   // 保存成功時のトースト通知
1022 - if (window.location.search.indexOf('archived=1') !== -1) {
1023 - showToast('年度アーカイブを作成しました', 'success');
1024 - }
1025 1025   if (window.location.search.indexOf('saved=1') !== -1) {
1026 1026   showToast('学校情報を保存しました', 'success');
1027 1027   // URLパラメータをクリーンアップ（リロード時に再表示されないよう）
... ... @@ -1057,6 +1057,9 @@
1057 1057   var card = document.getElementById(cardId);
1058 1058   if (!card) return;
1059 1059   card.classList.toggle('collapsed');
1006 + var isCollapsed = card.classList.contains('collapsed');
1007 + var h2 = card.querySelector('h2[role="button"]');
1008 + if (h2) h2.setAttribute('aria-expanded', !isCollapsed);
1060 1060  }
1061 1061  
1062 1062  // 投稿の編集（インライン編集フォームを開く）
... ... @@ -1088,7 +1088,9 @@
1088 1088   var csrfEl = document.querySelector('input[name="form_token"]');
1089 1089   var csrfToken = csrfEl ? csrfEl.value : '';
1090 1090   var xhr = new XMLHttpRequest();
1091 - 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);
1092 1092   xhr.onload = function() {
1093 1093   try {
1094 1094   var res = JSON.parse(xhr.responseText);
... ... @@ -1101,7 +1101,7 @@
1101 1101   } catch(e) { alert('編集に失敗しました'); }
1102 1102   };
1103 1103   xhr.onerror = function() { alert('通信エラーが発生しました'); };
1104 - xhr.send();
1055 + xhr.send(editPostData);
1105 1105  }
1106 1106  
1107 1107  // 投稿の削除（確認ダイアログ付き）
... ... @@ -1108,7 +1108,9 @@
1108 1108  function confirmDeletePost(schoolPage, postObjNum, token) {
1109 1109   if (!confirm('この投稿を削除しますか？\\n削除後は「この投稿は削除されました」と表示されます。')) return;
1110 1110   var xhr = new XMLHttpRequest();
1111 - 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);
1112 1112   xhr.onload = function() {
1113 1113   try {
1114 1114   var res = JSON.parse(xhr.responseText);
... ... @@ -1121,7 +1121,7 @@
1121 1121   } catch(e) { alert('削除に失敗しました'); }
1122 1122   };
1123 1123   xhr.onerror = function() { alert('通信エラーが発生しました'); };
1124 - xhr.send();
1077 + xhr.send(deletePostData);
1125 1125  }
1126 1126  </script>
1127 1127  {{/html}}