Skip to Content

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

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

From 74.1 to 75.1 From 110.1 to 111.1

From version

edited by Super Admin
on 2026/03/19 13:01

Change comment: There is no comment for this version

To version

edited by Super Admin
on 2026/03/24 19:13

Change comment: There is no comment for this version

Raw
Rendered

Summary

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

Details

Page properties

Content

@@ -7,6 +7,19 @@
    #stop
  #end
  {{html clean="false"}}
++## --- OGP メタタグ（SNSシェア対応） ---
++#set($ogTitle = "$!{schoolName} — 生徒会Wiki")
++#set($ogDesc = "$!{schoolName}の生徒会活動情報。全国の高校の生徒会活動事例を集積・共有するプラットフォーム。")
++#set($ogUrl = "https://${request.serverName}${doc.getURL('view')}")
++<meta property="og:type" content="article" />
++<meta property="og:title" content="$escapetool.xml($ogTitle)" />
++<meta property="og:description" content="$escapetool.xml($ogDesc)" />
++<meta property="og:url" content="$escapetool.xml($ogUrl)" />
++<meta property="og:site_name" content="生徒会Wiki" />
++<meta property="og:locale" content="ja_JP" />
++<meta name="twitter:card" content="summary" />
++<meta name="twitter:title" content="$escapetool.xml($ogTitle)" />
++<meta name="twitter:description" content="$escapetool.xml($ogDesc)" />
  ## メンテナンスバナー（{{include}}ではなくインラインで記述し、<p>タグ挿入を回避）
  #set($bannerDoc = $xwiki.getDocument('SeitokaiAdmin.MaintenanceBanner'))
  #set($bannerObj = $bannerDoc.getObject('SeitokaiCode.MaintenanceBannerClass'))
@@ -35,8 +35,9 @@
  #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'))
@@ -56,7 +56,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'))
@@ -63,6 +63,44 @@
  #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($ictTools = $doc.getValue('ictTools'))
++#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'))
@@ -87,6 +87,14 @@
  #set($visibilityBudget = $!doc.getValue('visibilityBudget'))
  #set($visibilityRuleReview = $!doc.getValue('visibilityRuleReview'))
  #set($visibilityChallenges = $!doc.getValue('visibilityChallenges'))
++#set($visibilityDailyActivities = $!doc.getValue('visibilityDailyActivities'))
++#set($visibilityElection = $!doc.getValue('visibilityElection'))
++#set($visibilityMeeting = $!doc.getValue('visibilityMeeting'))
++#set($visibilityActivityEnv = $!doc.getValue('visibilityActivityEnv'))
++#set($visibilityAssembly = $!doc.getValue('visibilityAssembly'))
++#set($visibilityPublicity = $!doc.getValue('visibilityPublicity'))
++#set($visibilityExternal = $!doc.getValue('visibilityExternal'))
++#set($visibilityAnnualEvents = $!doc.getValue('visibilityAnnualEvents'))
  ## デフォルト値（未設定なら全体公開）
  #if(!$visibilityOrgChart || $visibilityOrgChart == '') #set($visibilityOrgChart = 'public') #end
  #if(!$visibilityBudget || $visibilityBudget == '') #set($visibilityBudget = 'public') #end
@@ -98,6 +98,7 @@
  #set($isGuest = $viewerUser == 'XWiki.XWikiGuest')
  #set($isViewerAdmin = false)
  #set($viewerSchoolCode = '')
++#set($viewerSecondaryGraduated = false)
  #if(!$isGuest)
    #set($viewerDoc = $xwiki.getDocument($viewerUser))
    #set($viewerAccountType = $!viewerDoc.getValue('accountType'))
@@ -107,6 +107,24 @@
    #if($viewerAccountType == 'admin')
      #set($isViewerAdmin = true)
    #end
