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

Summary

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

Details

Page properties

Content

...	...	@@ -1,6 +1,25 @@
1	1	{{velocity}}
2	2	## ===== 学校ページ テンプレート =====
	3	+## ゲストが ?sheet= 付きURL（編集フォーム等）に直接アクセスした場合、ログインページへリダイレクト
	4	+#if($xcontext.user == 'XWiki.XWikiGuest' && $request.sheet && $request.sheet != '')
	5	+ #set($currentUrl = $doc.getURL('view', "sheet=${request.sheet}"))
	6	+ $response.sendRedirect("/bin/login/XWiki/XWikiLogin?srid=$escapetool.url($currentUrl)")
	7	+ #stop
	8	+#end
3	3	{{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)" />
4	4	## メンテナンスバナー（{{include}}ではなくインラインで記述し、<p>タグ挿入を回避）
5	5	#set($bannerDoc = $xwiki.getDocument('SeitokaiAdmin.MaintenanceBanner'))
6	6	#set($bannerObj = $bannerDoc.getObject('SeitokaiCode.MaintenanceBannerClass'))
...	...	@@ -28,8 +28,10 @@
28	28	#set($schoolLevel = $doc.getValue('schoolLevel'))
29	29	#set($schoolSystem = $doc.getValue('schoolSystem'))
30	30	#set($website = $doc.getValue('website'))
	50	+#set($schoolPhoto = $doc.getValue('schoolPhoto'))
	51	+#set($schoolDescription = $doc.getValue('schoolDescription'))
31	31
32		-## --- 組織図 ---
	53	+## --- 生徒会組織 ---
33	33	#set($orgChart = $doc.getValue('orgChart'))
34	34	#set($orgChartImage = $doc.getValue('orgChartImage'))
35	35
...	...	@@ -49,7 +49,7 @@
49	49	#set($budgetAllocation = $doc.getValue('budgetAllocation'))
50	50	#set($budgetNote = $doc.getValue('budgetNote'))
51	51
52		-## --- 校則の見直し ---
	73	+## --- 校則・生徒会会則の見直し ---
53	53	#set($ruleReviewStatus = $doc.getValue('ruleReviewStatus'))
54	54	#set($ruleReviewContent = $doc.getValue('ruleReviewContent'))
55	55	#set($ruleReviewProposer = $doc.getValue('ruleReviewProposer'))
...	...	@@ -56,6 +56,44 @@
56	56	#set($ruleReviewImplementer = $doc.getValue('ruleReviewImplementer'))
57	57	#set($ruleReviewSystem = $doc.getValue('ruleReviewSystem'))
58	58
	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	+
59	59	## --- 課題・連絡先 ---
60	60	#set($challenges = $doc.getValue('challenges'))
61	61	#set($contactInfo = $doc.getValue('contactInfo'))
...	...	@@ -80,6 +80,14 @@
80	80	#set($visibilityBudget = $!doc.getValue('visibilityBudget'))
81	81	#set($visibilityRuleReview = $!doc.getValue('visibilityRuleReview'))
82	82	#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'))
83	83	## デフォルト値（未設定なら全体公開）
84	84	#if(!$visibilityOrgChart || $visibilityOrgChart == '') #set($visibilityOrgChart = 'public') #end
85	85	#if(!$visibilityBudget || $visibilityBudget == '') #set($visibilityBudget = 'public') #end
...	...	@@ -91,15 +91,65 @@
91	91	#set($isGuest = $viewerUser == 'XWiki.XWikiGuest')
92	92	#set($isViewerAdmin = false)
93	93	#set($viewerSchoolCode = '')
	161	+#set($viewerSecondaryGraduated = false)
94	94	#if(!$isGuest)
95	95	#set($viewerDoc = $xwiki.getDocument($viewerUser))
96	96	#set($viewerAccountType = $!viewerDoc.getValue('accountType'))
97	97	#set($viewerSchoolCode = $!viewerDoc.getValue('schoolCode'))
	166	+ #set($viewerSecondarySchoolCode = $!viewerDoc.getValue('secondarySchoolCode'))
	167	+ #set($viewerUserRole = $!viewerDoc.getValue('userRole'))
98	98	#if($viewerAccountType == 'admin')
99	99	#set($isViewerAdmin = true)
100	100	#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
101	101	#end
102	102
	191	+## --- 関連校（中高一貫校）情報 ---
	192	+#set($affiliatedSchoolCode = $!doc.getValue('affiliatedSchoolCode'))
	193	+#set($affiliatedSchoolName = $!doc.getValue('affiliatedSchoolName'))
	194	+#set($isAffiliated = false)
	195	+#if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
	196	+ #if($viewerSchoolCode == $affiliatedSchoolCode)
	197	+ #set($isAffiliated = true)
	198	+ #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode && !$viewerSecondaryGraduated)
	199	+ #set($isAffiliated = true)
	200	+ #end
	201	+#end
	202	+
	203	+## --- 校内判定（卒業生を除外、secondarySchoolCodeも含む） ---
	204	+#set($isSchoolMember = false)
	205	+#if(!$isGuest && $viewerUserRole != 'graduate')
	206	+ #if($viewerSchoolCode == $schoolCode || $isAffiliated)
	207	+ #set($isSchoolMember = true)
	208	+ #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode && !$viewerSecondaryGraduated)
	209	+ #set($isSchoolMember = true)
	210	+ #end
	211	+#end
	212	+## 卒業生の母校判定（投稿バッジ用）
	213	+#set($isAlumniOfSchool = false)
	214	+#if(!$isGuest && $viewerUserRole == 'graduate')
	215	+ #if($viewerSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $viewerSchoolCode == $affiliatedSchoolCode))
	216	+ #set($isAlumniOfSchool = true)
	217	+ #end
	218	+#end
	219	+
103	103	## --- 学校ページ非表示チェック ---
104	104	#set($schoolHidden = $doc.getValue('hidden'))
105	105	#if($schoolHidden == 1)
...	...	@@ -127,8 +127,6 @@
127	127	<p>このページは管理者により非公開に設定されています。</p>
128	128	<a href="$xwiki.getURL('Schools.WebHome', 'view')" class="btn-back-list">学校一覧に戻る</a>
129	129	</div>
130		-{{/html}}
131		-{{/velocity}}
132	132	#stop
133	133	#end
134	134	#end
...	...	@@ -135,7 +135,7 @@
135	135
136	136	## --- 投稿固定/解除処理 ---
137	137	#set($pinAction = $!request.action)
138		-#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token))
	253	+#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $isSchoolMember)) && $services.csrf.isTokenValid($request.form_token))
139	139	#set($pinPostObjStr = $!request.postObj)
140	140	#if(!$pinPostObjStr.matches('^\d+$'))
141	141	## 不正な値 → 無視
...	...	@@ -165,7 +165,7 @@
165	165
166	166	## --- 特色ある活動 選定/解除処理 ---
167	167	#set($featAction = $!request.action)
168		-#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token))
	283	+#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $isSchoolMember)) && $services.csrf.isTokenValid($request.form_token))
169	169	#set($featActObjStr = $!request.actObj)
170	170	#if($featActObjStr.matches('^\d+$'))
171	171	#set($actObjNum = $mathtool.toInteger($featActObjStr))
...	...	@@ -267,314 +267,605 @@
267	267
268	268	## --- 編集ボタン（権限があるユーザーのみ表示） ---
269	269	#set($canEditSchool = false)
270		-#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode))
	385	+#if(!$isGuest && ($isViewerAdmin || $isSchoolMember || $isAlumniOfSchool))
271	271	#set($canEditSchool = true)
272	272	#end
273	273	#if($canEditSchool)
274	274	<div style="text-align:right; margin-bottom:12px;">
275		- <a href="$doc.getURL('view', 'sheet=SeitokaiCode.SchoolEditForm')" class="btn-school-edit"><svg class="ico" viewBox="0 0 24 24"><path d="M11 4H4a2 2 0 00-2 2v14a2 2 0 002 2h14a2 2 0 002-2v-7"/><path d="M18.5 2.5a2.121 2.121 0 013 3L12 15l-4 1 1-4 9.5-9.5z"/></svg> 基本情報を編集</a>
	390	+ <a href="$doc.getURL('view', 'sheet=SeitokaiCode.SchoolEditForm')" class="btn-school-edit"><svg class="ico" viewBox="0 0 24 24"><path d="M11 4H4a2 2 0 00-2 2v14a2 2 0 002 2h14a2 2 0 002-2v-7"/><path d="M18.5 2.5a2.121 2.121 0 013 3L12 15l-4 1 1-4 9.5-9.5z"/></svg> 情報を編集</a>
276	276	</div>
277	277	#end
278	278
279		-## --- ① 学校基本情報 + 連絡先（左右グリッド・折りたたみ対応） ---
280		-<div class="school-info-grid">
281		- <div class="school-info-card collapsed" id="card-basic-info">
282		- <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>
283		- <table class="wiki-table school-info-table">
284		- <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
285		- <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
286		- <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
287		- <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
288		- <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
289		- <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
290		- <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
291		- <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
292		- <tr><th>公式サイト</th><td>#if($website && $website != '')<a href="$!escapetool.xml($website)" target="_blank" rel="noopener">$!escapetool.xml($website)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
293		- </table>
294		- #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
295		- #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
296		- #if($infoEditDate && $infoEditDate != '')
297		- <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>
	394	+## --- 関連校（中高一貫校）バナー ---
	395	+#if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
	396	+ #set($affiliatedPageRef = "Schools.${affiliatedSchoolCode}.WebHome")
	397	+ #set($affiliatedPageExists = $xwiki.exists($affiliatedPageRef))
	398	+<div class="affiliated-school-banner">
	399	+ <svg class="ico" viewBox="0 0 24 24" stroke-width="1.5"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg>
	400	+ <div>
	401	+ <strong>中高一貫校</strong>：
	402	+ #if($affiliatedPageExists)
	403	+ <a href="$xwiki.getURL($affiliatedPageRef, 'view')">$!escapetool.xml($affiliatedSchoolName)</a>
	404	+ #else
	405	+ $!escapetool.xml($affiliatedSchoolName)
298	298	#end
	407	+ と連携しています
299	299	</div>
	409	+</div>
	410	+#end
300	300
301		- <div class="school-info-card collapsed" id="card-contact">
302		- <h2 role="button" tabindex="0" aria-expanded="false" onclick="toggleInfoCard('card-contact')" onkeydown="if(event.key==='Enter'||event.key===' '){event.preventDefault();toggleInfoCard('card-contact')}"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M22 16.92v3a2 2 0 01-2.18 2 19.79 19.79 0 01-8.63-3.07 19.5 19.5 0 01-6-6 19.79 19.79 0 01-3.07-8.67A2 2 0 014.11 2h3a2 2 0 012 1.72c.127.96.361 1.903.7 2.81a2 2 0 01-.45 2.11L8.09 9.91a16 16 0 006 6l1.27-1.27a2 2 0 012.11-.45c.907.339 1.85.573 2.81.7A2 2 0 0122 16.92z"/></svg> 連絡先・SNS</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2>
303		- <table class="wiki-table school-info-table">
304		- <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr>
305		- <tr><th>生徒会Web</th><td>#if($seitokaiWebsite && $seitokaiWebsite != '')<a href="$!escapetool.xml($seitokaiWebsite)" target="_blank" rel="noopener"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M2 12h20"/><path d="M12 2a15.3 15.3 0 014 10 15.3 15.3 0 01-4 10 15.3 15.3 0 01-4-10 15.3 15.3 0 014-10z"/></svg> $!escapetool.xml($seitokaiWebsite)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
306		- <tr><th>X (Twitter)</th><td>#if($seitokaiTwitter && $seitokaiTwitter != '')<a href="https://x.com/$!escapetool.url($seitokaiTwitter)" target="_blank" rel="noopener">𝕏 @$!escapetool.xml($seitokaiTwitter)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
307		- <tr><th>Instagram</th><td>#if($seitokaiInstagram && $seitokaiInstagram != '')<a href="https://instagram.com/$!escapetool.url($seitokaiInstagram)" target="_blank" rel="noopener"><svg class="ico" viewBox="0 0 24 24"><path d="M23 19a2 2 0 01-2 2H3a2 2 0 01-2-2V8a2 2 0 012-2h4l2-3h6l2 3h4a2 2 0 012 2z"/><circle cx="12" cy="13" r="4"/></svg> @$!escapetool.xml($seitokaiInstagram)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
308		- <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>
309		- <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
310		- </table>
	412	+## --- ① 学校基本情報 ---
	413	+<div class="school-info-card collapsed" id="card-basic-info">
	414	+ <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>
	415	+ <div class="school-basic-info-layout">
	416	+ <div class="school-basic-info-table">
	417	+ <table class="wiki-table school-info-table">
	418	+ <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
	419	+ <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
	420	+ <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
	421	+ <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
	422	+ <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
	423	+ <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
	424	+ <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
	425	+ <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
	426	+ <tr><th>公式サイト</th><td>#if($website && $website != '')<a href="$!escapetool.xml($website)" target="_blank" rel="noopener">$!escapetool.xml($website)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
	427	+ </table>
	428	+ </div>
	429	+ #if($schoolPhoto && $schoolPhoto != '')
	430	+ <div class="school-photo-area">
	431	+ <img src="$doc.getAttachmentURL($schoolPhoto)" alt="$!escapetool.xml($schoolName)" class="school-photo" />
	432	+ </div>
	433	+ #end
311	311	</div>
312		-</div>
	435	+ #if($schoolDescription && $schoolDescription.trim() != '')
	436	+ <div class="free-note" style="margin-top:var(--sp-4);">$!escapetool.xml($schoolDescription)</div>
	437	+ #end
313	313
314		-## --- 生徒会情報アコーディオン ---
315		-<div class="school-section-divider">
316		- <button class="shortcut-btn shortcut-btn-secondary" onclick="var sec=document.getElementById('seitokai-info-section');sec.classList.toggle('open');this.querySelector('.shortcut-arrow').textContent=sec.classList.contains('open')?'▲':'▼';">
317		- <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>
318		- 生徒会情報を見る <span class="shortcut-arrow">▼</span>
319		- </button>
320	320	</div>
321	321
322		-<div id="seitokai-info-section" class="seitokai-info-accordion">
	441	+## --- ② 生徒会情報（折りたたみカード） ---
	442	+<div class="school-info-card" id="card-seitokai-info">
	443	+ <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>
	444	+ <div class="seitokai-info-body">
323	323
324		-## --- ② 組織図 ---
325		-#set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
326		-#if($hasOrgContent)
327		- ## 公開範囲チェック
328		- #set($canViewOrgChart = true)
329		- #if($visibilityOrgChart == 'members' && $isGuest) #set($canViewOrgChart = false)
330		- #elseif($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewOrgChart = false)
331		- #end
332		- #if($canViewOrgChart)
333		-<h2 class="section-title"><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/><line x1="9" y1="10" x2="9" y2="10.01"/><line x1="15" y1="10" x2="15" y2="10.01"/><line x1="9" y1="14" x2="9" y2="14.01"/><line x1="15" y1="14" x2="15" y2="14.01"/></svg> 組織図 #if($visibilityOrgChart != 'public')<span class="visibility-badge visibility-${visibilityOrgChart}">#if($visibilityOrgChart == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h2>
334		-<div class="school-section-card">
335		- <div class="card-inner">
336		- #if($orgChartImage && $orgChartImage != '')
337		- <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
	446	+ ## --- 生徒会組織 ---
	447	+ #set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
	448	+ #if($hasOrgContent)
	449	+ #set($canViewOrgChart = true)
	450	+ #if($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewOrgChart = false)
	451	+ #elseif($visibilityOrgChart == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewOrgChart = false)
	452	+ #end
	453	+ #if($canViewOrgChart)
	454	+ <div class="seitokai-subsection">
	455	+ <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>
	456	+ <div class="seitokai-subsection-content">
	457	+ #if($orgChartImage && $orgChartImage != '')
	458	+ <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
	459	+ #end
	460	+ #if($orgChart && $orgChart != '')<div class="free-note">$!escapetool.xml($orgChart)</div>#end
	461	+ </div>
	462	+ </div>
	463	+ #else
	464	+ <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>
	465	+ #end
338	338	#end
339		- #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end
340		- </div>
341		-</div>
342		- #else
343		-<div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 組織図は #if($visibilityOrgChart == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
344		- #end
345		-#end
346	346
347		-## --- ③④⑤ 日常の活動・選挙・定例活動 ---
348		-<div class="school-section-grid">
349		- #if($dailyActivities && !$dailyActivities.isEmpty())
350		- <div class="school-section-card">
351		- <h3><svg class="ico" viewBox="0 0 24 24"><path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z"/><polyline points="14 2 14 8 20 8"/><line x1="16" y1="13" x2="8" y2="13"/><line x1="16" y1="17" x2="8" y2="17"/></svg> 日常の活動</h3>
352		- <div class="card-inner">
353		- <p class="activity-hint">活動時間の多い順に上位3つ</p>
354		- <div class="tag-container">
355		- #set($daIdx = 1)
356		- #foreach($da in $dailyActivities)
357		- <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
358		- #set($daIdx = $daIdx + 1)
	468	+ ## --- 活動環境 ---
	469	+ #set($hasActivityEnv = ($activityPlace && !$activityPlace.isEmpty()) || ($activityRoomEquipment && $activityRoomEquipment != '') || ($activityRoomImage && $activityRoomImage != '') || ($ictTools && !$ictTools.isEmpty()) || ($ictUsage && !$ictUsage.isEmpty()))
	470	+ #if($hasActivityEnv)
	471	+ #set($canViewAE = true)
	472	+ #if($visibilityActivityEnv == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAE = false)
	473	+ #elseif($visibilityActivityEnv == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAE = false)
	474	+ #end
	475	+ #if($canViewAE)
	476	+ <div class="seitokai-subsection">
	477	+ <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>
	478	+ <div class="seitokai-subsection-content">
	479	+ #if($activityPlace && !$activityPlace.isEmpty())
	480	+ <div class="info-row">
	481	+ <span class="info-label">普段の活動場所</span>
	482	+ <span class="info-value">
	483	+ <div class="selection-display">
	484	+ #foreach($ap in $activityPlace)
	485	+ <span class="selection-item">$!escapetool.xml($ap.trim())</span>
	486	+ #end
	487	+ </div>
	488	+ </span>
	489	+ </div>
359	359	#end
	491	+ #if($activityRoomEquipment && $activityRoomEquipment != '')
	492	+ <div class="info-row">
	493	+ <span class="info-label">生徒会室の設備</span>
	494	+ <span class="info-value free-text-value">$!escapetool.xml($activityRoomEquipment)</span>
	495	+ </div>
	496	+ #end
	497	+ #if($activityRoomImage && $activityRoomImage != '')
	498	+ <div class="info-row">
	499	+ <span class="info-label">活動場所の写真</span>
	500	+ <span class="info-value"><div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($activityRoomImage)" alt="活動場所の写真" class="org-chart-img" /></div></span>
	501	+ </div>
	502	+ #end
	503	+ #if($ictTools && !$ictTools.isEmpty())
	504	+ <div class="info-row">
	505	+ <span class="info-label">利用しているICTツール</span>
	506	+ <span class="info-value">
	507	+ #set($ictCatDisplay = [
	508	+ ["連絡ツール", ["メール","LINE","LINE WORKS","Discord","Slack","Microsoft Teams","Google Chat","InstagramのDM","XのDM","その他（連絡）"]],
	509	+ ["ドキュメント作成・共有", ["Googleドキュメント","Googleスプレッドシート","Googleスライド","Googleドライブ","Word","Excel","PowerPoint","OneDrive","SharePoint","Notion","Pages","Numbers","Keynote","Dropbox","Box","その他（ドキュメント）"]],
	510	+ ["タスク管理", ["Googleカレンダー","Google ToDoリスト","Trello","Asana","Excel等スプレッドシート","その他（タスク管理）"]],
	511	+ ["ビデオ会議ツール", ["Zoom","Google Meet","その他（ビデオ会議）"]],
	512	+ ["アンケート", ["Googleフォーム","Microsoft Forms","その他（アンケート）"]],
	513	+ ["デザイン・クリエイティブ", ["Canva","各種Adobe","CapCut","LumaFusion","AviUtl","ibisPaint","その他（デザイン）"]],
	514	+ ["その他", ["独自のWebシステム・自作アプリ"]]
	515	+ ])
	516	+ #foreach($catD in $ictCatDisplay)
	517	+ #set($catHasItems = false)
	518	+ #foreach($t in $catD.get(1))
	519	+ #if($ictTools.contains($t)) #set($catHasItems = true) #end
	520	+ #end
	521	+ #if($catHasItems)
	522	+ <div style="margin-bottom:6px">
	523	+ <span style="font-size:0.8em;font-weight:600;color:var(--text-mid)">$catD.get(0):</span>
	524	+ <div class="selection-display" style="margin-top:2px">
	525	+ #foreach($t in $catD.get(1))
	526	+ #if($ictTools.contains($t))
	527	+ <span class="selection-item">$!escapetool.xml($t)</span>
	528	+ #end
	529	+ #end
	530	+ </div>
	531	+ </div>
	532	+ #end
	533	+ #end
	534	+ </span>
	535	+ </div>
	536	+ #end
	537	+ #if($ictUsage && !$ictUsage.isEmpty())
	538	+ <div class="info-row">
	539	+ <span class="info-label">ICT活用している場面</span>
	540	+ <span class="info-value">
	541	+ <div class="selection-display">
	542	+ #foreach($iu in $ictUsage)
	543	+ <span class="selection-item">$!escapetool.xml($iu.trim())</span>
	544	+ #end
	545	+ </div>
	546	+ </span>
	547	+ </div>
	548	+ #end
