Skip to Content

Changes for page 学校ページテンプレート

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

From 34.1 to 33.1 From 72.1 to 71.1

From version

edited by Super Admin
on 2026/03/18 20:48

Change comment: There is no comment for this version

To version

edited by Super Admin
on 2026/03/10 14:35

Change comment: There is no comment for this version

Raw
Rendered

Summary

Page properties (1 modified, 0 added, 0 removed)

Details

Page properties

Content

@@ -1,11 +1,5 @@
  {{velocity}}
  ## ===== 学校ページ テンプレート =====
--## ゲストが ?sheet= 付きURL（編集フォーム等）に直接アクセスした場合、ログインページへリダイレクト
--#if($xcontext.user == 'XWiki.XWikiGuest' && $request.sheet && $request.sheet != '')
--  #set($currentUrl = $doc.getURL('view', "sheet=${request.sheet}"))
--  $response.sendRedirect("/bin/login/XWiki/XWikiLogin?srid=$escapetool.url($currentUrl)")
--  #stop
--#end
  {{html clean="false"}}
  ## メンテナンスバナー（{{include}}ではなくインラインで記述し、<p>タグ挿入を回避）
  #set($bannerDoc = $xwiki.getDocument('SeitokaiAdmin.MaintenanceBanner'))
@@ -25,6 +25,10 @@
  ## --- 学校基本情報フィールド ---
  #set($schoolCode = $doc.getValue('schoolCode'))
  #set($schoolName = $doc.getValue('schoolName'))
++## ページタイトルを学校名に設定（デフォルトでは学校コードが表示されるため）
++#if($schoolName && $schoolName != '')
++$!doc.setTitle($schoolName)
++#end
  #set($prefecture = $doc.getValue('prefecture'))
  #set($city = $doc.getValue('city'))
  #set($classCount = $doc.getValue('classCount'))
@@ -71,7 +71,9 @@
  #set($seitokaiYoutube = $doc.getValue('seitokaiYoutube'))
  #set($seitokaiOtherSns = $doc.getValue('seitokaiOtherSns'))
--## --- 現在の年度を計算（4月始まり） ---
++## --- 年度アーカイブ ---
++#set($pageFiscalYear = $!doc.getValue('fiscalYear'))
++## 現在の年度を計算（4月始まり）
  #set($nowFY = $datetool.date)
  #set($currentFYMonth = $mathtool.toInteger($datetool.format('MM', $nowFY)))
  #set($currentFYYear = $mathtool.toInteger($datetool.format('yyyy', $nowFY)))
@@ -80,6 +80,10 @@
  #else
    #set($currentFiscalYear = $mathtool.sub($currentFYYear, 1))
  #end
++## fiscalYear 未設定時はデフォルトとして現在の年度を使う
++#if(!$pageFiscalYear || $pageFiscalYear == '')
++  #set($pageFiscalYear = $currentFiscalYear.toString())
++#end
  ## --- 公開範囲フィールド ---
  #set($visibilityOrgChart = $!doc.getValue('visibilityOrgChart'))
@@ -106,53 +106,10 @@
    #end
  #end
--## --- 関連校（中高一貫校）情報 ---
--#set($affiliatedSchoolCode = $!doc.getValue('affiliatedSchoolCode'))
--#set($affiliatedSchoolName = $!doc.getValue('affiliatedSchoolName'))
--#set($isAffiliated = false)
--#if($affiliatedSchoolCode && $affiliatedSchoolCode != '' && $viewerSchoolCode == $affiliatedSchoolCode)
--  #set($isAffiliated = true)
--#end
--
--## --- 学校ページ非表示チェック ---
--#set($schoolHidden = $doc.getValue('hidden'))
--#if($schoolHidden == 1)
--  #if($isViewerAdmin)
--    ## 管理者: 黄色バナー + ページ内容は通常表示（プレビュー）
--<div class="school-hidden-banner admin">
--  <svg class="ico" viewBox="0 0 24 24"><path d="M17.94 17.94A10.07 10.07 0 0112 20c-7 0-11-8-11-8a18.45 18.45 0 015.06-5.94M9.9 4.24A9.12 9.12 0 0112 4c7 0 11 8 11 8a18.5 18.5 0 01-2.16 3.19m-6.72-1.07a3 3 0 01-4.24-4.24"/><line x1="1" y1="1" x2="23" y2="23"/></svg>
--  <div>
--    <strong>このページは非表示になっています</strong>（管理者のみ閲覧可能）
--    #set($hBy = $!doc.getValue('hiddenBy'))
--    #set($hAt = $!doc.getValue('hiddenAt'))
--    #set($hReason = $!doc.getValue('hiddenReason'))
--    <div class="school-hidden-detail">
--      非表示: $!escapetool.xml($hAt) / $!escapetool.xml($hBy)
--      #if($hReason && $hReason != '') ・ 理由: $!escapetool.xml($hReason)#end
--    </div>
--    <a href="$xwiki.getURL('SeitokaiAdmin.SchoolManagement', 'view')" style="color:#92400e;text-decoration:underline">学校ページ管理へ</a>
--  </div>
--</div>
--  #else
--    ## 一般ユーザー・ゲスト: 非公開メッセージを表示して停止
--<div class="school-hidden-public">
--  <svg class="ico" viewBox="0 0 24 24" style="width:2.5em;height:2.5em"><path d="M17.94 17.94A10.07 10.07 0 0112 20c-7 0-11-8-11-8a18.45 18.45 0 015.06-5.94M9.9 4.24A9.12 9.12 0 0112 4c7 0 11 8 11 8a18.5 18.5 0 01-2.16 3.19m-6.72-1.07a3 3 0 01-4.24-4.24"/><line x1="1" y1="1" x2="23" y2="23"/></svg>
--  <h2>このページは現在公開されていません</h2>
--  <p>このページは管理者により非公開に設定されています。</p>
--  <a href="$xwiki.getURL('Schools.WebHome', 'view')" class="btn-back-list">学校一覧に戻る</a>
--</div>
--#stop
--  #end
--#end
--
  ## --- 投稿固定/解除処理 ---
  #set($pinAction = $!request.action)