++  ## 第2所属校の在学年数超過チェック
++  #set($viewerSecEnrollYear = $!viewerDoc.getValue('secondaryEnrollmentYear'))
++  #if($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecEnrollYear && $viewerSecEnrollYear != '')
++    #set($vNow = $datetool.date)
++    #set($vCurYear = $mathtool.toInteger($datetool.format('yyyy', $vNow)))
++    #set($vCurMonth = $mathtool.toInteger($datetool.format('MM', $vNow)))
++    #if($vCurMonth >= 4)#set($vSchoolYear = $vCurYear)#else#set($vSchoolYear = $mathtool.sub($vCurYear, 1))#end
++    #set($vSecEnroll = $mathtool.toInteger($viewerSecEnrollYear))
++    #set($vSecMax = 3)
++    #if($viewerSecondarySchoolCode.length() >= 2)
++      #set($vSecType = $viewerSecondarySchoolCode.substring(0, 2))
++      #if($vSecType == 'C2')#set($vSecMax = 9)#elseif($vSecType == 'D2')#set($vSecMax = 6)#end
++    #end
++    #set($vSecGrade = $mathtool.add($mathtool.sub($vSchoolYear, $vSecEnroll), 1))
++    #if($vSecGrade > $vSecMax)
++      #set($viewerSecondaryGraduated = true)
++    #end
++  #end
  #end
  ## --- 関連校（中高一貫校）情報 ---
@@ -116,7 +116,7 @@
  #if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
    #if($viewerSchoolCode == $affiliatedSchoolCode)
      #set($isAffiliated = true)
--  #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode)
++  #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode && !$viewerSecondaryGraduated)
      #set($isAffiliated = true)
    #end
  #end
@@ -126,7 +126,7 @@
  #if(!$isGuest && $viewerUserRole != 'graduate')
    #if($viewerSchoolCode == $schoolCode || $isAffiliated)
      #set($isSchoolMember = true)
--  #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode)
++  #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode && !$viewerSecondaryGraduated)
      #set($isSchoolMember = true)
    #end
  #end
@@ -303,7 +303,7 @@
  ## --- 編集ボタン（権限があるユーザーのみ表示） ---
  #set($canEditSchool = false)
--#if(!$isGuest && ($isViewerAdmin || $isSchoolMember))
++#if(!$isGuest && ($isViewerAdmin || $isSchoolMember || $isAlumniOfSchool))
    #set($canEditSchool = true)
  #end
  #if($canEditSchool)
@@ -330,6 +330,106 @@
  </div>
  #end