360	360	</div>
361		- #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
362		- <div class="free-note">$!escapetool.xml($dailyActivitiesNote)</div>
363		- #end
364	364	</div>
365		- </div>
366		- #end
	551	+ #else
	552	+ <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>
	553	+ #end
	554	+ #end
367	367
368		- #if($electionExists && $electionExists != '')
369		- <div class="school-section-card">
370		- <h3><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="3" width="18" height="18" rx="2"/><path d="M7 13l3 3 7-7"/></svg> 選挙</h3>
371		- <div class="card-inner">
372		- <div class="info-row">
373		- <span class="info-label">役員選挙</span>
374		- <span class="info-value">$!escapetool.xml($!electionExists)</span>
	556	+ ## --- 年間主要行事 ---
	557	+ #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]])
	558	+ #set($hasAnyEvent = false)
	559	+ #foreach($m in $months)
	560	+ #if($m.get(1) && $m.get(1) != '') #set($hasAnyEvent = true) #end
	561	+ #end
	562	+ #if($hasAnyEvent)
	563	+ #set($canViewAN = true)
	564	+ #if($visibilityAnnualEvents == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAN = false)
	565	+ #elseif($visibilityAnnualEvents == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAN = false)
	566	+ #end
	567	+ #if($canViewAN)
	568	+ <div class="seitokai-subsection">
	569	+ <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>
	570	+ <div class="seitokai-subsection-content">
	571	+ <table class="wiki-table school-info-table" style="margin:0">
	572	+ #foreach($m in $months)
	573	+ #if($m.get(1) && $m.get(1) != '')
	574	+ <tr><td style="width:60px;font-weight:600;white-space:nowrap">$m.get(0)</td><td>$!escapetool.xml($m.get(1))</td></tr>
	575	+ #end
	576	+ #end
	577	+ </table>
