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)
...	...	@@ -133,7 +133,7 @@
133	133
134	134	## --- 投稿固定/解除処理 ---
135	135	#set($pinAction = $!request.action)
136		-#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))
137	137	#set($pinPostObjStr = $!request.postObj)
138	138	#if(!$pinPostObjStr.matches('^\d+$'))
139	139	## 不正な値 → 無視
...	...	@@ -163,7 +163,7 @@
163	163
164	164	## --- 特色ある活動 選定/解除処理 ---
165	165	#set($featAction = $!request.action)
166		-#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))
167	167	#set($featActObjStr = $!request.actObj)
168	168	#if($featActObjStr.matches('^\d+$'))
169	169	#set($actObjNum = $mathtool.toInteger($featActObjStr))
...	...	@@ -265,7 +265,7 @@
265	265
266	266	## --- 編集ボタン（権限があるユーザーのみ表示） ---
267	267	#set($canEditSchool = false)
268		-#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode))
	385	+#if(!$isGuest && ($isViewerAdmin || $isSchoolMember || $isAlumniOfSchool))
269	269	#set($canEditSchool = true)
270	270	#end
271	271	#if($canEditSchool)
...	...	@@ -274,305 +274,596 @@
274	274	</div>
275	275	#end
276	276
277		-## --- ① 学校基本情報 + 連絡先（左右グリッド・折りたたみ対応） ---
278		-<div class="school-info-grid">
279		- <div class="school-info-card collapsed" id="card-basic-info">
280		- <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>
281		- <table class="wiki-table school-info-table">
282		- <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
283		- <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
284		- <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
285		- <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
286		- <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
287		- <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
288		- <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
289		- <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
290		- <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>
291		- </table>
292		- #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
293		- #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
294		- #if($infoEditDate && $infoEditDate != '')
295		- <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)
296	296	#end
	407	+ と連携しています
297	297	</div>
	409	+</div>
	410	+#end
298	298
299		- <div class="school-info-card collapsed" id="card-contact">
300		- <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>
301		- <table class="wiki-table school-info-table">
302		- <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr>
303		- <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>
304		- <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>
305		- <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>
306		- <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>
307		- <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
308		- </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
309	309	</div>
310		-</div>
	435	+ #if($schoolDescription && $schoolDescription.trim() != '')
	436	+ <div class="free-note" style="margin-top:var(--sp-4);">$!escapetool.xml($schoolDescription)</div>
	437	+ #end