++## --- 入力進捗ガイド（自校ユーザー向け） ---
++#if(!$isGuest && $canEdit)
++  #set($stepItems = [])
++  #set($completedCount = 0)
++  #set($totalSteps = 8)
++  ## 1. 基本情報（生徒数）
++  #if($studentCount && $studentCount != '' && $studentCount != '0')
++    #set($discard = $stepItems.add({'name': '基本情報（生徒数・学級数）', 'done': true}))
++    #set($completedCount = $completedCount + 1)
++  #else
++    #set($discard = $stepItems.add({'name': '基本情報（生徒数・学級数）', 'done': false}))
++  #end
++  ## 2. 生徒会組織
++  #if($orgChart && $orgChart != '')
++    #set($discard = $stepItems.add({'name': '生徒会組織', 'done': true}))
++    #set($completedCount = $completedCount + 1)
++  #else
++    #set($discard = $stepItems.add({'name': '生徒会組織', 'done': false}))
++  #end
++  ## 3. 日常の活動
++  #if($dailyActivities && $dailyActivities != '')
++    #set($discard = $stepItems.add({'name': '日常の活動', 'done': true}))
++    #set($completedCount = $completedCount + 1)
++  #else
++    #set($discard = $stepItems.add({'name': '日常の活動', 'done': false}))
++  #end
++  ## 4. 選挙
++  #if($electionExists && $electionExists != '')
++    #set($discard = $stepItems.add({'name': '選挙', 'done': true}))
++    #set($completedCount = $completedCount + 1)
++  #else
++    #set($discard = $stepItems.add({'name': '選挙', 'done': false}))
++  #end
++  ## 5. 予算
++  #set($budgetFilled = false)
++  #if(($budgetScale && $budgetScale != '') || ($studentFee && $studentFee != '')) #set($budgetFilled = true) #end
++  #if($budgetFilled)
++    #set($discard = $stepItems.add({'name': '予算', 'done': true}))
++    #set($completedCount = $completedCount + 1)
++  #else
++    #set($discard = $stepItems.add({'name': '予算', 'done': false}))
++  #end
++  ## 6. 校則の見直し
++  #if($ruleReviewStatus && $ruleReviewStatus != '')
++    #set($discard = $stepItems.add({'name': '校則・生徒会会則の見直し', 'done': true}))
++    #set($completedCount = $completedCount + 1)
++  #else
++    #set($discard = $stepItems.add({'name': '校則・生徒会会則の見直し', 'done': false}))
++  #end
++  ## 7. 生徒総会
++  #if($assemblyFormat && $assemblyFormat != '')
++    #set($discard = $stepItems.add({'name': '生徒総会', 'done': true}))
++    #set($completedCount = $completedCount + 1)
++  #else
++    #set($discard = $stepItems.add({'name': '生徒総会', 'done': false}))
++  #end
++  ## 8. 活動報告
++  #set($activityCount = $doc.getObjects('SeitokaiCode.ActivityClass').size())
++  #if($activityCount > 0)
++    #set($discard = $stepItems.add({'name': '活動報告', 'done': true}))
++    #set($completedCount = $completedCount + 1)
++  #else
++    #set($discard = $stepItems.add({'name': '活動報告（まだ投稿がありません）', 'done': false}))
++  #end
++  ## 全完了なら非表示
++  #if($completedCount < $totalSteps)
++    #set($progressPct = $mathtool.mul($mathtool.div($completedCount, $totalSteps), 100))
++    #set($progressPctInt = $mathtool.toInteger($progressPct))
++    #set($firstMissing = false)
++<div class="progress-guide" style="margin-bottom:var(--sp-4);">
++  <div class="progress-guide-header">
++    <span class="progress-guide-title"><svg class="ico" viewBox="0 0 24 24" style="width:1.1em;height:1.1em;vertical-align:-2px;"><circle cx="12" cy="12" r="10"/><polyline points="12 6 12 12 16 14"/></svg> 学校情報の入力状況</span>
++    <span class="progress-guide-count">${completedCount} / ${totalSteps} 完了</span>
++  </div>
++  <div class="progress-bar-track">
++    <div class="progress-bar-fill" style="width:${progressPctInt}%"></div>
++  </div>
++  <ul class="progress-step-list">
++    #foreach($step in $stepItems)
++      #if($step.done)
++    <li class="progress-step done"><svg class="ico" viewBox="0 0 24 24" style="width:0.9em;height:0.9em;"><path d="M20 6L9 17l-5-5"/></svg> $step.name</li>
++      #else
++        #if(!$firstMissing)
++    <li class="progress-step next"><svg class="ico" viewBox="0 0 24 24" style="width:0.9em;height:0.9em;"><circle cx="12" cy="12" r="10"/></svg> $step.name <span class="progress-next-label">← 次はここ！</span></li>
++          #set($firstMissing = true)
++        #else
++    <li class="progress-step pending"><svg class="ico" viewBox="0 0 24 24" style="width:0.9em;height:0.9em;"><rect x="3" y="3" width="18" height="18" rx="2"/></svg> $step.name</li>
++        #end
++      #end
++    #end
++  </ul>
++  <div style="margin-top:var(--sp-3);">
++    <a href="$doc.getURL('view', 'sheet=SeitokaiCode.SchoolEditForm')" class="btn-primary-sm">
++      <svg class="ico" viewBox="0 0 24 24" style="width:0.9em;height:0.9em;"><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>
++</div>
++  #end
++#end
++
  ## --- ① 学校基本情報 ---
  <div class="school-info-card collapsed" id="card-basic-info">
    <h2 role="button" tabindex="0" aria-expanded="false" onclick="toggleInfoCard('card-basic-info')" onkeydown="if(event.key==='Enter'||event.key===' '){event.preventDefault();toggleInfoCard('card-basic-info')}"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M4 19.5A2.5 2.5 0 016.5 17H20"/><path d="M6.5 2H20v20H6.5A2.5 2.5 0 014 19.5v-15A2.5 2.5 0 016.5 2z"/></svg> 学校基本情報</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2>
@@ -353,19 +353,18 @@
      </div>
      #end
    </div>