375	375	</div>
376		- #if($electionType && $electionType != '')
377		- <div class="info-row">
378		- <span class="info-label">直近の選挙方式</span>
379		- <span class="info-value">$!escapetool.xml($!electionType)</span>
380		- </div>
	579	+ </div>
	580	+ #else
	581	+ <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>
381	381	#end
382		- #if($electionNote && $electionNote.trim() != '')
383		- <div class="free-note">$!escapetool.xml($electionNote)</div>
	583	+ #end
	584	+
	585	+ ## --- 日常の活動 ---
	586	+ #if($dailyActivities && !$dailyActivities.isEmpty())
	587	+ #set($canViewDA = true)
	588	+ #if($visibilityDailyActivities == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewDA = false)
	589	+ #elseif($visibilityDailyActivities == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewDA = false)
384	384	#end
	591	+ #if($canViewDA)
	592	+ <div class="seitokai-subsection">
	593	+ <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>
	594	+ <div class="seitokai-subsection-content">
	595	+ <p class="activity-hint">活動時間が多い3つ</p>
	596	+ <div class="tag-container">
	597	+ #foreach($da in $dailyActivities)
	598	+ <span class="tag tag-accent">$!escapetool.xml($da.trim())</span>
	599	+ #end
	600	+ </div>
	601	+ #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
	602	+ <div class="free-note">$!escapetool.xml($dailyActivitiesNote)</div>
	603	+ #end
	604	+ </div>
385	385	</div>
386		- </div>
387		- #end
388		-</div>
	606	+ #else
	607	+ <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>
	608	+ #end
	609	+ #end
389	389
390		-<div class="school-section-grid">
391		- #if($meetingFrequency && $meetingFrequency != '')
392		- <div class="school-section-card">
393		- <h3><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="4" width="18" height="18" rx="2"/><line x1="16" y1="2" x2="16" y2="6"/><line x1="8" y1="2" x2="8" y2="6"/><line x1="3" y1="10" x2="21" y2="10"/></svg> 定例活動</h3>
394		- <div class="card-inner">
395		- <div class="info-row">
396		- <span class="info-label">役員定例会の頻度</span>
397		- <span class="info-value">$!escapetool.xml($!meetingFrequency)</span>
398		- </div>
399		- #if($regularActivitiesNote && $regularActivitiesNote.trim() != '')
400		- <div class="free-note">$!escapetool.xml($regularActivitiesNote)</div>
	611	+ ## --- 定例活動 ---
	612	+ #if($meetingFrequency && $meetingFrequency != '')
	613	+ #set($canViewMT = true)
	614	+ #if($visibilityMeeting == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewMT = false)
	615	+ #elseif($visibilityMeeting == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewMT = false)
401	401	#end
	617	+ #if($canViewMT)
	618	+ <div class="seitokai-subsection">
	619	+ <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>
	620	+ <div class="seitokai-subsection-content">
	621	+ <div class="info-row">
	622	+ <span class="info-label">役員定例会の頻度</span>
	623	+ <span class="info-value">$!escapetool.xml($!meetingFrequency)</span>
	624	+ </div>
	625	+ #if($regularActivitiesNote && $regularActivitiesNote.trim() != '')
	626	+ <div class="free-note">$!escapetool.xml($regularActivitiesNote)</div>
	627	+ #end
	628	+ </div>
402	402	</div>
403		- </div>
404		- #end
405		-
406		- ## --- ⑦ 予算 ---
407		- #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
408		- #if($hasBudget)
409		- ## 公開範囲チェック
410		- #set($canViewBudget = true)
411		- #if($visibilityBudget == 'members' && $isGuest) #set($canViewBudget = false)
412		- #elseif($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewBudget = false)
	630	+ #else
	631	+ <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>
	632	+ #end
413	413	#end
414		- #if($canViewBudget)
415		- <div class="school-section-card">
416		- <h3><svg class="ico" viewBox="0 0 24 24"><line x1="12" y1="1" x2="12" y2="23"/><path d="M17 5H9.5a3.5 3.5 0 000 7h5a3.5 3.5 0 010 7H6"/></svg> 予算 #if($visibilityBudget != 'public')<span class="visibility-badge visibility-${visibilityBudget}">#if($visibilityBudget == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
417		- <div class="card-inner">
418		- #if($budgetProcess && !$budgetProcess.isEmpty())
419		- <div class="info-row">
420		- <span class="info-label">作成過程の生徒関与</span>
421		- <span class="info-value">
422		- <div class="selection-display">
423		- #foreach($bp in $budgetProcess)
424		- <span class="selection-item">$!escapetool.xml($bp.trim())</span>
425		- #end
426		- </div>
427		- </span>
428		- </div>
	634	+
	635	+ ## --- 生徒総会 ---
	636	+ #set($hasAssembly = ($assemblyFormat && $assemblyFormat != '') || ($assemblyCount && $assemblyCount > 0) || ($assemblyAgenda && !$assemblyAgenda.isEmpty()) || ($assemblyTopics && !$assemblyTopics.isEmpty()) || ($assemblyNote && $assemblyNote != ''))
	637	+ #if($hasAssembly)
	638	+ #set($canViewAS = true)
	639	+ #if($visibilityAssembly == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAS = false)
	640	+ #elseif($visibilityAssembly == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAS = false)
429	429	#end
430		- #if($studentFee && $studentFee != '')
431		- <div class="info-row">
432		- <span class="info-label">生徒会費（年額）</span>
433		- <span class="info-value">$!escapetool.xml($!studentFee)</span>
	642	+ #if($canViewAS)
	643	+ <div class="seitokai-subsection">
	644	+ <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>
	645	+ <div class="seitokai-subsection-content">
	646	+ #if($assemblyFormat && $assemblyFormat != '')
	647	+ <div class="info-row">
	648	+ <span class="info-label">開催方式</span>
	649	+ <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($assemblyFormat)</span></span>
	650	+ </div>
	651	+ #end
	652	+ #if($assemblyCount && $assemblyCount > 0)
	653	+ <div class="info-row">
	654	+ <span class="info-label">開催回数（年）</span>
	655	+ <span class="info-value">$!escapetool.xml($assemblyCount)回</span>
	656	+ </div>
	657	+ #end
	658	+ #if($assemblyAgenda && !$assemblyAgenda.isEmpty())
	659	+ <div class="info-row">
	660	+ <span class="info-label">議案の集め方</span>
	661	+ <span class="info-value">
	662	+ <div class="selection-display">
	663	+ #foreach($aa in $assemblyAgenda)
	664	+ <span class="selection-item">$!escapetool.xml($aa.trim())</span>
	665	+ #end
	666	+ </div>
	667	+ </span>
	668	+ </div>
	669	+ #end
	670	+ #if($assemblyTopics && !$assemblyTopics.isEmpty())
	671	+ <div class="info-row">
	672	+ <span class="info-label">扱う内容</span>
	673	+ <span class="info-value">
	674	+ <div class="selection-display">
	675	+ #foreach($at in $assemblyTopics)
	676	+ <span class="selection-item">$!escapetool.xml($at.trim())</span>
	677	+ #end
	678	+ </div>
	679	+ </span>
	680	+ </div>
	681	+ #end
	682	+ #if($assemblyNote && $assemblyNote != '')
	683	+ <div class="info-row">
	684	+ <span class="info-label">自由記述</span>
	685	+ <span class="info-value free-text-value">$!escapetool.xml($assemblyNote)</span>
	686	+ </div>
	687	+ #end
434	434	</div>
	689	+ </div>
	690	+ #else
	691	+ <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>
435	435	#end
436		- #if($budgetScale && $budgetScale != '')
437		- <div class="info-row">
438		- <span class="info-label">予算規模</span>
439		- <span class="info-value">$!escapetool.xml($!budgetScale)</span>
440		- </div>
	693	+ #end
	694	+
	695	+ ## --- 選挙 ---
	696	+ #if($electionExists && $electionExists != '')
	697	+ #set($canViewEL = true)
	698	+ #if($visibilityElection == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewEL = false)
	699	+ #elseif($visibilityElection == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewEL = false)
441	441	#end
442		- #if($budgetAllocation && !$budgetAllocation.isEmpty())
443		- <div class="info-row">
444		- <span class="info-label">主な予算配分</span>
445		- <span class="info-value">
446		- <div class="selection-display">
447		- #foreach($ba in $budgetAllocation)
448		- <span class="selection-item">$!escapetool.xml($ba.trim())</span>
449		- #end
450		- </div>
451		- </span>
	701	+ #if($canViewEL)
	702	+ <div class="seitokai-subsection">
	703	+ <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>
	704	+ <div class="seitokai-subsection-content">
	705	+ <div class="info-row">
	706	+ <span class="info-label">役員選挙</span>
	707	+ <span class="info-value">$!escapetool.xml($!electionExists)</span>
	708	+ </div>
	709	+ #if($electionType && $electionType != '')
	710	+ <div class="info-row">
	711	+ <span class="info-label">直近の選挙方式</span>
	712	+ <span class="info-value">$!escapetool.xml($!electionType)</span>
	713	+ </div>
	714	+ #end
	715	+ #if($electionNote && $electionNote.trim() != '')
	716	+ <div class="free-note">$!escapetool.xml($electionNote)</div>
	717	+ #end
452	452	</div>
	719	+ </div>
	720	+ #else
	721	+ <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>
453	453	#end
454		- #if($budgetNote && $budgetNote.trim() != '')
455		- <div class="free-note">$!escapetool.xml($budgetNote)</div>
	723	+ #end
	724	+
	725	+ ## --- 校則・生徒会会則の見直し ---
	726	+ #if($ruleReviewStatus && $ruleReviewStatus != '')
	727	+ #set($canViewRuleReview = true)
	728	+ #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewRuleReview = false)
	729	+ #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false)
456	456	#end
	731	+ #if($canViewRuleReview)
	732	+ <div class="seitokai-subsection">
	733	+ <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>
	734	+ <div class="seitokai-subsection-content">
	735	+ <div class="info-row">
	736	+ <span class="info-label">見直しの有無（3年以内）</span>
	737	+ <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
	738	+ </div>
	739	+ #if($ruleReviewStatus != '実施なし')
	740	+ #if($ruleReviewContent && !$ruleReviewContent.isEmpty())
	741	+ <div class="info-row">
	742	+ <span class="info-label">見直しの内容</span>
	743	+ <span class="info-value">
	744	+ <div class="selection-display">
	745	+ #foreach($rc in $ruleReviewContent)
	746	+ <span class="selection-item">$!escapetool.xml($rc.trim())</span>
	747	+ #end
	748	+ </div>
	749	+ </span>
	750	+ </div>
	751	+ #end
	752	+ #if($ruleReviewProposer && !$ruleReviewProposer.isEmpty())
	753	+ <div class="info-row">
	754	+ <span class="info-label">見直しの提案者</span>
	755	+ <span class="info-value">
	756	+ <div class="selection-display">
	757	+ #foreach($rp in $ruleReviewProposer)
	758	+ <span class="selection-item">$!escapetool.xml($rp.trim())</span>
	759	+ #end
	760	+ </div>
	761	+ </span>
	762	+ </div>
	763	+ #end
	764	+ #if($ruleReviewImplementer && !$ruleReviewImplementer.isEmpty())
	765	+ <div class="info-row">
	766	+ <span class="info-label">見直しの実施者</span>
	767	+ <span class="info-value">
	768	+ <div class="selection-display">
	769	+ #foreach($ri in $ruleReviewImplementer)
	770	+ <span class="selection-item">$!escapetool.xml($ri.trim())</span>
	771	+ #end
	772	+ </div>
	773	+ </span>
	774	+ </div>
	775	+ #end
	776	+ #end
	777	+ #if($ruleReviewSystem && $ruleReviewSystem != '')
	778	+ <div class="info-row">
	779	+ <span class="info-label">見直しの仕組み</span>
	780	+ <span class="info-value">$!escapetool.xml($!ruleReviewSystem)</span>
	781	+ </div>
	782	+ #end
	783	+ </div>
