Skip to Content

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

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

From 40.1 to 41.1 From 94.1 to 95.1

From version

edited by Super Admin
on 2026/03/10 22:25

Change comment: There is no comment for this version

To version

edited by Super Admin
on 2026/03/20 17:50

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,5 +1,11 @@
  {{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'))
@@ -28,8 +28,10 @@
  #set($schoolLevel = $doc.getValue('schoolLevel'))
  #set($schoolSystem = $doc.getValue('schoolSystem'))
  #set($website = $doc.getValue('website'))
++#set($schoolPhoto = $doc.getValue('schoolPhoto'))
++#set($schoolDescription = $doc.getValue('schoolDescription'))
--## --- 組織図 ---
++## --- 生徒会組織 ---
  #set($orgChart = $doc.getValue('orgChart'))
  #set($orgChartImage = $doc.getValue('orgChartImage'))
@@ -49,7 +49,7 @@
  #set($budgetAllocation = $doc.getValue('budgetAllocation'))
  #set($budgetNote = $doc.getValue('budgetNote'))
--## --- 校則の見直し ---
++## --- 校則・生徒会会則の見直し ---
  #set($ruleReviewStatus = $doc.getValue('ruleReviewStatus'))
  #set($ruleReviewContent = $doc.getValue('ruleReviewContent'))
  #set($ruleReviewProposer = $doc.getValue('ruleReviewProposer'))
@@ -56,6 +56,43 @@
  #set($ruleReviewImplementer = $doc.getValue('ruleReviewImplementer'))
  #set($ruleReviewSystem = $doc.getValue('ruleReviewSystem'))
++## --- 活動環境 ---
++#set($activityPlace = $doc.getValue('activityPlace'))
++#set($activityRoomEquipment = $doc.getValue('activityRoomEquipment'))
++#set($activityRoomImage = $doc.getValue('activityRoomImage'))
++#set($ictUsage = $doc.getValue('ictUsage'))
++
++## --- 生徒総会 ---
++#set($assemblyFormat = $doc.getValue('assemblyFormat'))
++#set($assemblyCount = $doc.getValue('assemblyCount'))
++#set($assemblyAgenda = $doc.getValue('assemblyAgenda'))
++#set($assemblyTopics = $doc.getValue('assemblyTopics'))
++#set($assemblyNote = $doc.getValue('assemblyNote'))
++
++## --- 広報 ---
++#set($publicityMethod = $doc.getValue('publicityMethod'))
++#set($publicityFrequency = $doc.getValue('publicityFrequency'))
++#set($publicityNote = $doc.getValue('publicityNote'))
++
++## --- 外部連携 ---
++#set($externalCooperation = $doc.getValue('externalCooperation'))
++#set($externalOrgName = $doc.getValue('externalOrgName'))
++#set($socialParticipation = $doc.getValue('socialParticipation'))
++
++## --- 年間主要行事 ---
++#set($eventApril = $doc.getValue('eventApril'))
++#set($eventMay = $doc.getValue('eventMay'))
++#set($eventJune = $doc.getValue('eventJune'))
++#set($eventJuly = $doc.getValue('eventJuly'))
++#set($eventAugust = $doc.getValue('eventAugust'))
++#set($eventSeptember = $doc.getValue('eventSeptember'))
++#set($eventOctober = $doc.getValue('eventOctober'))
++#set($eventNovember = $doc.getValue('eventNovember'))
++#set($eventDecember = $doc.getValue('eventDecember'))
++#set($eventJanuary = $doc.getValue('eventJanuary'))
++#set($eventFebruary = $doc.getValue('eventFebruary'))
++#set($eventMarch = $doc.getValue('eventMarch'))
++
  ## --- 課題・連絡先 ---
  #set($challenges = $doc.getValue('challenges'))
  #set($contactInfo = $doc.getValue('contactInfo'))
@@ -65,9 +65,7 @@
  #set($seitokaiYoutube = $doc.getValue('seitokaiYoutube'))
  #set($seitokaiOtherSns = $doc.getValue('seitokaiOtherSns'))
--## --- 年度アーカイブ ---
--#set($pageFiscalYear = $!doc.getValue('fiscalYear'))
--## 現在の年度を計算（4月始まり）
++## --- 現在の年度を計算（4月始まり） ---
  #set($nowFY = $datetool.date)
  #set($currentFYMonth = $mathtool.toInteger($datetool.format('MM', $nowFY)))
  #set($currentFYYear = $mathtool.toInteger($datetool.format('yyyy', $nowFY)))
@@ -76,10 +76,6 @@
  #else
    #set($currentFiscalYear = $mathtool.sub($currentFYYear, 1))
  #end
--## fiscalYear 未設定時はデフォルトとして現在の年度を使う
--#if(!$pageFiscalYear || $pageFiscalYear == '')
--  #set($pageFiscalYear = $currentFiscalYear.toString())
--#end
  ## --- 公開範囲フィールド ---
  #set($visibilityOrgChart = $!doc.getValue('visibilityOrgChart'))
@@ -101,15 +101,81 @@
    #set($viewerDoc = $xwiki.getDocument($viewerUser))
    #set($viewerAccountType = $!viewerDoc.getValue('accountType'))
    #set($viewerSchoolCode = $!viewerDoc.getValue('schoolCode'))
++  #set($viewerSecondarySchoolCode = $!viewerDoc.getValue('secondarySchoolCode'))
++  #set($viewerUserRole = $!viewerDoc.getValue('userRole'))
    #if($viewerAccountType == 'admin')
      #set($isViewerAdmin = true)
    #end
  #end
++## --- 関連校（中高一貫校）情報 ---
++#set($affiliatedSchoolCode = $!doc.getValue('affiliatedSchoolCode'))
++#set($affiliatedSchoolName = $!doc.getValue('affiliatedSchoolName'))
++#set($isAffiliated = false)
++#if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
++  #if($viewerSchoolCode == $affiliatedSchoolCode)
++    #set($isAffiliated = true)
++  #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode)
++    #set($isAffiliated = true)
++  #end
++#end
++
++## --- 校内判定（卒業生を除外、secondarySchoolCodeも含む） ---
++#set($isSchoolMember = false)
++#if(!$isGuest && $viewerUserRole != 'graduate')
++  #if($viewerSchoolCode == $schoolCode || $isAffiliated)
++    #set($isSchoolMember = true)
++  #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode)
++    #set($isSchoolMember = true)
++  #end
++#end
++## 卒業生の母校判定（投稿バッジ用）
++#set($isAlumniOfSchool = false)
++#if(!$isGuest && $viewerUserRole == 'graduate')
++  #if($viewerSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $viewerSchoolCode == $affiliatedSchoolCode))
++    #set($isAlumniOfSchool = true)
++  #end
++#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') && $services.csrf.isTokenValid($request.form_token))
--  #set($postObjNum = $mathtool.toInteger($!request.postObj))
++#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $isSchoolMember)) && $services.csrf.isTokenValid($request.form_token))
++  #set($pinPostObjStr = $!request.postObj)
++  #if(!$pinPostObjStr.matches('^\d+$'))
++    ## 不正な値 → 無視
++  #else
++  #set($postObjNum = $mathtool.toInteger($pinPostObjStr))
    #set($postObj = $doc.getObject('SeitokaiCode.ActivityPostClass', $postObjNum))
    #if($postObj)
      #if($pinAction == 'pin')
@@ -129,12 +129,15 @@
      $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') && $services.csrf.isTokenValid($request.form_token))
--  #set($actObjNum = $mathtool.toInteger($!request.actObj))
++#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $isSchoolMember)) && $services.csrf.isTokenValid($request.form_token))
++  #set($featActObjStr = $!request.actObj)
++  #if($featActObjStr.matches('^\d+$'))
++  #set($actObjNum = $mathtool.toInteger($featActObjStr))
    #set($actObj = $doc.getObject('SeitokaiCode.ActivityClass', $actObjNum))
    #if($actObj)
      #if($featAction == 'feature')
@@ -166,6 +166,7 @@
      $response.sendRedirect($doc.getURL('view'))
      #stop
    #end
++  #end## /matches
  #end
  ## --- ユーザー情報取得 ---
@@ -232,7 +232,7 @@
  ## --- 編集ボタン（権限があるユーザーのみ表示） ---
  #set($canEditSchool = false)
--#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode))
++#if(!$isGuest && ($isViewerAdmin || $isSchoolMember || $isAlumniOfSchool))
    #set($canEditSchool = true)
  #end
  #if($canEditSchool)
@@ -241,305 +241,492 @@
  </div>
  #end
--## --- ① 学校基本情報 + 連絡先（左右グリッド・折りたたみ対応） ---
--<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>
++## --- 関連校（中高一貫校）バナー ---
++#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)
      #end
++    と連携しています
    </div>
++</div>
++#end
--  <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 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>
++  <div class="school-basic-info-layout">
++    <div class="school-basic-info-table">
++      <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>
++    </div>
++    #if($schoolPhoto && $schoolPhoto != '')
++    <div class="school-photo-area">
++      <img src="$doc.getAttachmentURL($schoolPhoto)" alt="$!escapetool.xml($schoolName)" class="school-photo" />
++    </div>
++    #end
    </div>
--</div>
++  #if($schoolDescription && $schoolDescription.trim() != '')
++  <div class="free-note" style="margin-top:var(--sp-4);">$!escapetool.xml($schoolDescription)</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 id="seitokai-info-section" class="seitokai-info-accordion">
++## --- ② 生徒会情報（折りたたみカード） ---
++<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">
--## --- ② 組織図 ---
--#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>
++    ## --- 生徒会組織 ---
++    #set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
++    #if($hasOrgContent)
++      #set($canViewOrgChart = true)
++      #if($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewOrgChart = false)
++      #elseif($visibilityOrgChart == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($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 != '')<div class="free-note">$!escapetool.xml($orgChart)</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($visibilityOrgChart == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
++      #end
      #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
--## --- ③④⑤ 日常の活動・選挙・定例活動 ---
--<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)
++    ## --- 日常の活動 ---
++    #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">
++          #foreach($da in $dailyActivities)
++            <span class="tag tag-accent">$!escapetool.xml($da.trim())</span>
++          #end
++        </div>
++        #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
++        <div class="free-note">$!escapetool.xml($dailyActivitiesNote)</div>
          #end
        </div>
--      #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
--      <div class="free-note">$!escapetool.xml($dailyActivitiesNote)</div>
--      #end
      </div>
--  </div>
--  #end
++    #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>
++    ## --- 選挙 ---
++    #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
        </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>
--  </div>
--  #end
--</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>
++    ## --- 定例活動 ---
++    #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>
--      #if($regularActivitiesNote && $regularActivitiesNote.trim() != '')
--      <div class="free-note">$!escapetool.xml($regularActivitiesNote)</div>
--      #end
      </div>
--  </div>
--  #end
--
--  ## --- ⑦ 予算 ---
--  #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>
++
++    ## --- 予算 ---
++    #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
++    #if($hasBudget)
++      #set($canViewBudget = true)
++      #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewBudget = false)
++      #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false)
        #end
--      #if($studentFee && $studentFee != '')
--      <div class="info-row">
--        <span class="info-label">生徒会費（年額）</span>
--        <span class="info-value">$!escapetool.xml($!studentFee)</span>
++      #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">
++              #set($allBpOpts = ["各部・委員会等への予算希望額調査","予算額調整（折衝等）","生徒会予算案の作成","生徒総会での議決","生徒関与なし","その他"])
++              #foreach($bpOpt in $allBpOpts)
++                #if($budgetProcess.contains($bpOpt))
++                  <span class="selection-item">$!escapetool.xml($bpOpt)</span>
++                #else
++                  <span class="selection-item selection-item-off">$!escapetool.xml($bpOpt)</span>
++                #end
++              #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
        </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($ruleReviewStatus && $ruleReviewStatus != '')
++      #set($canViewRuleReview = true)
++      #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewRuleReview = false)
++      #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false)
        #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>
++      #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>
++        </div>
++        #if($ruleReviewStatus != '実施なし')
++        #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>
++        </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>
++        </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
++        #end
++        #if($ruleReviewSystem && $ruleReviewSystem != '')
++        <div class="info-row">
++          <span class="info-label">見直しの仕組み</span>
++          <span class="info-value">$!escapetool.xml($!ruleReviewSystem)</span>
++        </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($visibilityRuleReview == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
        #end
--      #if($budgetNote && $budgetNote.trim() != '')
--      <div class="free-note">$!escapetool.xml($budgetNote)</div>
--      #end
++    #end
++
++    ## --- 活動環境 ---
++    #set($hasActivityEnv = ($activityPlace && $activityPlace != '') || ($activityRoomEquipment && $activityRoomEquipment != '') || ($activityRoomImage && $activityRoomImage != '') || ($ictUsage && !$ictUsage.isEmpty()))
++    #if($hasActivityEnv)
++    <div class="seitokai-subsection">
++      <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M3 9l9-7 9 7v11a2 2 0 01-2 2H5a2 2 0 01-2-2z"/><polyline points="9 22 9 12 15 12 15 22"/></svg> 生徒会の活動環境</h3>
++      <div class="seitokai-subsection-content">
++        #if($activityPlace && $activityPlace != '')
++        <div class="info-row">
++          <span class="info-label">普段の活動場所</span>
++          <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($activityPlace)</span></span>
++        </div>
++        #end
++        #if($activityRoomEquipment && $activityRoomEquipment != '')
++        <div class="info-row">
++          <span class="info-label">生徒会室の設備</span>
++          <span class="info-value free-text-value">$!escapetool.xml($activityRoomEquipment)</span>
++        </div>
++        #end
++        #if($activityRoomImage && $activityRoomImage != '')
++        <div class="info-row">
++          <span class="info-label">活動場所の写真</span>
++          <span class="info-value"><div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($activityRoomImage)" alt="活動場所の写真" class="org-chart-img" /></div></span>
++        </div>
++        #end
++        #if($ictUsage && !$ictUsage.isEmpty())
++        <div class="info-row">
++          <span class="info-label">ICT活用している場面</span>
++          <span class="info-value">
++            <div class="selection-display">
++              #foreach($iu in $ictUsage)
++                <span class="selection-item">$!escapetool.xml($iu.trim())</span>
++              #end
++            </div>
++          </span>
++        </div>
++        #end
++      </div>
      </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 == '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>
++    ## --- 生徒総会 ---
++    #set($hasAssembly = ($assemblyFormat && $assemblyFormat != '') || ($assemblyCount && $assemblyCount > 0) || ($assemblyAgenda && !$assemblyAgenda.isEmpty()) || ($assemblyTopics && !$assemblyTopics.isEmpty()) || ($assemblyNote && $assemblyNote != ''))
++    #if($hasAssembly)
++    <div class="seitokai-subsection">
++      <h3 class="seitokai-subsection-title"><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> 生徒総会</h3>
++      <div class="seitokai-subsection-content">
++        #if($assemblyFormat && $assemblyFormat != '')
++        <div class="info-row">
++          <span class="info-label">開催方式</span>
++          <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($assemblyFormat)</span></span>
++        </div>
++        #end
++        #if($assemblyCount && $assemblyCount > 0)
++        <div class="info-row">
++          <span class="info-label">開催回数（年）</span>
++          <span class="info-value">$!escapetool.xml($assemblyCount)回</span>
++        </div>
++        #end
++        #if($assemblyAgenda && !$assemblyAgenda.isEmpty())
++        <div class="info-row">
++          <span class="info-label">議案の集め方</span>
++          <span class="info-value">
++            <div class="selection-display">
++              #foreach($aa in $assemblyAgenda)
++                <span class="selection-item">$!escapetool.xml($aa.trim())</span>
++              #end
++            </div>
++          </span>
++        </div>
++        #end
++        #if($assemblyTopics && !$assemblyTopics.isEmpty())
++        <div class="info-row">
++          <span class="info-label">扱う内容</span>
++          <span class="info-value">
++            <div class="selection-display">
++              #foreach($at in $assemblyTopics)
++                <span class="selection-item">$!escapetool.xml($at.trim())</span>
++              #end
++            </div>
++          </span>
++        </div>
++        #end
++        #if($assemblyNote && $assemblyNote != '')
++        <div class="info-row">
++          <span class="info-label">自由記述</span>
++          <span class="info-value free-text-value">$!escapetool.xml($assemblyNote)</span>
++        </div>
++        #end
++      </div>
      </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
++    #end
++
++    ## --- 広報 ---
++    #set($hasPublicity = ($publicityMethod && !$publicityMethod.isEmpty()) || ($publicityFrequency && $publicityFrequency != '') || ($publicityNote && $publicityNote != ''))
++    #if($hasPublicity)
++    <div class="seitokai-subsection">
++      <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M1 12s4-8 11-8 11 8 11 8-4 8-11 8-11-8-11-8z"/><circle cx="12" cy="12" r="3"/></svg> 広報</h3>
++      <div class="seitokai-subsection-content">
++        #if($publicityMethod && !$publicityMethod.isEmpty())
++        <div class="info-row">
++          <span class="info-label">方法</span>
++          <span class="info-value">
++            <div class="selection-display">
++              #foreach($pm in $publicityMethod)
++                <span class="selection-item">$!escapetool.xml($pm.trim())</span>
++              #end
++            </div>
++          </span>
          </div>
--      </span>
++        #end
++        #if($publicityFrequency && $publicityFrequency != '')
++        <div class="info-row">
++          <span class="info-label">頻度</span>
++          <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($publicityFrequency)</span></span>
++        </div>
++        #end
++        #if($publicityNote && $publicityNote != '')
++        <div class="info-row">
++          <span class="info-label">自由記述</span>
++          <span class="info-value free-text-value">$!escapetool.xml($publicityNote)</span>
++        </div>
++        #end
++      </div>
      </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
++
++    ## --- 外部連携 ---
++    #set($hasExternal = ($externalCooperation && $externalCooperation != '') || ($externalOrgName && $externalOrgName != '') || ($socialParticipation && !$socialParticipation.isEmpty()))
++    #if($hasExternal)
++    <div class="seitokai-subsection">
++      <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><circle cx="18" cy="5" r="3"/><circle cx="6" cy="12" r="3"/><circle cx="18" cy="19" r="3"/><line x1="8.59" y1="13.51" x2="15.42" y2="17.49"/><line x1="15.41" y1="6.51" x2="8.59" y2="10.49"/></svg> 外部連携</h3>
++      <div class="seitokai-subsection-content">
++        #if($externalCooperation && $externalCooperation != '')
++        <div class="info-row">
++          <span class="info-label">他校の生徒会との連携</span>
++          <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($externalCooperation)</span></span>
          </div>
--      </span>
++        #end
++        #if($externalOrgName && $externalOrgName != '')
++        <div class="info-row">
++          <span class="info-label">参加している生徒会団体の名前</span>
++          <span class="info-value">$!escapetool.xml($externalOrgName)</span>
++        </div>
++        #end
++        #if($socialParticipation && !$socialParticipation.isEmpty())
++        <div class="info-row">
++          <span class="info-label">社会参加・地域連携・ボランティア</span>
++          <span class="info-value">
++            <div class="selection-display">
++              #foreach($sp2 in $socialParticipation)
++                <span class="selection-item">$!escapetool.xml($sp2.trim())</span>
++              #end
++            </div>
++          </span>
++        </div>
++        #end
++      </div>
      </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>
++
++    ## --- 年間主要行事 ---
++    #set($months = [["4月", $eventApril], ["5月", $eventMay], ["6月", $eventJune], ["7月", $eventJuly], ["8月", $eventAugust], ["9月", $eventSeptember], ["10月", $eventOctober], ["11月", $eventNovember], ["12月", $eventDecember], ["1月", $eventJanuary], ["2月", $eventFebruary], ["3月", $eventMarch]])
++    #set($hasAnyEvent = false)
++    #foreach($m in $months)
++      #if($m.get(1) && $m.get(1) != '') #set($hasAnyEvent = true) #end
++    #end
++    #if($hasAnyEvent)
++    <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" ry="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">
++        <table class="wiki-table school-info-table" style="margin:0">
++        #foreach($m in $months)
++          #if($m.get(1) && $m.get(1) != '')
++          <tr><td style="width:60px;font-weight:600;white-space:nowrap">$m.get(0)</td><td>$!escapetool.xml($m.get(1))</td></tr>
            #end
--        </div>
--      </span>
++        #end
++        </table>
++      </div>
      </div>
      #end
--    #if($ruleReviewSystem && $ruleReviewSystem != '')
--    <div class="info-row">
--      <span class="info-label">見直しの仕組み</span>
--      <span class="info-value">$!escapetool.xml($!ruleReviewSystem)</span>
++
++    ## --- 生徒会の課題意識 ---
++    #if($challenges && $challenges != '')
++      #set($canViewChallenges = true)
++      #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewChallenges = false)
++      #elseif($visibilityChallenges == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($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>
      </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
--## --- ⑨ 課題 ---
--#if($challenges && $challenges != '')
--  ## 公開範囲チェック
--  #set($canViewChallenges = true)
--  #if($visibilityChallenges == 'members' && $isGuest) #set($canViewChallenges = false)
--  #elseif($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewChallenges = false)
++  </div>## seitokai-info-body 終了
++</div>## card-seitokai-info 終了
++
++## --- ③ 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>
++  #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
--  #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
++</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>
  ## --- 年度タブ ---
  ## 全活動から年度一覧を収集
@@ -561,14 +561,49 @@
  #end
  ## ソート（降順にしたいが Velocity にはないので JS で制御）
--<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>
++<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
      #end
--  #end
--  <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
++    <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-alumni 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> <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>
  </div>
  {{/html}}
@@ -633,10 +633,18 @@
  <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" 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>
++      <h3 #if($actFeatured == '1')class="featured-title"#end>#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$!escapetool.xml($!actTitle)</h3>
++      <div class="activity-meta-line">
++        <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>
--    <div class="thread-meta-row">
++    <div class="thread-meta-right">
        <span class="thread-post-count">${reportCount}件の報告 ・ ${commentCount}件のコメント</span>
        #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred')
          #if($actFeatured == '1')
@@ -696,12 +696,12 @@
      #set($postVis = $!post.getValue('visibility'))
      #if(!$postVis || $postVis == '') #set($postVis = 'public') #end
      #set($canViewPost = true)
--    #if($postVis == 'members' && $isGuest) #set($canViewPost = false)
--    #elseif($postVis == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewPost = false)
++    #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewPost = false)
++    #elseif($postVis == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #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 == 'members')登録ユーザー#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 == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
    </div>
      #else
      ## 投稿者のアカウント種別に基づいたCSSクラス
@@ -741,8 +741,11 @@
              <span class="badge badge-general badge-sm">一般</span>
            #end
            ## 所属バッジ（投稿者の学校コードとページの学校コードを比較）
++          #set($postIsSchoolMatch = ($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode)))
            #if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general')
--            #if($postSchoolCode == $schoolCode)
++            #if($postUserRole == 'graduate' && $postIsSchoolMatch)
++            <span class="badge badge-alumni 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>
++            #elseif($postIsSchoolMatch && $postUserRole != 'graduate')
                #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
@@ -763,9 +763,6 @@
            #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'))
@@ -772,6 +772,13 @@
          #if($postEdited == 1 || $postEdited == '1')
          <span class="post-edited-label">（編集済み）</span>
          #end
++        #set($postAuthorRefH = $!post.getValue('authorRef'))
++        #set($postObjNumH = $post.number)
++        #if(!$isGuest && $xcontext.user != $postAuthorRefH)
++        <button type="button" class="btn-post-report btn-post-report-header" onclick="openReportDialog(this, '${doc.fullName}', $postObjNumH, '${services.csrf.getToken()}')" title="この投稿を通報">
++          <svg class="ico ico-fixed-14" viewBox="0 0 24 24"><path d="M4 15s1-1 4-1 5 2 8 2 4-1 4-1V3s-1 1-4 1-5-2-8-2-4 1-4 1z"/><line x1="4" y1="22" x2="4" y2="15"/></svg> 通報
++        </button>
++        #end
        </div>
        <div class="thread-post-body">
          $!escapetool.xml($!postContent)
@@ -836,12 +836,18 @@
          #end
        </div>
        #if($postVis != 'public')
--      <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>
++      <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>
        #end
--      ## 固定/解除ボタン（承認済み・管理者のみ）
--      #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
--      #set($postObjNum = $post.number)
--      <div class="post-pin-action post-action-mt">
++      ## 固定/編集/削除/通報/非表示ボタン（横並び）
++      #set($postAuthorRef = $!post.getValue('authorRef'))
++      #set($postObjNumED = $post.number)
++      #set($showPinBtn = ($viewerAccountType == 'admin' || $viewerAccountType == 'verified'))
++      #set($showEditDeleteBtn = ($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin'))
++      #set($showHideBtn = ($viewerAccountType == 'admin'))
++      #if($showPinBtn || $showEditDeleteBtn || $showHideBtn)
++      <div class="post-edit-actions post-action-mt">
++        #if($showPinBtn)
++        #set($postObjNum = $post.number)
          #if($isPinned == '1')
            <a href="$doc.getURL('view', "action=unpin&postObj=${postObjNum}&form_token=${services.csrf.getToken()}")" class="btn-pin-toggle btn-unpin" title="固定を解除">
              <svg class="ico ico-fixed-14" viewBox="0 0 24 24" fill="currentColor" stroke="none"><path d="M16 2l-4 4-2-1-5 5 3 3-6 6h4l4-4 3 3 5-5-1-2 4-4-5-5z"/></svg> 固定を解除
@@ -851,15 +851,12 @@
              <svg class="ico ico-fixed-14" viewBox="0 0 24 24"><path d="M16 2l-4 4-2-1-5 5 3 3-6 6h4l4-4 3 3 5-5-1-2 4-4-5-5z"/></svg> 固定する
            </a>
          #end
--      </div>
--      #end
--      ## 編集・削除ボタン（投稿者本人 or 管理者）
--      #set($postAuthorRef = $!post.getValue('authorRef'))
--      #set($postObjNumED = $post.number)
--      #if($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin')
--      <div class="post-edit-actions post-action-mt">
++        #end
++        #if($showEditDeleteBtn)
          #if($xcontext.user == $postAuthorRef)
--        <button type="button" class="btn-post-edit" onclick="openEditPost(this, '${doc.fullName}', $postObjNumED, '$!escapetool.javascript($!postContent)')" title="この投稿を編集">
++        #set($editImages = $!post.getValue('images'))
++        #set($editFiles = $!post.getValue('files'))
++        <button type="button" class="btn-post-edit" data-school="${doc.fullName}" data-obj="$postObjNumED" data-content="$!escapetool.xml($!postContent)" data-images="$!escapetool.xml($!editImages)" data-files="$!escapetool.xml($!editFiles)" data-post-type="$!post.getValue('postType')" onclick="openEditPost(this)" title="この投稿を編集">
            <svg class="ico ico-fixed-14" 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> 編集
          </button>
          #end
@@ -866,6 +866,12 @@
          <button type="button" class="btn-post-delete" onclick="confirmDeletePost('${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を削除">
            <svg class="ico ico-fixed-14" viewBox="0 0 24 24"><polyline points="3 6 5 6 21 6"/><path d="M19 6v14a2 2 0 01-2 2H7a2 2 0 01-2-2V6m3 0V4a2 2 0 012-2h4a2 2 0 012 2v2"/></svg> 削除
          </button>
++        #end
++        #if($showHideBtn)
++        <button type="button" class="btn-post-hide" onclick="openHideDialog(this, '${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を非表示にする">
++          <svg class="ico ico-fixed-14" 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 11-4.24-4.24"/><line x1="1" y1="1" x2="23" y2="23"/></svg> 非表示
++        </button>
++        #end
        </div>
        #end
      </div>
@@ -915,9 +915,11 @@
    #if($xcontext.user != "XWiki.XWikiGuest")
    <div class="thread-add-post">
++    #if($isSchoolMember || $isAlumniOfSchool || $isViewerAdmin)
      <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
        ＋ 活動報告を追加
      </a>
++    #end
      <a href="/bin/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>
@@ -947,62 +947,38 @@
  {{/html}}
  #end
--## --- 年度アーカイブ セクション ---
--{{html clean="false"}}
--<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>
--
--  ## 過去アーカイブの検索
--  #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/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 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');
++    }
++  });
++}
++
++// コンパクトモードで個別スレッドを展開/折りたたみ
++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');
++  }
++}
++
  function switchActivityFY(fy, btn) {
    // タブのアクティブ状態を切り替え
    document.querySelectorAll('.activity-fy-tab').forEach(function(t) { t.classList.remove('active'); });
@@ -1018,13 +1018,31 @@
  }
  // ページ読み込み時の初期化
  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パラメータをクリーンアップ（リロード時に再表示されないよう）