--  #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($schoolDescription && $schoolDescription.trim() != '')
++  <div class="free-note" style="margin-top:var(--sp-4);">$!escapetool.xml($schoolDescription)</div>
    #end
++
  </div>
--## --- ② 生徒会基本情報（折りたたみカード） ---
++## --- ② 生徒会情報（折りたたみカード） ---
  <div class="school-info-card" id="card-seitokai-info">
--  <h2 role="button" tabindex="0" aria-expanded="true" onclick="toggleInfoCard('card-seitokai-info')" onkeydown="if(event.key==='Enter'||event.key===' '){event.preventDefault();toggleInfoCard('card-seitokai-info')}"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/></svg> 生徒会基本情報</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2>
++  <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)
@@ -374,30 +374,33 @@
        #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>
++      <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/><line x1="9" y1="10" x2="9" y2="10.01"/><line x1="15" y1="10" x2="15" y2="10.01"/><line x1="9" y1="14" x2="9" y2="14.01"/><line x1="15" y1="14" x2="15" y2="14.01"/></svg> 生徒会組織 #if($visibilityOrgChart != 'public')<span class="visibility-badge visibility-${visibilityOrgChart}">#if($visibilityOrgChart == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
        <div class="seitokai-subsection-content">
          #if($orgChartImage && $orgChartImage != '')
          <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
          #end
--        #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end
++        #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>
++    <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($dailyActivities && !$dailyActivities.isEmpty())
++      #set($canViewDA = true)
++      #if($visibilityDailyActivities == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewDA = false)
++      #elseif($visibilityDailyActivities == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewDA = false)
++      #end
++      #if($canViewDA)
      <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>
++      <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> 日常の活動 #if($visibilityDailyActivities != '' && $visibilityDailyActivities != 'public')<span class="visibility-badge visibility-${visibilityDailyActivities}">#if($visibilityDailyActivities == '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">
--        <p class="activity-hint">活動時間の多い順に上位3つ</p>
++        <p class="activity-hint">活動時間が多い3つ</p>
          <div class="tag-container">
--          #set($daIdx = 1)
            #foreach($da in $dailyActivities)
--            <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
--            #set($daIdx = $daIdx + 1)
++            <span class="tag tag-accent">$!escapetool.xml($da.trim())</span>
            #end
          </div>
          #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
@@ -405,12 +405,20 @@
          #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($visibilityDailyActivities == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
++      #end
      #end
      ## --- 選挙 ---
      #if($electionExists && $electionExists != '')
++      #set($canViewEL = true)
++      #if($visibilityElection == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewEL = false)
++      #elseif($visibilityElection == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewEL = false)
++      #end
++      #if($canViewEL)
      <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>
++      <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> 選挙 #if($visibilityElection != '' && $visibilityElection != 'public')<span class="visibility-badge visibility-${visibilityElection}">#if($visibilityElection == '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">役員選挙</span>
@@ -427,12 +427,20 @@
          #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($visibilityElection == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
++      #end
      #end
      ## --- 定例活動 ---
      #if($meetingFrequency && $meetingFrequency != '')
++      #set($canViewMT = true)
++      #if($visibilityMeeting == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewMT = false)
++      #elseif($visibilityMeeting == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewMT = false)
++      #end
++      #if($canViewMT)
      <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>
++      <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> 定例活動 #if($visibilityMeeting != '' && $visibilityMeeting != 'public')<span class="visibility-badge visibility-${visibilityMeeting}">#if($visibilityMeeting == '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">役員定例会の頻度</span>
@@ -443,6 +443,9 @@
          #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($visibilityMeeting == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
++      #end
      #end
      ## --- 予算 ---
@@ -454,7 +454,7 @@
        #end
        #if($canViewBudget)
      <div class="seitokai-subsection">
--      <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><line x1="12" y1="1" x2="12" y2="23"/><path d="M17 5H9.5a3.5 3.5 0 000 7h5a3.5 3.5 0 010 7H6"/></svg> 予算 #if($visibilityBudget != 'public')<span class="visibility-badge visibility-${visibilityBudget}">#if($visibilityBudget == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
++      <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">
@@ -461,8 +461,13 @@
            <span class="info-label">作成過程の生徒関与</span>
            <span class="info-value">
              <div class="selection-display">
