Skip to Content
Last modified by Super Admin on 2026/04/05 18:59
From version Icon 111.1 Icon
edited by Super Admin
on 2026/03/24 21:32
Change comment: There is no comment for this version
To version Icon 93.1 Icon
edited by Super Admin
on 2026/03/20 10:33
Change comment: There is no comment for this version

Summary

Details

Icon Page properties
Content
... ... @@ -7,19 +7,6 @@
7 7   #stop
8 8  #end
9 9  {{html clean="false"}}
10 -## --- OGP メタタグ（SNSシェア対応） ---
11 -#set($ogTitle = "$!{schoolName} — 生徒会Wiki")
12 -#set($ogDesc = "$!{schoolName}の生徒会活動情報。全国の高校の生徒会活動事例を集積・共有するプラットフォーム。")
13 -#set($ogUrl = "https://${request.serverName}${doc.getURL('view')}")
14 -<meta property="og:type" content="article" />
15 -<meta property="og:title" content="$escapetool.xml($ogTitle)" />
16 -<meta property="og:description" content="$escapetool.xml($ogDesc)" />
17 -<meta property="og:url" content="$escapetool.xml($ogUrl)" />
18 -<meta property="og:site_name" content="生徒会Wiki" />
19 -<meta property="og:locale" content="ja_JP" />
20 -<meta name="twitter:card" content="summary" />
21 -<meta name="twitter:title" content="$escapetool.xml($ogTitle)" />
22 -<meta name="twitter:description" content="$escapetool.xml($ogDesc)" />
23 23  ## メンテナンスバナー（{{include}}ではなくインラインで記述し、<p>タグ挿入を回避）
24 24  #set($bannerDoc = $xwiki.getDocument('SeitokaiAdmin.MaintenanceBanner'))
25 25  #set($bannerObj = $bannerDoc.getObject('SeitokaiCode.MaintenanceBannerClass'))
... ... @@ -77,44 +77,6 @@
77 77  #set($ruleReviewImplementer = $doc.getValue('ruleReviewImplementer'))
78 78  #set($ruleReviewSystem = $doc.getValue('ruleReviewSystem'))
79 79  
80 -## --- 活動環境 ---
81 -#set($activityPlace = $doc.getValue('activityPlace'))
82 -#set($activityRoomEquipment = $doc.getValue('activityRoomEquipment'))
83 -#set($activityRoomImage = $doc.getValue('activityRoomImage'))
84 -#set($ictTools = $doc.getValue('ictTools'))
85 -#set($ictUsage = $doc.getValue('ictUsage'))
86 -
87 -## --- 生徒総会 ---
88 -#set($assemblyFormat = $doc.getValue('assemblyFormat'))
89 -#set($assemblyCount = $doc.getValue('assemblyCount'))
90 -#set($assemblyAgenda = $doc.getValue('assemblyAgenda'))
91 -#set($assemblyTopics = $doc.getValue('assemblyTopics'))
92 -#set($assemblyNote = $doc.getValue('assemblyNote'))
93 -
94 -## --- 広報 ---
95 -#set($publicityMethod = $doc.getValue('publicityMethod'))
96 -#set($publicityFrequency = $doc.getValue('publicityFrequency'))
97 -#set($publicityNote = $doc.getValue('publicityNote'))
98 -
99 -## --- 外部連携 ---
100 -#set($externalCooperation = $doc.getValue('externalCooperation'))
101 -#set($externalOrgName = $doc.getValue('externalOrgName'))
102 -#set($socialParticipation = $doc.getValue('socialParticipation'))
103 -
104 -## --- 年間主要行事 ---
105 -#set($eventApril = $doc.getValue('eventApril'))
106 -#set($eventMay = $doc.getValue('eventMay'))
107 -#set($eventJune = $doc.getValue('eventJune'))
108 -#set($eventJuly = $doc.getValue('eventJuly'))
109 -#set($eventAugust = $doc.getValue('eventAugust'))
110 -#set($eventSeptember = $doc.getValue('eventSeptember'))
111 -#set($eventOctober = $doc.getValue('eventOctober'))
112 -#set($eventNovember = $doc.getValue('eventNovember'))
113 -#set($eventDecember = $doc.getValue('eventDecember'))
114 -#set($eventJanuary = $doc.getValue('eventJanuary'))
115 -#set($eventFebruary = $doc.getValue('eventFebruary'))
116 -#set($eventMarch = $doc.getValue('eventMarch'))
117 -
118 118  ## --- 課題・連絡先 ---
119 119  #set($challenges = $doc.getValue('challenges'))
120 120  #set($contactInfo = $doc.getValue('contactInfo'))
... ... @@ -139,14 +139,6 @@
139 139  #set($visibilityBudget = $!doc.getValue('visibilityBudget'))
140 140  #set($visibilityRuleReview = $!doc.getValue('visibilityRuleReview'))
141 141  #set($visibilityChallenges = $!doc.getValue('visibilityChallenges'))
142 -#set($visibilityDailyActivities = $!doc.getValue('visibilityDailyActivities'))
143 -#set($visibilityElection = $!doc.getValue('visibilityElection'))
144 -#set($visibilityMeeting = $!doc.getValue('visibilityMeeting'))
145 -#set($visibilityActivityEnv = $!doc.getValue('visibilityActivityEnv'))
146 -#set($visibilityAssembly = $!doc.getValue('visibilityAssembly'))
147 -#set($visibilityPublicity = $!doc.getValue('visibilityPublicity'))
148 -#set($visibilityExternal = $!doc.getValue('visibilityExternal'))
149 -#set($visibilityAnnualEvents = $!doc.getValue('visibilityAnnualEvents'))
150 150  ## デフォルト値（未設定なら全体公開）
151 151  #if(!$visibilityOrgChart || $visibilityOrgChart == '') #set($visibilityOrgChart = 'public') #end
152 152  #if(!$visibilityBudget || $visibilityBudget == '') #set($visibilityBudget = 'public') #end
... ... @@ -158,7 +158,6 @@
158 158  #set($isGuest = $viewerUser == 'XWiki.XWikiGuest')
159 159  #set($isViewerAdmin = false)
160 160  #set($viewerSchoolCode = '')
161 -#set($viewerSecondaryGraduated = false)
162 162  #if(!$isGuest)
163 163   #set($viewerDoc = $xwiki.getDocument($viewerUser))
164 164   #set($viewerAccountType = $!viewerDoc.getValue('accountType'))
... ... @@ -168,24 +168,6 @@
168 168   #if($viewerAccountType == 'admin')
169 169   #set($isViewerAdmin = true)
170 170   #end
171 - ## 第2所属校の在学年数超過チェック
172 - #set($viewerSecEnrollYear = $!viewerDoc.getValue('secondaryEnrollmentYear'))
173 - #if($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecEnrollYear && $viewerSecEnrollYear != '')
174 - #set($vNow = $datetool.date)
175 - #set($vCurYear = $mathtool.toInteger($datetool.format('yyyy', $vNow)))
176 - #set($vCurMonth = $mathtool.toInteger($datetool.format('MM', $vNow)))
177 - #if($vCurMonth >= 4)#set($vSchoolYear = $vCurYear)#else#set($vSchoolYear = $mathtool.sub($vCurYear, 1))#end
178 - #set($vSecEnroll = $mathtool.toInteger($viewerSecEnrollYear))
179 - #set($vSecMax = 3)
180 - #if($viewerSecondarySchoolCode.length() >= 2)
181 - #set($vSecType = $viewerSecondarySchoolCode.substring(0, 2))
182 - #if($vSecType == 'C2')#set($vSecMax = 9)#elseif($vSecType == 'D2')#set($vSecMax = 6)#end
183 - #end
184 - #set($vSecGrade = $mathtool.add($mathtool.sub($vSchoolYear, $vSecEnroll), 1))
185 - #if($vSecGrade > $vSecMax)
186 - #set($viewerSecondaryGraduated = true)
187 - #end
188 - #end
189 189  #end
190 190  
191 191  ## --- 関連校（中高一貫校）情報 ---
... ... @@ -195,7 +195,7 @@
195 195  #if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
196 196   #if($viewerSchoolCode == $affiliatedSchoolCode)
197 197   #set($isAffiliated = true)
198 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode && !$viewerSecondaryGraduated)
120 + #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode)
199 199   #set($isAffiliated = true)
200 200   #end
201 201  #end
... ... @@ -205,7 +205,7 @@
205 205  #if(!$isGuest && $viewerUserRole != 'graduate')
206 206   #if($viewerSchoolCode == $schoolCode || $isAffiliated)
207 207   #set($isSchoolMember = true)
208 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode && !$viewerSecondaryGraduated)
130 + #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode)
209 209   #set($isSchoolMember = true)
210 210   #end
211 211  #end
... ... @@ -409,106 +409,6 @@
409 409  </div>
410 410  #end
411 411  
412 -## --- 入力進捗ガイド（自校ユーザー向け） ---
413 -#if(!$isGuest && $canEdit)
414 - #set($stepItems = [])
415 - #set($completedCount = 0)
416 - #set($totalSteps = 8)
417 - ## 1. 基本情報（生徒数）
418 - #if($studentCount && $studentCount != '' && $studentCount != '0')
419 - #set($discard = $stepItems.add({'name': '基本情報（生徒数・学級数）', 'done': true}))
420 - #set($completedCount = $completedCount + 1)
421 - #else
422 - #set($discard = $stepItems.add({'name': '基本情報（生徒数・学級数）', 'done': false}))
423 - #end
424 - ## 2. 生徒会組織
425 - #if($orgChart && $orgChart != '')
426 - #set($discard = $stepItems.add({'name': '生徒会組織', 'done': true}))
427 - #set($completedCount = $completedCount + 1)
428 - #else
429 - #set($discard = $stepItems.add({'name': '生徒会組織', 'done': false}))
430 - #end
431 - ## 3. 日常の活動
432 - #if($dailyActivities && $dailyActivities != '')
433 - #set($discard = $stepItems.add({'name': '日常の活動', 'done': true}))
434 - #set($completedCount = $completedCount + 1)
435 - #else
436 - #set($discard = $stepItems.add({'name': '日常の活動', 'done': false}))
437 - #end
438 - ## 4. 生徒総会
439 - #if($assemblyFormat && $assemblyFormat != '')
440 - #set($discard = $stepItems.add({'name': '生徒総会', 'done': true}))
441 - #set($completedCount = $completedCount + 1)
442 - #else
443 - #set($discard = $stepItems.add({'name': '生徒総会', 'done': false}))
444 - #end
445 - ## 5. 選挙
446 - #if($electionExists && $electionExists != '')
447 - #set($discard = $stepItems.add({'name': '選挙', 'done': true}))
448 - #set($completedCount = $completedCount + 1)
449 - #else
450 - #set($discard = $stepItems.add({'name': '選挙', 'done': false}))
451 - #end
452 - ## 6. 校則の見直し
453 - #if($ruleReviewStatus && $ruleReviewStatus != '')
454 - #set($discard = $stepItems.add({'name': '校則・生徒会会則の見直し', 'done': true}))
455 - #set($completedCount = $completedCount + 1)
456 - #else
457 - #set($discard = $stepItems.add({'name': '校則・生徒会会則の見直し', 'done': false}))
458 - #end
459 - ## 7. 予算
460 - #set($budgetFilled = false)
461 - #if(($budgetScale && $budgetScale != '') || ($studentFee && $studentFee != '')) #set($budgetFilled = true) #end
462 - #if($budgetFilled)
463 - #set($discard = $stepItems.add({'name': '予算', 'done': true}))
464 - #set($completedCount = $completedCount + 1)
465 - #else
466 - #set($discard = $stepItems.add({'name': '予算', 'done': false}))
467 - #end
468 - ## 8. 活動報告
469 - #set($activityCount = $doc.getObjects('SeitokaiCode.ActivityClass').size())
470 - #if($activityCount > 0)
471 - #set($discard = $stepItems.add({'name': '活動報告', 'done': true}))
472 - #set($completedCount = $completedCount + 1)
473 - #else
474 - #set($discard = $stepItems.add({'name': '活動報告（まだ投稿がありません）', 'done': false}))
475 - #end
476 - ## 全完了なら非表示
477 - #if($completedCount < $totalSteps)
478 - #set($progressPct = $mathtool.mul($mathtool.div($completedCount, $totalSteps), 100))
479 - #set($progressPctInt = $mathtool.toInteger($progressPct))
480 - #set($firstMissing = false)
481 -<div class="progress-guide" style="margin-bottom:var(--sp-4);">
482 - <div class="progress-guide-header">
483 - <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>
484 - <span class="progress-guide-count">${completedCount} / ${totalSteps} 完了</span>
485 - </div>
486 - <div class="progress-bar-track">
487 - <div class="progress-bar-fill" style="width:${progressPctInt}%"></div>
488 - </div>
489 - <ul class="progress-step-list">
490 - #foreach($step in $stepItems)
491 - #if($step.done)
492 - <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>
493 - #else
494 - #if(!$firstMissing)
495 - <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>
496 - #set($firstMissing = true)
497 - #else
498 - <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>
499 - #end
500 - #end
501 - #end
502 - </ul>
503 - <div style="margin-top:var(--sp-3);">
504 - <a href="$doc.getURL('view', 'sheet=SeitokaiCode.SchoolEditForm')" class="btn-primary-sm">
505 - <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> 編集画面を開く
506 - </a>
507 - </div>
508 -</div>
509 - #end
510 -#end
511 -
512 512  ## --- ① 学校基本情報 ---
513 513  <div class="school-info-card collapsed" id="card-basic-info">
514 514   <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>
... ... @@ -565,132 +565,10 @@
565 565   #end
566 566   #end
567 567  
568 - ## --- 活動環境 ---
569 - #set($hasActivityEnv = ($activityPlace && !$activityPlace.isEmpty()) || ($activityRoomEquipment && $activityRoomEquipment != '') || ($activityRoomImage && $activityRoomImage != '') || ($ictTools && !$ictTools.isEmpty()) || ($ictUsage && !$ictUsage.isEmpty()))
570 - #if($hasActivityEnv)
571 - #set($canViewAE = true)
572 - #if($visibilityActivityEnv == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAE = false)
573 - #elseif($visibilityActivityEnv == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAE = false)
574 - #end
575 - #if($canViewAE)
576 - <div class="seitokai-subsection">
577 - <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>
578 - <div class="seitokai-subsection-content">
579 - #if($activityPlace && !$activityPlace.isEmpty())
580 - <div class="info-row">
581 - <span class="info-label">普段の活動場所</span>
582 - <span class="info-value">
583 - <div class="selection-display">
584 - #foreach($ap in $activityPlace)
585 - <span class="selection-item">$!escapetool.xml($ap.trim())</span>
586 - #end
587 - </div>
588 - </span>
589 - </div>
590 - #end
591 - #if($activityRoomEquipment && $activityRoomEquipment != '')
592 - <div class="info-row">
593 - <span class="info-label">生徒会室の設備</span>
594 - <span class="info-value free-text-value">$!escapetool.xml($activityRoomEquipment)</span>
595 - </div>
596 - #end
597 - #if($activityRoomImage && $activityRoomImage != '')
598 - <div class="info-row">
599 - <span class="info-label">活動場所の写真</span>
600 - <span class="info-value"><div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($activityRoomImage)" alt="活動場所の写真" class="org-chart-img" /></div></span>
601 - </div>
602 - #end
603 - #if($ictTools && !$ictTools.isEmpty())
604 - <div class="info-row">
605 - <span class="info-label">利用しているICTツール</span>
606 - <span class="info-value">
607 - #set($ictCatDisplay = [
608 - ["連絡ツール", ["メール","LINE","LINE WORKS","Discord","Slack","Microsoft Teams","Google Chat","InstagramのDM","XのDM","その他（連絡）"]],
609 - ["ドキュメント作成・共有", ["Googleドキュメント","Googleスプレッドシート","Googleスライド","Googleドライブ","Word","Excel","PowerPoint","OneDrive","SharePoint","Notion","Pages","Numbers","Keynote","Dropbox","Box","その他（ドキュメント）"]],
610 - ["タスク管理", ["Googleカレンダー","Google ToDoリスト","Trello","Asana","Excel等スプレッドシート","その他（タスク管理）"]],
611 - ["ビデオ会議ツール", ["Zoom","Google Meet","その他（ビデオ会議）"]],
612 - ["アンケート", ["Googleフォーム","Microsoft Forms","その他（アンケート）"]],
613 - ["デザイン・クリエイティブ", ["Canva","各種Adobe","CapCut","LumaFusion","AviUtl","ibisPaint","その他（デザイン）"]],
614 - ["その他", ["独自のWebシステム・自作アプリ"]]
615 - ])
616 - #foreach($catD in $ictCatDisplay)
617 - #set($catHasItems = false)
618 - #foreach($t in $catD.get(1))
619 - #if($ictTools.contains($t)) #set($catHasItems = true) #end
620 - #end
621 - #if($catHasItems)
622 - <div style="margin-bottom:6px">
623 - <span style="font-size:0.8em;font-weight:600;color:var(--text-mid)">$catD.get(0):</span>
624 - <div class="selection-display" style="margin-top:2px">
625 - #foreach($t in $catD.get(1))
626 - #if($ictTools.contains($t))
627 - <span class="selection-item">$!escapetool.xml($t)</span>
628 - #end
629 - #end
630 - </div>
631 - </div>
632 - #end
633 - #end
634 - </span>
635 - </div>
636 - #end
637 - #if($ictUsage && !$ictUsage.isEmpty())
638 - <div class="info-row">
639 - <span class="info-label">ICT活用している場面</span>
640 - <span class="info-value">
641 - <div class="selection-display">
642 - #foreach($iu in $ictUsage)
643 - <span class="selection-item">$!escapetool.xml($iu.trim())</span>
644 - #end
645 - </div>
646 - </span>
647 - </div>
648 - #end
649 - </div>
650 - </div>
651 - #else
652 - <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>
653 - #end
654 - #end
655 -
656 - ## --- 年間主要行事 ---
657 - #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]])
658 - #set($hasAnyEvent = false)
659 - #foreach($m in $months)
660 - #if($m.get(1) && $m.get(1) != '') #set($hasAnyEvent = true) #end
661 - #end
662 - #if($hasAnyEvent)
663 - #set($canViewAN = true)
664 - #if($visibilityAnnualEvents == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAN = false)
665 - #elseif($visibilityAnnualEvents == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAN = false)
666 - #end
667 - #if($canViewAN)
668 - <div class="seitokai-subsection">
669 - <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>
670 - <div class="seitokai-subsection-content">
671 - <table class="wiki-table school-info-table" style="margin:0">
672 - #foreach($m in $months)
673 - #if($m.get(1) && $m.get(1) != '')
674 - <tr><td style="width:60px;font-weight:600;white-space:nowrap">$m.get(0)</td><td>$!escapetool.xml($m.get(1))</td></tr>
675 - #end
676 - #end
677 - </table>
678 - </div>
679 - </div>
680 - #else
681 - <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>
682 - #end
683 - #end
684 -
685 685   ## --- 日常の活動 ---
686 686   #if($dailyActivities && !$dailyActivities.isEmpty())
687 - #set($canViewDA = true)
688 - #if($visibilityDailyActivities == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewDA = false)
689 - #elseif($visibilityDailyActivities == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewDA = false)
690 - #end
691 - #if($canViewDA)
692 692   <div class="seitokai-subsection">
693 - <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>
393 + <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>
694 694   <div class="seitokai-subsection-content">
695 695   <p class="activity-hint">活動時間が多い3つ</p>
696 696   <div class="tag-container">
... ... @@ -703,104 +703,12 @@
703 703   #end
704 704   </div>
705 705   </div>
706 - #else
707 - <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>
708 - #end
709 709   #end
710 710  
711 - ## --- 定例活動 ---
712 - #if($meetingFrequency && $meetingFrequency != '')
713 - #set($canViewMT = true)
714 - #if($visibilityMeeting == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewMT = false)
715 - #elseif($visibilityMeeting == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewMT = false)
716 - #end
717 - #if($canViewMT)
718 - <div class="seitokai-subsection">
719 - <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>
720 - <div class="seitokai-subsection-content">
721 - <div class="info-row">
722 - <span class="info-label">役員定例会の頻度</span>
723 - <span class="info-value">$!escapetool.xml($!meetingFrequency)</span>
724 - </div>
725 - #if($regularActivitiesNote && $regularActivitiesNote.trim() != '')
726 - <div class="free-note">$!escapetool.xml($regularActivitiesNote)</div>
727 - #end
728 - </div>
729 - </div>
730 - #else
731 - <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>
732 - #end
733 - #end
734 -
735 - ## --- 生徒総会 ---
736 - #set($hasAssembly = ($assemblyFormat && $assemblyFormat != '') || ($assemblyCount && $assemblyCount > 0) || ($assemblyAgenda && !$assemblyAgenda.isEmpty()) || ($assemblyTopics && !$assemblyTopics.isEmpty()) || ($assemblyNote && $assemblyNote != ''))
737 - #if($hasAssembly)
738 - #set($canViewAS = true)
739 - #if($visibilityAssembly == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAS = false)
740 - #elseif($visibilityAssembly == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAS = false)
741 - #end
742 - #if($canViewAS)
743 - <div class="seitokai-subsection">
744 - <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>
745 - <div class="seitokai-subsection-content">
746 - #if($assemblyFormat && $assemblyFormat != '')
747 - <div class="info-row">
748 - <span class="info-label">開催方式</span>
749 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($assemblyFormat)</span></span>
750 - </div>
751 - #end
752 - #if($assemblyCount && $assemblyCount > 0)
753 - <div class="info-row">
754 - <span class="info-label">開催回数（年）</span>
755 - <span class="info-value">$!escapetool.xml($assemblyCount)回</span>
756 - </div>
757 - #end
758 - #if($assemblyAgenda && !$assemblyAgenda.isEmpty())
759 - <div class="info-row">
760 - <span class="info-label">議案の集め方</span>
761 - <span class="info-value">
762 - <div class="selection-display">
763 - #foreach($aa in $assemblyAgenda)
764 - <span class="selection-item">$!escapetool.xml($aa.trim())</span>
765 - #end
766 - </div>
767 - </span>
768 - </div>
769 - #end
770 - #if($assemblyTopics && !$assemblyTopics.isEmpty())
771 - <div class="info-row">
772 - <span class="info-label">扱う内容</span>
773 - <span class="info-value">
774 - <div class="selection-display">
775 - #foreach($at in $assemblyTopics)
776 - <span class="selection-item">$!escapetool.xml($at.trim())</span>
777 - #end
778 - </div>
779 - </span>
780 - </div>
781 - #end
782 - #if($assemblyNote && $assemblyNote != '')
783 - <div class="info-row">
784 - <span class="info-label">自由記述</span>
785 - <span class="info-value free-text-value">$!escapetool.xml($assemblyNote)</span>
786 - </div>
787 - #end
788 - </div>
789 - </div>
790 - #else
791 - <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>
792 - #end
793 - #end
794 -
795 795   ## --- 選挙 ---
796 796   #if($electionExists && $electionExists != '')
797 - #set($canViewEL = true)
798 - #if($visibilityElection == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewEL = false)
799 - #elseif($visibilityElection == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewEL = false)
800 - #end
801 - #if($canViewEL)
802 802   <div class="seitokai-subsection">
803 - <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>
411 + <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>
804 804   <div class="seitokai-subsection-content">
805 805   <div class="info-row">
806 806   <span class="info-label">役員選挙</span>
... ... @@ -817,74 +817,22 @@
817 817   #end
818 818   </div>
819 819   </div>
820 - #else
821 - <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>
822 - #end
823 823   #end
824 824  
825 - ## --- 校則・生徒会会則の見直し ---
826 - #if($ruleReviewStatus && $ruleReviewStatus != '')
827 - #set($canViewRuleReview = true)
828 - #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewRuleReview = false)
829 - #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false)
830 - #end
831 - #if($canViewRuleReview)
430 + ## --- 定例活動 ---
431 + #if($meetingFrequency && $meetingFrequency != '')
832 832   <div class="seitokai-subsection">
833 - <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>
433 + <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>
834 834   <div class="seitokai-subsection-content">
835 835   <div class="info-row">
836 - <span class="info-label">見直しの有無（3年以内）</span>
837 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
436 + <span class="info-label">役員定例会の頻度</span>
437 + <span class="info-value">$!escapetool.xml($!meetingFrequency)</span>
838 838   </div>
839 - #if($ruleReviewStatus != '実施なし')
840 - #if($ruleReviewContent && !$ruleReviewContent.isEmpty())
841 - <div class="info-row">
842 - <span class="info-label">見直しの内容</span>
843 - <span class="info-value">
844 - <div class="selection-display">
845 - #foreach($rc in $ruleReviewContent)
846 - <span class="selection-item">$!escapetool.xml($rc.trim())</span>
847 - #end
848 - </div>
849 - </span>
850 - </div>
439 + #if($regularActivitiesNote && $regularActivitiesNote.trim() != '')
440 + <div class="free-note">$!escapetool.xml($regularActivitiesNote)</div>
851 851   #end
852 - #if($ruleReviewProposer && !$ruleReviewProposer.isEmpty())
853 - <div class="info-row">
854 - <span class="info-label">見直しの提案者</span>
855 - <span class="info-value">
856 - <div class="selection-display">
857 - #foreach($rp in $ruleReviewProposer)
858 - <span class="selection-item">$!escapetool.xml($rp.trim())</span>
859 - #end
860 - </div>
861 - </span>
862 - </div>
863 - #end
864 - #if($ruleReviewImplementer && !$ruleReviewImplementer.isEmpty())
865 - <div class="info-row">
866 - <span class="info-label">見直しの実施者</span>
867 - <span class="info-value">
868 - <div class="selection-display">
869 - #foreach($ri in $ruleReviewImplementer)
870 - <span class="selection-item">$!escapetool.xml($ri.trim())</span>
871 - #end
872 - </div>
873 - </span>
874 - </div>
875 - #end
876 - #end
877 - #if($ruleReviewSystem && $ruleReviewSystem != '')
878 - <div class="info-row">
879 - <span class="info-label">見直しの仕組み</span>
880 - <span class="info-value">$!escapetool.xml($!ruleReviewSystem)</span>
881 - </div>
882 - #end
883 883   </div>
884 884   </div>
885 - #else
886 - <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>
887 - #end
888 888   #end
889 889  
890 890   ## --- 予算 ---
... ... @@ -949,87 +949,68 @@
949 949   #end
950 950   #end
951 951  
952 - ## --- 広報 ---
953 - #set($hasPublicity = ($publicityMethod && !$publicityMethod.isEmpty()) || ($publicityFrequency && $publicityFrequency != '') || ($publicityNote && $publicityNote != ''))
954 - #if($hasPublicity)
955 - #set($canViewPB = true)
956 - #if($visibilityPublicity == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewPB = false)
957 - #elseif($visibilityPublicity == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPB = false)
508 + ## --- 校則・生徒会会則の見直し ---
509 + #if($ruleReviewStatus && $ruleReviewStatus != '')
510 + #set($canViewRuleReview = true)
511 + #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewRuleReview = false)
512 + #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false)
958 958   #end
959 - #if($canViewPB)
514 + #if($canViewRuleReview)
960 960   <div class="seitokai-subsection">
961 - <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>
516 + <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>
962 962   <div class="seitokai-subsection-content">
963 - #if($publicityMethod && !$publicityMethod.isEmpty())
964 964   <div class="info-row">
965 - <span class="info-label">方法</span>
519 + <span class="info-label">見直しの有無（3年以内）</span>
520 + <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
521 + </div>
522 + #if($ruleReviewStatus != '実施なし')
523 + #if($ruleReviewContent && !$ruleReviewContent.isEmpty())
524 + <div class="info-row">
525 + <span class="info-label">見直しの内容</span>
966 966   <span class="info-value">
967 967   <div class="selection-display">
968 - #foreach($pm in $publicityMethod)
969 - <span class="selection-item">$!escapetool.xml($pm.trim())</span>
528 + #foreach($rc in $ruleReviewContent)
529 + <span class="selection-item">$!escapetool.xml($rc.trim())</span>
970 970   #end
971 971   </div>
972 972   </span>
973 973   </div>
974 974   #end
975 - #if($publicityFrequency && $publicityFrequency != '')
535 + #if($ruleReviewProposer && !$ruleReviewProposer.isEmpty())
976 976   <div class="info-row">
977 - <span class="info-label">頻度</span>
978 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($publicityFrequency)</span></span>
537 + <span class="info-label">見直しの提案者</span>
538 + <span class="info-value">
539 + <div class="selection-display">
540 + #foreach($rp in $ruleReviewProposer)
541 + <span class="selection-item">$!escapetool.xml($rp.trim())</span>
542 + #end
543 + </div>
544 + </span>
979 979   </div>
980 980   #end
981 - #if($publicityNote && $publicityNote != '')
547 + #if($ruleReviewImplementer && !$ruleReviewImplementer.isEmpty())
982 982   <div class="info-row">
983 - <span class="info-label">自由記述</span>
984 - <span class="info-value free-text-value">$!escapetool.xml($publicityNote)</span>
985 - </div>
986 - #end
987 - </div>
988 - </div>
989 - #else
990 - <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>
991 - #end
992 - #end
993 -
994 - ## --- 外部連携 ---
995 - #set($hasExternal = ($externalCooperation && $externalCooperation != '') || ($externalOrgName && $externalOrgName != '') || ($socialParticipation && !$socialParticipation.isEmpty()))
996 - #if($hasExternal)
997 - #set($canViewEX = true)
998 - #if($visibilityExternal == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewEX = false)
999 - #elseif($visibilityExternal == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewEX = false)
1000 - #end
1001 - #if($canViewEX)
1002 - <div class="seitokai-subsection">
1003 - <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>
1004 - <div class="seitokai-subsection-content">
1005 - #if($externalCooperation && $externalCooperation != '')
1006 - <div class="info-row">
1007 - <span class="info-label">他校の生徒会との連携</span>
1008 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($externalCooperation)</span></span>
1009 - </div>
1010 - #end
1011 - #if($externalOrgName && $externalOrgName != '')
1012 - <div class="info-row">
1013 - <span class="info-label">参加している生徒会団体の名前</span>
1014 - <span class="info-value">$!escapetool.xml($externalOrgName)</span>
1015 - </div>
1016 - #end
1017 - #if($socialParticipation && !$socialParticipation.isEmpty())
1018 - <div class="info-row">
1019 - <span class="info-label">社会参加・地域連携・ボランティア</span>
549 + <span class="info-label">見直しの実施者</span>
1020 1020   <span class="info-value">
1021 1021   <div class="selection-display">
1022 - #foreach($sp2 in $socialParticipation)
1023 - <span class="selection-item">$!escapetool.xml($sp2.trim())</span>
552 + #foreach($ri in $ruleReviewImplementer)
553 + <span class="selection-item">$!escapetool.xml($ri.trim())</span>
1024 1024   #end
1025 1025   </div>
1026 1026   </span>
1027 1027   </div>
1028 1028   #end
559 + #end
560 + #if($ruleReviewSystem && $ruleReviewSystem != '')
561 + <div class="info-row">
562 + <span class="info-label">見直しの仕組み</span>
563 + <span class="info-value">$!escapetool.xml($!ruleReviewSystem)</span>
564 + </div>
565 + #end
1029 1029   </div>
1030 1030   </div>
1031 1031   #else
1032 - <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>
569 + <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>
1033 1033   #end
1034 1034   #end
1035 1035  
... ... @@ -1429,25 +1429,6 @@
1429 1429   #if($postVis != 'public')
1430 1430   <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>
1431 1431   #end
1432 - ## いいねボタン
1433 - #set($postLikeCount = $!post.getValue('likeCount'))
1434 - #if(!$postLikeCount || $postLikeCount == '') #set($postLikeCount = 0) #end
1435 - #set($postLikedBy = $!post.getValue('likedBy'))
1436 - #set($isLikedByMe = false)
1437 - #if($postLikedBy && $postLikedBy.contains($xcontext.user)) #set($isLikedByMe = true) #end
1438 - <div class="post-like-row post-action-mt">
1439 - #if($xcontext.user != 'XWiki.XWikiGuest')
1440 - <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)">
1441 - <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>
1442 - <span class="like-count">$postLikeCount</span>
1443 - </button>
1444 - #else
1445 - <span class="btn-like disabled">
1446 - <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>
1447 - <span class="like-count">$postLikeCount</span>
1448 - </span>
1449 - #end
1450 - </div>
1451 1451   ## 固定/編集/削除/通報/非表示ボタン（横並び）
1452 1452   #set($postAuthorRef = $!post.getValue('authorRef'))
1453 1453   #set($postObjNumED = $post.number)
... ... @@ -1568,68 +1568,10 @@
1568 1568  {{/html}}
1569 1569  #end
1570 1570  
1571 -## --- OGP / SNSシェア対応 ---
1572 -#set($ogpTitle = "${schoolName} — 生徒会Wiki")
1573 -#set($ogpDesc = "${schoolName}の生徒会活動情報。")
1574 -#if($prefecture && $prefecture != '') #set($ogpDesc = "${ogpDesc}${prefecture}") #end
1575 -#if($city && $city != '') #set($ogpDesc = "${ogpDesc}${city}。") #end
1576 -#if($dailyActivities && $dailyActivities != '') #set($ogpDesc = "${ogpDesc} 主な活動: ${dailyActivities}") #end
1577 -#set($ogpUrl = "https://${request.serverName}${doc.getURL()}")
1578 -
1579 1579  ## --- 年度タブ切り替え JavaScript ---
1580 1580  {{html clean="false"}}
1581 1581  <script>
1582 -// OGPメタタグ挿入
1583 -(function() {
1584 - var ogp = {
1585 - 'og:title': '$escapetool.javascript($ogpTitle)',
1586 - 'og:description': '$escapetool.javascript($ogpDesc)',
1587 - 'og:type': 'article',
1588 - 'og:url': '$escapetool.javascript($ogpUrl)',
1589 - 'og:site_name': '生徒会Wiki',
1590 - 'twitter:card': 'summary'
1591 - };
1592 - for (var p in ogp) {
1593 - var meta = document.createElement('meta');
1594 - meta.setAttribute('property', p);
1595 - meta.setAttribute('content', ogp[p]);
1596 - document.head.appendChild(meta);
1597 - }
1598 - // twitter用
1599 - var tw = document.createElement('meta');
1600 - tw.setAttribute('name', 'twitter:card');
1601 - tw.setAttribute('content', 'summary');
1602 - document.head.appendChild(tw);
1603 -})();
1604 1604  // コンパクト表示（タイトルのみ）トグル
1605 -// いいねトグル
1606 -function toggleLike(btn) {
1607 - var page = btn.getAttribute('data-page');
1608 - var obj = btn.getAttribute('data-obj');
1609 - var csrf = btn.getAttribute('data-csrf');
1610 - btn.disabled = true;
1611 - var fd = new FormData();
1612 - fd.append('page', page);
1613 - fd.append('obj', obj);
1614 - fd.append('form_token', csrf);
1615 - fetch('/bin/SeitokaiCode/LikePost', { method: 'POST', body: fd })
1616 - .then(function(r) { return r.json(); })
1617 - .then(function(data) {
1618 - btn.querySelector('.like-count').textContent = data.count;
1619 - if (data.action === 'liked') {
1620 - btn.classList.add('liked');
1621 - btn.querySelector('svg').setAttribute('fill', 'currentColor');
1622 - btn.querySelector('svg').setAttribute('stroke', 'none');
1623 - } else {
1624 - btn.classList.remove('liked');
1625 - btn.querySelector('svg').removeAttribute('fill');
1626 - btn.querySelector('svg').setAttribute('stroke', 'currentColor');
1627 - }
1628 - })
1629 - .catch(function() { alert('エラーが発生しました'); })
1630 - .finally(function() { btn.disabled = false; });
1631 -}
1632 -
1633 1633  function toggleCompactView() {
1634 1634   var container = document.querySelector('.xwiki-content') || document.body;
1635 1635   var isCompact = container.classList.toggle('activity-compact-view');
... ... @@ -1747,15 +1747,7 @@
1747 1747   };
1748 1748   var toast = document.createElement('div');
1749 1749   toast.className = 'toast toast-' + type;
1750 - var iconSvg = icons[type] || '';
1751 - if (iconSvg) {
1752 - var iconSpan = document.createElement('span');
1753 - iconSpan.innerHTML = iconSvg;
1754 - toast.appendChild(iconSpan);
1755 - }
1756 - var msgSpan = document.createElement('span');
1757 - msgSpan.textContent = message;
1758 - toast.appendChild(msgSpan);
1210 + toast.innerHTML = (icons[type] || '') + '<span>' + message + '</span>';
1759 1759   container.appendChild(toast);
1760 1760   setTimeout(function() { toast.remove(); }, 3200);
1761 1761  }
... ... @@ -1794,7 +1794,6 @@
1794 1794   var html = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>';
1795 1795  
1796 1796   // コメント以外は添付ファイル編集を表示
1797 - function escAttr(s) { return s.replace(/&/g,'&amp;').replace(/"/g,'&quot;').replace(/'/g,'&#39;').replace(/</g,'&lt;').replace(/>/g,'&gt;'); }
1798 1798   if (postType !== 'comment') {
1799 1799   // 既存画像
1800 1800   html += '<div class="edit-attachments">';
... ... @@ -1804,10 +1804,10 @@
1804 1804   for (var i = 0; i < imgs.length; i++) {
1805 1805   var img = imgs[i].trim();
1806 1806   if (!img) continue;
1807 - html += '<div class="edit-attach-item" data-name="' + escAttr(img) + '">' +
1258 + html += '<div class="edit-attach-item" data-name="' + img.replace(/"/g,'&quot;') + '">' +
1808 1808   '<img src="/xwiki/bin/download/' + schoolPage.replace(/\./g,'/') + '/' + encodeURIComponent(img) + '" class="edit-attach-thumb" />' +
1809 1809   '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1810 - '<input type="hidden" name="keepImages" value="' + escAttr(img) + '" />' +
1261 + '<input type="hidden" name="keepImages" value="' + img.replace(/"/g,'&quot;') + '" />' +
1811 1811   '</div>';
1812 1812   }
1813 1813   html += '</div>';
... ... @@ -1821,10 +1821,10 @@
1821 1821   if (!f) continue;
1822 1822   var displayName = f;
1823 1823   if (/^file_\d{14}_\d+_/.test(f)) displayName = f.replace(/^file_\d{14}_\d+_/, '');
1824 - html += '<div class="edit-attach-item" data-name="' + escAttr(f) + '">' +
1825 - '<span class="edit-attach-fname">' + escAttr(displayName) + '</span>' +
1275 + html += '<div class="edit-attach-item" data-name="' + f.replace(/"/g,'&quot;') + '">' +
1276 + '<span class="edit-attach-fname">' + displayName.replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</span>' +
1826 1826   '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1827 - '<input type="hidden" name="keepFiles" value="' + escAttr(f) + '" />' +
1278 + '<input type="hidden" name="keepFiles" value="' + f.replace(/"/g,'&quot;') + '" />' +
1828 1828   '</div>';
1829 1829   }
1830 1830   html += '</div>';