457	457	</div>
458		- </div>
459		- #else
460		- <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 予算情報は #if($visibilityBudget == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
	785	+ #else
	786	+ <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>
	787	+ #end
461	461	#end
462		- #end
463		-</div>
464	464
465		-## --- ⑧ 校則の見直し ---
466		-#if($ruleReviewStatus && $ruleReviewStatus != '')
467		- ## 公開範囲チェック
468		- #set($canViewRuleReview = true)
469		- #if($visibilityRuleReview == 'members' && $isGuest) #set($canViewRuleReview = false)
470		- #elseif($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewRuleReview = false)
471		- #end
472		- #if($canViewRuleReview)
473		-<h2 class="section-title"><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M16 4h2a2 2 0 012 2v12a2 2 0 01-2 2h-2"/><path d="M8 4H6a2 2 0 00-2 2v12a2 2 0 002 2h2"/><line x1="12" y1="4" x2="12" y2="8"/><line x1="12" y1="16" x2="12" y2="20"/><line x1="8" y1="8" x2="16" y2="8"/><line x1="8" y1="16" x2="16" y2="16"/></svg> 校則の見直し #if($visibilityRuleReview != 'public')<span class="visibility-badge visibility-${visibilityRuleReview}">#if($visibilityRuleReview == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h2>
474		-<div class="school-section-card">
475		- <div class="card-inner">
476		- <div class="info-row">
477		- <span class="info-label">見直しの有無（3年以内）</span>
478		- <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
479		- </div>
480		- #if($ruleReviewContent && !$ruleReviewContent.isEmpty())
481		- <div class="info-row">
482		- <span class="info-label">見直しの内容</span>
483		- <span class="info-value">
484		- <div class="selection-display">
485		- #foreach($rc in $ruleReviewContent)
486		- <span class="selection-item">$!escapetool.xml($rc.trim())</span>
487		- #end
	790	+ ## --- 予算 ---
	791	+ #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
	792	+ #if($hasBudget)
	793	+ #set($canViewBudget = true)
	794	+ #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewBudget = false)
	795	+ #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false)
	796	+ #end
	797	+ #if($canViewBudget)
	798	+ <div class="seitokai-subsection">
	799	+ <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>
	800	+ <div class="seitokai-subsection-content">
	801	+ #if($budgetProcess && !$budgetProcess.isEmpty())
	802	+ <div class="info-row">
	803	+ <span class="info-label">作成過程の生徒関与</span>
	804	+ <span class="info-value">
	805	+ <div class="selection-display">
	806	+ #set($allBpOpts = ["各部・委員会等への予算希望額調査","予算額調整（折衝等）","生徒会予算案の作成","生徒総会での議決","生徒関与なし","その他"])
	807	+ #foreach($bpOpt in $allBpOpts)
	808	+ #if($budgetProcess.contains($bpOpt))
	809	+ <span class="selection-item">$!escapetool.xml($bpOpt)</span>
	810	+ #else
	811	+ <span class="selection-item selection-item-off">$!escapetool.xml($bpOpt)</span>
	812	+ #end
	813	+ #end
	814	+ </div>
	815	+ </span>
488	488	</div>
489		- </span>
	817	+ #end
	818	+ #if($studentFee && $studentFee != '')
	819	+ <div class="info-row">
	820	+ <span class="info-label">生徒会費（年額）</span>
	821	+ <span class="info-value">$!escapetool.xml($!studentFee)</span>
	822	+ </div>
	823	+ #end
	824	+ #if($budgetScale && $budgetScale != '')
	825	+ <div class="info-row">
	826	+ <span class="info-label">予算規模</span>
	827	+ <span class="info-value">$!escapetool.xml($!budgetScale)</span>
	828	+ </div>
	829	+ #end
	830	+ #if($budgetAllocation && !$budgetAllocation.isEmpty())
	831	+ <div class="info-row">
	832	+ <span class="info-label">主な予算配分</span>
	833	+ <span class="info-value">
	834	+ <div class="selection-display">
	835	+ #foreach($ba in $budgetAllocation)
	836	+ <span class="selection-item">$!escapetool.xml($ba.trim())</span>
	837	+ #end
	838	+ </div>
	839	+ </span>
	840	+ </div>
	841	+ #end
	842	+ #if($budgetNote && $budgetNote.trim() != '')
	843	+ <div class="free-note">$!escapetool.xml($budgetNote)</div>
	844	+ #end
	845	+ </div>
490	490	</div>
	847	+ #else
	848	+ <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 予算情報は #if($visibilityBudget == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
	849	+ #end
491	491	#end
492		- #if($ruleReviewProposer && !$ruleReviewProposer.isEmpty())
493		- <div class="info-row">
494		- <span class="info-label">見直しの提案者</span>
495		- <span class="info-value">
496		- <div class="selection-display">
497		- #foreach($rp in $ruleReviewProposer)
498		- <span class="selection-item">$!escapetool.xml($rp.trim())</span>
499		- #end
	851	+
	852	+ ## --- 広報 ---
	853	+ #set($hasPublicity = ($publicityMethod && !$publicityMethod.isEmpty()) || ($publicityFrequency && $publicityFrequency != '') || ($publicityNote && $publicityNote != ''))
	854	+ #if($hasPublicity)
	855	+ #set($canViewPB = true)
	856	+ #if($visibilityPublicity == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewPB = false)
	857	+ #elseif($visibilityPublicity == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPB = false)
	858	+ #end
	859	+ #if($canViewPB)
	860	+ <div class="seitokai-subsection">
	861	+ <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>
	862	+ <div class="seitokai-subsection-content">
	863	+ #if($publicityMethod && !$publicityMethod.isEmpty())
	864	+ <div class="info-row">
	865	+ <span class="info-label">方法</span>
	866	+ <span class="info-value">
	867	+ <div class="selection-display">
	868	+ #foreach($pm in $publicityMethod)
	869	+ <span class="selection-item">$!escapetool.xml($pm.trim())</span>
	870	+ #end
	871	+ </div>
	872	+ </span>
500	500	</div>
501		- </span>
	874	+ #end
	875	+ #if($publicityFrequency && $publicityFrequency != '')
	876	+ <div class="info-row">
	877	+ <span class="info-label">頻度</span>
	878	+ <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($publicityFrequency)</span></span>
	879	+ </div>
	880	+ #end
	881	+ #if($publicityNote && $publicityNote != '')
	882	+ <div class="info-row">
	883	+ <span class="info-label">自由記述</span>
	884	+ <span class="info-value free-text-value">$!escapetool.xml($publicityNote)</span>
	885	+ </div>
	886	+ #end
	887	+ </div>
502	502	</div>
	889	+ #else
	890	+ <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>
	891	+ #end
503	503	#end
504		- #if($ruleReviewImplementer && !$ruleReviewImplementer.isEmpty())
505		- <div class="info-row">
506		- <span class="info-label">見直しの実施者</span>
507		- <span class="info-value">
508		- <div class="selection-display">
509		- #foreach($ri in $ruleReviewImplementer)
510		- <span class="selection-item">$!escapetool.xml($ri.trim())</span>
511		- #end
	893	+
	894	+ ## --- 外部連携 ---
	895	+ #set($hasExternal = ($externalCooperation && $externalCooperation != '') || ($externalOrgName && $externalOrgName != '') || ($socialParticipation && !$socialParticipation.isEmpty()))
	896	+ #if($hasExternal)
	897	+ #set($canViewEX = true)
	898	+ #if($visibilityExternal == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewEX = false)
	899	+ #elseif($visibilityExternal == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewEX = false)
	900	+ #end
	901	+ #if($canViewEX)
	902	+ <div class="seitokai-subsection">
	903	+ <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>
	904	+ <div class="seitokai-subsection-content">
	905	+ #if($externalCooperation && $externalCooperation != '')
	906	+ <div class="info-row">
	907	+ <span class="info-label">他校の生徒会との連携</span>
	908	+ <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($externalCooperation)</span></span>
512	512	</div>
513		- </span>
	910	+ #end
	911	+ #if($externalOrgName && $externalOrgName != '')
	912	+ <div class="info-row">
	913	+ <span class="info-label">参加している生徒会団体の名前</span>
	914	+ <span class="info-value">$!escapetool.xml($externalOrgName)</span>
	915	+ </div>
	916	+ #end
	917	+ #if($socialParticipation && !$socialParticipation.isEmpty())
	918	+ <div class="info-row">
	919	+ <span class="info-label">社会参加・地域連携・ボランティア</span>
	920	+ <span class="info-value">
	921	+ <div class="selection-display">
	922	+ #foreach($sp2 in $socialParticipation)
	923	+ <span class="selection-item">$!escapetool.xml($sp2.trim())</span>
	924	+ #end
	925	+ </div>
	926	+ </span>
	927	+ </div>
	928	+ #end
	929	+ </div>
514	514	</div>
	931	+ #else
	932	+ <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>
	933	+ #end
515	515	#end
516		- #if($ruleReviewSystem && $ruleReviewSystem != '')
517		- <div class="info-row">
518		- <span class="info-label">見直しの仕組み</span>
519		- <span class="info-value">$!escapetool.xml($!ruleReviewSystem)</span>
	935	+
	936	+ ## --- 生徒会の課題意識 ---
	937	+ #if($challenges && $challenges != '')
	938	+ #set($canViewChallenges = true)
	939	+ #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewChallenges = false)
	940	+ #elseif($visibilityChallenges == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewChallenges = false)
	941	+ #end
	942	+ #if($canViewChallenges)
	943	+ <div class="seitokai-subsection">
	944	+ <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>
	945	+ <div class="seitokai-subsection-content">
	946	+ <div class="challenge-text">$!escapetool.xml($challenges)</div>
	947	+ </div>
520	520	</div>
	949	+ #else
	950	+ <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 課題情報は #if($visibilityChallenges == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
	951	+ #end
521	521	#end
522		- </div>
523		-</div>
524		- #else
525		-<div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 校則の見直し情報は #if($visibilityRuleReview == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
526		- #end
527		-#end
528	528
529		-## --- ⑨ 課題 ---
530		-#if($challenges && $challenges != '')
531		- ## 公開範囲チェック
532		- #set($canViewChallenges = true)
533		- #if($visibilityChallenges == 'members' && $isGuest) #set($canViewChallenges = false)
534		- #elseif($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewChallenges = false)
	954	+ </div>## seitokai-info-body 終了
	955	+</div>## card-seitokai-info 終了
	956	+
	957	+## --- ③ SNS・連絡先 ---
	958	+<div class="school-info-card collapsed" id="card-contact">
	959	+ <h2 role="button" tabindex="0" aria-expanded="false" onclick="toggleInfoCard('card-contact')" onkeydown="if(event.key==='Enter'||event.key===' '){event.preventDefault();toggleInfoCard('card-contact')}"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M22 16.92v3a2 2 0 01-2.18 2 19.79 19.79 0 01-8.63-3.07 19.5 19.5 0 01-6-6 19.79 19.79 0 01-3.07-8.67A2 2 0 014.11 2h3a2 2 0 012 1.72c.127.96.361 1.903.7 2.81a2 2 0 01-.45 2.11L8.09 9.91a16 16 0 006 6l1.27-1.27a2 2 0 012.11-.45c.907.339 1.85.573 2.81.7A2 2 0 0122 16.92z"/></svg> SNS・連絡先</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2>
	960	+ <table class="wiki-table school-info-table">
	961	+ <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr>
	962	+ <tr><th>生徒会Web</th><td>#if($seitokaiWebsite && $seitokaiWebsite != '')<a href="$!escapetool.xml($seitokaiWebsite)" target="_blank" rel="noopener"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M2 12h20"/><path d="M12 2a15.3 15.3 0 014 10 15.3 15.3 0 01-4 10 15.3 15.3 0 01-4-10 15.3 15.3 0 014-10z"/></svg> $!escapetool.xml($seitokaiWebsite)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
	963	+ <tr><th>X (Twitter)</th><td>#if($seitokaiTwitter && $seitokaiTwitter != '')<a href="https://x.com/$!escapetool.url($seitokaiTwitter)" target="_blank" rel="noopener">𝕏 @$!escapetool.xml($seitokaiTwitter)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
	964	+ <tr><th>Instagram</th><td>#if($seitokaiInstagram && $seitokaiInstagram != '')<a href="https://instagram.com/$!escapetool.url($seitokaiInstagram)" target="_blank" rel="noopener"><svg class="ico" viewBox="0 0 24 24"><path d="M23 19a2 2 0 01-2 2H3a2 2 0 01-2-2V8a2 2 0 012-2h4l2-3h6l2 3h4a2 2 0 012 2z"/><circle cx="12" cy="13" r="4"/></svg> @$!escapetool.xml($seitokaiInstagram)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
	965	+ <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>
	966	+ <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
	967	+ </table>
	968	+ #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
	969	+ #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
	970	+ #if($infoEditDate && $infoEditDate != '')
	971	+ <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>
