Skip to Content

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

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

From 18.1 to 19.1 From 45.1 to 46.1

From version

edited by XWikiGuest
on 2026/03/08 09:23

Change comment: There is no comment for this version

To version

edited by Super Admin
on 2026/03/13 02:03

Change comment: There is no comment for this version

Raw
Rendered

Summary

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

Details

Page properties

Author

@@ -1,1 +1,1 @@
--XWiki.XWikiGuest
++XWiki.superadmin

Content

@@ -1,10 +1,21 @@
  {{velocity}}
  ## ===== 学校ページ テンプレート =====
--## このテンプレートは学校ページの表示と入力フォームを制御します。
--
--## メンテナンスバナー
--{{include reference="SeitokaiCode.MaintenanceBannerInclude" /}}
--
++{{html clean="false"}}
++## メンテナンスバナー（{{include}}ではなくインラインで記述し、<p>タグ挿入を回避）
++#set($bannerDoc = $xwiki.getDocument('SeitokaiAdmin.MaintenanceBanner'))
++#set($bannerObj = $bannerDoc.getObject('SeitokaiCode.MaintenanceBannerClass'))
++#if($bannerObj && $bannerObj.getValue('enabled') == 1)
++#set($bannerMsg = $bannerObj.getValue('message'))
++#set($bannerLevel = $bannerObj.getValue('level'))
++#if(!$bannerLevel || $bannerLevel == '')#set($bannerLevel = 'warning')#end
++<div class="maintenance-banner active maintenance-${bannerLevel}" id="maintenance-banner">
++  <div class="maintenance-banner-inner">
++    <span class="maintenance-icon">#if($bannerLevel == 'urgent')<svg class="ico-banner" viewBox="0 0 24 24"><path d="M10.29 3.86L1.82 18a2 2 0 001.71 3h16.94a2 2 0 001.71-3L13.71 3.86a2 2 0 00-3.42 0z"/><line x1="12" y1="9" x2="12" y2="13"/><line x1="12" y1="17" x2="12.01" y2="17"/></svg>#elseif($bannerLevel == 'info')<svg class="ico-banner" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><line x1="12" y1="16" x2="12" y2="12"/><line x1="12" y1="8" x2="12.01" y2="8"/></svg>#else<svg class="ico-banner" viewBox="0 0 24 24"><path d="M14.7 6.3a1 1 0 000 1.4l1.6 1.6a1 1 0 001.4 0l3.77-3.77a6 6 0 01-7.94 7.94l-6.91 6.91a2.12 2.12 0 01-3-3l6.91-6.91a6 6 0 017.94-7.94l-3.76 3.76z"/></svg>#end</span>
++    <span class="maintenance-text">$!escapetool.xml($bannerMsg)</span>
++    <button class="maintenance-close" onclick="document.getElementById('maintenance-banner').style.display='none'">&times;</button>
++  </div>
++</div>
++#end
  ## --- 学校基本情報フィールド ---
  #set($schoolCode = $doc.getValue('schoolCode'))
  #set($schoolName = $doc.getValue('schoolName'))
@@ -54,9 +54,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)))
@@ -65,10 +65,6 @@
  #else
    #set($currentFiscalYear = $mathtool.sub($currentFYYear, 1))
  #end
--## fiscalYear 未設定時はデフォルトとして現在の年度を使う
--#if(!$pageFiscalYear || $pageFiscalYear == '')
--  #set($pageFiscalYear = $currentFiscalYear.toString())
--#end
  ## --- 公開範囲フィールド ---
  #set($visibilityOrgChart = $!doc.getValue('visibilityOrgChart'))
@@ -97,8 +97,12 @@
  ## --- 投稿固定/解除処理 ---
  #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' && $viewerSchoolCode == $schoolCode)) && $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')
@@ -118,12 +118,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') && $viewerSchoolCode == $schoolCode)) && $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')
@@ -155,12 +155,13 @@
      $response.sendRedirect($doc.getURL('view'))
      #stop
    #end
++  #end## /matches
  #end
  ## --- ユーザー情報取得 ---
  ## displayName: Wiki上の表示名（ニックネーム）。本名(firstName/lastName)は管理者のみ閲覧可能。
  #set($lastAuthor = $doc.author)
--#set($lastAuthorDoc = $xwiki.getDocument("XWiki.${lastAuthor}"))
++#set($lastAuthorDoc = $xwiki.getDocument($lastAuthor))
  #set($authorAccountType = '')
  #set($authorUserRole = '')
  #set($authorUserStatus = '')