--#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && ($viewerSchoolCode == $schoolCode || $isAffiliated))) && $services.csrf.isTokenValid($request.form_token))
--  #set($pinPostObjStr = $!request.postObj)
--  #if(!$pinPostObjStr.matches('^\d+$'))
--    ## 不正な値 → 無視
--  #else
--  #set($postObjNum = $mathtool.toInteger($pinPostObjStr))
++#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || $viewerAccountType == 'verified') && $services.csrf.isTokenValid($request.form_token))
++  #set($postObjNum = $mathtool.toInteger($!request.postObj))
    #set($postObj = $doc.getObject('SeitokaiCode.ActivityPostClass', $postObjNum))
    #if($postObj)
      #if($pinAction == 'pin')
@@ -172,15 +172,12 @@
      $response.sendRedirect($doc.getURL('view'))
      #stop
    #end
--  #end## /matches
  #end
  ## --- 特色ある活動 選定/解除処理 ---
  #set($featAction = $!request.action)
--#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token))
--  #set($featActObjStr = $!request.actObj)
--  #if($featActObjStr.matches('^\d+$'))
--  #set($actObjNum = $mathtool.toInteger($featActObjStr))
++#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $services.csrf.isTokenValid($request.form_token))
++  #set($actObjNum = $mathtool.toInteger($!request.actObj))
    #set($actObj = $doc.getObject('SeitokaiCode.ActivityClass', $actObjNum))
    #if($actObj)
      #if($featAction == 'feature')
@@ -212,7 +212,6 @@
      $response.sendRedirect($doc.getURL('view'))
      #stop
    #end
--  #end## /matches
  #end
  ## --- ユーザー情報取得 ---
@@ -271,15 +271,9 @@
    #end
  #end
--## --- 学校名見出し（XWikiデフォルトタイトルを非表示にし、学校名を表示） ---
--#if($schoolName && $schoolName != '')
--<style>.document-header { display: none !important; }</style>
--<h1 class="school-page-title">$!escapetool.xml($schoolName)</h1>
--#end
--
  ## --- 編集ボタン（権限があるユーザーのみ表示） ---
  #set($canEditSchool = false)
--#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode || $isAffiliated))
++#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode))
    #set($canEditSchool = true)
  #end
  #if($canEditSchool)
@@ -288,293 +288,305 @@
  </div>
  #end
--## --- 関連校（中高一貫校）バナー ---
--#if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
--  #set($affiliatedPageRef = "Schools.${affiliatedSchoolCode}.WebHome")
--  #set($affiliatedPageExists = $xwiki.exists($affiliatedPageRef))
--<div class="affiliated-school-banner">
--  <svg class="ico" viewBox="0 0 24 24" stroke-width="1.5"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg>
--  <div>
--    <strong>中高一貫校</strong>：
--    #if($affiliatedPageExists)
--      <a href="$xwiki.getURL($affiliatedPageRef, 'view')">$!escapetool.xml($affiliatedSchoolName)</a>
--    #else
--      $!escapetool.xml($affiliatedSchoolName)
++## --- ① 学校基本情報 + 連絡先（左右グリッド・折りたたみ対応） ---
++<div class="school-info-grid">
++  <div class="school-info-card collapsed" id="card-basic-info">
++    <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>
++    <table class="wiki-table school-info-table">
++      <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
++      <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
++      <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
++      <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
++      <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
++      <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
++      <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
++      <tr><th>課程</th><td>#if($schoolSystem && $schoolSystem != '' && $schoolSystem != '[]')$!escapetool.xml($!schoolSystem)#end</td></tr>
++      <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>
++    </table>
++    #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
++    #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
++    #if($infoEditDate && $infoEditDate != '')
++    <div class="info-last-updated"><svg class="ico" viewBox="0 0 24 24"><path d="M11 4H4a2 2 0 00-2 2v14a2 2 0 002 2h14a2 2 0 002-2v-7"/><path d="M18.5 2.5a2.121 2.121 0 013 3L12 15l-4 1 1-4 9.5-9.5z"/></svg> 基本情報の最終更新: $!escapetool.xml($infoEditBy) — $!escapetool.xml($infoEditDate)</div>
      #end
--    と連携しています
    </div>
++
++  <div class="school-info-card collapsed" id="card-contact">
++    <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>
++    <table class="wiki-table school-info-table">
++      <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr>
++      <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>
++      <tr><th>X (Twitter)</th><td>#if($seitokaiTwitter && $seitokaiTwitter != '')<a href="https://x.com/$!escapetool.url($seitokaiTwitter)" target="_blank" rel="noopener">𝕏 @$!escapetool.xml($seitokaiTwitter)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
++      <tr><th>Instagram</th><td>#if($seitokaiInstagram && $seitokaiInstagram != '')<a href="https://instagram.com/$!escapetool.url($seitokaiInstagram)" target="_blank" rel="noopener"><svg class="ico" viewBox="0 0 24 24"><path d="M23 19a2 2 0 01-2 2H3a2 2 0 01-2-2V8a2 2 0 012-2h4l2-3h6l2 3h4a2 2 0 012 2z"/><circle cx="12" cy="13" r="4"/></svg> @$!escapetool.xml($seitokaiInstagram)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
++      <tr><th>YouTube</th><td>#if($seitokaiYoutube && $seitokaiYoutube != '')<a href="$!escapetool.xml($seitokaiYoutube)" target="_blank" rel="noopener"><svg class="ico" viewBox="0 0 24 24"><polygon points="5 3 19 12 5 21 5 3"/></svg> YouTubeチャンネル</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
++      <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
++    </table>
++  </div>
  </div>
--#end
--## --- ① 学校基本情報 ---
--<div class="school-info-card collapsed" id="card-basic-info">
--  <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>
--  <table class="wiki-table school-info-table">
--    <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
--    <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
--    <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
--    <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
--    <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
--    <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
--    <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
--    <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
--    <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>
--  </table>
--  #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
--  #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
--  #if($infoEditDate && $infoEditDate != '')
--  <div class="info-last-updated"><svg class="ico" viewBox="0 0 24 24"><path d="M11 4H4a2 2 0 00-2 2v14a2 2 0 002 2h14a2 2 0 002-2v-7"/><path d="M18.5 2.5a2.121 2.121 0 013 3L12 15l-4 1 1-4 9.5-9.5z"/></svg> 基本情報の最終更新: $!escapetool.xml($infoEditBy) — $!escapetool.xml($infoEditDate)</div>
--  #end
++## --- 生徒会情報アコーディオン ---
++<div class="school-section-divider">
++  <button class="shortcut-btn shortcut-btn-secondary" onclick="var sec=document.getElementById('seitokai-info-section');sec.classList.toggle('open');this.querySelector('.shortcut-arrow').textContent=sec.classList.contains('open')?'▲':'▼';">
++    <svg class="ico ico-md" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/></svg>
++    生徒会情報を見る <span class="shortcut-arrow">▼</span>
++  </button>
  </div>