535	535	#end
536		- #if($canViewChallenges)
537		-<h2 class="section-title">生徒会の課題意識 #if($visibilityChallenges != 'public')<span class="visibility-badge visibility-${visibilityChallenges}">#if($visibilityChallenges == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h2>
538		-<div class="challenge-text">$!escapetool.xml($challenges)</div>
539		- #else
540		-<div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 課題情報は #if($visibilityChallenges == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
541		- #end
542		-#end
	973	+</div>
543	543
544		-</div>## seitokai-info-accordion 終了
545		-
546	546	{{/html}}
547	547
	977	+----
	978	+
548	548	## --- ⑩ 活動報告一覧（スレッド型・年度タブ付き） ---
549	549	= 活動報告 =
550	550
551		-## --- 投稿者ステータス凡例（折りたたみ） ---
	982	+## --- 年度タブ + 投稿者ステータス凡例 ---
552	552	{{html clean="false"}}
553		-<div class="author-legend-wrapper">
554		- <button class="author-legend-toggle" onclick="this.classList.toggle('open');this.nextElementSibling.classList.toggle('open')"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M12 16v-4"/><path d="M12 8h.01"/></svg> バッジの見方 <span class="chevron">▼</span></button>
555		- <div class="author-legend-body">
556		- <div class="author-legend">
557		- <span class="author-legend-title">投稿者の信頼度:</span>
558		- <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者</span>
559		- <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み</span>
560		- <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介</span>
561		- <span class="author-legend-item"><span class="bar bar-general"></span> 一般（未承認）</span>
562		- </div>
563		- <div class="author-legend">
564		- <span class="author-legend-title">所属:</span>
565		- <span class="author-legend-item"><span class="badge badge-school-internal-confirmed badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内（確認済）</span> 承認済み＋同校</span>
566		- <span class="author-legend-item"><span class="badge badge-school-internal badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内</span> 紹介＋同校</span>
567		- <span class="author-legend-item"><span class="badge badge-school-external badge-sm"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M2 12h20"/><path d="M12 2a15.3 15.3 0 014 10 15.3 15.3 0 01-4 10 15.3 15.3 0 01-4-10 15.3 15.3 0 014-10z"/></svg> 他校</span> 他校所属</span>
568		- <span class="author-legend-item text-hint">※一般アカウントは所属未確認のため非表示</span>
569		- </div>
570		- <div class="author-legend">
571		- <span class="author-legend-title">役割:</span>
572		- <span class="author-legend-item"><span class="badge badge-role-student badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M22 10v6M2 10l10-5 10 5-10 5z"/><path d="M6 12v5c0 2 4 3 6 3s6-1 6-3v-5"/></svg> 生徒</span></span>
573		- <span class="author-legend-item"><span class="badge badge-role-officer badge-sm"><svg class="ico" viewBox="0 0 24 24"><polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"/></svg> 役員</span></span>
574		- <span class="author-legend-item"><span class="badge badge-role-teacher badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M20 21v-2a4 4 0 00-4-4H8a4 4 0 00-4 4v2"/><circle cx="12" cy="7" r="4"/></svg> 教員</span></span>
575		- </div>
576		- </div>
577		-</div>
578	578
579	579	## --- 年度タブ ---
580	580	## 全活動から年度一覧を収集
...	...	@@ -596,34 +596,114 @@
596	596	#end
597	597	## ソート（降順にしたいが Velocity にはないので JS で制御）
598	598
599		-<div class="activity-fy-tabs">
600		- <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
601		- #foreach($fy in $fySet)
602		- #if($fy != $currentFYStr)
603		- <button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button>
	1005	+<div class="activity-toolbar">
	1006	+ <div class="activity-fy-tabs">
	1007	+ <button class="activity-fy-tab" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
	1008	+ #foreach($fy in $fySet)
	1009	+ #if($fy != $currentFYStr)
	1010	+ <button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button>
	1011	+ #end
604	604	#end
605		- #end
606		- <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
	1013	+ <button class="activity-fy-tab active" onclick="switchActivityFY('all', this)">全期間</button>
	1014	+ </div>
	1015	+ <div class="activity-toolbar-right">
	1016	+ <button class="btn-view-toggle" id="btnViewToggle" onclick="toggleCompactView()" title="タイトルのみ表示">
	1017	+ <svg class="ico-list" viewBox="0 0 24 24" stroke="currentColor" fill="none" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><line x1="8" y1="6" x2="21" y2="6"/><line x1="8" y1="12" x2="21" y2="12"/><line x1="8" y1="18" x2="21" y2="18"/><line x1="3" y1="6" x2="3.01" y2="6"/><line x1="3" y1="12" x2="3.01" y2="12"/><line x1="3" y1="18" x2="3.01" y2="18"/></svg>
	1018	+ <svg class="ico-detail" viewBox="0 0 24 24" stroke="currentColor" fill="none" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="3" width="7" height="7"/><rect x="14" y="3" width="7" height="7"/><rect x="3" y="14" width="7" height="7"/><rect x="14" y="14" width="7" height="7"/></svg>
	1019	+ <span class="toggle-label">一覧表示</span>
	1020	+ </button>
	1021	+ </div>
	1022	+ <div class="author-legend-wrapper">
	1023	+ <button class="author-legend-toggle" onclick="this.classList.toggle('open');this.nextElementSibling.classList.toggle('open')"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M12 16v-4"/><path d="M12 8h.01"/></svg> バッジの見方 <span class="chevron">▼</span></button>
	1024	+ <div class="author-legend-body">
	1025	+ <div class="author-legend">
	1026	+ <span class="author-legend-title">投稿者の信頼度:</span>
	1027	+ <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者 <span class="text-hint">— 運営スタッフ</span></span>
	1028	+ <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み <span class="text-hint">— 本人確認済みのユーザー</span></span>
	1029	+ <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介 <span class="text-hint">— 承認済みユーザーからの紹介</span></span>
	1030	+ <span class="author-legend-item"><span class="bar bar-general"></span> 一般 <span class="text-hint">— 一般登録ユーザー</span></span>
	1031	+ </div>
	1032	+ <div class="author-legend">
	1033	+ <span class="author-legend-title">所属:</span>
	1034	+ <span class="author-legend-item"><span class="badge badge-school-internal-confirmed badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内（確認済）</span> <span class="text-hint">所属が確認されたこの学校のユーザー</span></span>
	1035	+ <span class="author-legend-item"><span class="badge badge-school-internal badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内</span> <span class="text-hint">この学校に所属登録しているユーザー</span></span>
	1036	+ <span class="author-legend-item"><span class="badge badge-alumni badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M22 10l-10-5L2 10l10 5 10-5z"/><path d="M6 12v5c0 1.66 2.69 3 6 3s6-1.34 6-3v-5"/></svg> 卒業生</span> <span class="text-hint">この学校の卒業生</span></span>
	1037	+ <span class="author-legend-item"><span class="badge badge-school-external badge-sm"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M2 12h20"/><path d="M12 2a15.3 15.3 0 014 10 15.3 15.3 0 01-4 10 15.3 15.3 0 01-4-10 15.3 15.3 0 014-10z"/></svg> 他校</span> <span class="text-hint">別の学校に所属しているユーザー</span></span>
	1038	+ <span class="author-legend-item text-hint">※一般アカウントは所属バッジが表示されません</span>
	1039	+ </div>
	1040	+ <div class="author-legend">
	1041	+ <span class="author-legend-title">役割:</span>
	1042	+ <span class="author-legend-item"><span class="badge badge-role-student badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M22 10v6M2 10l10-5 10 5-10 5z"/><path d="M6 12v5c0 2 4 3 6 3s6-1 6-3v-5"/></svg> 生徒</span></span>
	1043	+ <span class="author-legend-item"><span class="badge badge-role-officer badge-sm"><svg class="ico" viewBox="0 0 24 24"><polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"/></svg> 役員</span> <span class="text-hint">生徒会役員</span></span>
	1044	+ <span class="author-legend-item"><span class="badge badge-role-teacher badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M20 21v-2a4 4 0 00-4-4H8a4 4 0 00-4 4v2"/><circle cx="12" cy="7" r="4"/></svg> 教員</span></span>
	1045	+ </div>
	1046	+ </div>
	1047	+ </div>
607	607	</div>
608	608
609	609	{{/html}}
610	610
611		-## 特色ある活動を先頭に表示するため、並び替え用リストを作成
612		-#set($featuredActivities = [])
613		-#set($normalActivities = [])
614		-#if($activities && $activities.size() > 0)
615		- #foreach($act in $activities)
616		- #set($isFeatured = $!act.getValue('featured'))
617		- #if($isFeatured == '1')
618		- #set($discard = $featuredActivities.add($foreach.index))
	1052	+## 活動を「年度降順 + 特色あり先頭」で並び替え
	1053	+## Step1: fySet から年度を降順ソート（Velocity ネイティブ実装）
	1054	+#set($fyNums = [])
	1055	+#foreach($fy in $fySet)
	1056	+ #if($fy && $fy != '' && $fy != 'unknown')
	1057	+ #set($fyInt = $mathtool.toInteger($fy))
	1058	+ #if($fyInt)
	1059	+ #set($discard = $fyNums.add($fyInt))
	1060	+ #end
	1061	+ #end
	1062	+#end
	1063	+## 最大値を順番に取り出して降順リストを構築（最大20年度まで対応）
	1064	+#set($fyDesc = [])
	1065	+#set($fyRemaining = [])
	1066	+#foreach($fy in $fyNums)
	1067	+ #set($discard = $fyRemaining.add($fy))
	1068	+#end
	1069	+#foreach($dummy in [1..20])
	1070	+ #if($fyRemaining.isEmpty())#break#end
	1071	+ #set($fyMax = $fyRemaining.get(0))
	1072	+ #foreach($fy in $fyRemaining)
	1073	+ #if($fy > $fyMax)#set($fyMax = $fy)#end
	1074	+ #end
	1075	+ #set($discard = $fyDesc.add($fyMax))
	1076	+ #set($fyNextRem = [])
	1077	+ #set($fyMaxRemoved = false)
	1078	+ #foreach($fy in $fyRemaining)
	1079	+ #if(!$fyMaxRemoved && $fy == $fyMax)
	1080	+ #set($fyMaxRemoved = true)
619	619	#else
620		- #set($discard = $normalActivities.add($foreach.index))
	1082	+ #set($discard = $fyNextRem.add($fy))
621	621	#end
622	622	#end
	1085	+ #set($fyRemaining = $fyNextRem)