@@ -174,7 +174,8 @@
    #set($authorEnrollmentYear = $!lastAuthorDoc.getValue('enrollmentYear'))
    #set($authorDisplayName = $!lastAuthorDoc.getValue('displayName'))
    #if(!$authorDisplayName || $authorDisplayName == '')
--    #set($authorDisplayName = $xwiki.getUserName($doc.author))
++    ## false引数でプレーンテキスト（HTMLリンクなし）を取得
++    #set($authorDisplayName = $xwiki.getUserName($doc.author, false))
    #end
    ## --- 学年の動的計算（学校種別対応） ---
    ## 日本の学校年度: 4月始まり。currentSchoolYear = (月>=4) ? 今年 : 去年
@@ -212,52 +212,26 @@
    #end
  #end
--## --- 信頼性バッジ + ユーザー情報 ---
--{{html clean="false"}}
--<div class="seitokai-badge-container">
--  ## 承認バッジ
--  #if($authorAccountType == 'admin')
--    <span class="badge badge-admin"><svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 管理者</span>
--  #elseif($authorAccountType == 'verified')
--    <span class="badge badge-verified"><svg class="ico" viewBox="0 0 24 24" stroke-width="2.5"><path d="M20 6L9 17l-5-5"/></svg> 承認済み</span>
--  #elseif($authorAccountType == 'referred')
--    <span class="badge badge-referred"><svg class="ico" viewBox="0 0 24 24"><path d="M10 13a5 5 0 007.54.54l3-3a5 5 0 00-7.07-7.07l-1.72 1.71"/><path d="M14 11a5 5 0 00-7.54-.54l-3 3a5 5 0 007.07 7.07l1.71-1.71"/></svg> 紹介</span>
--  #else
--    <span class="badge badge-general">一般</span>
--  #end
--  ## 役割バッジ
--  #if($authorUserRole == 'student')
--    <span class="badge badge-role-student"><svg class="ico" viewBox="0 0 24 24"><path d="M22 10l-10-5L2 10l10 5 10-5z"/><path d="M6 12v5c0 1.66 2.69 3 6 3s6-1.34 6-3v-5"/></svg> 生徒</span>
--    #set($authorIsOfficer = $!lastAuthorDoc.getValue('isOfficer'))
--    #if($authorIsOfficer == 'true')
--      <span class="badge badge-role-officer"><svg class="ico" viewBox="0 0 24 24"><path d="M12 2l3.09 6.26L22 9.27l-5 4.87 1.18 6.88L12 17.77l-6.18 3.25L7 14.14 2 9.27l6.91-1.01L12 2z"/></svg> 役員</span>
--    #end
--  #elseif($authorUserRole == 'teacher')
--    <span class="badge badge-role-teacher"><svg class="ico" viewBox="0 0 24 24"><path d="M4 19.5A2.5 2.5 0 016.5 17H20"/><path d="M6.5 2H20v20H6.5A2.5 2.5 0 014 19.5v-15A2.5 2.5 0 016.5 2z"/></svg> 教員</span>
--  #elseif($authorUserRole == 'graduate')
--    <span class="badge badge-role-graduate"><svg class="ico" viewBox="0 0 24 24"><path d="M22 10l-10-5L2 10l10 5 10-5z"/><path d="M6 12v5c0 1.66 2.69 3 6 3s6-1.34 6-3v-5"/></svg> 卒業生</span>
--  #end
--  ## 学年（生徒のみ公開）
--  #if($authorGrade && $authorGrade != '')
--    <span class="badge badge-grade">$authorGrade</span>
--  #end
--  ## 在籍状態（卒業・休学等の場合のみ表示）
--  #if($authorUserStatus == 'graduated')
--    <span class="badge badge-status-graduated"><svg class="ico" viewBox="0 0 24 24"><path d="M22 10l-10-5L2 10l10 5 10-5z"/><path d="M6 12v5c0 1.66 2.69 3 6 3s6-1.34 6-3v-5"/></svg> 卒業済み</span>
--  #elseif($authorUserStatus == 'on_leave')
--    <span class="badge badge-status-onleave"><svg class="ico" viewBox="0 0 24 24" fill="currentColor"><rect x="6" y="4" width="4" height="16" rx="1"/><rect x="14" y="4" width="4" height="16" rx="1"/></svg> 休学中</span>
--  #elseif($authorUserStatus == 'transferred')
--    <span class="badge badge-status-transferred"><svg class="ico" viewBox="0 0 24 24"><polyline points="23 4 23 10 17 10"/><polyline points="1 20 1 14 7 14"/><path d="M3.51 9a9 9 0 0114.85-3.36L23 10M1 14l4.64 4.36A9 9 0 0020.49 15"/></svg> 転校済み</span>
--  #end
--  <span class="badge-info">最終編集: $!escapetool.xml($authorDisplayName) ($xwiki.formatDate($doc.date, "yyyy/MM/dd"))</span>
++## --- 学校名見出し（XWikiデフォルトタイトルを非表示にし、学校名を表示） ---
++#if($schoolName && $schoolName != '')
++<style>.document-header { display: none !important; }</style>
++<h1 class="school-page-title">$!escapetool.xml($schoolName)</h1>
++#end
++
++## --- 編集ボタン（権限があるユーザーのみ表示） ---
++#set($canEditSchool = false)
++#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode))
++  #set($canEditSchool = true)
++#end
++#if($canEditSchool)
++<div style="text-align:right; margin-bottom:12px;">
++  <a href="$doc.getURL('view', 'sheet=SeitokaiCode.SchoolEditForm')" class="btn-school-edit"><svg class="ico" viewBox="0 0 24 24"><path d="M11 4H4a2 2 0 00-2 2v14a2 2 0 002 2h14a2 2 0 002-2v-7"/><path d="M18.5 2.5a2.121 2.121 0 013 3L12 15l-4 1 1-4 9.5-9.5z"/></svg> 基本情報を編集</a>
  </div>