--## --- ② 生徒会基本情報（折りたたみカード） ---
--<div class="school-info-card" id="card-seitokai-info">
--  <h2 role="button" tabindex="0" aria-expanded="true" onclick="toggleInfoCard('card-seitokai-info')" onkeydown="if(event.key==='Enter'||event.key===' '){event.preventDefault();toggleInfoCard('card-seitokai-info')}"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/></svg> 生徒会基本情報</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2>
--  <div class="seitokai-info-body">
++<div id="seitokai-info-section" class="seitokai-info-accordion">
--    ## --- 組織図 ---
--    #set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
--    #if($hasOrgContent)
--      #set($canViewOrgChart = true)
--      #if($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewOrgChart = false)
--      #elseif($visibilityOrgChart == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewOrgChart = false)
--      #end
--      #if($canViewOrgChart)
--    <div class="seitokai-subsection">
--      <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/><line x1="9" y1="10" x2="9" y2="10.01"/><line x1="15" y1="10" x2="15" y2="10.01"/><line x1="9" y1="14" x2="9" y2="14.01"/><line x1="15" y1="14" x2="15" y2="14.01"/></svg> 組織図 #if($visibilityOrgChart != 'public')<span class="visibility-badge visibility-${visibilityOrgChart}">#if($visibilityOrgChart == 'school_trusted')<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> 校内承認者限定#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>
--      <div class="seitokai-subsection-content">
--        #if($orgChartImage && $orgChartImage != '')
--        <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
--        #end
--        #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end
--      </div>
--    </div>
--      #else
--    <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 組織図は #if($visibilityOrgChart == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
--      #end
++## --- ② 組織図 ---
++#set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
++#if($hasOrgContent)
++  ## 公開範囲チェック
++  #set($canViewOrgChart = true)
++  #if($visibilityOrgChart == 'members' && $isGuest) #set($canViewOrgChart = false)
++  #elseif($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewOrgChart = false)
++  #end
++  #if($canViewOrgChart)
++<h2 class="section-title"><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/><line x1="9" y1="10" x2="9" y2="10.01"/><line x1="15" y1="10" x2="15" y2="10.01"/><line x1="9" y1="14" x2="9" y2="14.01"/><line x1="15" y1="14" x2="15" y2="14.01"/></svg> 組織図 #if($visibilityOrgChart != 'public')<span class="visibility-badge visibility-${visibilityOrgChart}">#if($visibilityOrgChart == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h2>
++<div class="school-section-card">
++  <div class="card-inner">
++    #if($orgChartImage && $orgChartImage != '')
++    <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
      #end
++    #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end
++  </div>
++</div>
++  #else
++<div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 組織図は #if($visibilityOrgChart == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
++  #end
++#end
--    ## --- 日常の活動 ---
--    #if($dailyActivities && !$dailyActivities.isEmpty())
--    <div class="seitokai-subsection">
--      <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z"/><polyline points="14 2 14 8 20 8"/><line x1="16" y1="13" x2="8" y2="13"/><line x1="16" y1="17" x2="8" y2="17"/></svg> 日常の活動</h3>
--      <div class="seitokai-subsection-content">
--        <p class="activity-hint">活動時間の多い順に上位3つ</p>
--        <div class="tag-container">
--          #set($daIdx = 1)
--          #foreach($da in $dailyActivities)
--            <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
--            #set($daIdx = $daIdx + 1)
--          #end
--        </div>
--        #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
--        <div class="free-note">$!escapetool.xml($dailyActivitiesNote)</div>
++## --- ③④⑤ 日常の活動・選挙・定例活動 ---
++<div class="school-section-grid">
++  #if($dailyActivities && $dailyActivities != '')
++  <div class="school-section-card">
++    <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>
++    <div class="card-inner">
++      <p class="activity-hint">活動時間の多い順に上位3つ</p>
++      <div class="tag-container">
++        #set($daIdx = 1)
++        #foreach($da in $dailyActivities.split(","))
++          <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
++          #set($daIdx = $daIdx + 1)
          #end
        </div>
++      #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
++      <div class="free-note">$!escapetool.xml($dailyActivitiesNote)</div>
++      #end
      </div>
--    #end
++  </div>
++  #end
--    ## --- 選挙 ---
--    #if($electionExists && $electionExists != '')
--    <div class="seitokai-subsection">
--      <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="3" width="18" height="18" rx="2"/><path d="M7 13l3 3 7-7"/></svg> 選挙</h3>
--      <div class="seitokai-subsection-content">
--        <div class="info-row">
--          <span class="info-label">役員選挙</span>
--          <span class="info-value">$!escapetool.xml($!electionExists)</span>
--        </div>
--        #if($electionType && $electionType != '')
--        <div class="info-row">
--          <span class="info-label">直近の選挙方式</span>
--          <span class="info-value">$!escapetool.xml($!electionType)</span>
--        </div>
--        #end
--        #if($electionNote && $electionNote.trim() != '')
--        <div class="free-note">$!escapetool.xml($electionNote)</div>
--        #end
++  #if($electionExists && $electionExists != '')
++  <div class="school-section-card">
++    <h3><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="3" width="18" height="18" rx="2"/><path d="M7 13l3 3 7-7"/></svg> 選挙</h3>
++    <div class="card-inner">
++      <div class="info-row">
++        <span class="info-label">役員選挙</span>
++        <span class="info-value">$!escapetool.xml($!electionExists)</span>
        </div>
++      #if($electionType && $electionType != '')
++      <div class="info-row">
++        <span class="info-label">直近の選挙方式</span>
++        <span class="info-value">$!escapetool.xml($!electionType)</span>
++      </div>
++      #end
++      #if($electionNote && $electionNote.trim() != '')
++      <div class="free-note">$!escapetool.xml($electionNote)</div>
++      #end
      </div>