311	311
312		-## --- 生徒会情報アコーディオン ---
313		-<div class="school-section-divider">
314		- <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')?'▲':'▼';">
315		- <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>
316		- 生徒会情報を見る <span class="shortcut-arrow">▼</span>
317		- </button>
318	318	</div>
319	319
320		-<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">
321	321
322		-## --- ② 組織図 ---
323		-#set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
324		-#if($hasOrgContent)
325		- ## 公開範囲チェック
326		- #set($canViewOrgChart = true)
327		- #if($visibilityOrgChart == 'members' && $isGuest) #set($canViewOrgChart = false)
328		- #elseif($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewOrgChart = false)
329		- #end
330		- #if($canViewOrgChart)
331		-<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>
332		-<div class="school-section-card">
333		- <div class="card-inner">
334		- #if($orgChartImage && $orgChartImage != '')
335		- <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
336	336	#end
337		- #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end
338		- </div>
339		-</div>
340		- #else
341		-<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>
342		- #end
343		-#end
344	344
345		-## --- ③④⑤ 日常の活動・選挙・定例活動 ---
346		-<div class="school-section-grid">
347		- #if($dailyActivities && !$dailyActivities.isEmpty())
348		- <div class="school-section-card">
349		- <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>
350		- <div class="card-inner">
351		- <p class="activity-hint">活動時間の多い順に上位3つ</p>
352		- <div class="tag-container">
353		- #set($daIdx = 1)
354		- #foreach($da in $dailyActivities)
355		- <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
356		- #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>
357	357	#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
358	358	</div>
359		- #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
360		- <div class="free-note">$!escapetool.xml($dailyActivitiesNote)</div>
361		- #end
362	362	</div>
363		- </div>
364		- #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
365	365
366		- #if($electionExists && $electionExists != '')
367		- <div class="school-section-card">
368		- <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>
369		- <div class="card-inner">
370		- <div class="info-row">
371		- <span class="info-label">役員選挙</span>
372		- <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>
373	373	</div>
374		- #if($electionType && $electionType != '')
375		- <div class="info-row">
376		- <span class="info-label">直近の選挙方式</span>
377		- <span class="info-value">$!escapetool.xml($!electionType)</span>
378		- </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>
379	379	#end
380		- #if($electionNote && $electionNote.trim() != '')
381		- <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)
382	382	#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>
383	383	</div>
384		- </div>
385		- #end
386		-</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
387	387
388		-<div class="school-section-grid">
389		- #if($meetingFrequency && $meetingFrequency != '')
390		- <div class="school-section-card">
391		- <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>
392		- <div class="card-inner">
393		- <div class="info-row">
394		- <span class="info-label">役員定例会の頻度</span>
395		- <span class="info-value">$!escapetool.xml($!meetingFrequency)</span>
396		- </div>
397		- #if($regularActivitiesNote && $regularActivitiesNote.trim() != '')
398		- <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)
399	399	#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>
400	400	</div>
401		- </div>
402		- #end
403		-
404		- ## --- ⑦ 予算 ---
405		- #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
406		- #if($hasBudget)
407		- ## 公開範囲チェック
408		- #set($canViewBudget = true)
409		- #if($visibilityBudget == 'members' && $isGuest) #set($canViewBudget = false)
410		- #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
411	411	#end
412		- #if($canViewBudget)
413		- <div class="school-section-card">
414		- <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>
415		- <div class="card-inner">
416		- #if($budgetProcess && !$budgetProcess.isEmpty())
417		- <div class="info-row">
418		- <span class="info-label">作成過程の生徒関与</span>
419		- <span class="info-value">
420		- <div class="selection-display">
421		- #foreach($bp in $budgetProcess)
422		- <span class="selection-item">$!escapetool.xml($bp.trim())</span>
423		- #end
424		- </div>
425		- </span>
426		- </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)
427	427	#end
428		- #if($studentFee && $studentFee != '')
429		- <div class="info-row">
430		- <span class="info-label">生徒会費（年額）</span>
431		- <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
432	432	</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>
433	433	#end
434		- #if($budgetScale && $budgetScale != '')
435		- <div class="info-row">
436		- <span class="info-label">予算規模</span>
437		- <span class="info-value">$!escapetool.xml($!budgetScale)</span>
438		- </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)
439	439	#end
440		- #if($budgetAllocation && !$budgetAllocation.isEmpty())
441		- <div class="info-row">
442		- <span class="info-label">主な予算配分</span>
443		- <span class="info-value">
444		- <div class="selection-display">
445		- #foreach($ba in $budgetAllocation)
446		- <span class="selection-item">$!escapetool.xml($ba.trim())</span>
447		- #end
448		- </div>
449		- </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
450	450	</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>
451	451	#end
452		- #if($budgetNote && $budgetNote.trim() != '')
453		- <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)
454	454	#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>
455	455	</div>
456		- </div>
457		- #else
458		- <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
459	459	#end
460		- #end
461		-</div>
462	462
463		-## --- ⑧ 校則の見直し ---
464		-#if($ruleReviewStatus && $ruleReviewStatus != '')
465		- ## 公開範囲チェック
466		- #set($canViewRuleReview = true)
467		- #if($visibilityRuleReview == 'members' && $isGuest) #set($canViewRuleReview = false)
468		- #elseif($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewRuleReview = false)
469		- #end
470		- #if($canViewRuleReview)
471		-<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>
472		-<div class="school-section-card">
473		- <div class="card-inner">
474		- <div class="info-row">
475		- <span class="info-label">見直しの有無（3年以内）</span>
476		- <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
477		- </div>
478		- #if($ruleReviewContent && !$ruleReviewContent.isEmpty())
479		- <div class="info-row">
480		- <span class="info-label">見直しの内容</span>
481		- <span class="info-value">
482		- <div class="selection-display">
483		- #foreach($rc in $ruleReviewContent)
484		- <span class="selection-item">$!escapetool.xml($rc.trim())</span>
485		- #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>
486	486	</div>
487		- </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>
488	488	</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
489	489	#end
490		- #if($ruleReviewProposer && !$ruleReviewProposer.isEmpty())
491		- <div class="info-row">
492		- <span class="info-label">見直しの提案者</span>
493		- <span class="info-value">
494		- <div class="selection-display">
495		- #foreach($rp in $ruleReviewProposer)
496		- <span class="selection-item">$!escapetool.xml($rp.trim())</span>
497		- #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>
498	498	</div>
499		- </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>
500	500	</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
501	501	#end
502		- #if($ruleReviewImplementer && !$ruleReviewImplementer.isEmpty())
503		- <div class="info-row">
504		- <span class="info-label">見直しの実施者</span>
505		- <span class="info-value">
506		- <div class="selection-display">
507		- #foreach($ri in $ruleReviewImplementer)
508		- <span class="selection-item">$!escapetool.xml($ri.trim())</span>
509		- #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>
510	510	</div>
511		- </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>
512	512	</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
513	513	#end
514		- #if($ruleReviewSystem && $ruleReviewSystem != '')
515		- <div class="info-row">
516		- <span class="info-label">見直しの仕組み</span>
517		- <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>
518	518	</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
519	519	#end
520		- </div>
521		-</div>
522		- #else
523		-<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>
524		- #end
525		-#end
526	526
527		-## --- ⑨ 課題 ---
528		-#if($challenges && $challenges != '')
529		- ## 公開範囲チェック
530		- #set($canViewChallenges = true)
531		- #if($visibilityChallenges == 'members' && $isGuest) #set($canViewChallenges = false)
532		- #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>
533	533	#end
534		- #if($canViewChallenges)
535		-<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>
536		-<div class="challenge-text">$!escapetool.xml($challenges)</div>
537		- #else
538		-<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>
539		- #end
540		-#end
	973	+</div>
541	541
542		-</div>## seitokai-info-accordion 終了
543		-
544	544	{{/html}}
545	545
	977	+----
	978	+
546	546	## --- ⑩ 活動報告一覧（スレッド型・年度タブ付き） ---
547	547	= 活動報告 =
548	548
549		-## --- 投稿者ステータス凡例（折りたたみ） ---
	982	+## --- 年度タブ + 投稿者ステータス凡例 ---