--{{/html}}
++#end
--{{html clean="false"}}
--
  ## --- ① 学校基本情報 + 連絡先（左右グリッド・折りたたみ対応） ---
  <div class="school-info-grid">
--  <div class="school-info-card mobile-collapse" id="card-basic-info">
++  <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>
@@ -267,7 +267,7 @@
        <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>$!escapetool.xml($!schoolSystem)</td></tr>
++      <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
        <tr><th>公式サイト</th><td>#if($website && $website != '')<a href="$!escapetool.xml($website)" target="_blank" rel="noopener">$!escapetool.xml($website)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
      </table>
      #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
@@ -277,7 +277,7 @@
      #end
    </div>
--  <div class="school-info-card mobile-collapse" id="card-contact">
++  <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>
@@ -325,7 +325,7 @@
  ## --- ③④⑤ 日常の活動・選挙・定例活動 ---
  <div class="school-section-grid">
--  #if($dailyActivities && $dailyActivities != '')
++  #if($dailyActivities && !$dailyActivities.isEmpty())
    <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">
@@ -332,7 +332,7 @@
        <p class="activity-hint">活動時間の多い順に上位3つ</p>
        <div class="tag-container">
          #set($daIdx = 1)
--        #foreach($da in $dailyActivities.split(","))
++        #foreach($da in $dailyActivities)
            <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
            #set($daIdx = $daIdx + 1)
          #end
@@ -383,7 +383,7 @@
    #end
    ## --- ⑦ 予算 ---
--  #set($hasBudget = ($budgetProcess && $budgetProcess != '') || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
++  #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
    #if($hasBudget)
      ## 公開範囲チェック
      #set($canViewBudget = true)
@@ -394,12 +394,12 @@
    <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 != '')
++      #if($budgetProcess && !$budgetProcess.isEmpty())
        <div class="info-row">
          <span class="info-label">作成過程の生徒関与</span>
          <span class="info-value">
            <div class="selection-display">
--            #foreach($bp in $budgetProcess.split(","))
++            #foreach($bp in $budgetProcess)
                <span class="selection-item">$!escapetool.xml($bp.trim())</span>
              #end
            </div>
@@ -418,12 +418,12 @@
          <span class="info-value">$!escapetool.xml($!budgetScale)</span>
        </div>
        #end
--      #if($budgetAllocation && $budgetAllocation != '')
++      #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.split(","))
++            #foreach($ba in $budgetAllocation)
                <span class="selection-item">$!escapetool.xml($ba.trim())</span>
              #end
            </div>
@@ -456,12 +456,12 @@
        <span class="info-label">見直しの有無（3年以内）</span>
        <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
      </div>
--    #if($ruleReviewContent && $ruleReviewContent != '')
++    #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.split(","))
++          #foreach($rc in $ruleReviewContent)
              <span class="selection-item">$!escapetool.xml($rc.trim())</span>
            #end
          </div>
@@ -468,12 +468,12 @@
        </span>
      </div>
      #end
--    #if($ruleReviewProposer && $ruleReviewProposer != '')
++    #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.split(","))
++          #foreach($rp in $ruleReviewProposer)
              <span class="selection-item">$!escapetool.xml($rp.trim())</span>
            #end
          </div>
@@ -480,12 +480,12 @@
        </span>
      </div>
      #end