--    #end
++  </div>
++  #end
++</div>
--    ## --- 定例活動 ---
--    #if($meetingFrequency && $meetingFrequency != '')
--    <div class="seitokai-subsection">
--      <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="4" width="18" height="18" rx="2"/><line x1="16" y1="2" x2="16" y2="6"/><line x1="8" y1="2" x2="8" y2="6"/><line x1="3" y1="10" x2="21" y2="10"/></svg> 定例活動</h3>
--      <div class="seitokai-subsection-content">
--        <div class="info-row">
--          <span class="info-label">役員定例会の頻度</span>
--          <span class="info-value">$!escapetool.xml($!meetingFrequency)</span>
--        </div>
--        #if($regularActivitiesNote && $regularActivitiesNote.trim() != '')
--        <div class="free-note">$!escapetool.xml($regularActivitiesNote)</div>
--        #end
++<div class="school-section-grid">
++  #if($meetingFrequency && $meetingFrequency != '')
++  <div class="school-section-card">
++    <h3><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="4" width="18" height="18" rx="2"/><line x1="16" y1="2" x2="16" y2="6"/><line x1="8" y1="2" x2="8" y2="6"/><line x1="3" y1="10" x2="21" y2="10"/></svg> 定例活動</h3>
++    <div class="card-inner">
++      <div class="info-row">
++        <span class="info-label">役員定例会の頻度</span>
++        <span class="info-value">$!escapetool.xml($!meetingFrequency)</span>
        </div>
++      #if($regularActivitiesNote && $regularActivitiesNote.trim() != '')
++      <div class="free-note">$!escapetool.xml($regularActivitiesNote)</div>
++      #end
      </div>
--    #end
++  </div>
++  #end
--    ## --- 予算 ---
--    #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
--    #if($hasBudget)
--      #set($canViewBudget = true)
--      #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewBudget = false)
--      #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false)
++  ## --- ⑦ 予算 ---
++  #set($hasBudget = ($budgetProcess && $budgetProcess != '') || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
++  #if($hasBudget)
++    ## 公開範囲チェック
++    #set($canViewBudget = true)
++    #if($visibilityBudget == 'members' && $isGuest) #set($canViewBudget = false)
++    #elseif($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewBudget = false)
++    #end
++    #if($canViewBudget)
++  <div class="school-section-card">
++    <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>
++    <div class="card-inner">
++      #if($budgetProcess && $budgetProcess != '')
++      <div class="info-row">
++        <span class="info-label">作成過程の生徒関与</span>
++        <span class="info-value">
++          <div class="selection-display">
++            #foreach($bp in $budgetProcess.split(","))
++              <span class="selection-item">$!escapetool.xml($bp.trim())</span>
++            #end
++          </div>
++        </span>
++      </div>
        #end
--      #if($canViewBudget)
--    <div class="seitokai-subsection">
--      <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><line x1="12" y1="1" x2="12" y2="23"/><path d="M17 5H9.5a3.5 3.5 0 000 7h5a3.5 3.5 0 010 7H6"/></svg> 予算 #if($visibilityBudget != 'public')<span class="visibility-badge visibility-${visibilityBudget}">#if($visibilityBudget == 'school_trusted')<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> 校内承認者限定#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>
--      <div class="seitokai-subsection-content">
--        #if($budgetProcess && !$budgetProcess.isEmpty())
--        <div class="info-row">
--          <span class="info-label">作成過程の生徒関与</span>
--          <span class="info-value">
--            <div class="selection-display">
--              #foreach($bp in $budgetProcess)
--                <span class="selection-item">$!escapetool.xml($bp.trim())</span>
--              #end
--            </div>
--          </span>
--        </div>
--        #end
--        #if($studentFee && $studentFee != '')
--        <div class="info-row">
--          <span class="info-label">生徒会費（年額）</span>
--          <span class="info-value">$!escapetool.xml($!studentFee)</span>
--        </div>
--        #end
--        #if($budgetScale && $budgetScale != '')
--        <div class="info-row">
--          <span class="info-label">予算規模</span>
--          <span class="info-value">$!escapetool.xml($!budgetScale)</span>
--        </div>
--        #end
--        #if($budgetAllocation && !$budgetAllocation.isEmpty())
--        <div class="info-row">
--          <span class="info-label">主な予算配分</span>
--          <span class="info-value">
--            <div class="selection-display">
--              #foreach($ba in $budgetAllocation)
--                <span class="selection-item">$!escapetool.xml($ba.trim())</span>
--              #end
--            </div>
--          </span>
--        </div>
--        #end
--        #if($budgetNote && $budgetNote.trim() != '')
--        <div class="free-note">$!escapetool.xml($budgetNote)</div>
--        #end
++      #if($studentFee && $studentFee != '')
++      <div class="info-row">
++        <span class="info-label">生徒会費（年額）</span>
++        <span class="info-value">$!escapetool.xml($!studentFee)</span>
        </div>
--    </div>
--      #else
--    <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 予算情報は #if($visibilityBudget == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
        #end
++      #if($budgetScale && $budgetScale != '')
++      <div class="info-row">
++        <span class="info-label">予算規模</span>
++        <span class="info-value">$!escapetool.xml($!budgetScale)</span>
++      </div>
++      #end
++      #if($budgetAllocation && $budgetAllocation != '')
++      <div class="info-row">
++        <span class="info-label">主な予算配分</span>
++        <span class="info-value">
++          <div class="selection-display">
++            #foreach($ba in $budgetAllocation.split(","))
++              <span class="selection-item">$!escapetool.xml($ba.trim())</span>
++            #end
++          </div>
++        </span>
++      </div>
++      #end
++      #if($budgetNote && $budgetNote.trim() != '')
++      <div class="free-note">$!escapetool.xml($budgetNote)</div>
++      #end
++    </div>
++  </div>
++    #else
++  <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 予算情報は #if($visibilityBudget == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
      #end