--              #foreach($bp in $budgetProcess)
--                <span class="selection-item">$!escapetool.xml($bp.trim())</span>
++              #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>
@@ -502,7 +502,7 @@
        #end
      #end
--    ## --- 校則の見直し ---
++    ## --- 校則・生徒会会則の見直し ---
      #if($ruleReviewStatus && $ruleReviewStatus != '')
        #set($canViewRuleReview = true)
        #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewRuleReview = false)
@@ -510,12 +510,13 @@
        #end
        #if($canViewRuleReview)
      <div class="seitokai-subsection">
--      <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M16 4h2a2 2 0 012 2v12a2 2 0 01-2 2h-2"/><path d="M8 4H6a2 2 0 00-2 2v12a2 2 0 002 2h2"/><line x1="12" y1="4" x2="12" y2="8"/><line x1="12" y1="16" x2="12" y2="20"/><line x1="8" y1="8" x2="16" y2="8"/><line x1="8" y1="16" x2="16" y2="16"/></svg> 校則の見直し #if($visibilityRuleReview != 'public')<span class="visibility-badge visibility-${visibilityRuleReview}">#if($visibilityRuleReview == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
++      <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>
@@ -552,6 +552,7 @@
            </span>
          </div>
          #end
++        #end
          #if($ruleReviewSystem && $ruleReviewSystem != '')
          <div class="info-row">
            <span class="info-label">見直しの仕組み</span>
@@ -561,10 +561,271 @@
        </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>
++    <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 校則・生徒会会則の見直し情報は #if($visibilityRuleReview == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
        #end
      #end