--    #if($ruleReviewImplementer && $ruleReviewImplementer != '')
++    #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.split(","))
++          #foreach($ri in $ruleReviewImplementer)
              <span class="selection-item">$!escapetool.xml($ri.trim())</span>
            #end
          </div>
@@ -546,6 +546,12 @@
        <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>
@@ -625,6 +625,17 @@
      #set($threadPosts = [])
      #set($discard = $threadPosts.addAll($pinnedPosts))
      #set($discard = $threadPosts.addAll($normalPosts))
++    ## report/comment カウント
++    #set($reportCount = 0)
++    #set($commentCount = 0)
++    #foreach($tp in $threadPosts)
++      #set($tpType = $!tp.getValue('postType'))
++      #if($tpType == 'comment')
++        #set($commentCount = $commentCount + 1)
++      #else
++        #set($reportCount = $reportCount + 1)
++      #end
++    #end
  {{html clean="false"}}
  <div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)">
@@ -634,7 +634,7 @@
        <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
      </div>
      <div class="thread-meta-row">
--      <span class="thread-post-count">${threadPosts.size()}件の投稿</span>
++      <span class="thread-post-count">${reportCount}件の報告 ・ ${commentCount}件のコメント</span>
        #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred')
          #if($actFeatured == '1')
            <a href="$doc.getURL('view', "action=unfeature&actObj=${actIdx}&form_token=${services.csrf.getToken()}")" class="btn-featured-toggle btn-unfeature" title="特色ある活動の選定を解除"><svg class="ico ico-fixed-14" viewBox="0 0 24 24" fill="currentColor" stroke="none"><polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"/></svg> 特色解除</a>
@@ -645,7 +645,10 @@
      </div>
    </div>
++  ## --- 活動報告セクション ---
    #foreach($post in $threadPosts)
++    #set($thisPostType = $!post.getValue('postType'))
++    #if($thisPostType != 'comment')
      #set($postContent = $post.getValue('content'))
      #set($postAuthor = $post.getValue('author'))
      #set($postAccountType = $!post.getValue('authorAccountType'))
@@ -867,14 +867,52 @@
      #end## /canViewPost
      #end## /postHidden
      #end## /postDeleted
++    #end## /postType != comment
++  #end## /foreach reports
++
++  ## --- コメントセクション（折りたたみ） ---
++  #if($commentCount > 0)
++  <details class="thread-comments-section">
++    <summary class="thread-comments-toggle">
++      <svg class="ico" viewBox="0 0 24 24"><path d="M21 15a2 2 0 01-2 2H7l-4 4V5a2 2 0 012-2h14a2 2 0 012 2z"/></svg> ${commentCount}件のコメント
++    </summary>
++    #foreach($post in $threadPosts)
++      #set($thisPostType = $!post.getValue('postType'))
++      #if($thisPostType == 'comment')
++        #set($postContent = $post.getValue('content'))
++        #set($postAuthor = $post.getValue('author'))
++        #set($postAccountType = $!post.getValue('authorAccountType'))
++        #set($postDate = $post.getValue('createdDate'))
++        #set($postDeleted = $!post.getValue('deleted'))
++        #if($postDeleted == 1 || $postDeleted == '1')
++          <div class="thread-comment thread-comment-deleted">
++            <span class="thread-comment-meta">このコメントは削除されました</span>
++          </div>
++        #else
++          #set($postHidden = $!post.getValue('hidden'))
++          #if($postHidden == 1 || $postHidden == '1')
++            <div class="thread-comment thread-comment-hidden">
++              <span class="thread-comment-meta">このコメントは非表示にされました</span>
++            </div>
++          #else
++            <div class="thread-comment">
++              <span class="thread-comment-author">$!escapetool.xml($postAuthor)</span>
++              <span class="thread-comment-date">$!postDate</span>
++              <div class="thread-comment-body">$!escapetool.xml($postContent)</div>
++            </div>
++          #end
++        #end
++      #end
++    #end
++  </details>
    #end
    #if($xcontext.user != "XWiki.XWikiGuest")
    <div class="thread-add-post">
--    <a href="/xwiki/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
++    <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
        ＋ 活動報告を追加
      </a>
--    <a href="/xwiki/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
++    <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>
    </div>
@@ -896,7 +896,7 @@
  #if($xcontext.user != "XWiki.XWikiGuest")
  {{html clean="false"}}
  <div class="activity-add-section">