++  #end
++</div>
--    ## --- 校則の見直し ---
--    #if($ruleReviewStatus && $ruleReviewStatus != '')
--      #set($canViewRuleReview = true)
--      #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewRuleReview = false)
--      #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false)
--      #end
--      #if($canViewRuleReview)
--    <div class="seitokai-subsection">
--      <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M16 4h2a2 2 0 012 2v12a2 2 0 01-2 2h-2"/><path d="M8 4H6a2 2 0 00-2 2v12a2 2 0 002 2h2"/><line x1="12" y1="4" x2="12" y2="8"/><line x1="12" y1="16" x2="12" y2="20"/><line x1="8" y1="8" x2="16" y2="8"/><line x1="8" y1="16" x2="16" y2="16"/></svg> 校則の見直し #if($visibilityRuleReview != 'public')<span class="visibility-badge visibility-${visibilityRuleReview}">#if($visibilityRuleReview == 'school_trusted')<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> 校内承認者限定#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>
--      <div class="seitokai-subsection-content">
--        <div class="info-row">
--          <span class="info-label">見直しの有無（3年以内）</span>
--          <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
++## --- ⑧ 校則の見直し ---
++#if($ruleReviewStatus && $ruleReviewStatus != '')
++  ## 公開範囲チェック
++  #set($canViewRuleReview = true)
++  #if($visibilityRuleReview == 'members' && $isGuest) #set($canViewRuleReview = false)
++  #elseif($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewRuleReview = false)
++  #end
++  #if($canViewRuleReview)
++<h2 class="section-title"><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M16 4h2a2 2 0 012 2v12a2 2 0 01-2 2h-2"/><path d="M8 4H6a2 2 0 00-2 2v12a2 2 0 002 2h2"/><line x1="12" y1="4" x2="12" y2="8"/><line x1="12" y1="16" x2="12" y2="20"/><line x1="8" y1="8" x2="16" y2="8"/><line x1="8" y1="16" x2="16" y2="16"/></svg> 校則の見直し #if($visibilityRuleReview != 'public')<span class="visibility-badge visibility-${visibilityRuleReview}">#if($visibilityRuleReview == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h2>
++<div class="school-section-card">
++  <div class="card-inner">
++    <div class="info-row">
++      <span class="info-label">見直しの有無（3年以内）</span>
++      <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
++    </div>
++    #if($ruleReviewContent && $ruleReviewContent != '')
++    <div class="info-row">
++      <span class="info-label">見直しの内容</span>
++      <span class="info-value">
++        <div class="selection-display">
++          #foreach($rc in $ruleReviewContent.split(","))
++            <span class="selection-item">$!escapetool.xml($rc.trim())</span>
++          #end
          </div>
--        #if($ruleReviewContent && !$ruleReviewContent.isEmpty())
--        <div class="info-row">
--          <span class="info-label">見直しの内容</span>
--          <span class="info-value">
--            <div class="selection-display">
--              #foreach($rc in $ruleReviewContent)
--                <span class="selection-item">$!escapetool.xml($rc.trim())</span>
--              #end
--            </div>
--          </span>
++      </span>
++    </div>
++    #end
++    #if($ruleReviewProposer && $ruleReviewProposer != '')
++    <div class="info-row">
++      <span class="info-label">見直しの提案者</span>
++      <span class="info-value">
++        <div class="selection-display">
++          #foreach($rp in $ruleReviewProposer.split(","))
++            <span class="selection-item">$!escapetool.xml($rp.trim())</span>
++          #end
          </div>
--        #end
--        #if($ruleReviewProposer && !$ruleReviewProposer.isEmpty())
--        <div class="info-row">
--          <span class="info-label">見直しの提案者</span>
--          <span class="info-value">
--            <div class="selection-display">
--              #foreach($rp in $ruleReviewProposer)
--                <span class="selection-item">$!escapetool.xml($rp.trim())</span>
--              #end
--            </div>
--          </span>
++      </span>
++    </div>
++    #end
++    #if($ruleReviewImplementer && $ruleReviewImplementer != '')
++    <div class="info-row">
++      <span class="info-label">見直しの実施者</span>
++      <span class="info-value">
++        <div class="selection-display">
++          #foreach($ri in $ruleReviewImplementer.split(","))
++            <span class="selection-item">$!escapetool.xml($ri.trim())</span>
++          #end
          </div>
--        #end
--        #if($ruleReviewImplementer && !$ruleReviewImplementer.isEmpty())
--        <div class="info-row">
--          <span class="info-label">見直しの実施者</span>
--          <span class="info-value">
--            <div class="selection-display">
--              #foreach($ri in $ruleReviewImplementer)
--                <span class="selection-item">$!escapetool.xml($ri.trim())</span>
--              #end
--            </div>
--          </span>
--        </div>
--        #end
--        #if($ruleReviewSystem && $ruleReviewSystem != '')
--        <div class="info-row">
--          <span class="info-label">見直しの仕組み</span>
--          <span class="info-value">$!escapetool.xml($!ruleReviewSystem)</span>
--        </div>
--        #end
--      </div>
++      </span>
      </div>
--      #else
--    <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 校則の見直し情報は #if($visibilityRuleReview == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
--      #end
      #end
--
--    ## --- 生徒会の課題意識 ---
--    #if($challenges && $challenges != '')
--      #set($canViewChallenges = true)
--      #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewChallenges = false)
--      #elseif($visibilityChallenges == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewChallenges = false)
--      #end
--      #if($canViewChallenges)
--    <div class="seitokai-subsection">
--      <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M12 16v-4"/><path d="M12 8h.01"/></svg> 生徒会の課題意識 #if($visibilityChallenges != 'public')<span class="visibility-badge visibility-${visibilityChallenges}">#if($visibilityChallenges == 'school_trusted')<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> 校内承認者限定#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>
--      <div class="seitokai-subsection-content">
--        <div class="challenge-text">$!escapetool.xml($challenges)</div>
--      </div>
++    #if($ruleReviewSystem && $ruleReviewSystem != '')
++    <div class="info-row">
++      <span class="info-label">見直しの仕組み</span>
++      <span class="info-value">$!escapetool.xml($!ruleReviewSystem)</span>
      </div>
--      #else
--    <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 課題情報は #if($visibilityChallenges == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
--      #end
      #end