++    ## --- 活動環境 ---
++    #set($hasActivityEnv = ($activityPlace && !$activityPlace.isEmpty()) || ($activityRoomEquipment && $activityRoomEquipment != '') || ($activityRoomImage && $activityRoomImage != '') || ($ictTools && !$ictTools.isEmpty()) || ($ictUsage && !$ictUsage.isEmpty()))
++    #if($hasActivityEnv)
++      #set($canViewAE = true)
++      #if($visibilityActivityEnv == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAE = false)
++      #elseif($visibilityActivityEnv == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAE = false)
++      #end
++      #if($canViewAE)
++    <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> 生徒会の活動環境 #if($visibilityActivityEnv != '' && $visibilityActivityEnv != 'public')<span class="visibility-badge visibility-${visibilityActivityEnv}">#if($visibilityActivityEnv == '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($activityPlace && !$activityPlace.isEmpty())
++        <div class="info-row">
++          <span class="info-label">普段の活動場所</span>
++          <span class="info-value">
++            <div class="selection-display">
++              #foreach($ap in $activityPlace)
++                <span class="selection-item">$!escapetool.xml($ap.trim())</span>
++              #end
++            </div>
++          </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($ictTools && !$ictTools.isEmpty())
++        <div class="info-row">
++          <span class="info-label">利用しているICTツール</span>
++          <span class="info-value">
++            #set($ictCatDisplay = [
++              ["連絡ツール", ["メール","LINE","LINE WORKS","Discord","Slack","Microsoft Teams","Google Chat","InstagramのDM","XのDM","その他（連絡）"]],
++              ["ドキュメント作成・共有", ["Googleドキュメント","Googleスプレッドシート","Googleスライド","Googleドライブ","Word","Excel","PowerPoint","OneDrive","SharePoint","Notion","Pages","Numbers","Keynote","Dropbox","Box","その他（ドキュメント）"]],
++              ["タスク管理", ["Googleカレンダー","Google ToDoリスト","Trello","Asana","Excel等スプレッドシート","その他（タスク管理）"]],
++              ["ビデオ会議ツール", ["Zoom","Google Meet","その他（ビデオ会議）"]],
++              ["アンケート", ["Googleフォーム","Microsoft Forms","その他（アンケート）"]],
++              ["デザイン・クリエイティブ", ["Canva","各種Adobe","CapCut","LumaFusion","AviUtl","ibisPaint","その他（デザイン）"]],
++              ["その他", ["独自のWebシステム・自作アプリ"]]
++            ])
++            #foreach($catD in $ictCatDisplay)
++              #set($catHasItems = false)
++              #foreach($t in $catD.get(1))
++                #if($ictTools.contains($t)) #set($catHasItems = true) #end
++              #end
++              #if($catHasItems)
++              <div style="margin-bottom:6px">
++                <span style="font-size:0.8em;font-weight:600;color:var(--text-mid)">$catD.get(0):</span>
++                <div class="selection-display" style="margin-top:2px">
++                  #foreach($t in $catD.get(1))
++                    #if($ictTools.contains($t))
++                    <span class="selection-item">$!escapetool.xml($t)</span>
++                    #end
++                  #end
++                </div>
++              </div>
++              #end
++            #end
++          </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>
++      #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($visibilityActivityEnv == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
++      #end
++    #end
++
++    ## --- 生徒総会 ---
++    #set($hasAssembly = ($assemblyFormat && $assemblyFormat != '') || ($assemblyCount && $assemblyCount > 0) || ($assemblyAgenda && !$assemblyAgenda.isEmpty()) || ($assemblyTopics && !$assemblyTopics.isEmpty()) || ($assemblyNote && $assemblyNote != ''))
++    #if($hasAssembly)
++      #set($canViewAS = true)
++      #if($visibilityAssembly == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAS = false)
++      #elseif($visibilityAssembly == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAS = false)
++      #end
++      #if($canViewAS)
++    <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> 生徒総会 #if($visibilityAssembly != '' && $visibilityAssembly != 'public')<span class="visibility-badge visibility-${visibilityAssembly}">#if($visibilityAssembly == '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($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>
++      #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($visibilityAssembly == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
++      #end
++    #end
++
++    ## --- 広報 ---
++    #set($hasPublicity = ($publicityMethod && !$publicityMethod.isEmpty()) || ($publicityFrequency && $publicityFrequency != '') || ($publicityNote && $publicityNote != ''))
++    #if($hasPublicity)
++      #set($canViewPB = true)
++      #if($visibilityPublicity == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewPB = false)
++      #elseif($visibilityPublicity == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPB = false)
++      #end
++      #if($canViewPB)
++    <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> 広報 #if($visibilityPublicity != '' && $visibilityPublicity != 'public')<span class="visibility-badge visibility-${visibilityPublicity}">#if($visibilityPublicity == '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($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>
++        #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>
++      #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($visibilityPublicity == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
++      #end
++    #end
++
++    ## --- 外部連携 ---
++    #set($hasExternal = ($externalCooperation && $externalCooperation != '') || ($externalOrgName && $externalOrgName != '') || ($socialParticipation && !$socialParticipation.isEmpty()))
++    #if($hasExternal)
++      #set($canViewEX = true)
++      #if($visibilityExternal == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewEX = false)
++      #elseif($visibilityExternal == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewEX = false)
++      #end
++      #if($canViewEX)
++    <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> 外部連携 #if($visibilityExternal != '' && $visibilityExternal != 'public')<span class="visibility-badge visibility-${visibilityExternal}">#if($visibilityExternal == '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($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>
++        #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>
++      #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($visibilityExternal == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
++      #end
++    #end
++
++    ## --- 年間主要行事 ---
++    #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)
++      #set($canViewAN = true)
++      #if($visibilityAnnualEvents == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAN = false)
++      #elseif($visibilityAnnualEvents == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAN = false)
++      #end
++      #if($canViewAN)
++    <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> 年間主要行事 #if($visibilityAnnualEvents != '' && $visibilityAnnualEvents != 'public')<span class="visibility-badge visibility-${visibilityAnnualEvents}">#if($visibilityAnnualEvents == '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">
++        <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
++        #end
++        </table>
++      </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($visibilityAnnualEvents == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
++      #end
++    #end
++
      ## --- 生徒会の課題意識 ---
      #if($challenges && $challenges != '')
        #set($canViewChallenges = true)
@@ -573,7 +573,7 @@
        #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>
++      <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>
@@ -597,6 +597,11 @@
      <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
  </div>
  {{/html}}
@@ -736,16 +736,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 ico-star-offset" viewBox="0 0 24 24" fill="currentColor" stroke="none"><polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"/></svg>#end</h3>
--      <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
++      <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
--      #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')
@@ -881,6 +881,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)
@@ -945,16 +945,34 @@
          #end
        </div>
        #if($postVis != 'public')