--  <a href="/xwiki/bin/view/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$!escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity">
++  <a href="/bin/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$!escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity">
      <svg class="ico" viewBox="0 0 24 24" stroke-width="2.5"><line x1="12" y1="5" x2="12" y2="19"/><line x1="5" y1="12" x2="19" y2="12"/></svg> 活動を追加
    </a>
  </div>
@@ -903,59 +903,6 @@
  {{/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="/xwiki/bin/view/SeitokaiCode/YearArchiveAction?schoolPage=${doc.fullName}" class="btn-accent">
--      <svg class="ico" viewBox="0 0 24 24" stroke-width="2.5"><path d="M19 21H5a2 2 0 01-2-2V5a2 2 0 012-2h11l5 5v11a2 2 0 01-2 2z"/><polyline points="17 21 17 13 7 13 7 21"/><polyline points="7 3 7 8 15 8"/></svg>
--      ${pageFiscalYear}年度をアーカイブして新年度に移行
--    </a>
--    <div class="archive-action-hint">現在の学校情報を${pageFiscalYear}年度として保存し、新しい年度に移行します。</div>
--  </div>
--  #end
--</div>
--{{/html}}
--
  ## --- 年度タブ切り替え JavaScript ---
  {{html clean="false"}}
  <script>
@@ -965,29 +965,19 @@
    btn.classList.add('active');
    // 活動スレッドの表示切り替え
    document.querySelectorAll('.activity-thread[data-fiscal-year]').forEach(function(thread) {
--    if (fy === 'all') {
--      thread.style.display = '';
--    } else if (thread.getAttribute('data-fiscal-year') === fy) {
--      thread.style.display = '';
++    if (fy === 'all' || thread.getAttribute('data-fiscal-year') === fy) {
++      thread.classList.remove('fy-hidden');
      } else {
--      thread.style.display = 'none';
++      thread.classList.add('fy-hidden');
      }
    });
  }
--// ページ読み込み時にデフォルトで現在の年度を表示
++// ページ読み込み時の初期化
  document.addEventListener('DOMContentLoaded', function() {
++  // デフォルトで現在の年度を表示
    var defaultTab = document.querySelector('.activity-fy-tab.active');
    if (defaultTab) { defaultTab.click(); }
--  // モバイルでは基本情報・連絡先をデフォルト折りたたみ
--  if (window.innerWidth <= 768) {
--    document.querySelectorAll('.school-info-card.mobile-collapse').forEach(function(card) {
--      card.classList.add('collapsed');
--    });
--  }
    // 保存成功時のトースト通知
--  if (window.location.search.indexOf('archived=1') !== -1) {
--    showToast('年度アーカイブを作成しました', 'success');
--  }
    if (window.location.search.indexOf('saved=1') !== -1) {
      showToast('学校情報を保存しました', 'success');
      // URLパラメータをクリーンアップ（リロード時に再表示されないよう）
@@ -1023,7 +1023,6 @@
    var card = document.getElementById(cardId);
    if (!card) return;
    card.classList.toggle('collapsed');
--  card.classList.remove('mobile-collapse');
  }
  // 投稿の編集（インライン編集フォームを開く）
@@ -1055,7 +1055,9 @@
    var csrfEl = document.querySelector('input[name="form_token"]');
    var csrfToken = csrfEl ? csrfEl.value : '';
    var xhr = new XMLHttpRequest();
--  xhr.open('GET', '/xwiki/bin/view/SeitokaiCode/EditPost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken), true);
++  xhr.open('POST', '/bin/SeitokaiCode/EditPost?outputSyntax=plain', true);
++  xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
++  var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken);
    xhr.onload = function() {
      try {
        var res = JSON.parse(xhr.responseText);
@@ -1068,7 +1068,7 @@
      } catch(e) { alert('編集に失敗しました'); }
    };
    xhr.onerror = function() { alert('通信エラーが発生しました'); };
--  xhr.send();
++  xhr.send(editPostData);
  }
  // 投稿の削除（確認ダイアログ付き）
@@ -1075,7 +1075,9 @@
  function confirmDeletePost(schoolPage, postObjNum, token) {
    if (!confirm('この投稿を削除しますか？\\n削除後は「この投稿は削除されました」と表示されます。')) return;
    var xhr = new XMLHttpRequest();
--  xhr.open('GET', '/xwiki/bin/view/SeitokaiCode/DeletePost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token), true);
++  xhr.open('POST', '/bin/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);
@@ -1088,7 +1088,7 @@
      } catch(e) { alert('削除に失敗しました'); }
    };
    xhr.onerror = function() { alert('通信エラーが発生しました'); };
--  xhr.send();
++  xhr.send(deletePostData);
  }
  </script>
  {{/html}}