550	550	{{html clean="false"}}
551		-<div class="author-legend-wrapper">
552		- <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>
553		- <div class="author-legend-body">
554		- <div class="author-legend">
555		- <span class="author-legend-title">投稿者の信頼度:</span>
556		- <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者</span>
557		- <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み</span>
558		- <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介</span>
559		- <span class="author-legend-item"><span class="bar bar-general"></span> 一般（未承認）</span>
560		- </div>
561		- <div class="author-legend">
562		- <span class="author-legend-title">所属:</span>
563		- <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>
564		- <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>
565		- <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>
566		- <span class="author-legend-item text-hint">※一般アカウントは所属未確認のため非表示</span>
567		- </div>
568		- <div class="author-legend">
569		- <span class="author-legend-title">役割:</span>
570		- <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>
571		- <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>
572		- <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>
573		- </div>
574		- </div>
575		-</div>
576	576
577	577	## --- 年度タブ ---
578	578	## 全活動から年度一覧を収集
...	...	@@ -594,34 +594,111 @@
594	594	#end
595	595	## ソート（降順にしたいが Velocity にはないので JS で制御）
596	596
597		-<div class="activity-fy-tabs">
598		- <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
599		- #foreach($fy in $fySet)
600		- #if($fy != $currentFYStr)
601		- <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
602	602	#end
603		- #end
604		- <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>
605	605	</div>
606	606
607	607	{{/html}}
608	608
609		-## 特色ある活動を先頭に表示するため、並び替え用リストを作成
610		-#set($featuredActivities = [])
611		-#set($normalActivities = [])
612		-#if($activities && $activities.size() > 0)
613		- #foreach($act in $activities)
614		- #set($isFeatured = $!act.getValue('featured'))
615		- #if($isFeatured == '1')
616		- #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($discard = $fyNums.add($fy))
	1058	+ #end
	1059	+#end
	1060	+## 最大値を順番に取り出して降順リストを構築（最大20年度まで対応）
	1061	+#set($fyDesc = [])
	1062	+#set($fyRemaining = [])
	1063	+#foreach($fy in $fyNums)
	1064	+ #set($discard = $fyRemaining.add($fy))
	1065	+#end
	1066	+#foreach($dummy in [1..20])
	1067	+ #if($fyRemaining.isEmpty())#break#end
	1068	+ #set($fyMax = $fyRemaining.get(0))
	1069	+ #foreach($fy in $fyRemaining)
	1070	+ #if($fy > $fyMax)#set($fyMax = $fy)#end
	1071	+ #end
	1072	+ #set($discard = $fyDesc.add($fyMax))
	1073	+ #set($fyNextRem = [])
	1074	+ #set($fyMaxRemoved = false)
	1075	+ #foreach($fy in $fyRemaining)
	1076	+ #if(!$fyMaxRemoved && $fy == $fyMax)
	1077	+ #set($fyMaxRemoved = true)
617	617	#else
618		- #set($discard = $normalActivities.add($foreach.index))
	1079	+ #set($discard = $fyNextRem.add($fy))
619	619	#end
620	620	#end
	1082	+ #set($fyRemaining = $fyNextRem)
621	621	#end
	1084	+## 年度未設定の活動は末尾に表示（fySetに'unknown'は入らないため無条件追加）
	1085	+#set($discard = $fyDesc.add('unknown'))
	1086	+## Step2: 年度降順で featured → normal の順にインデックスを収集
622	622	#set($orderedActivityIndices = [])
623		-#set($discard = $orderedActivityIndices.addAll($featuredActivities))
624		-#set($discard = $orderedActivityIndices.addAll($normalActivities))
	1088	+#foreach($curFY in $fyDesc)
	1089	+ ## 同年度の特色あり活動を先頭に
	1090	+ #set($actIdx2 = 0)
	1091	+ #foreach($act in $activities)
	1092	+ #set($aFY2 = $!act.getValue('fiscalYear'))
	1093	+ #if(!$aFY2 || $aFY2 == '') #set($aFY2 = 'unknown') #end
	1094	+ #if($aFY2 == $curFY && $act.getValue('featured') == '1')
	1095	+ #set($discard = $orderedActivityIndices.add($actIdx2))
	1096	+ #end
	1097	+ #set($actIdx2 = $actIdx2 + 1)
	1098	+ #end
	1099	+ ## 同年度の通常活動
	1100	+ #set($actIdx2 = 0)
	1101	+ #foreach($act in $activities)
	1102	+ #set($aFY2 = $!act.getValue('fiscalYear'))
	1103	+ #if(!$aFY2 || $aFY2 == '') #set($aFY2 = 'unknown') #end
	1104	+ #if($aFY2 == $curFY && $act.getValue('featured') != '1')
	1105	+ #set($discard = $orderedActivityIndices.add($actIdx2))
	1106	+ #end
	1107	+ #set($actIdx2 = $actIdx2 + 1)
	1108	+ #end
	1109	+#end
625	625
626	626	#if($activities && $activities.size() > 0)
627	627	#foreach($actIdx in $orderedActivityIndices)
...	...	@@ -666,10 +666,18 @@
666	666	<div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)">
667	667	<div class="activity-thread-header">
668	668	<div class="activity-thread-title">
669		- <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>
670		- <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
	1154	+ <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>
	1155	+ <div class="activity-meta-line">
	1156	+ <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
	1157	+ #set($actTagsList = $activity.getValue('tags'))
	1158	+ #if($actTagsList && !$actTagsList.isEmpty())
	1159	+ #foreach($tagItem in $actTagsList)
	1160	+ #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end
	1161	+ #end
	1162	+ #end
	1163	+ </div>
671	671	</div>
672		- <div class="thread-meta-row">
	1165	+ <div class="thread-meta-right">
673	673	<span class="thread-post-count">${reportCount}件の報告 ・ ${commentCount}件のコメント</span>
674	674	#if($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred')
675	675	#if($actFeatured == '1')
...	...	@@ -729,12 +729,12 @@
729	729	#set($postVis = $!post.getValue('visibility'))
730	730	#if(!$postVis || $postVis == '') #set($postVis = 'public') #end
731	731	#set($canViewPost = true)
732		- #if($postVis == 'members' && $isGuest) #set($canViewPost = false)
733		- #elseif($postVis == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewPost = false)
	1225	+ #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewPost = false)
	1226	+ #elseif($postVis == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPost = false)
734	734	#end
735	735	#if(!$canViewPost)
736	736	<div class="thread-post visibility-restricted-post">
737		- <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>
	1230	+ <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>
738	738	</div>
739	739	#else
740	740	## 投稿者のアカウント種別に基づいたCSSクラス
...	...	@@ -774,8 +774,11 @@
774	774	<span class="badge badge-general badge-sm">一般</span>
775	775	#end
776	776	## 所属バッジ（投稿者の学校コードとページの学校コードを比較）
	1270	+ #set($postIsSchoolMatch = ($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode)))
777	777	#if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general')
778		- #if($postSchoolCode == $schoolCode)
	1272	+ #if($postUserRole == 'graduate' && $postIsSchoolMatch)
	1273	+ <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>
	1274	+ #elseif($postIsSchoolMatch && $postUserRole != 'graduate')