++  </div>
++</div>
++  #else
++<div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 校則の見直し情報は #if($visibilityRuleReview == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
++  #end
++#end
--  </div>## seitokai-info-body 終了
--</div>## card-seitokai-info 終了
++## --- ⑨ 課題 ---
++#if($challenges && $challenges != '')
++  ## 公開範囲チェック
++  #set($canViewChallenges = true)
++  #if($visibilityChallenges == 'members' && $isGuest) #set($canViewChallenges = false)
++  #elseif($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewChallenges = false)
++  #end
++  #if($canViewChallenges)
++<h2 class="section-title">生徒会の課題意識 #if($visibilityChallenges != 'public')<span class="visibility-badge visibility-${visibilityChallenges}">#if($visibilityChallenges == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h2>
++<div class="challenge-text">$!escapetool.xml($challenges)</div>
++  #else
++<div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 課題情報は #if($visibilityChallenges == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
++  #end
++#end
--## --- ③ SNS・連絡先 ---
--<div class="school-info-card collapsed" id="card-contact">
--  <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>
--  <table class="wiki-table school-info-table">
--    <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr>
--    <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>
--    <tr><th>X (Twitter)</th><td>#if($seitokaiTwitter && $seitokaiTwitter != '')<a href="https://x.com/$!escapetool.url($seitokaiTwitter)" target="_blank" rel="noopener">𝕏 @$!escapetool.xml($seitokaiTwitter)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
--    <tr><th>Instagram</th><td>#if($seitokaiInstagram && $seitokaiInstagram != '')<a href="https://instagram.com/$!escapetool.url($seitokaiInstagram)" target="_blank" rel="noopener"><svg class="ico" viewBox="0 0 24 24"><path d="M23 19a2 2 0 01-2 2H3a2 2 0 01-2-2V8a2 2 0 012-2h4l2-3h6l2 3h4a2 2 0 012 2z"/><circle cx="12" cy="13" r="4"/></svg> @$!escapetool.xml($seitokaiInstagram)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
--    <tr><th>YouTube</th><td>#if($seitokaiYoutube && $seitokaiYoutube != '')<a href="$!escapetool.xml($seitokaiYoutube)" target="_blank" rel="noopener"><svg class="ico" viewBox="0 0 24 24"><polygon points="5 3 19 12 5 21 5 3"/></svg> YouTubeチャンネル</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
--    <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
--  </table>
--</div>
++</div>## seitokai-info-accordion 終了
  {{/html}}
------
--
  ## --- ⑩ 活動報告一覧（スレッド型・年度タブ付き） ---
  = 活動報告 =
--## --- 年度タブ + 投稿者ステータス凡例 ---
++## --- 投稿者ステータス凡例（折りたたみ） ---
  {{html clean="false"}}
++<div class="author-legend-wrapper">
++  <button class="author-legend-toggle" onclick="this.classList.toggle('open');this.nextElementSibling.classList.toggle('open')"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M12 16v-4"/><path d="M12 8h.01"/></svg> バッジの見方 <span class="chevron">▼</span></button>
++  <div class="author-legend-body">
++    <div class="author-legend">
++      <span class="author-legend-title">投稿者の信頼度:</span>
++      <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者</span>
++      <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み</span>
++      <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介</span>
++      <span class="author-legend-item"><span class="bar bar-general"></span> 一般（未承認）</span>
++    </div>
++    <div class="author-legend">
++      <span class="author-legend-title">所属:</span>
++      <span class="author-legend-item"><span class="badge badge-school-internal-confirmed badge-sm"><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> 校内（確認済）</span> 承認済み＋同校</span>
++      <span class="author-legend-item"><span class="badge badge-school-internal badge-sm"><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> 校内</span> 紹介＋同校</span>
++      <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>
++      <span class="author-legend-item text-hint">※一般アカウントは所属未確認のため非表示</span>
++    </div>
++    <div class="author-legend">
++      <span class="author-legend-title">役割:</span>
++      <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>
++      <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>
++      <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>
++    </div>
++  </div>
++</div>
  ## --- 年度タブ ---
  ## 全活動から年度一覧を収集
@@ -596,48 +596,14 @@
  #end
  ## ソート（降順にしたいが Velocity にはないので JS で制御）
--<div class="activity-toolbar">
--  <div class="activity-fy-tabs">
--    <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
--    #foreach($fy in $fySet)
--      #if($fy != $currentFYStr)
--    <button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button>
--      #end
++<div class="activity-fy-tabs">
++  <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
++  #foreach($fy in $fySet)
++    #if($fy != $currentFYStr)
++  <button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button>
      #end
--    <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
--  </div>
--  <div class="activity-toolbar-right">
--    <button class="btn-view-toggle" id="btnViewToggle" onclick="toggleCompactView()" title="タイトルのみ表示">
--      <svg class="ico-list" viewBox="0 0 24 24" stroke="currentColor" fill="none" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><line x1="8" y1="6" x2="21" y2="6"/><line x1="8" y1="12" x2="21" y2="12"/><line x1="8" y1="18" x2="21" y2="18"/><line x1="3" y1="6" x2="3.01" y2="6"/><line x1="3" y1="12" x2="3.01" y2="12"/><line x1="3" y1="18" x2="3.01" y2="18"/></svg>
--      <svg class="ico-detail" viewBox="0 0 24 24" stroke="currentColor" fill="none" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="3" width="7" height="7"/><rect x="14" y="3" width="7" height="7"/><rect x="3" y="14" width="7" height="7"/><rect x="14" y="14" width="7" height="7"/></svg>
--      <span class="toggle-label">一覧表示</span>
--    </button>
--  </div>
--  <div class="author-legend-wrapper">
--    <button class="author-legend-toggle" onclick="this.classList.toggle('open');this.nextElementSibling.classList.toggle('open')"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M12 16v-4"/><path d="M12 8h.01"/></svg> バッジの見方 <span class="chevron">▼</span></button>
--    <div class="author-legend-body">
--      <div class="author-legend">
--        <span class="author-legend-title">投稿者の信頼度:</span>
--        <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者 <span class="text-hint">— 運営スタッフ</span></span>
--        <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み <span class="text-hint">— 本人確認済みのユーザー</span></span>
--        <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介 <span class="text-hint">— 承認済みユーザーからの紹介</span></span>
--        <span class="author-legend-item"><span class="bar bar-general"></span> 一般 <span class="text-hint">— 一般登録ユーザー</span></span>
--      </div>
--      <div class="author-legend">
--        <span class="author-legend-title">所属:</span>
--        <span class="author-legend-item"><span class="badge badge-school-internal-confirmed badge-sm"><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> 校内（確認済）</span> <span class="text-hint">所属が確認されたこの学校のユーザー</span></span>
--        <span class="author-legend-item"><span class="badge badge-school-internal badge-sm"><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> 校内</span> <span class="text-hint">この学校に所属登録しているユーザー</span></span>
--        <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 class="text-hint">別の学校に所属しているユーザー</span></span>
--        <span class="author-legend-item text-hint">※一般アカウントは所属バッジが表示されません</span>
--      </div>
--      <div class="author-legend">
--        <span class="author-legend-title">役割:</span>
--        <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>
--        <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 class="text-hint">生徒会役員</span></span>
--        <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>
--      </div>
--    </div>
--  </div>
++  #end
++  <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
  </div>
  {{/html}}