623	623	#end
	1087	+## 年度未設定の活動は末尾に表示（fySetに'unknown'は入らないため無条件追加）
	1088	+#set($discard = $fyDesc.add('unknown'))
	1089	+## Step2: 年度降順で featured → normal の順にインデックスを収集
624	624	#set($orderedActivityIndices = [])
625		-#set($discard = $orderedActivityIndices.addAll($featuredActivities))
626		-#set($discard = $orderedActivityIndices.addAll($normalActivities))
	1091	+#foreach($curFY in $fyDesc)
	1092	+ ## 同年度の特色あり活動を先頭に
	1093	+ #set($actIdx2 = 0)
	1094	+ #foreach($act in $activities)
	1095	+ #set($aFY2 = $!act.getValue('fiscalYear'))
	1096	+ #if(!$aFY2 || $aFY2 == '') #set($aFY2 = 'unknown') #end
	1097	+ #if($aFY2 == $curFY && $act.getValue('featured') == '1')
	1098	+ #set($discard = $orderedActivityIndices.add($actIdx2))
	1099	+ #end
	1100	+ #set($actIdx2 = $actIdx2 + 1)
	1101	+ #end
	1102	+ ## 同年度の通常活動
	1103	+ #set($actIdx2 = 0)
	1104	+ #foreach($act in $activities)
	1105	+ #set($aFY2 = $!act.getValue('fiscalYear'))
	1106	+ #if(!$aFY2 || $aFY2 == '') #set($aFY2 = 'unknown') #end
	1107	+ #if($aFY2 == $curFY && $act.getValue('featured') != '1')
	1108	+ #set($discard = $orderedActivityIndices.add($actIdx2))
	1109	+ #end
	1110	+ #set($actIdx2 = $actIdx2 + 1)
	1111	+ #end
	1112	+#end
627	627
628	628	#if($activities && $activities.size() > 0)
629	629	#foreach($actIdx in $orderedActivityIndices)
...	...	@@ -668,10 +668,18 @@
668	668	<div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)">
669	669	<div class="activity-thread-header">
670	670	<div class="activity-thread-title">
671		- <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>
672		- <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
	1157	+ <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>
	1158	+ <div class="activity-meta-line">
	1159	+ <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
	1160	+ #set($actTagsList = $activity.getValue('tags'))
	1161	+ #if($actTagsList && !$actTagsList.isEmpty())
	1162	+ #foreach($tagItem in $actTagsList)
	1163	+ #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end
	1164	+ #end
	1165	+ #end
	1166	+ </div>
673	673	</div>
674		- <div class="thread-meta-row">
	1168	+ <div class="thread-meta-right">
675	675	<span class="thread-post-count">${reportCount}件の報告 ・ ${commentCount}件のコメント</span>
676	676	#if($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred')
677	677	#if($actFeatured == '1')
...	...	@@ -731,12 +731,12 @@
731	731	#set($postVis = $!post.getValue('visibility'))
732	732	#if(!$postVis || $postVis == '') #set($postVis = 'public') #end
733	733	#set($canViewPost = true)
734		- #if($postVis == 'members' && $isGuest) #set($canViewPost = false)
735		- #elseif($postVis == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewPost = false)
	1228	+ #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewPost = false)
	1229	+ #elseif($postVis == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPost = false)
736	736	#end
737	737	#if(!$canViewPost)
738	738	<div class="thread-post visibility-restricted-post">
739		- <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> この投稿は #if($postVis == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
	1233	+ <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> この投稿は #if($postVis == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
740	740	</div>
741	741	#else
742	742	## 投稿者のアカウント種別に基づいたCSSクラス
...	...	@@ -776,8 +776,11 @@
776	776	<span class="badge badge-general badge-sm">一般</span>
777	777	#end
778	778	## 所属バッジ（投稿者の学校コードとページの学校コードを比較）
	1273	+ #set($postIsSchoolMatch = ($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode)))
779	779	#if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general')
780		- #if($postSchoolCode == $schoolCode)
	1275	+ #if($postUserRole == 'graduate' && $postIsSchoolMatch)
	1276	+ <span class="badge badge-alumni badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M22 10l-10-5L2 10l10 5 10-5z"/><path d="M6 12v5c0 1.66 2.69 3 6 3s6-1.34 6-3v-5"/></svg> 卒業生</span>
	1277	+ #elseif($postIsSchoolMatch && $postUserRole != 'graduate')
781	781	#if($postAccountType == 'verified' || $postAccountType == 'admin')
782	782	<span class="badge badge-school-internal-confirmed badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内（確認済）</span>
783	783	#else
...	...	@@ -804,6 +804,13 @@
804	804	#if($postEdited == 1 || $postEdited == '1')
805	805	<span class="post-edited-label">（編集済み）</span>
806	806	#end
	1304	+ #set($postAuthorRefH = $!post.getValue('authorRef'))
	1305	+ #set($postObjNumH = $post.number)
	1306	+ #if(!$isGuest && $xcontext.user != $postAuthorRefH)
	1307	+ <button type="button" class="btn-post-report btn-post-report-header" onclick="openReportDialog(this, '${doc.fullName}', $postObjNumH, '${services.csrf.getToken()}')" title="この投稿を通報">
	1308	+ <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> 通報
	1309	+ </button>
	1310	+ #end
807	807	</div>
808	808	<div class="thread-post-body">
809	809	$!escapetool.xml($!postContent)
...	...	@@ -868,12 +868,37 @@
868	868	#end
869	869	</div>
870	870	#if($postVis != 'public')
871		- <div class="visibility-badge visibility-${postVis} post-action-mt">#if($postVis == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</div>
	1375	+ <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>
872	872	#end
873		- ## 固定/解除ボタン（承認済み・管理者のみ）
874		- #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
875		- #set($postObjNum = $post.number)
876		- <div class="post-pin-action post-action-mt">
	1377	+ ## いいねボタン
	1378	+ #set($postLikeCount = $!post.getValue('likeCount'))
	1379	+ #if(!$postLikeCount || $postLikeCount == '') #set($postLikeCount = 0) #end
	1380	+ #set($postLikedBy = $!post.getValue('likedBy'))
	1381	+ #set($isLikedByMe = false)
	1382	+ #if($postLikedBy && $postLikedBy.contains($xcontext.user)) #set($isLikedByMe = true) #end
	1383	+ <div class="post-like-row post-action-mt">
	1384	+ #if($xcontext.user != 'XWiki.XWikiGuest')
	1385	+ <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)">
	1386	+ <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>
	1387	+ <span class="like-count">$postLikeCount</span>
	1388	+ </button>
	1389	+ #else
	1390	+ <span class="btn-like disabled">
	1391	+ <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>
	1392	+ <span class="like-count">$postLikeCount</span>
	1393	+ </span>
	1394	+ #end
	1395	+ </div>
	1396	+ ## 固定/編集/削除/通報/非表示ボタン（横並び）
	1397	+ #set($postAuthorRef = $!post.getValue('authorRef'))
	1398	+ #set($postObjNumED = $post.number)
	1399	+ #set($showPinBtn = ($viewerAccountType == 'admin' || $viewerAccountType == 'verified'))
	1400	+ #set($showEditDeleteBtn = ($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin'))
	1401	+ #set($showHideBtn = ($viewerAccountType == 'admin'))
	1402	+ #if($showPinBtn || $showEditDeleteBtn || $showHideBtn)
	1403	+ <div class="post-edit-actions post-action-mt">
	1404	+ #if($showPinBtn)
	1405	+ #set($postObjNum = $post.number)
877	877	#if($isPinned == '1')
878	878	<a href="$doc.getURL('view', "action=unpin&postObj=${postObjNum}&form_token=${services.csrf.getToken()}")" class="btn-pin-toggle btn-unpin" title="固定を解除">
879	879	<svg class="ico ico-fixed-14" viewBox="0 0 24 24" fill="currentColor" stroke="none"><path d="M16 2l-4 4-2-1-5 5 3 3-6 6h4l4-4 3 3 5-5-1-2 4-4-5-5z"/></svg> 固定を解除
...	...	@@ -883,15 +883,12 @@
883	883	<svg class="ico ico-fixed-14" viewBox="0 0 24 24"><path d="M16 2l-4 4-2-1-5 5 3 3-6 6h4l4-4 3 3 5-5-1-2 4-4-5-5z"/></svg> 固定する
884	884	</a>
885	885	#end
886		- </div>
887		- #end
888		- ## 編集・削除ボタン（投稿者本人 or 管理者）
889		- #set($postAuthorRef = $!post.getValue('authorRef'))
890		- #set($postObjNumED = $post.number)
891		- #if($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin')
892		- <div class="post-edit-actions post-action-mt">
	1415	+ #end
	1416	+ #if($showEditDeleteBtn)
893	893	#if($xcontext.user == $postAuthorRef)
894		- <button type="button" class="btn-post-edit" onclick="openEditPost(this, '${doc.fullName}', $postObjNumED, '$!escapetool.javascript($!postContent)')" title="この投稿を編集">
	1418	+ #set($editImages = $!post.getValue('images'))
	1419	+ #set($editFiles = $!post.getValue('files'))
	1420	+ <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="この投稿を編集">
895	895	<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> 編集
896	896	</button>
897	897	#end
...	...	@@ -898,6 +898,12 @@
898	898	<button type="button" class="btn-post-delete" onclick="confirmDeletePost('${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を削除">
899	899	<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> 削除
900	900	</button>
	1427	+ #end
	1428	+ #if($showHideBtn)
	1429	+ <button type="button" class="btn-post-hide" onclick="openHideDialog(this, '${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を非表示にする">
	1430	+ <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> 非表示
	1431	+ </button>
	1432	+ #end
901	901	</div>
902	902	#end
903	903	</div>
...	...	@@ -947,9 +947,11 @@
947	947
948	948	#if($xcontext.user != "XWiki.XWikiGuest")
949	949	<div class="thread-add-post">
	1482	+ #if($isSchoolMember || $isAlumniOfSchool || $isViewerAdmin)
950	950	<a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
951	951	＋ 活動報告を追加
952	952	</a>
	1486	+ #end
953	953	<a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
954	954	<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> コメントを書く
955	955	</a>
...	...	@@ -979,9 +979,96 @@
979	979	{{/html}}
980	980	#end
981	981
	1516	+## --- OGP / SNSシェア対応 ---
	1517	+#set($ogpTitle = "${schoolName} — 生徒会Wiki")
	1518	+#set($ogpDesc = "${schoolName}の生徒会活動情報。")
	1519	+#if($prefecture && $prefecture != '') #set($ogpDesc = "${ogpDesc}${prefecture}") #end
	1520	+#if($city && $city != '') #set($ogpDesc = "${ogpDesc}${city}。") #end
	1521	+#if($dailyActivities && $dailyActivities != '') #set($ogpDesc = "${ogpDesc} 主な活動: ${dailyActivities}") #end
	1522	+#set($ogpUrl = "https://${request.serverName}${doc.getURL()}")
	1523	+