779	779	#if($postAccountType == 'verified' || $postAccountType == 'admin')
780	780	<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>
781	781	#else
...	...	@@ -802,6 +802,13 @@
802	802	#if($postEdited == 1 || $postEdited == '1')
803	803	<span class="post-edited-label">（編集済み）</span>
804	804	#end
	1301	+ #set($postAuthorRefH = $!post.getValue('authorRef'))
	1302	+ #set($postObjNumH = $post.number)
	1303	+ #if(!$isGuest && $xcontext.user != $postAuthorRefH)
	1304	+ <button type="button" class="btn-post-report btn-post-report-header" onclick="openReportDialog(this, '${doc.fullName}', $postObjNumH, '${services.csrf.getToken()}')" title="この投稿を通報">
	1305	+ <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> 通報
	1306	+ </button>
	1307	+ #end
805	805	</div>
806	806	<div class="thread-post-body">
807	807	$!escapetool.xml($!postContent)
...	...	@@ -866,12 +866,37 @@
866	866	#end
867	867	</div>
868	868	#if($postVis != 'public')
869		- <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>
	1372	+ <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>
870	870	#end
871		- ## 固定/解除ボタン（承認済み・管理者のみ）
872		- #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
873		- #set($postObjNum = $post.number)
874		- <div class="post-pin-action post-action-mt">
	1374	+ ## いいねボタン
	1375	+ #set($postLikeCount = $!post.getValue('likeCount'))
	1376	+ #if(!$postLikeCount || $postLikeCount == '') #set($postLikeCount = 0) #end
	1377	+ #set($postLikedBy = $!post.getValue('likedBy'))
	1378	+ #set($isLikedByMe = false)
	1379	+ #if($postLikedBy && $postLikedBy.contains($xcontext.user)) #set($isLikedByMe = true) #end
	1380	+ <div class="post-like-row post-action-mt">
	1381	+ #if($xcontext.user != 'XWiki.XWikiGuest')
	1382	+ <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)">
	1383	+ <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>
	1384	+ <span class="like-count">$postLikeCount</span>
	1385	+ </button>
	1386	+ #else
	1387	+ <span class="btn-like disabled">
	1388	+ <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>
	1389	+ <span class="like-count">$postLikeCount</span>
	1390	+ </span>
	1391	+ #end
	1392	+ </div>
	1393	+ ## 固定/編集/削除/通報/非表示ボタン（横並び）
	1394	+ #set($postAuthorRef = $!post.getValue('authorRef'))
	1395	+ #set($postObjNumED = $post.number)
	1396	+ #set($showPinBtn = ($viewerAccountType == 'admin' || $viewerAccountType == 'verified'))
	1397	+ #set($showEditDeleteBtn = ($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin'))
	1398	+ #set($showHideBtn = ($viewerAccountType == 'admin'))
	1399	+ #if($showPinBtn || $showEditDeleteBtn || $showHideBtn)
	1400	+ <div class="post-edit-actions post-action-mt">
	1401	+ #if($showPinBtn)
	1402	+ #set($postObjNum = $post.number)
875	875	#if($isPinned == '1')
876	876	<a href="$doc.getURL('view', "action=unpin&postObj=${postObjNum}&form_token=${services.csrf.getToken()}")" class="btn-pin-toggle btn-unpin" title="固定を解除">
877	877	<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> 固定を解除
...	...	@@ -881,15 +881,12 @@
881	881	<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> 固定する
882	882	</a>
883	883	#end
884		- </div>
885		- #end
886		- ## 編集・削除ボタン（投稿者本人 or 管理者）
887		- #set($postAuthorRef = $!post.getValue('authorRef'))
888		- #set($postObjNumED = $post.number)
889		- #if($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin')
890		- <div class="post-edit-actions post-action-mt">
	1412	+ #end
	1413	+ #if($showEditDeleteBtn)
891	891	#if($xcontext.user == $postAuthorRef)
892		- <button type="button" class="btn-post-edit" onclick="openEditPost(this, '${doc.fullName}', $postObjNumED, '$!escapetool.javascript($!postContent)')" title="この投稿を編集">
	1415	+ #set($editImages = $!post.getValue('images'))
	1416	+ #set($editFiles = $!post.getValue('files'))
	1417	+ <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="この投稿を編集">
893	893	<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> 編集
894	894	</button>
895	895	#end
...	...	@@ -896,6 +896,12 @@
896	896	<button type="button" class="btn-post-delete" onclick="confirmDeletePost('${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を削除">
897	897	<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> 削除
898	898	</button>
	1424	+ #end
	1425	+ #if($showHideBtn)
	1426	+ <button type="button" class="btn-post-hide" onclick="openHideDialog(this, '${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を非表示にする">
	1427	+ <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> 非表示
	1428	+ </button>
	1429	+ #end
899	899	</div>
900	900	#end
901	901	</div>
...	...	@@ -945,9 +945,11 @@
945	945
946	946	#if($xcontext.user != "XWiki.XWikiGuest")
947	947	<div class="thread-add-post">
	1479	+ #if($isSchoolMember || $isAlumniOfSchool || $isViewerAdmin)
948	948	<a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
949	949	＋ 活動報告を追加
950	950	</a>
	1483	+ #end
951	951	<a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
952	952	<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> コメントを書く
953	953	</a>
...	...	@@ -977,9 +977,96 @@
977	977	{{/html}}
978	978	#end
979	979
	1513	+## --- OGP / SNSシェア対応 ---
	1514	+#set($ogpTitle = "${schoolName} — 生徒会Wiki")
	1515	+#set($ogpDesc = "${schoolName}の生徒会活動情報。")
	1516	+#if($prefecture && $prefecture != '') #set($ogpDesc = "${ogpDesc}${prefecture}") #end
	1517	+#if($city && $city != '') #set($ogpDesc = "${ogpDesc}${city}。") #end
	1518	+#if($dailyActivities && $dailyActivities != '') #set($ogpDesc = "${ogpDesc} 主な活動: ${dailyActivities}") #end
	1519	+#set($ogpUrl = "https://${request.serverName}${doc.getURL()}")
	1520	+