--      <div class="visibility-badge visibility-${postVis} post-action-mt">#if($postVis == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</div>
++      <div class="visibility-badge visibility-${postVis} post-action-mt">#if($postVis == '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
++      ## いいねボタン
++      #set($postLikeCount = $!post.getValue('likeCount'))
++      #if(!$postLikeCount || $postLikeCount == '') #set($postLikeCount = 0) #end
++      #set($postLikedBy = $!post.getValue('likedBy'))
++      #set($isLikedByMe = false)
++      #if($postLikedBy && $postLikedBy.contains($xcontext.user)) #set($isLikedByMe = true) #end
++      <div class="post-like-row post-action-mt">
++        #if($xcontext.user != 'XWiki.XWikiGuest')
++        <button type="button" class="btn-like #if($isLikedByMe)liked#end" data-page="$escapetool.xml($doc.fullName)" data-obj="$post.number" data-csrf="$services.csrf.getToken()" onclick="toggleLike(this)">
++          <svg class="ico ico-fixed-14" viewBox="0 0 24 24" #if($isLikedByMe)fill="currentColor" stroke="none"#end><path d="M20.84 4.61a5.5 5.5 0 00-7.78 0L12 5.67l-1.06-1.06a5.5 5.5 0 00-7.78 7.78l1.06 1.06L12 21.23l7.78-7.78 1.06-1.06a5.5 5.5 0 000-7.78z"/></svg>
++          <span class="like-count">$postLikeCount</span>
++        </button>
++        #else
++        <span class="btn-like disabled">
++          <svg class="ico ico-fixed-14" viewBox="0 0 24 24"><path d="M20.84 4.61a5.5 5.5 0 00-7.78 0L12 5.67l-1.06-1.06a5.5 5.5 0 00-7.78 7.78l1.06 1.06L12 21.23l7.78-7.78 1.06-1.06a5.5 5.5 0 000-7.78z"/></svg>
++          <span class="like-count">$postLikeCount</span>
++        </span>
++        #end
++      </div>
        ## 固定/編集/削除/通報/非表示ボタン（横並び）
        #set($postAuthorRef = $!post.getValue('authorRef'))
        #set($postObjNumED = $post.number)
        #set($showPinBtn = ($viewerAccountType == 'admin' || $viewerAccountType == 'verified'))
        #set($showEditDeleteBtn = ($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin'))
--      #set($showReportBtn = (!$isGuest && $xcontext.user != $postAuthorRef))
        #set($showHideBtn = ($viewerAccountType == 'admin'))
--      #if($showPinBtn || $showEditDeleteBtn || $showReportBtn || $showHideBtn)
++      #if($showPinBtn || $showEditDeleteBtn || $showHideBtn)
        <div class="post-edit-actions post-action-mt">
          #if($showPinBtn)
          #set($postObjNum = $post.number)
@@ -970,7 +970,9 @@
          #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
@@ -978,11 +978,6 @@
            <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($showReportBtn)
--        <button type="button" class="btn-post-report" onclick="openReportDialog(this, '${doc.fullName}', $postObjNumED, '${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
          #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> 非表示
@@ -1037,9 +1037,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>
@@ -1069,10 +1069,68 @@
  {{/html}}
  #end
++## --- OGP / SNSシェア対応 ---
++#set($ogpTitle = "${schoolName} — 生徒会Wiki")
++#set($ogpDesc = "${schoolName}の生徒会活動情報。")
++#if($prefecture && $prefecture != '') #set($ogpDesc = "${ogpDesc}${prefecture}") #end
++#if($city && $city != '') #set($ogpDesc = "${ogpDesc}${city}。") #end
++#if($dailyActivities && $dailyActivities != '') #set($ogpDesc = "${ogpDesc} 主な活動: ${dailyActivities}") #end
++#set($ogpUrl = "https://${request.serverName}${doc.getURL()}")
++
  ## --- 年度タブ切り替え JavaScript ---
  {{html clean="false"}}
  <script>