982	982	## --- 年度タブ切り替え JavaScript ---
983	983	{{html clean="false"}}
984	984	<script>
	1527	+// OGPメタタグ挿入
	1528	+(function() {
	1529	+ var ogp = {
	1530	+ 'og:title': '$escapetool.javascript($ogpTitle)',
	1531	+ 'og:description': '$escapetool.javascript($ogpDesc)',
	1532	+ 'og:type': 'article',
	1533	+ 'og:url': '$escapetool.javascript($ogpUrl)',
	1534	+ 'og:site_name': '生徒会Wiki',
	1535	+ 'twitter:card': 'summary'
	1536	+ };
	1537	+ for (var p in ogp) {
	1538	+ var meta = document.createElement('meta');
	1539	+ meta.setAttribute('property', p);
	1540	+ meta.setAttribute('content', ogp[p]);
	1541	+ document.head.appendChild(meta);
	1542	+ }
	1543	+ // twitter用
	1544	+ var tw = document.createElement('meta');
	1545	+ tw.setAttribute('name', 'twitter:card');
	1546	+ tw.setAttribute('content', 'summary');
	1547	+ document.head.appendChild(tw);
	1548	+})();
	1549	+// コンパクト表示（タイトルのみ）トグル
	1550	+// いいねトグル
	1551	+function toggleLike(btn) {
	1552	+ var page = btn.getAttribute('data-page');
	1553	+ var obj = btn.getAttribute('data-obj');
	1554	+ var csrf = btn.getAttribute('data-csrf');
	1555	+ btn.disabled = true;
	1556	+ var fd = new FormData();
	1557	+ fd.append('page', page);
	1558	+ fd.append('obj', obj);
	1559	+ fd.append('form_token', csrf);
	1560	+ fetch('/bin/SeitokaiCode/LikePost', { method: 'POST', body: fd })
	1561	+ .then(function(r) { return r.json(); })
	1562	+ .then(function(data) {
	1563	+ btn.querySelector('.like-count').textContent = data.count;
	1564	+ if (data.action === 'liked') {
	1565	+ btn.classList.add('liked');
	1566	+ btn.querySelector('svg').setAttribute('fill', 'currentColor');
	1567	+ btn.querySelector('svg').setAttribute('stroke', 'none');
	1568	+ } else {
	1569	+ btn.classList.remove('liked');
	1570	+ btn.querySelector('svg').removeAttribute('fill');
	1571	+ btn.querySelector('svg').setAttribute('stroke', 'currentColor');
	1572	+ }
	1573	+ })
	1574	+ .catch(function() { alert('エラーが発生しました'); })
	1575	+ .finally(function() { btn.disabled = false; });
	1576	+}
	1577	+
	1578	+function toggleCompactView() {
	1579	+ var container = document.querySelector('.xwiki-content') || document.body;
	1580	+ var isCompact = container.classList.toggle('activity-compact-view');
	1581	+ var btn = document.getElementById('btnViewToggle');
	1582	+ if (btn) {
	1583	+ btn.querySelector('.toggle-label').textContent = isCompact ? '詳細表示' : '一覧表示';
	1584	+ btn.title = isCompact ? '詳細表示に戻す' : 'タイトルのみ表示';
	1585	+ }
	1586	+ // コンパクトモードでは各スレッドヘッダーをクリックで個別展開可能にする
	1587	+ document.querySelectorAll('.activity-thread').forEach(function(thread) {
	1588	+ if (isCompact) {
	1589	+ thread.classList.remove('compact-expanded');
	1590	+ }
	1591	+ });
	1592	+}
	1593	+
	1594	+// コンパクトモードで個別スレッドを展開/折りたたみ
	1595	+function toggleThreadExpand(e) {
	1596	+ var container = document.querySelector('.xwiki-content') || document.body;
	1597	+ if (!container.classList.contains('activity-compact-view')) return;
	1598	+ // リンクやボタンのクリックはスルー
	1599	+ if (e.target.closest('a, button, .btn-featured-toggle')) return;
	1600	+ var thread = e.target.closest('.activity-thread');
	1601	+ if (thread) {
	1602	+ thread.classList.toggle('compact-expanded');
	1603	+ }
	1604	+}
	1605	+
985	985	function switchActivityFY(fy, btn) {
986	986	// タブのアクティブ状態を切り替え
987	987	document.querySelectorAll('.activity-fy-tab').forEach(function(t) { t.classList.remove('active'); });
...	...	@@ -997,7 +997,28 @@
997	997	}
998	998	// ページ読み込み時の初期化
999	999	document.addEventListener('DOMContentLoaded', function() {
1000		- // デフォルトで現在の年度を表示
	1621	+ // 年度タブを降順にソート（「全期間」タブは先頭に固定）
	1622	+ var tabContainer = document.querySelector('.activity-fy-tabs');
	1623	+ if (tabContainer) {
	1624	+ var tabs = Array.from(tabContainer.querySelectorAll('.activity-fy-tab'));
	1625	+ var allTab = null;
	1626	+ var fyTabs = [];
	1627	+ tabs.forEach(function(t) {
	1628	+ var onclickStr = t.getAttribute('onclick') || '';
	1629	+ if (onclickStr.indexOf("'all'") !== -1) { allTab = t; }
	1630	+ else { fyTabs.push(t); }
	1631	+ });
	1632	+ // 年度タブを数値の降順でソート
	1633	+ fyTabs.sort(function(a, b) {
	1634	+ var aYear = parseInt(a.textContent) || 0;
	1635	+ var bYear = parseInt(b.textContent) || 0;
	1636	+ return bYear - aYear;
	1637	+ });
	1638	+ // DOM再配置（全期間を先頭、年度タブを降順で続ける）
	1639	+ if (allTab) { tabContainer.appendChild(allTab); }
	1640	+ fyTabs.forEach(function(t) { tabContainer.appendChild(t); });
	1641	+ }
	1642	+ // デフォルトで全期間を表示
1001	1001	var defaultTab = document.querySelector('.activity-fy-tab.active');
1002	1002	if (defaultTab) { defaultTab.click(); }
1003	1003	// 保存成功時のトースト通知
...	...	@@ -1008,6 +1008,30 @@
1008	1008	window.history.replaceState({}, document.title, window.location.pathname);
1009	1009	}
1010	1010	}
	1653	+ // コンパクトモード: スレッドヘッダークリックで個別展開
	1654	+ document.querySelectorAll('.activity-thread-header').forEach(function(header) {
	1655	+ header.addEventListener('click', toggleThreadExpand);
	1656	+ });
	1657	+ // 長文投稿の折りたたみ初期化（max-height: 12em 超で省略）
	1658	+ document.querySelectorAll('.thread-post-body').forEach(function(body) {
	1659	+ // pre-wrapのまま高さを測定し、max-height(12em ≒ ~200px)を超える場合に折りたたむ
	1660	+ var fullH = body.scrollHeight;
	1661	+ // 12em を px に変換（font-size × line-height × 行数 の近似値ではなくCSSと同じ値を取得）
	1662	+ body.classList.add('truncated');
	1663	+ var maxH = body.clientHeight; // max-height: 12em 適用後の高さ
	1664	+ body.classList.remove('truncated');
	1665	+ if (fullH > maxH + 30) {
	1666	+ body.classList.add('truncated');
	1667	+ var btn = document.createElement('button');
	1668	+ btn.className = 'btn-read-more';
	1669	+ btn.textContent = '広げて読む ▼';
	1670	+ btn.addEventListener('click', function() {
	1671	+ var isExpanded = body.classList.toggle('expanded');
	1672	+ btn.textContent = isExpanded ? '折りたたむ ▲' : '広げて読む ▼';
	1673	+ });
	1674	+ body.parentNode.insertBefore(btn, body.nextSibling);
	1675	+ }
	1676	+ });
1011	1011	});
1012	1012
1013	1013	// トースト通知表示
...	...	@@ -1026,7 +1026,15 @@
1026	1026	};
1027	1027	var toast = document.createElement('div');
1028	1028	toast.className = 'toast toast-' + type;
1029		- toast.innerHTML = (icons[type] || '') + '<span>' + message + '</span>';
	1695	+ var iconSvg = icons[type] || '';
	1696	+ if (iconSvg) {
	1697	+ var iconSpan = document.createElement('span');
	1698	+ iconSpan.innerHTML = iconSvg;
	1699	+ toast.appendChild(iconSpan);
	1700	+ }
	1701	+ var msgSpan = document.createElement('span');
	1702	+ msgSpan.textContent = message;
	1703	+ toast.appendChild(msgSpan);