980	980	## --- 年度タブ切り替え JavaScript ---
981	981	{{html clean="false"}}
982	982	<script>
	1524	+// OGPメタタグ挿入
	1525	+(function() {
	1526	+ var ogp = {
	1527	+ 'og:title': '$escapetool.javascript($ogpTitle)',
	1528	+ 'og:description': '$escapetool.javascript($ogpDesc)',
	1529	+ 'og:type': 'article',
	1530	+ 'og:url': '$escapetool.javascript($ogpUrl)',
	1531	+ 'og:site_name': '生徒会Wiki',
	1532	+ 'twitter:card': 'summary'
	1533	+ };
	1534	+ for (var p in ogp) {
	1535	+ var meta = document.createElement('meta');
	1536	+ meta.setAttribute('property', p);
	1537	+ meta.setAttribute('content', ogp[p]);
	1538	+ document.head.appendChild(meta);
	1539	+ }
	1540	+ // twitter用
	1541	+ var tw = document.createElement('meta');
	1542	+ tw.setAttribute('name', 'twitter:card');
	1543	+ tw.setAttribute('content', 'summary');
	1544	+ document.head.appendChild(tw);
	1545	+})();
	1546	+// コンパクト表示（タイトルのみ）トグル
	1547	+// いいねトグル
	1548	+function toggleLike(btn) {
	1549	+ var page = btn.getAttribute('data-page');
	1550	+ var obj = btn.getAttribute('data-obj');
	1551	+ var csrf = btn.getAttribute('data-csrf');
	1552	+ btn.disabled = true;
	1553	+ var fd = new FormData();
	1554	+ fd.append('page', page);
	1555	+ fd.append('obj', obj);
	1556	+ fd.append('form_token', csrf);
	1557	+ fetch('/bin/SeitokaiCode/LikePost', { method: 'POST', body: fd })
	1558	+ .then(function(r) { return r.json(); })
	1559	+ .then(function(data) {
	1560	+ btn.querySelector('.like-count').textContent = data.count;
	1561	+ if (data.action === 'liked') {
	1562	+ btn.classList.add('liked');
	1563	+ btn.querySelector('svg').setAttribute('fill', 'currentColor');
	1564	+ btn.querySelector('svg').setAttribute('stroke', 'none');
	1565	+ } else {
	1566	+ btn.classList.remove('liked');
	1567	+ btn.querySelector('svg').removeAttribute('fill');
	1568	+ btn.querySelector('svg').setAttribute('stroke', 'currentColor');
	1569	+ }
	1570	+ })
	1571	+ .catch(function() { alert('エラーが発生しました'); })
	1572	+ .finally(function() { btn.disabled = false; });
	1573	+}
	1574	+
	1575	+function toggleCompactView() {
	1576	+ var container = document.querySelector('.xwiki-content') || document.body;
	1577	+ var isCompact = container.classList.toggle('activity-compact-view');
	1578	+ var btn = document.getElementById('btnViewToggle');
	1579	+ if (btn) {
	1580	+ btn.querySelector('.toggle-label').textContent = isCompact ? '詳細表示' : '一覧表示';
	1581	+ btn.title = isCompact ? '詳細表示に戻す' : 'タイトルのみ表示';
	1582	+ }
	1583	+ // コンパクトモードでは各スレッドヘッダーをクリックで個別展開可能にする
	1584	+ document.querySelectorAll('.activity-thread').forEach(function(thread) {
	1585	+ if (isCompact) {
	1586	+ thread.classList.remove('compact-expanded');
	1587	+ }
	1588	+ });
	1589	+}
	1590	+
	1591	+// コンパクトモードで個別スレッドを展開/折りたたみ
	1592	+function toggleThreadExpand(e) {
	1593	+ var container = document.querySelector('.xwiki-content') || document.body;
	1594	+ if (!container.classList.contains('activity-compact-view')) return;
	1595	+ // リンクやボタンのクリックはスルー
	1596	+ if (e.target.closest('a, button, .btn-featured-toggle')) return;
	1597	+ var thread = e.target.closest('.activity-thread');
	1598	+ if (thread) {
	1599	+ thread.classList.toggle('compact-expanded');
	1600	+ }
	1601	+}
	1602	+
