Last modified by Super Admin on 2026/04/05 18:59

From version Icon 43.1 Icon
edited by Super Admin
on 2026/03/12 17:54
Change comment: There is no comment for this version
To version Icon 18.1 Icon
edited by Super Admin
on 2026/03/08 00:14
Change comment: There is no comment for this version

Summary

Details

Icon Page properties
Content
... ... @@ -1,21 +1,10 @@
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" /}}
7 +
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月始まり) ---
57 +## --- 年度アーカイブ ---
58 +#set($pageFiscalYear = $!doc.getValue('fiscalYear'))
59 +## 現在の年度を計算(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
68 +## fiscalYear 未設定時はデフォルトとして現在の年度を使う
69 +#if(!$pageFiscalYear || $pageFiscalYear == '')
70 + #set($pageFiscalYear = $currentFiscalYear.toString())
71 +#end
77 77  
78 78  ## --- 公開範囲フィールド ---
79 79  #set($visibilityOrgChart = $!doc.getValue('visibilityOrgChart'))
... ... @@ -165,7 +165,7 @@
165 165  ## --- ユーザー情報取得 ---
166 166  ## displayName: Wiki上の表示名(ニックネーム)。本名(firstName/lastName)は管理者のみ閲覧可能。
167 167  #set($lastAuthor = $doc.author)
168 -#set($lastAuthorDoc = $xwiki.getDocument($lastAuthor))
163 +#set($lastAuthorDoc = $xwiki.getDocument("XWiki.${lastAuthor}"))
169 169  #set($authorAccountType = '')
170 170  #set($authorUserRole = '')
171 171  #set($authorUserStatus = '')
... ... @@ -179,8 +179,7 @@
179 179   #set($authorEnrollmentYear = $!lastAuthorDoc.getValue('enrollmentYear'))
180 180   #set($authorDisplayName = $!lastAuthorDoc.getValue('displayName'))
181 181   #if(!$authorDisplayName || $authorDisplayName == '')
182 - ## false引数でプレーンテキスト(HTMLリンクなし)を取得
183 - #set($authorDisplayName = $xwiki.getUserName($doc.author, false))
177 + #set($authorDisplayName = $xwiki.getUserName($doc.author))
184 184   #end
185 185   ## --- 学年の動的計算(学校種別対応) ---
186 186   ## 日本の学校年度: 4月始まり。currentSchoolYear = (月>=4) ? 今年 : 去年
... ... @@ -218,26 +218,52 @@
218 218   #end
219 219  #end
220 220  
221 -## --- 学校名見出し(XWikiデフォルトタイトルを非表示にし、学校名を表示) ---
222 -#if($schoolName && $schoolName != '')
223 -<style>.document-header { display: none !important; }</style>
224 -<h1 class="school-page-title">$!escapetool.xml($schoolName)</h1>
225 -#end
226 -
227 -## --- 編集ボタン(権限があるユーザーのみ表示) ---
228 -#set($canEditSchool = false)
229 -#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode))
230 - #set($canEditSchool = true)
231 -#end
232 -#if($canEditSchool)
233 -<div style="text-align:right; margin-bottom:12px;">
234 - <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 +{{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>
235 235  </div>
236 -#end
254 +{{/html}}
237 237  
256 +{{html clean="false"}}
257 +
238 238  ## --- ① 学校基本情報 + 連絡先(左右グリッド・折りたたみ対応) ---
239 239  <div class="school-info-grid">
240 - <div class="school-info-card collapsed" id="card-basic-info">
260 + <div class="school-info-card mobile-collapse" id="card-basic-info">
241 241   <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>
242 242   <table class="wiki-table school-info-table">
243 243   <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
... ... @@ -247,7 +247,7 @@
247 247   <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
248 248   <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
249 249   <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
250 - <tr><th>課程</th><td>#if($schoolSystem && $schoolSystem != '' && $schoolSystem != '[]')$!escapetool.xml($!schoolSystem)#end</td></tr>
270 + <tr><th>課程</th><td>$!escapetool.xml($!schoolSystem)</td></tr>
251 251   <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>
252 252   </table>
253 253   #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
... ... @@ -257,7 +257,7 @@
257 257   #end
258 258   </div>
259 259  
260 - <div class="school-info-card collapsed" id="card-contact">
280 + <div class="school-info-card mobile-collapse" id="card-contact">
261 261   <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>
262 262   <table class="wiki-table school-info-table">
263 263   <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr>
... ... @@ -526,12 +526,6 @@
526 526   <span class="author-legend-item"><span class="badge badge-school-external badge-sm"><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> 他校</span> 他校所属</span>
527 527   <span class="author-legend-item text-hint">※一般アカウントは所属未確認のため非表示</span>
528 528   </div>
529 - <div class="author-legend">
530 - <span class="author-legend-title">役割:</span>
531 - <span class="author-legend-item"><span class="badge badge-role-student badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M22 10v6M2 10l10-5 10 5-10 5z"/><path d="M6 12v5c0 2 4 3 6 3s6-1 6-3v-5"/></svg> 生徒</span></span>
532 - <span class="author-legend-item"><span class="badge badge-role-officer badge-sm"><svg class="ico" viewBox="0 0 24 24"><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> 役員</span></span>
533 - <span class="author-legend-item"><span class="badge badge-role-teacher badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M20 21v-2a4 4 0 00-4-4H8a4 4 0 00-4 4v2"/><circle cx="12" cy="7" r="4"/></svg> 教員</span></span>
534 - </div>
535 535   </div>
536 536  </div>
537 537  
... ... @@ -611,17 +611,6 @@
611 611   #set($threadPosts = [])
612 612   #set($discard = $threadPosts.addAll($pinnedPosts))
613 613   #set($discard = $threadPosts.addAll($normalPosts))
614 - ## report/comment カウント
615 - #set($reportCount = 0)
616 - #set($commentCount = 0)
617 - #foreach($tp in $threadPosts)
618 - #set($tpType = $!tp.getValue('postType'))
619 - #if($tpType == 'comment')
620 - #set($commentCount = $commentCount + 1)
621 - #else
622 - #set($reportCount = $reportCount + 1)
623 - #end
624 - #end
625 625  
626 626  {{html clean="false"}}
627 627  <div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)">
... ... @@ -631,7 +631,7 @@
631 631   <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
632 632   </div>
633 633   <div class="thread-meta-row">
634 - <span class="thread-post-count">${reportCount}件の報告 ・ ${commentCount}件のコメント</span>
637 + <span class="thread-post-count">${threadPosts.size()}件の投稿</span>
635 635   #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred')
636 636   #if($actFeatured == '1')
637 637   <a href="$doc.getURL('view', "action=unfeature&actObj=${actIdx}&form_token=${services.csrf.getToken()}")" class="btn-featured-toggle btn-unfeature" title="特色ある活動の選定を解除"><svg class="ico ico-fixed-14" 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> 特色解除</a>
... ... @@ -642,10 +642,7 @@
642 642   </div>
643 643   </div>
644 644  
645 - ## --- 活動報告セクション ---
646 646   #foreach($post in $threadPosts)
647 - #set($thisPostType = $!post.getValue('postType'))
648 - #if($thisPostType != 'comment')
649 649   #set($postContent = $post.getValue('content'))
650 650   #set($postAuthor = $post.getValue('author'))
651 651   #set($postAccountType = $!post.getValue('authorAccountType'))
... ... @@ -867,52 +867,14 @@
867 867   #end## /canViewPost
868 868   #end## /postHidden
869 869   #end## /postDeleted
870 - #end## /postType != comment
871 - #end## /foreach reports
872 -
873 - ## --- コメントセクション(折りたたみ) ---
874 - #if($commentCount > 0)
875 - <details class="thread-comments-section">
876 - <summary class="thread-comments-toggle">
877 - <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> ${commentCount}件のコメント
878 - </summary>
879 - #foreach($post in $threadPosts)
880 - #set($thisPostType = $!post.getValue('postType'))
881 - #if($thisPostType == 'comment')
882 - #set($postContent = $post.getValue('content'))
883 - #set($postAuthor = $post.getValue('author'))
884 - #set($postAccountType = $!post.getValue('authorAccountType'))
885 - #set($postDate = $post.getValue('createdDate'))
886 - #set($postDeleted = $!post.getValue('deleted'))
887 - #if($postDeleted == 1 || $postDeleted == '1')
888 - <div class="thread-comment thread-comment-deleted">
889 - <span class="thread-comment-meta">このコメントは削除されました</span>
890 - </div>
891 - #else
892 - #set($postHidden = $!post.getValue('hidden'))
893 - #if($postHidden == 1 || $postHidden == '1')
894 - <div class="thread-comment thread-comment-hidden">
895 - <span class="thread-comment-meta">このコメントは非表示にされました</span>
896 - </div>
897 - #else
898 - <div class="thread-comment">
899 - <span class="thread-comment-author">$!escapetool.xml($postAuthor)</span>
900 - <span class="thread-comment-date">$!postDate</span>
901 - <div class="thread-comment-body">$!escapetool.xml($postContent)</div>
902 - </div>
903 - #end
904 - #end
905 - #end
906 - #end
907 - </details>
908 908   #end
909 909  
910 910   #if($xcontext.user != "XWiki.XWikiGuest")
911 911   <div class="thread-add-post">
912 - <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
874 + <a href="/xwiki/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
913 913   + 活動報告を追加
914 914   </a>
915 - <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
877 + <a href="/xwiki/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
916 916   <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> コメントを書く
917 917   </a>
918 918   </div>
... ... @@ -934,7 +934,7 @@
934 934  #if($xcontext.user != "XWiki.XWikiGuest")
935 935  {{html clean="false"}}
936 936  <div class="activity-add-section">
937 - <a href="/bin/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$!escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity">
899 + <a href="/xwiki/bin/view/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$!escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity">
938 938   <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> 活動を追加
939 939   </a>
940 940  </div>
... ... @@ -941,6 +941,59 @@
941 941  {{/html}}
942 942  #end
943 943  
906 +## --- 年度アーカイブ セクション ---
907 +{{html clean="false"}}
908 +<div class="school-section-card school-archive-card">
909 + <h2 class="archive-section-title">
910 + <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>
911 + 年度アーカイブ
912 + </h2>
913 + <div class="archive-meta">
914 + 現在のページ: <strong>${pageFiscalYear}年度</strong>
915 + #set($lyud = $!doc.getValue('lastYearUpdateDate'))
916 + #if($lyud && $lyud != '')
917 + | 最終年度更新: $!escapetool.xml($lyud) ($!escapetool.xml($!doc.getValue('lastYearUpdateBy')))
918 + #end
919 + </div>
920 +
921 + ## 過去アーカイブの検索
922 + #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))
923 + #set($archivePages = $archiveQuery.execute())
924 +
925 + #if($archivePages && $archivePages.size() > 0)
926 + <div class="archive-card-field-lg">
927 + <div class="archive-list-label">過去の年度アーカイブ</div>
928 + <div class="archive-list">
929 + #foreach($archPage in $archivePages)
930 + #set($archPageDoc = $xwiki.getDocument($archPage))
931 + #set($archPageObj = $archPageDoc.getObject('SeitokaiCode.SchoolClass'))
932 + #if($archPageObj)
933 + #set($archPageFY = $!archPageObj.getValue('fiscalYear'))
934 + <a href="$archPageDoc.getURL('view')" class="archive-link">
935 + <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>
936 + ${archPageFY}年度
937 + </a>
938 + #end
939 + #end
940 + </div>
941 + </div>
942 + #else
943 + <div class="archive-empty">過去のアーカイブはまだありません</div>
944 + #end
945 +
946 + ## 新年度に移行ボタン(承認済み・管理者のみ)
947 + #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
948 + <div class="archive-action">
949 + <a href="/xwiki/bin/view/SeitokaiCode/YearArchiveAction?schoolPage=${doc.fullName}" class="btn-accent">
950 + <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>
951 + ${pageFiscalYear}年度をアーカイブして新年度に移行
952 + </a>
953 + <div class="archive-action-hint">現在の学校情報を${pageFiscalYear}年度として保存し、新しい年度に移行します。</div>
954 + </div>
955 + #end
956 +</div>
957 +{{/html}}
958 +
944 944  ## --- 年度タブ切り替え JavaScript ---
945 945  {{html clean="false"}}
946 946  <script>
... ... @@ -950,19 +950,29 @@
950 950   btn.classList.add('active');
951 951   // 活動スレッドの表示切り替え
952 952   document.querySelectorAll('.activity-thread[data-fiscal-year]').forEach(function(thread) {
953 - if (fy === 'all' || thread.getAttribute('data-fiscal-year') === fy) {
954 - thread.classList.remove('fy-hidden');
968 + if (fy === 'all') {
969 + thread.style.display = '';
970 + } else if (thread.getAttribute('data-fiscal-year') === fy) {
971 + thread.style.display = '';
955 955   } else {
956 - thread.classList.add('fy-hidden');
973 + thread.style.display = 'none';
957 957   }
958 958   });
959 959  }
960 -// ページ読み込み時の初期化
977 +// ページ読み込み時にデフォルトで現在年度を表示
961 961  document.addEventListener('DOMContentLoaded', function() {
962 - // デフォルトで現在の年度を表示
963 963   var defaultTab = document.querySelector('.activity-fy-tab.active');
964 964   if (defaultTab) { defaultTab.click(); }
981 + // モバイルでは基本情報・連絡先をデフォルト折りたたみ
982 + if (window.innerWidth <= 768) {
983 + document.querySelectorAll('.school-info-card.mobile-collapse').forEach(function(card) {
984 + card.classList.add('collapsed');
985 + });
986 + }
965 965   // 保存成功時のトースト通知
988 + if (window.location.search.indexOf('archived=1') !== -1) {
989 + showToast('年度アーカイブを作成しました', 'success');
990 + }
966 966   if (window.location.search.indexOf('saved=1') !== -1) {
967 967   showToast('学校情報を保存しました', 'success');
968 968   // URLパラメータをクリーンアップ(リロード時に再表示されないよう)
... ... @@ -998,6 +998,7 @@
998 998   var card = document.getElementById(cardId);
999 999   if (!card) return;
1000 1000   card.classList.toggle('collapsed');
1026 + card.classList.remove('mobile-collapse');
1001 1001  }
1002 1002  
1003 1003  // 投稿の編集(インライン編集フォームを開く)
... ... @@ -1029,9 +1029,7 @@
1029 1029   var csrfEl = document.querySelector('input[name="form_token"]');
1030 1030   var csrfToken = csrfEl ? csrfEl.value : '';
1031 1031   var xhr = new XMLHttpRequest();
1032 - xhr.open('POST', '/bin/SeitokaiCode/EditPost?outputSyntax=plain', true);
1033 - xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1034 - var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken);
1058 + xhr.open('GET', '/xwiki/bin/view/SeitokaiCode/EditPost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken), true);
1035 1035   xhr.onload = function() {
1036 1036   try {
1037 1037   var res = JSON.parse(xhr.responseText);
... ... @@ -1044,7 +1044,7 @@
1044 1044   } catch(e) { alert('編集に失敗しました'); }
1045 1045   };
1046 1046   xhr.onerror = function() { alert('通信エラーが発生しました'); };
1047 - xhr.send(editPostData);
1071 + xhr.send();
1048 1048  }
1049 1049  
1050 1050  // 投稿の削除(確認ダイアログ付き)
... ... @@ -1051,9 +1051,7 @@
1051 1051  function confirmDeletePost(schoolPage, postObjNum, token) {
1052 1052   if (!confirm('この投稿を削除しますか?\\n削除後は「この投稿は削除されました」と表示されます。')) return;
1053 1053   var xhr = new XMLHttpRequest();
1054 - xhr.open('POST', '/bin/SeitokaiCode/DeletePost?outputSyntax=plain', true);
1055 - xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1056 - var deletePostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token);
1078 + xhr.open('GET', '/xwiki/bin/view/SeitokaiCode/DeletePost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token), true);
1057 1057   xhr.onload = function() {
1058 1058   try {
1059 1059   var res = JSON.parse(xhr.responseText);
... ... @@ -1066,7 +1066,7 @@
1066 1066   } catch(e) { alert('削除に失敗しました'); }
1067 1067   };
1068 1068   xhr.onerror = function() { alert('通信エラーが発生しました'); };
1069 - xhr.send(deletePostData);
1091 + xhr.send();
1070 1070  }
1071 1071  </script>
1072 1072  {{/html}}