++// OGPメタタグ挿入
++(function() {
++  var ogp = {
++    'og:title': '$escapetool.javascript($ogpTitle)',
++    'og:description': '$escapetool.javascript($ogpDesc)',
++    'og:type': 'article',
++    'og:url': '$escapetool.javascript($ogpUrl)',
++    'og:site_name': '生徒会Wiki',
++    'twitter:card': 'summary'
++  };
++  for (var p in ogp) {
++    var meta = document.createElement('meta');
++    meta.setAttribute('property', p);
++    meta.setAttribute('content', ogp[p]);
++    document.head.appendChild(meta);
++  }
++  // twitter用
++  var tw = document.createElement('meta');
++  tw.setAttribute('name', 'twitter:card');
++  tw.setAttribute('content', 'summary');
++  document.head.appendChild(tw);
++})();
  // コンパクト表示（タイトルのみ）トグル
++// いいねトグル
++function toggleLike(btn) {
++  var page = btn.getAttribute('data-page');
++  var obj = btn.getAttribute('data-obj');
++  var csrf = btn.getAttribute('data-csrf');
++  btn.disabled = true;
++  var fd = new FormData();
++  fd.append('page', page);
++  fd.append('obj', obj);
++  fd.append('form_token', csrf);
++  fetch('/bin/SeitokaiCode/LikePost', { method: 'POST', body: fd })
++    .then(function(r) { return r.json(); })
++    .then(function(data) {
++      btn.querySelector('.like-count').textContent = data.count;
++      if (data.action === 'liked') {
++        btn.classList.add('liked');
++        btn.querySelector('svg').setAttribute('fill', 'currentColor');
++        btn.querySelector('svg').setAttribute('stroke', 'none');
++      } else {
++        btn.classList.remove('liked');
++        btn.querySelector('svg').removeAttribute('fill');
++        btn.querySelector('svg').setAttribute('stroke', 'currentColor');
++      }
++    })
++    .catch(function() { alert('エラーが発生しました'); })
++    .finally(function() { btn.disabled = false; });
++}
++
  function toggleCompactView() {
    var container = document.querySelector('.xwiki-content') || document.body;
    var isCompact = container.classList.toggle('activity-compact-view');
@@ -1190,7 +1190,15 @@
    };
    var toast = document.createElement('div');
    toast.className = 'toast toast-' + type;
--  toast.innerHTML = (icons[type] || '') + '<span>' + message + '</span>';
++  var iconSvg = icons[type] || '';
++  if (iconSvg) {
++    var iconSpan = document.createElement('span');
++    iconSpan.innerHTML = iconSvg;
++    toast.appendChild(iconSpan);
++  }
++  var msgSpan = document.createElement('span');
++  msgSpan.textContent = message;
++  toast.appendChild(msgSpan);
    container.appendChild(toast);
    setTimeout(function() { toast.remove(); }, 3200);
  }
@@ -1206,37 +1206,131 @@
  }
  // 投稿の編集（インライン編集フォームを開く）
--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>';
++
++  // コメント以外は添付ファイル編集を表示
++  function escAttr(s) { return s.replace(/&/g,'&amp;').replace(/"/g,'&quot;').replace(/'/g,'&#39;').replace(/</g,'&lt;').replace(/>/g,'&gt;'); }
++  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="' + escAttr(img) + '">' +
++          '<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="' + escAttr(img) + '" />' +
++          '</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="' + escAttr(f) + '">' +
++          '<span class="edit-attach-fname">' + escAttr(displayName) + '</span>' +
++          '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
++          '<input type="hidden" name="keepFiles" value="' + escAttr(f) + '" />' +
++          '</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('POST', '/bin/get/SeitokaiCode/EditPost?outputSyntax=plain', true);
--  xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
--  var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken);
    xhr.onload = function() {
      try {
        var res = JSON.parse(xhr.responseText);
@@ -1244,12 +1244,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(editPostData);
++  xhr.onerror = function() { btn.disabled = false; btn.textContent = '保存'; alert('通信エラーが発生しました'); };
++  xhr.send(fd);
  }
  // 投稿の削除（確認ダイアログ付き）