983	983	function switchActivityFY(fy, btn) {
984	984	// タブのアクティブ状態を切り替え
985	985	document.querySelectorAll('.activity-fy-tab').forEach(function(t) { t.classList.remove('active'); });
...	...	@@ -995,7 +995,28 @@
995	995	}
996	996	// ページ読み込み時の初期化
997	997	document.addEventListener('DOMContentLoaded', function() {
998		- // デフォルトで現在の年度を表示
	1618	+ // 年度タブを降順にソート（「全期間」タブは先頭に固定）
	1619	+ var tabContainer = document.querySelector('.activity-fy-tabs');
	1620	+ if (tabContainer) {
	1621	+ var tabs = Array.from(tabContainer.querySelectorAll('.activity-fy-tab'));
	1622	+ var allTab = null;
	1623	+ var fyTabs = [];
	1624	+ tabs.forEach(function(t) {
	1625	+ var onclickStr = t.getAttribute('onclick') || '';
	1626	+ if (onclickStr.indexOf("'all'") !== -1) { allTab = t; }
	1627	+ else { fyTabs.push(t); }
	1628	+ });
	1629	+ // 年度タブを数値の降順でソート
	1630	+ fyTabs.sort(function(a, b) {
	1631	+ var aYear = parseInt(a.textContent) || 0;
	1632	+ var bYear = parseInt(b.textContent) || 0;
	1633	+ return bYear - aYear;
	1634	+ });
	1635	+ // DOM再配置（全期間を先頭、年度タブを降順で続ける）
	1636	+ if (allTab) { tabContainer.appendChild(allTab); }
	1637	+ fyTabs.forEach(function(t) { tabContainer.appendChild(t); });
	1638	+ }
	1639	+ // デフォルトで全期間を表示
999	999	var defaultTab = document.querySelector('.activity-fy-tab.active');
1000	1000	if (defaultTab) { defaultTab.click(); }
1001	1001	// 保存成功時のトースト通知
...	...	@@ -1006,6 +1006,30 @@
1006	1006	window.history.replaceState({}, document.title, window.location.pathname);
1007	1007	}
1008	1008	}
	1650	+ // コンパクトモード: スレッドヘッダークリックで個別展開
	1651	+ document.querySelectorAll('.activity-thread-header').forEach(function(header) {
	1652	+ header.addEventListener('click', toggleThreadExpand);
	1653	+ });
	1654	+ // 長文投稿の折りたたみ初期化（max-height: 12em 超で省略）
	1655	+ document.querySelectorAll('.thread-post-body').forEach(function(body) {
	1656	+ // pre-wrapのまま高さを測定し、max-height(12em ≒ ~200px)を超える場合に折りたたむ
	1657	+ var fullH = body.scrollHeight;
	1658	+ // 12em を px に変換（font-size × line-height × 行数 の近似値ではなくCSSと同じ値を取得）
	1659	+ body.classList.add('truncated');
	1660	+ var maxH = body.clientHeight; // max-height: 12em 適用後の高さ
	1661	+ body.classList.remove('truncated');
	1662	+ if (fullH > maxH + 30) {
	1663	+ body.classList.add('truncated');
	1664	+ var btn = document.createElement('button');
	1665	+ btn.className = 'btn-read-more';
	1666	+ btn.textContent = '広げて読む ▼';
	1667	+ btn.addEventListener('click', function() {
	1668	+ var isExpanded = body.classList.toggle('expanded');
	1669	+ btn.textContent = isExpanded ? '折りたたむ ▲' : '広げて読む ▼';
	1670	+ });
	1671	+ body.parentNode.insertBefore(btn, body.nextSibling);
	1672	+ }
	1673	+ });
1009	1009	});
1010	1010
1011	1011	// トースト通知表示
...	...	@@ -1024,7 +1024,15 @@
1024	1024	};
1025	1025	var toast = document.createElement('div');
1026	1026	toast.className = 'toast toast-' + type;
1027		- toast.innerHTML = (icons[type] || '') + '<span>' + message + '</span>';
	1692	+ var iconSvg = icons[type] || '';
	1693	+ if (iconSvg) {
	1694	+ var iconSpan = document.createElement('span');
	1695	+ iconSpan.innerHTML = iconSvg;
	1696	+ toast.appendChild(iconSpan);
	1697	+ }
	1698	+ var msgSpan = document.createElement('span');
	1699	+ msgSpan.textContent = message;
	1700	+ toast.appendChild(msgSpan);