@@ -1032,6 +1032,30 @@
        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);
++    }
++  });
  });
  // トースト通知表示
@@ -1060,38 +1060,136 @@
    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);
  }
  // 投稿の編集（インライン編集フォームを開く）
--function openEditPost(btn, schoolPage, postObjNum, currentContent) {
++function openEditPost(btn) {
    var postEl = btn.closest('.thread-post');
    if (!postEl) return;
--  // 既存の編集フォームがあれば閉じる
    var existing = postEl.querySelector('.post-edit-form');
    if (existing) { existing.remove(); return; }
    var bodyEl = postEl.querySelector('.thread-post-body');
    if (!bodyEl) return;
++
++  var schoolPage = btn.getAttribute('data-school');
++  var postObjNum = btn.getAttribute('data-obj');
++  var currentContent = btn.getAttribute('data-content') || '';
++  var currentImages = btn.getAttribute('data-images') || '';
++  var currentFiles = btn.getAttribute('data-files') || '';
++  var postType = btn.getAttribute('data-post-type') || 'report';
++
    var form = document.createElement('div');
    form.className = 'post-edit-form';
--  form.innerHTML = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>' +
--    '<div class="post-edit-form-actions">' +
++  form.setAttribute('data-school', schoolPage);
++  form.setAttribute('data-obj', postObjNum);
++
++  var html = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>';
++
++  // コメント以外は添付ファイル編集を表示
++  if (postType !== 'comment') {
++    // 既存画像
++    html += '<div class="edit-attachments">';
++    if (currentImages.trim()) {
++      html += '<div class="edit-attach-section"><span class="edit-attach-label">画像</span>';
++      var imgs = currentImages.trim().split('\n');
++      for (var i = 0; i < imgs.length; i++) {
++        var img = imgs[i].trim();
++        if (!img) continue;
++        html += '<div class="edit-attach-item" data-name="' + img.replace(/"/g,'&quot;') + '">' +
++          '<img src="/xwiki/bin/download/' + schoolPage.replace(/\./g,'/') + '/' + encodeURIComponent(img) + '" class="edit-attach-thumb" />' +
++          '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
++          '<input type="hidden" name="keepImages" value="' + img.replace(/"/g,'&quot;') + '" />' +
++          '</div>';
++      }
++      html += '</div>';
++    }
++    // 既存ファイル
++    if (currentFiles.trim()) {
++      html += '<div class="edit-attach-section"><span class="edit-attach-label">ファイル</span>';
++      var files = currentFiles.trim().split('\n');
++      for (var j = 0; j < files.length; j++) {
++        var f = files[j].trim();
++        if (!f) continue;
++        var displayName = f;
++        if (/^file_\d{14}_\d+_/.test(f)) displayName = f.replace(/^file_\d{14}_\d+_/, '');
++        html += '<div class="edit-attach-item" data-name="' + f.replace(/"/g,'&quot;') + '">' +
++          '<span class="edit-attach-fname">' + displayName.replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</span>' +
++          '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
++          '<input type="hidden" name="keepFiles" value="' + f.replace(/"/g,'&quot;') + '" />' +
++          '</div>';
++      }
++      html += '</div>';
++    }
++    // 新規追加
++    html += '<div class="edit-attach-add">' +
++      '<label class="form-label-sm">画像を追加（最大4枚まで）</label>' +
++      '<input type="file" name="editNewImages" accept="image/*" multiple class="form-file-input-sm" />' +
++      '<div class="form-hint">JPEG / PNG / GIF / WebP、各5MBまで</div>' +
++      '<label class="form-label-sm" style="margin-top:8px;">ファイルを追加（最大2つまで）</label>' +
++      '<input type="file" name="editNewFiles" accept=".pdf,.docx,.xlsx,.pptx" multiple class="form-file-input-sm" />' +
++      '<div class="form-hint">PDF / Word / Excel / PowerPoint、各10MBまで</div>' +
++      '</div>';
++    html += '</div>';
++  }
++
++  html += '<div class="post-edit-form-actions">' +
      '<button type="button" class="btn-cancel-edit" onclick="this.closest(\'.post-edit-form\').remove()">キャンセル</button>' +
--    '<button type="button" class="btn-save" onclick="saveEditPost(\'' + schoolPage + '\', ' + postObjNum + ')">保存</button>' +
++    '<button type="button" class="btn-save" onclick="saveEditPost(this)">保存</button>' +
      '</div>';
++
++  form.innerHTML = html;
    bodyEl.parentNode.insertBefore(form, bodyEl.nextSibling);
    form.querySelector('textarea').focus();
  }
++function removeEditAttach(btn) {
++  var item = btn.closest('.edit-attach-item');
++  if (item) item.remove();
++}
++
  // 投稿の編集を保存
--function saveEditPost(schoolPage, postObjNum) {
--  var textarea = document.getElementById('editContent_' + postObjNum);
++function saveEditPost(btn) {
++  var formEl = btn.closest('.post-edit-form');
++  if (!formEl) return;
++  var schoolPage = formEl.getAttribute('data-school');
++  var postObjNum = formEl.getAttribute('data-obj');
++  var textarea = formEl.querySelector('textarea');
    if (!textarea) return;
    var newContent = textarea.value.trim();
    if (!newContent) { alert('投稿内容を入力してください'); return; }
++
    var csrfEl = document.querySelector('input[name="form_token"]');
    var csrfToken = csrfEl ? csrfEl.value : '';
++
++  var fd = new FormData();
++  fd.append('schoolPage', schoolPage);
++  fd.append('postObj', postObjNum);
++  fd.append('newContent', newContent);
++  fd.append('form_token', csrfToken);
++
++  // 残す画像・ファイル
++  formEl.querySelectorAll('input[name="keepImages"]').forEach(function(el) { fd.append('keepImages', el.value); });
++  formEl.querySelectorAll('input[name="keepFiles"]').forEach(function(el) { fd.append('keepFiles', el.value); });
++
++  // 新規画像
++  var newImgInput = formEl.querySelector('input[name="editNewImages"]');
++  if (newImgInput && newImgInput.files) {
++    for (var i = 0; i < newImgInput.files.length; i++) { fd.append('editNewImages', newImgInput.files[i]); }
++  }
++  // 新規ファイル
++  var newFileInput = formEl.querySelector('input[name="editNewFiles"]');
++  if (newFileInput && newFileInput.files) {
++    for (var j = 0; j < newFileInput.files.length; j++) { fd.append('editNewFiles', newFileInput.files[j]); }
++  }
++
++  btn.disabled = true;
++  btn.textContent = '保存中...';
++
    var xhr = new XMLHttpRequest();
--  xhr.open('GET', '/bin/SeitokaiCode/EditPost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken), true);
++  xhr.open('POST', '/bin/get/SeitokaiCode/EditPost?outputSyntax=plain', true);
    xhr.onload = function() {
      try {
        var res = JSON.parse(xhr.responseText);
@@ -1099,12 +1099,13 @@
          showToast('投稿を更新しました', 'success');
          setTimeout(function() { location.reload(); }, 800);
        } else {
++        btn.disabled = false; btn.textContent = '保存';
          alert('編集に失敗しました: ' + (res.error || ''));
        }
--    } catch(e) { alert('編集に失敗しました'); }
++    } catch(e) { btn.disabled = false; btn.textContent = '保存'; alert('編集に失敗しました'); }
    };
--  xhr.onerror = function() { alert('通信エラーが発生しました'); };
--  xhr.send();
++  xhr.onerror = function() { btn.disabled = false; btn.textContent = '保存'; alert('通信エラーが発生しました'); };
++  xhr.send(fd);
  }
  // 投稿の削除（確認ダイアログ付き）
@@ -1111,7 +1111,9 @@
  function confirmDeletePost(schoolPage, postObjNum, token) {
    if (!confirm('この投稿を削除しますか？\\n削除後は「この投稿は削除されました」と表示されます。')) return;
    var xhr = new XMLHttpRequest();
--  xhr.open('GET', '/bin/SeitokaiCode/DeletePost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token), true);
++  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.onload = function() {
      try {
        var res = JSON.parse(xhr.responseText);
@@ -1124,8 +1124,82 @@
      } catch(e) { alert('削除に失敗しました'); }
    };
    xhr.onerror = function() { alert('通信エラーが発生しました'); };
--  xhr.send();
++  xhr.send(deletePostData);
  }
++
++/* --- 通報ダイアログ --- */
++function openReportDialog(btn, targetPage, postObjNum, token) {
++  if (document.getElementById('report-dialog-overlay')) return;
++  var reasons = ['宣伝・スパム','不適切な内容','個人情報の露出','誹謗中傷','誤情報','その他'];
++  var overlay = document.createElement('div');
++  overlay.id = 'report-dialog-overlay';
++  overlay.style.cssText = 'position:fixed;inset:0;background:rgba(0,0,0,0.5);z-index:9999;display:flex;align-items:center;justify-content:center;';
++  var dialog = document.createElement('div');
++  dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;max-height:80vh;overflow-y:auto;';
++  var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を通報</h3>';
++  html += '<p style="margin:0 0 12px;font-size:0.9em;color:#4b5563;">通報された投稿は管理者が確認するまで一時的に非表示になります。</p>';
++  html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">通報理由</label>';
++  html += '<select id="report-reason" style="width:100%;padding:8px;border:1px solid #d1d5db;border-radius:8px;margin-bottom:12px;font-size:0.9em;">';
++  for (var i=0; i<reasons.length; i++) html += '<option value="'+reasons[i]+'">'+reasons[i]+'</option>';
++  html += '</select>';
++  html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">補足コメント（任意）</label>';
++  html += '<textarea id="report-detail" rows="3" maxlength="500" style="width:100%;padding:8px;border:1px solid #d1d5db;border-radius:8px;resize:vertical;font-size:0.9em;box-sizing:border-box;" placeholder="具体的な内容があればご記入ください"></textarea>';
++  html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
++  html += '<button type="button" id="report-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
++  html += '<button type="button" id="report-submit-btn" style="padding:8px 16px;border:none;border-radius:8px;background:#dc2626;color:#fff;cursor:pointer;font-weight:600;">通報する</button>';
++  html += '</div>';
++  dialog.innerHTML = html;
++  overlay.appendChild(dialog);
++  document.body.appendChild(overlay);
++  overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
++  document.getElementById('report-cancel-btn').addEventListener('click', function() { overlay.remove(); });
++  document.getElementById('report-submit-btn').addEventListener('click', function() {
++    var reason = document.getElementById('report-reason').value;
++    var detail = document.getElementById('report-detail').value;
++    var submitBtn = document.getElementById('report-submit-btn');
++    submitBtn.disabled = true; submitBtn.textContent = '送信中...';
++    var xhr = new XMLHttpRequest();
++    xhr.open('POST', '/bin/get/SeitokaiCode/ReportAction?outputSyntax=plain', true);
++    xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
++    var data = 'targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&detail=' + encodeURIComponent(detail) + '&form_token=' + encodeURIComponent(token);
++    xhr.onload = function() {
++      overlay.remove();
++      showToast('通報を受け付けました', 'success');
++      setTimeout(function() { location.reload(); }, 1000);
++    };
++    xhr.onerror = function() { overlay.remove(); alert('通信エラーが発生しました'); };
++    xhr.send(data);
++  });
++}
++
++/* --- 非表示ダイアログ（管理者用） --- */
++function openHideDialog(btn, targetPage, postObjNum, token) {
++  if (document.getElementById('hide-dialog-overlay')) return;
++  var overlay = document.createElement('div');
++  overlay.id = 'hide-dialog-overlay';
++  overlay.style.cssText = 'position:fixed;inset:0;background:rgba(0,0,0,0.5);z-index:9999;display:flex;align-items:center;justify-content:center;';
++  var dialog = document.createElement('div');
++  dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;';
++  var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を非表示にする</h3>';
++  html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">非表示の理由</label>';
++  html += '<input type="text" id="hide-reason" style="width:100%;padding:8px;border:1px solid #d1d5db;border-radius:8px;margin-bottom:12px;font-size:0.9em;box-sizing:border-box;" placeholder="理由を入力" />';
++  html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
++  html += '<button type="button" id="hide-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
++  html += '<button type="button" id="hide-submit-btn" style="padding:8px 16px;border:none;border-radius:8px;background:#d97706;color:#fff;cursor:pointer;font-weight:600;">非表示にする</button>';
++  html += '<button type="button" id="hide-warn-btn" style="padding:8px 16px;border:none;border-radius:8px;background:#dc2626;color:#fff;cursor:pointer;font-weight:600;">非表示+警告</button>';
++  html += '</div>';
++  dialog.innerHTML = html;
++  overlay.appendChild(dialog);
++  document.body.appendChild(overlay);
++  overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
++  document.getElementById('hide-cancel-btn').addEventListener('click', function() { overlay.remove(); });
++  function doHide(action) {
++    var reason = document.getElementById('hide-reason').value || '管理者判断';
++    window.location.href = '/bin/view/SeitokaiCode/ModerationAction?action=' + action + '&targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&form_token=' + encodeURIComponent(token);
++  }
++  document.getElementById('hide-submit-btn').addEventListener('click', function() { doHide('hide'); });
++  document.getElementById('hide-warn-btn').addEventListener('click', function() { doHide('hide-warn'); });
++}
  </script>
  {{/html}}
  {{/velocity}}