1030	1030	container.appendChild(toast);
1031	1031	setTimeout(function() { toast.remove(); }, 3200);
1032	1032	}
...	...	@@ -1042,37 +1042,131 @@
1042	1042	}
1043	1043
1044	1044	// 投稿の編集（インライン編集フォームを開く）
1045		-function openEditPost(btn, schoolPage, postObjNum, currentContent) {
	1719	+function openEditPost(btn) {
1046	1046	var postEl = btn.closest('.thread-post');
1047	1047	if (!postEl) return;
1048		- // 既存の編集フォームがあれば閉じる
1049	1049	var existing = postEl.querySelector('.post-edit-form');
1050	1050	if (existing) { existing.remove(); return; }
1051	1051	var bodyEl = postEl.querySelector('.thread-post-body');
1052	1052	if (!bodyEl) return;
	1726	+
	1727	+ var schoolPage = btn.getAttribute('data-school');
	1728	+ var postObjNum = btn.getAttribute('data-obj');
	1729	+ var currentContent = btn.getAttribute('data-content') || '';
	1730	+ var currentImages = btn.getAttribute('data-images') || '';
	1731	+ var currentFiles = btn.getAttribute('data-files') || '';
	1732	+ var postType = btn.getAttribute('data-post-type') || 'report';
	1733	+
1053	1053	var form = document.createElement('div');
1054	1054	form.className = 'post-edit-form';
1055		- form.innerHTML = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>' +
1056		- '<div class="post-edit-form-actions">' +
	1736	+ form.setAttribute('data-school', schoolPage);
	1737	+ form.setAttribute('data-obj', postObjNum);
	1738	+
	1739	+ var html = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>';
	1740	+
	1741	+ // コメント以外は添付ファイル編集を表示
	1742	+ function escAttr(s) { return s.replace(/&/g,'&amp;').replace(/"/g,'&quot;').replace(/'/g,'&#39;').replace(/</g,'&lt;').replace(/>/g,'&gt;'); }
	1743	+ if (postType !== 'comment') {
	1744	+ // 既存画像
	1745	+ html += '<div class="edit-attachments">';
	1746	+ if (currentImages.trim()) {
	1747	+ html += '<div class="edit-attach-section"><span class="edit-attach-label">画像</span>';
	1748	+ var imgs = currentImages.trim().split('\n');
	1749	+ for (var i = 0; i < imgs.length; i++) {
	1750	+ var img = imgs[i].trim();
	1751	+ if (!img) continue;
	1752	+ html += '<div class="edit-attach-item" data-name="' + escAttr(img) + '">' +
	1753	+ '<img src="/xwiki/bin/download/' + schoolPage.replace(/\./g,'/') + '/' + encodeURIComponent(img) + '" class="edit-attach-thumb" />' +
	1754	+ '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
	1755	+ '<input type="hidden" name="keepImages" value="' + escAttr(img) + '" />' +
	1756	+ '</div>';
	1757	+ }
	1758	+ html += '</div>';
	1759	+ }
	1760	+ // 既存ファイル
	1761	+ if (currentFiles.trim()) {
	1762	+ html += '<div class="edit-attach-section"><span class="edit-attach-label">ファイル</span>';
	1763	+ var files = currentFiles.trim().split('\n');
	1764	+ for (var j = 0; j < files.length; j++) {
	1765	+ var f = files[j].trim();
	1766	+ if (!f) continue;
	1767	+ var displayName = f;
	1768	+ if (/^file_\d{14}_\d+_/.test(f)) displayName = f.replace(/^file_\d{14}_\d+_/, '');
	1769	+ html += '<div class="edit-attach-item" data-name="' + escAttr(f) + '">' +
	1770	+ '<span class="edit-attach-fname">' + escAttr(displayName) + '</span>' +
	1771	+ '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
	1772	+ '<input type="hidden" name="keepFiles" value="' + escAttr(f) + '" />' +
	1773	+ '</div>';
	1774	+ }
	1775	+ html += '</div>';
	1776	+ }
	1777	+ // 新規追加
	1778	+ html += '<div class="edit-attach-add">' +
	1779	+ '<label class="form-label-sm">画像を追加（最大4枚まで）</label>' +
	1780	+ '<input type="file" name="editNewImages" accept="image/*" multiple class="form-file-input-sm" />' +
	1781	+ '<div class="form-hint">JPEG / PNG / GIF / WebP、各5MBまで</div>' +
	1782	+ '<label class="form-label-sm" style="margin-top:8px;">ファイルを追加（最大2つまで）</label>' +
	1783	+ '<input type="file" name="editNewFiles" accept=".pdf,.docx,.xlsx,.pptx" multiple class="form-file-input-sm" />' +
	1784	+ '<div class="form-hint">PDF / Word / Excel / PowerPoint、各10MBまで</div>' +
	1785	+ '</div>';
	1786	+ html += '</div>';
	1787	+ }
	1788	+
	1789	+ html += '<div class="post-edit-form-actions">' +
1057	1057	'<button type="button" class="btn-cancel-edit" onclick="this.closest(\'.post-edit-form\').remove()">キャンセル</button>' +
1058		- '<button type="button" class="btn-save" onclick="saveEditPost(\'' + schoolPage + '\', ' + postObjNum + ')">保存</button>' +
	1791	+ '<button type="button" class="btn-save" onclick="saveEditPost(this)">保存</button>' +
1059	1059	'</div>';
	1793	+
	1794	+ form.innerHTML = html;
1060	1060	bodyEl.parentNode.insertBefore(form, bodyEl.nextSibling);
1061	1061	form.querySelector('textarea').focus();
1062	1062	}
1063	1063
	1799	+function removeEditAttach(btn) {
	1800	+ var item = btn.closest('.edit-attach-item');
	1801	+ if (item) item.remove();
	1802	+}
	1803	+
1064	1064	// 投稿の編集を保存
1065		-function saveEditPost(schoolPage, postObjNum) {
1066		- var textarea = document.getElementById('editContent_' + postObjNum);
	1805	+function saveEditPost(btn) {
	1806	+ var formEl = btn.closest('.post-edit-form');
	1807	+ if (!formEl) return;
	1808	+ var schoolPage = formEl.getAttribute('data-school');
	1809	+ var postObjNum = formEl.getAttribute('data-obj');
	1810	+ var textarea = formEl.querySelector('textarea');
1067	1067	if (!textarea) return;
1068	1068	var newContent = textarea.value.trim();
1069	1069	if (!newContent) { alert('投稿内容を入力してください'); return; }
	1814	+
1070	1070	var csrfEl = document.querySelector('input[name="form_token"]');
1071	1071	var csrfToken = csrfEl ? csrfEl.value : '';
	1817	+
	1818	+ var fd = new FormData();
	1819	+ fd.append('schoolPage', schoolPage);
	1820	+ fd.append('postObj', postObjNum);
	1821	+ fd.append('newContent', newContent);
	1822	+ fd.append('form_token', csrfToken);
	1823	+
	1824	+ // 残す画像・ファイル
	1825	+ formEl.querySelectorAll('input[name="keepImages"]').forEach(function(el) { fd.append('keepImages', el.value); });
	1826	+ formEl.querySelectorAll('input[name="keepFiles"]').forEach(function(el) { fd.append('keepFiles', el.value); });
	1827	+
	1828	+ // 新規画像
	1829	+ var newImgInput = formEl.querySelector('input[name="editNewImages"]');
	1830	+ if (newImgInput && newImgInput.files) {
	1831	+ for (var i = 0; i < newImgInput.files.length; i++) { fd.append('editNewImages', newImgInput.files[i]); }
	1832	+ }
	1833	+ // 新規ファイル
	1834	+ var newFileInput = formEl.querySelector('input[name="editNewFiles"]');
	1835	+ if (newFileInput && newFileInput.files) {
	1836	+ for (var j = 0; j < newFileInput.files.length; j++) { fd.append('editNewFiles', newFileInput.files[j]); }
	1837	+ }
	1838	+
	1839	+ btn.disabled = true;
	1840	+ btn.textContent = '保存中...';
	1841	+
1072	1072	var xhr = new XMLHttpRequest();
1073		- xhr.open('POST', '/bin/SeitokaiCode/EditPost?outputSyntax=plain', true);
1074		- xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1075		- var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken);
	1843	+ xhr.open('POST', '/bin/get/SeitokaiCode/EditPost?outputSyntax=plain', true);
1076	1076	xhr.onload = function() {
1077	1077	try {
1078	1078	var res = JSON.parse(xhr.responseText);
...	...	@@ -1080,12 +1080,13 @@
1080	1080	showToast('投稿を更新しました', 'success');
1081	1081	setTimeout(function() { location.reload(); }, 800);
1082	1082	} else {
	1851	+ btn.disabled = false; btn.textContent = '保存';
1083	1083	alert('編集に失敗しました: ' + (res.error || ''));
1084	1084	}
1085		- } catch(e) { alert('編集に失敗しました'); }
	1854	+ } catch(e) { btn.disabled = false; btn.textContent = '保存'; alert('編集に失敗しました'); }
1086	1086	};
1087		- xhr.onerror = function() { alert('通信エラーが発生しました'); };
1088		- xhr.send(editPostData);
	1856	+ xhr.onerror = function() { btn.disabled = false; btn.textContent = '保存'; alert('通信エラーが発生しました'); };
	1857	+ xhr.send(fd);
1089	1089	}
1090	1090
1091	1091	// 投稿の削除（確認ダイアログ付き）
...	...	@@ -1092,7 +1092,7 @@
1092	1092	function confirmDeletePost(schoolPage, postObjNum, token) {
1093	1093	if (!confirm('この投稿を削除しますか？\\n削除後は「この投稿は削除されました」と表示されます。')) return;
1094	1094	var xhr = new XMLHttpRequest();
1095		- xhr.open('POST', '/bin/SeitokaiCode/DeletePost?outputSyntax=plain', true);
	1864	+ xhr.open('POST', '/bin/get/SeitokaiCode/DeletePost?outputSyntax=plain', true);
1096	1096	xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1097	1097	var deletePostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token);
1098	1098	xhr.onload = function() {
...	...	@@ -1109,6 +1109,80 @@
1109	1109	xhr.onerror = function() { alert('通信エラーが発生しました'); };
1110	1110	xhr.send(deletePostData);
1111	1111	}
	1881	+
	1882	+/* --- 通報ダイアログ --- */
	1883	+function openReportDialog(btn, targetPage, postObjNum, token) {
	1884	+ if (document.getElementById('report-dialog-overlay')) return;
	1885	+ var reasons = ['宣伝・スパム','不適切な内容','個人情報の露出','誹謗中傷','誤情報','その他'];
	1886	+ var overlay = document.createElement('div');
	1887	+ overlay.id = 'report-dialog-overlay';
	1888	+ overlay.style.cssText = 'position:fixed;inset:0;background:rgba(0,0,0,0.5);z-index:9999;display:flex;align-items:center;justify-content:center;';
	1889	+ var dialog = document.createElement('div');
	1890	+ dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;max-height:80vh;overflow-y:auto;';
	1891	+ var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を通報</h3>';
	1892	+ html += '<p style="margin:0 0 12px;font-size:0.9em;color:#4b5563;">通報された投稿は管理者が確認するまで一時的に非表示になります。</p>';
	1893	+ html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">通報理由</label>';
	1894	+ html += '<select id="report-reason" style="width:100%;padding:8px;border:1px solid #d1d5db;border-radius:8px;margin-bottom:12px;font-size:0.9em;">';
	1895	+ for (var i=0; i<reasons.length; i++) html += '<option value="'+reasons[i]+'">'+reasons[i]+'</option>';
	1896	+ html += '</select>';
	1897	+ html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">補足コメント（任意）</label>';
	1898	+ html += '<textarea id="report-detail" rows="3" maxlength="500" style="width:100%;padding:8px;border:1px solid #d1d5db;border-radius:8px;resize:vertical;font-size:0.9em;box-sizing:border-box;" placeholder="具体的な内容があればご記入ください"></textarea>';
	1899	+ html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
	1900	+ html += '<button type="button" id="report-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
	1901	+ html += '<button type="button" id="report-submit-btn" style="padding:8px 16px;border:none;border-radius:8px;background:#dc2626;color:#fff;cursor:pointer;font-weight:600;">通報する</button>';
	1902	+ html += '</div>';
	1903	+ dialog.innerHTML = html;
	1904	+ overlay.appendChild(dialog);
	1905	+ document.body.appendChild(overlay);
	1906	+ overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
	1907	+ document.getElementById('report-cancel-btn').addEventListener('click', function() { overlay.remove(); });
	1908	+ document.getElementById('report-submit-btn').addEventListener('click', function() {
	1909	+ var reason = document.getElementById('report-reason').value;
	1910	+ var detail = document.getElementById('report-detail').value;
	1911	+ var submitBtn = document.getElementById('report-submit-btn');
	1912	+ submitBtn.disabled = true; submitBtn.textContent = '送信中...';
	1913	+ var xhr = new XMLHttpRequest();
	1914	+ xhr.open('POST', '/bin/get/SeitokaiCode/ReportAction?outputSyntax=plain', true);
	1915	+ xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
	1916	+ var data = 'targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&detail=' + encodeURIComponent(detail) + '&form_token=' + encodeURIComponent(token);
	1917	+ xhr.onload = function() {
	1918	+ overlay.remove();
	1919	+ showToast('通報を受け付けました', 'success');
	1920	+ setTimeout(function() { location.reload(); }, 1000);
	1921	+ };
	1922	+ xhr.onerror = function() { overlay.remove(); alert('通信エラーが発生しました'); };
	1923	+ xhr.send(data);
	1924	+ });
	1925	+}
	1926	+
	1927	+/* --- 非表示ダイアログ（管理者用） --- */
	1928	+function openHideDialog(btn, targetPage, postObjNum, token) {
	1929	+ if (document.getElementById('hide-dialog-overlay')) return;
	1930	+ var overlay = document.createElement('div');
	1931	+ overlay.id = 'hide-dialog-overlay';
	1932	+ overlay.style.cssText = 'position:fixed;inset:0;background:rgba(0,0,0,0.5);z-index:9999;display:flex;align-items:center;justify-content:center;';
	1933	+ var dialog = document.createElement('div');
	1934	+ dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;';
	1935	+ var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を非表示にする</h3>';
	1936	+ html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">非表示の理由</label>';
	1937	+ html += '<input type="text" id="hide-reason" style="width:100%;padding:8px;border:1px solid #d1d5db;border-radius:8px;margin-bottom:12px;font-size:0.9em;box-sizing:border-box;" placeholder="理由を入力" />';
	1938	+ html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
	1939	+ html += '<button type="button" id="hide-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
	1940	+ html += '<button type="button" id="hide-submit-btn" style="padding:8px 16px;border:none;border-radius:8px;background:#d97706;color:#fff;cursor:pointer;font-weight:600;">非表示にする</button>';
	1941	+ html += '<button type="button" id="hide-warn-btn" style="padding:8px 16px;border:none;border-radius:8px;background:#dc2626;color:#fff;cursor:pointer;font-weight:600;">非表示+警告</button>';
	1942	+ html += '</div>';
	1943	+ dialog.innerHTML = html;
	1944	+ overlay.appendChild(dialog);
	1945	+ document.body.appendChild(overlay);
	1946	+ overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
	1947	+ document.getElementById('hide-cancel-btn').addEventListener('click', function() { overlay.remove(); });
	1948	+ function doHide(action) {
	1949	+ var reason = document.getElementById('hide-reason').value || '管理者判断';
	1950	+ window.location.href = '/bin/view/SeitokaiCode/ModerationAction?action=' + action + '&targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&form_token=' + encodeURIComponent(token);
	1951	+ }
	1952	+ document.getElementById('hide-submit-btn').addEventListener('click', function() { doHide('hide'); });
	1953	+ document.getElementById('hide-warn-btn').addEventListener('click', function() { doHide('hide-warn'); });
	1954	+}
1112	1112	</script>
1113	1113	{{/html}}
1114	1114	{{/velocity}}