1028	1028	container.appendChild(toast);
1029	1029	setTimeout(function() { toast.remove(); }, 3200);
1030	1030	}
...	...	@@ -1040,37 +1040,131 @@
1040	1040	}
1041	1041
1042	1042	// 投稿の編集（インライン編集フォームを開く）
1043		-function openEditPost(btn, schoolPage, postObjNum, currentContent) {
	1716	+function openEditPost(btn) {
1044	1044	var postEl = btn.closest('.thread-post');
1045	1045	if (!postEl) return;
1046		- // 既存の編集フォームがあれば閉じる
1047	1047	var existing = postEl.querySelector('.post-edit-form');
1048	1048	if (existing) { existing.remove(); return; }
1049	1049	var bodyEl = postEl.querySelector('.thread-post-body');
1050	1050	if (!bodyEl) return;
	1723	+
	1724	+ var schoolPage = btn.getAttribute('data-school');
	1725	+ var postObjNum = btn.getAttribute('data-obj');
	1726	+ var currentContent = btn.getAttribute('data-content') || '';
	1727	+ var currentImages = btn.getAttribute('data-images') || '';
	1728	+ var currentFiles = btn.getAttribute('data-files') || '';
	1729	+ var postType = btn.getAttribute('data-post-type') || 'report';
	1730	+
1051	1051	var form = document.createElement('div');
1052	1052	form.className = 'post-edit-form';
1053		- form.innerHTML = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>' +
1054		- '<div class="post-edit-form-actions">' +
	1733	+ form.setAttribute('data-school', schoolPage);
	1734	+ form.setAttribute('data-obj', postObjNum);
	1735	+
	1736	+ var html = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>';
	1737	+
	1738	+ // コメント以外は添付ファイル編集を表示
	1739	+ function escAttr(s) { return s.replace(/&/g,'&amp;').replace(/"/g,'&quot;').replace(/'/g,'&#39;').replace(/</g,'&lt;').replace(/>/g,'&gt;'); }
	1740	+ if (postType !== 'comment') {
	1741	+ // 既存画像
	1742	+ html += '<div class="edit-attachments">';
	1743	+ if (currentImages.trim()) {
	1744	+ html += '<div class="edit-attach-section"><span class="edit-attach-label">画像</span>';
	1745	+ var imgs = currentImages.trim().split('\n');
	1746	+ for (var i = 0; i < imgs.length; i++) {
	1747	+ var img = imgs[i].trim();
	1748	+ if (!img) continue;
	1749	+ html += '<div class="edit-attach-item" data-name="' + escAttr(img) + '">' +
	1750	+ '<img src="/xwiki/bin/download/' + schoolPage.replace(/\./g,'/') + '/' + encodeURIComponent(img) + '" class="edit-attach-thumb" />' +
	1751	+ '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
	1752	+ '<input type="hidden" name="keepImages" value="' + escAttr(img) + '" />' +
	1753	+ '</div>';
	1754	+ }
	1755	+ html += '</div>';
	1756	+ }
	1757	+ // 既存ファイル
	1758	+ if (currentFiles.trim()) {
	1759	+ html += '<div class="edit-attach-section"><span class="edit-attach-label">ファイル</span>';
	1760	+ var files = currentFiles.trim().split('\n');
	1761	+ for (var j = 0; j < files.length; j++) {
	1762	+ var f = files[j].trim();
	1763	+ if (!f) continue;
	1764	+ var displayName = f;
	1765	+ if (/^file_\d{14}_\d+_/.test(f)) displayName = f.replace(/^file_\d{14}_\d+_/, '');
	1766	+ html += '<div class="edit-attach-item" data-name="' + escAttr(f) + '">' +
	1767	+ '<span class="edit-attach-fname">' + escAttr(displayName) + '</span>' +
	1768	+ '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
	1769	+ '<input type="hidden" name="keepFiles" value="' + escAttr(f) + '" />' +
	1770	+ '</div>';
	1771	+ }
	1772	+ html += '</div>';
	1773	+ }
	1774	+ // 新規追加
	1775	+ html += '<div class="edit-attach-add">' +
	1776	+ '<label class="form-label-sm">画像を追加（最大4枚まで）</label>' +
	1777	+ '<input type="file" name="editNewImages" accept="image/*" multiple class="form-file-input-sm" />' +
	1778	+ '<div class="form-hint">JPEG / PNG / GIF / WebP、各5MBまで</div>' +
	1779	+ '<label class="form-label-sm" style="margin-top:8px;">ファイルを追加（最大2つまで）</label>' +
	1780	+ '<input type="file" name="editNewFiles" accept=".pdf,.docx,.xlsx,.pptx" multiple class="form-file-input-sm" />' +
	1781	+ '<div class="form-hint">PDF / Word / Excel / PowerPoint、各10MBまで</div>' +
	1782	+ '</div>';
	1783	+ html += '</div>';
	1784	+ }
	1785	+
	1786	+ html += '<div class="post-edit-form-actions">' +
1055	1055	'<button type="button" class="btn-cancel-edit" onclick="this.closest(\'.post-edit-form\').remove()">キャンセル</button>' +
1056		- '<button type="button" class="btn-save" onclick="saveEditPost(\'' + schoolPage + '\', ' + postObjNum + ')">保存</button>' +
	1788	+ '<button type="button" class="btn-save" onclick="saveEditPost(this)">保存</button>' +
1057	1057	'</div>';
	1790	+
	1791	+ form.innerHTML = html;
1058	1058	bodyEl.parentNode.insertBefore(form, bodyEl.nextSibling);
1059	1059	form.querySelector('textarea').focus();
1060	1060	}
1061	1061
	1796	+function removeEditAttach(btn) {
	1797	+ var item = btn.closest('.edit-attach-item');
	1798	+ if (item) item.remove();
	1799	+}
	1800	+
1062	1062	// 投稿の編集を保存
1063		-function saveEditPost(schoolPage, postObjNum) {
1064		- var textarea = document.getElementById('editContent_' + postObjNum);
	1802	+function saveEditPost(btn) {
	1803	+ var formEl = btn.closest('.post-edit-form');
	1804	+ if (!formEl) return;
	1805	+ var schoolPage = formEl.getAttribute('data-school');
	1806	+ var postObjNum = formEl.getAttribute('data-obj');
	1807	+ var textarea = formEl.querySelector('textarea');
1065	1065	if (!textarea) return;
1066	1066	var newContent = textarea.value.trim();
1067	1067	if (!newContent) { alert('投稿内容を入力してください'); return; }
	1811	+
1068	1068	var csrfEl = document.querySelector('input[name="form_token"]');
1069	1069	var csrfToken = csrfEl ? csrfEl.value : '';
	1814	+
	1815	+ var fd = new FormData();
	1816	+ fd.append('schoolPage', schoolPage);
	1817	+ fd.append('postObj', postObjNum);
	1818	+ fd.append('newContent', newContent);
	1819	+ fd.append('form_token', csrfToken);
	1820	+
	1821	+ // 残す画像・ファイル
	1822	+ formEl.querySelectorAll('input[name="keepImages"]').forEach(function(el) { fd.append('keepImages', el.value); });
	1823	+ formEl.querySelectorAll('input[name="keepFiles"]').forEach(function(el) { fd.append('keepFiles', el.value); });
	1824	+
	1825	+ // 新規画像
	1826	+ var newImgInput = formEl.querySelector('input[name="editNewImages"]');
	1827	+ if (newImgInput && newImgInput.files) {
	1828	+ for (var i = 0; i < newImgInput.files.length; i++) { fd.append('editNewImages', newImgInput.files[i]); }
	1829	+ }
	1830	+ // 新規ファイル
	1831	+ var newFileInput = formEl.querySelector('input[name="editNewFiles"]');
	1832	+ if (newFileInput && newFileInput.files) {
	1833	+ for (var j = 0; j < newFileInput.files.length; j++) { fd.append('editNewFiles', newFileInput.files[j]); }
	1834	+ }
	1835	+
	1836	+ btn.disabled = true;
	1837	+ btn.textContent = '保存中...';
	1838	+
1070	1070	var xhr = new XMLHttpRequest();
1071		- xhr.open('POST', '/bin/SeitokaiCode/EditPost?outputSyntax=plain', true);
1072		- xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1073		- var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken);
	1840	+ xhr.open('POST', '/bin/get/SeitokaiCode/EditPost?outputSyntax=plain', true);
1074	1074	xhr.onload = function() {
1075	1075	try {
1076	1076	var res = JSON.parse(xhr.responseText);
...	...	@@ -1078,12 +1078,13 @@
1078	1078	showToast('投稿を更新しました', 'success');
1079	1079	setTimeout(function() { location.reload(); }, 800);
1080	1080	} else {
	1848	+ btn.disabled = false; btn.textContent = '保存';
1081	1081	alert('編集に失敗しました: ' + (res.error || ''));
1082	1082	}
1083		- } catch(e) { alert('編集に失敗しました'); }
	1851	+ } catch(e) { btn.disabled = false; btn.textContent = '保存'; alert('編集に失敗しました'); }
1084	1084	};
1085		- xhr.onerror = function() { alert('通信エラーが発生しました'); };
1086		- xhr.send(editPostData);
	1853	+ xhr.onerror = function() { btn.disabled = false; btn.textContent = '保存'; alert('通信エラーが発生しました'); };
	1854	+ xhr.send(fd);
1087	1087	}
1088	1088
1089	1089	// 投稿の削除（確認ダイアログ付き）
...	...	@@ -1090,7 +1090,7 @@
1090	1090	function confirmDeletePost(schoolPage, postObjNum, token) {
1091	1091	if (!confirm('この投稿を削除しますか？\\n削除後は「この投稿は削除されました」と表示されます。')) return;
1092	1092	var xhr = new XMLHttpRequest();
1093		- xhr.open('POST', '/bin/SeitokaiCode/DeletePost?outputSyntax=plain', true);
	1861	+ xhr.open('POST', '/bin/get/SeitokaiCode/DeletePost?outputSyntax=plain', true);
1094	1094	xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1095	1095	var deletePostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token);
1096	1096	xhr.onload = function() {
...	...	@@ -1107,6 +1107,80 @@
1107	1107	xhr.onerror = function() { alert('通信エラーが発生しました'); };
1108	1108	xhr.send(deletePostData);
1109	1109	}
	1878	+
	1879	+/* --- 通報ダイアログ --- */
	1880	+function openReportDialog(btn, targetPage, postObjNum, token) {
	1881	+ if (document.getElementById('report-dialog-overlay')) return;
	1882	+ var reasons = ['宣伝・スパム','不適切な内容','個人情報の露出','誹謗中傷','誤情報','その他'];
	1883	+ var overlay = document.createElement('div');
	1884	+ overlay.id = 'report-dialog-overlay';
	1885	+ 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;';
	1886	+ var dialog = document.createElement('div');
	1887	+ dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;max-height:80vh;overflow-y:auto;';
	1888	+ var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を通報</h3>';
	1889	+ html += '<p style="margin:0 0 12px;font-size:0.9em;color:#4b5563;">通報された投稿は管理者が確認するまで一時的に非表示になります。</p>';
	1890	+ html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">通報理由</label>';
	1891	+ html += '<select id="report-reason" style="width:100%;padding:8px;border:1px solid #d1d5db;border-radius:8px;margin-bottom:12px;font-size:0.9em;">';
	1892	+ for (var i=0; i<reasons.length; i++) html += '<option value="'+reasons[i]+'">'+reasons[i]+'</option>';
	1893	+ html += '</select>';
	1894	+ html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">補足コメント（任意）</label>';
	1895	+ 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>';
	1896	+ html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
	1897	+ html += '<button type="button" id="report-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
	1898	+ 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>';
	1899	+ html += '</div>';
	1900	+ dialog.innerHTML = html;
	1901	+ overlay.appendChild(dialog);
	1902	+ document.body.appendChild(overlay);
	1903	+ overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
	1904	+ document.getElementById('report-cancel-btn').addEventListener('click', function() { overlay.remove(); });
	1905	+ document.getElementById('report-submit-btn').addEventListener('click', function() {
	1906	+ var reason = document.getElementById('report-reason').value;
	1907	+ var detail = document.getElementById('report-detail').value;
	1908	+ var submitBtn = document.getElementById('report-submit-btn');
	1909	+ submitBtn.disabled = true; submitBtn.textContent = '送信中...';
	1910	+ var xhr = new XMLHttpRequest();
	1911	+ xhr.open('POST', '/bin/get/SeitokaiCode/ReportAction?outputSyntax=plain', true);
	1912	+ xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
	1913	+ var data = 'targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&detail=' + encodeURIComponent(detail) + '&form_token=' + encodeURIComponent(token);
	1914	+ xhr.onload = function() {
	1915	+ overlay.remove();
	1916	+ showToast('通報を受け付けました', 'success');
	1917	+ setTimeout(function() { location.reload(); }, 1000);
	1918	+ };
	1919	+ xhr.onerror = function() { overlay.remove(); alert('通信エラーが発生しました'); };
	1920	+ xhr.send(data);
	1921	+ });
	1922	+}
	1923	+
	1924	+/* --- 非表示ダイアログ（管理者用） --- */
	1925	+function openHideDialog(btn, targetPage, postObjNum, token) {
	1926	+ if (document.getElementById('hide-dialog-overlay')) return;
	1927	+ var overlay = document.createElement('div');
	1928	+ overlay.id = 'hide-dialog-overlay';
	1929	+ 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;';
	1930	+ var dialog = document.createElement('div');
	1931	+ dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;';
	1932	+ var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を非表示にする</h3>';
	1933	+ html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">非表示の理由</label>';
	1934	+ 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="理由を入力" />';
	1935	+ html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
	1936	+ html += '<button type="button" id="hide-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
	1937	+ 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>';
	1938	+ 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>';
	1939	+ html += '</div>';
	1940	+ dialog.innerHTML = html;
	1941	+ overlay.appendChild(dialog);
	1942	+ document.body.appendChild(overlay);
	1943	+ overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
	1944	+ document.getElementById('hide-cancel-btn').addEventListener('click', function() { overlay.remove(); });
	1945	+ function doHide(action) {
	1946	+ var reason = document.getElementById('hide-reason').value || '管理者判断';
	1947	+ window.location.href = '/bin/view/SeitokaiCode/ModerationAction?action=' + action + '&targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&form_token=' + encodeURIComponent(token);
	1948	+ }
	1949	+ document.getElementById('hide-submit-btn').addEventListener('click', function() { doHide('hide'); });
	1950	+ document.getElementById('hide-warn-btn').addEventListener('click', function() { doHide('hide-warn'); });
	1951	+}
1110	1110	</script>
1111	1111	{{/html}}
1112	1112	{{/velocity}}