@@ -702,14 +702,8 @@
  <div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)">
    <div class="activity-thread-header">
      <div class="activity-thread-title">
--      <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>
++      <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>
        <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
--      #set($actTagsList = $activity.getValue('tags'))
--      #if($actTagsList && !$actTagsList.isEmpty())
--        #foreach($tagItem in $actTagsList)
--          #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end
--        #end
--      #end
      </div>
      <div class="thread-meta-row">
        <span class="thread-post-count">${reportCount}件の報告 ・ ${commentCount}件のコメント</span>
@@ -771,12 +771,12 @@
      #set($postVis = $!post.getValue('visibility'))
      #if(!$postVis || $postVis == '') #set($postVis = 'public') #end
      #set($canViewPost = true)
--    #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewPost = false)
--    #elseif($postVis == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPost = false)
++    #if($postVis == 'members' && $isGuest) #set($canViewPost = false)
++    #elseif($postVis == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewPost = false)
      #end
      #if(!$canViewPost)
    <div class="thread-post visibility-restricted-post">
--    <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> この投稿は #if($postVis == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
++    <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> この投稿は #if($postVis == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
    </div>
      #else
      ## 投稿者のアカウント種別に基づいたCSSクラス
@@ -817,7 +817,7 @@
            #end
            ## 所属バッジ（投稿者の学校コードとページの学校コードを比較）
            #if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general')
--            #if($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode))
++            #if($postSchoolCode == $schoolCode)
                #if($postAccountType == 'verified' || $postAccountType == 'admin')
              <span class="badge badge-school-internal-confirmed badge-sm"><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> 校内（確認済）</span>
                #else
@@ -838,6 +838,9 @@
            #elseif($postUserRole == 'graduate')
              <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>
            #end
++          #if($postGrade && $postGrade != '')
++            <span class="badge badge-grade badge-sm">$postGrade</span>
++          #end
          </span>
          <span class="thread-post-date">$!postDate</span>
          #set($postEdited = $!post.getValue('edited'))
@@ -908,7 +908,7 @@
          #end
        </div>
        #if($postVis != 'public')
--      <div class="visibility-badge visibility-${postVis} post-action-mt">#if($postVis == 'school_trusted')<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> 校内承認者限定#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</div>
++      <div class="visibility-badge visibility-${postVis} post-action-mt">#if($postVis == '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</div>
        #end
        ## 固定/解除ボタン（承認済み・管理者のみ）
        #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
@@ -987,10 +987,10 @@
    #if($xcontext.user != "XWiki.XWikiGuest")
    <div class="thread-add-post">
--    <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
++    <a href="/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
        ＋ 活動報告を追加
      </a>
--    <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
++    <a href="/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
        <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> コメントを書く
      </a>
    </div>
@@ -1012,7 +1012,7 @@
  #if($xcontext.user != "XWiki.XWikiGuest")
  {{html clean="false"}}
  <div class="activity-add-section">
--  <a href="/bin/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$!escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity">
++  <a href="/bin/view/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$!escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity">
      <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> 活動を追加
    </a>
  </div>
@@ -1019,38 +1019,62 @@
  {{/html}}
  #end
--## --- 年度タブ切り替え JavaScript ---
++## --- 年度アーカイブ セクション ---
  {{html clean="false"}}
--<script>
--// コンパクト表示（タイトルのみ）トグル
--function toggleCompactView() {
--  var container = document.querySelector('.xwiki-content') || document.body;
--  var isCompact = container.classList.toggle('activity-compact-view');
--  var btn = document.getElementById('btnViewToggle');
--  if (btn) {
--    btn.querySelector('.toggle-label').textContent = isCompact ? '詳細表示' : '一覧表示';
--    btn.title = isCompact ? '詳細表示に戻す' : 'タイトルのみ表示';
--  }
--  // コンパクトモードでは各スレッドヘッダーをクリックで個別展開可能にする
--  document.querySelectorAll('.activity-thread').forEach(function(thread) {
--    if (isCompact) {
--      thread.classList.remove('compact-expanded');
--    }
--  });
--}
++<div class="school-section-card school-archive-card">
++  <h2 class="archive-section-title">
++    <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>
++    年度アーカイブ
++  </h2>
++  <div class="archive-meta">
++    現在のページ: <strong>${pageFiscalYear}年度</strong>
++    #set($lyud = $!doc.getValue('lastYearUpdateDate'))
++    #if($lyud && $lyud != '')
++      | 最終年度更新: $!escapetool.xml($lyud) ($!escapetool.xml($!doc.getValue('lastYearUpdateBy')))
++    #end
++  </div>
--// コンパクトモードで個別スレッドを展開/折りたたみ
--function toggleThreadExpand(e) {
--  var container = document.querySelector('.xwiki-content') || document.body;
--  if (!container.classList.contains('activity-compact-view')) return;
--  // リンクやボタンのクリックはスルー
--  if (e.target.closest('a, button, .btn-featured-toggle')) return;
--  var thread = e.target.closest('.activity-thread');
--  if (thread) {
--    thread.classList.toggle('compact-expanded');
--  }
--}
++  ## 過去アーカイブの検索
++  #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))
++  #set($archivePages = $archiveQuery.execute())
++  #if($archivePages && $archivePages.size() > 0)
++  <div class="archive-card-field-lg">
++    <div class="archive-list-label">過去の年度アーカイブ</div>
++    <div class="archive-list">
++      #foreach($archPage in $archivePages)
++        #set($archPageDoc = $xwiki.getDocument($archPage))
++        #set($archPageObj = $archPageDoc.getObject('SeitokaiCode.SchoolClass'))
++        #if($archPageObj)
++          #set($archPageFY = $!archPageObj.getValue('fiscalYear'))
++          <a href="$archPageDoc.getURL('view')" class="archive-link">
++            <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>
++            ${archPageFY}年度
++          </a>
++        #end
++      #end
++    </div>
++  </div>
++  #else
++  <div class="archive-empty">過去のアーカイブはまだありません</div>
++  #end
++
++  ## 新年度に移行ボタン（承認済み・管理者のみ）
++  #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
++  <div class="archive-action">
++    <a href="/bin/view/SeitokaiCode/YearArchiveAction?schoolPage=${doc.fullName}" class="btn-accent">
++      <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>
++      ${pageFiscalYear}年度をアーカイブして新年度に移行
++    </a>
++    <div class="archive-action-hint">現在の学校情報を${pageFiscalYear}年度として保存し、新しい年度に移行します。</div>
++  </div>
++  #end
++</div>
++{{/html}}
++
++## --- 年度タブ切り替え JavaScript ---
++{{html clean="false"}}
++<script>
  function switchActivityFY(fy, btn) {
    // タブのアクティブ状態を切り替え
    document.querySelectorAll('.activity-fy-tab').forEach(function(t) { t.classList.remove('active'); });
@@ -1064,33 +1064,14 @@
      }
    });
  }
--// ページ読み込み時の初期化
++// ページ読み込み時にデフォルトで現在の年度を表示
  document.addEventListener('DOMContentLoaded', function() {
--  // 年度タブを降順にソート（「全期間」タブは末尾に固定）
--  var tabContainer = document.querySelector('.activity-fy-tabs');
--  if (tabContainer) {
--    var tabs = Array.from(tabContainer.querySelectorAll('.activity-fy-tab'));
--    var allTab = null;
--    var fyTabs = [];
--    tabs.forEach(function(t) {
--      var onclickStr = t.getAttribute('onclick') || '';
--      if (onclickStr.indexOf("'all'") !== -1) { allTab = t; }
--      else { fyTabs.push(t); }
--    });
--    // 年度タブを数値の降順でソート
--    fyTabs.sort(function(a, b) {
--      var aYear = parseInt(a.textContent) || 0;
--      var bYear = parseInt(b.textContent) || 0;
--      return bYear - aYear;
--    });
--    // DOM再配置
--    fyTabs.forEach(function(t) { tabContainer.appendChild(t); });
--    if (allTab) { tabContainer.appendChild(allTab); }
--  }
--  // デフォルトで現在の年度を表示
    var defaultTab = document.querySelector('.activity-fy-tab.active');
    if (defaultTab) { defaultTab.click(); }
    // 保存成功時のトースト通知
++  if (window.location.search.indexOf('archived=1') !== -1) {
++    showToast('年度アーカイブを作成しました', 'success');
++  }
    if (window.location.search.indexOf('saved=1') !== -1) {
      showToast('学校情報を保存しました', 'success');
      // URLパラメータをクリーンアップ（リロード時に再表示されないよう）
@@ -1098,30 +1098,6 @@
        window.history.replaceState({}, document.title, window.location.pathname);
      }
    }
--  // コンパクトモード: スレッドヘッダークリックで個別展開
--  document.querySelectorAll('.activity-thread-header').forEach(function(header) {
--    header.addEventListener('click', toggleThreadExpand);
--  });
--  // 長文投稿の折りたたみ初期化（max-height: 12em 超で省略）
--  document.querySelectorAll('.thread-post-body').forEach(function(body) {
--    // pre-wrapのまま高さを測定し、max-height(12em ≒ ~200px)を超える場合に折りたたむ
--    var fullH = body.scrollHeight;
--    // 12em を px に変換（font-size × line-height × 行数 の近似値ではなくCSSと同じ値を取得）
--    body.classList.add('truncated');
--    var maxH = body.clientHeight; // max-height: 12em 適用後の高さ
--    body.classList.remove('truncated');
--    if (fullH > maxH + 30) {
--      body.classList.add('truncated');
--      var btn = document.createElement('button');
--      btn.className = 'btn-read-more';
--      btn.textContent = '広げて読む ▼';
--      btn.addEventListener('click', function() {
--        var isExpanded = body.classList.toggle('expanded');
--        btn.textContent = isExpanded ? '折りたたむ ▲' : '広げて読む ▼';
--      });
--      body.parentNode.insertBefore(btn, body.nextSibling);
--    }
--  });
  });
  // トースト通知表示
@@ -1150,9 +1150,6 @@
    var card = document.getElementById(cardId);
    if (!card) return;
    card.classList.toggle('collapsed');
--  var isCollapsed = card.classList.contains('collapsed');
--  var h2 = card.querySelector('h2[role="button"]');
--  if (h2) h2.setAttribute('aria-expanded', !isCollapsed);
  }
  // 投稿の編集（インライン編集フォームを開く）
@@ -1184,9 +1184,7 @@
    var csrfEl = document.querySelector('input[name="form_token"]');
    var csrfToken = csrfEl ? csrfEl.value : '';
    var xhr = new XMLHttpRequest();
--  xhr.open('POST', '/bin/get/SeitokaiCode/EditPost?outputSyntax=plain', true);
--  xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
--  var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken);
++  xhr.open('GET', '/bin/view/SeitokaiCode/EditPost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken), true);
    xhr.onload = function() {
      try {
        var res = JSON.parse(xhr.responseText);
@@ -1199,7 +1199,7 @@
      } catch(e) { alert('編集に失敗しました'); }
    };
    xhr.onerror = function() { alert('通信エラーが発生しました'); };
--  xhr.send(editPostData);
++  xhr.send();
  }
  // 投稿の削除（確認ダイアログ付き）
@@ -1206,9 +1206,7 @@
  function confirmDeletePost(schoolPage, postObjNum, token) {
    if (!confirm('この投稿を削除しますか？\\n削除後は「この投稿は削除されました」と表示されます。')) return;
    var xhr = new XMLHttpRequest();
--  xhr.open('POST', '/bin/get/SeitokaiCode/DeletePost?outputSyntax=plain', true);
--  xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
--  var deletePostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token);
++  xhr.open('GET', '/bin/view/SeitokaiCode/DeletePost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token), true);
    xhr.onload = function() {
      try {
        var res = JSON.parse(xhr.responseText);
@@ -1221,7 +1221,7 @@
      } catch(e) { alert('削除に失敗しました'); }
    };
    xhr.onerror = function() { alert('通信エラーが発生しました'); };
--  xhr.send(deletePostData);
++  xhr.send();
  }
  </script>
  {{/html}}