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,13 +91,34 @@
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
103	103	## --- 関連校（中高一貫校）情報 ---
...	...	@@ -104,10 +104,31 @@
104	104	#set($affiliatedSchoolCode = $!doc.getValue('affiliatedSchoolCode'))
105	105	#set($affiliatedSchoolName = $!doc.getValue('affiliatedSchoolName'))
106	106	#set($isAffiliated = false)
107		-#if($affiliatedSchoolCode && $affiliatedSchoolCode != '' && $viewerSchoolCode == $affiliatedSchoolCode)
108		- #set($isAffiliated = true)
	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
109	109	#end
110	110
	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	+
111	111	## --- 学校ページ非表示チェック ---
112	112	#set($schoolHidden = $doc.getValue('hidden'))
113	113	#if($schoolHidden == 1)
...	...	@@ -141,7 +141,7 @@
141	141
142	142	## --- 投稿固定/解除処理 ---
143	143	#set($pinAction = $!request.action)
144		-#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && ($viewerSchoolCode == $schoolCode || $isAffiliated))) && $services.csrf.isTokenValid($request.form_token))
	253	+#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $isSchoolMember)) && $services.csrf.isTokenValid($request.form_token))
145	145	#set($pinPostObjStr = $!request.postObj)
146	146	#if(!$pinPostObjStr.matches('^\d+$'))
147	147	## 不正な値 → 無視
...	...	@@ -171,7 +171,7 @@
171	171
172	172	## --- 特色ある活動 選定/解除処理 ---
173	173	#set($featAction = $!request.action)
174		-#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))
175	175	#set($featActObjStr = $!request.actObj)
176	176	#if($featActObjStr.matches('^\d+$'))
177	177	#set($actObjNum = $mathtool.toInteger($featActObjStr))
...	...	@@ -273,12 +273,12 @@
273	273
274	274	## --- 編集ボタン（権限があるユーザーのみ表示） ---
275	275	#set($canEditSchool = false)
276		-#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode || $isAffiliated))
	385	+#if(!$isGuest && ($isViewerAdmin || $isSchoolMember || $isAlumniOfSchool))
277	277	#set($canEditSchool = true)
278	278	#end
279	279	#if($canEditSchool)
280	280	<div style="text-align:right; margin-bottom:12px;">
281		- <a href="$doc.getURL('view', 'sheet=SeitokaiCode.SchoolEditForm')" class="btn-school-edit"><svg class="ico" viewBox="0 0 24 24"><path d="M11 4H4a2 2 0 00-2 2v14a2 2 0 002 2h14a2 2 0 002-2v-7"/><path d="M18.5 2.5a2.121 2.121 0 013 3L12 15l-4 1 1-4 9.5-9.5z"/></svg> 基本情報を編集</a>
	390	+ <a href="$doc.getURL('view', 'sheet=SeitokaiCode.SchoolEditForm')" class="btn-school-edit"><svg class="ico" viewBox="0 0 24 24"><path d="M11 4H4a2 2 0 00-2 2v14a2 2 0 002 2h14a2 2 0 002-2v-7"/><path d="M18.5 2.5a2.121 2.121 0 013 3L12 15l-4 1 1-4 9.5-9.5z"/></svg> 情報を編集</a>
282	282	</div>
283	283	#end
284	284
...	...	@@ -303,62 +303,210 @@
303	303	## --- ① 学校基本情報 ---
304	304	<div class="school-info-card collapsed" id="card-basic-info">
305	305	<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>
306		- <table class="wiki-table school-info-table">
307		- <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
308		- <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
309		- <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
310		- <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
311		- <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
312		- <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
313		- <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
314		- <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
315		- <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>
316		- </table>
317		- #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
318		- #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
319		- #if($infoEditDate && $infoEditDate != '')
320		- <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>
	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>
	423	+ #if($coeducation && $coeducation != '')
	424	+ <div class="selection-display">
	425	+ #foreach($ceo in ["共学","男子校","女子校","その他"])
	426	+ #if($coeducation == $ceo)
	427	+ <span class="selection-item">$!escapetool.xml($ceo)</span>
	428	+ #else
	429	+ <span class="selection-item selection-item-off">$!escapetool.xml($ceo)</span>
	430	+ #end
	431	+ #end
	432	+ </div>
	433	+ #end
	434	+ </td></tr>
	435	+ <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
	436	+ <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
	437	+ <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
	438	+ <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>
	439	+ </table>
	440	+ </div>
	441	+ #if($schoolPhoto && $schoolPhoto != '')
	442	+ <div class="school-photo-area">
	443	+ <img src="$doc.getAttachmentURL($schoolPhoto)" alt="$!escapetool.xml($schoolName)" class="school-photo" />
	444	+ </div>
	445	+ #end
	446	+ </div>
	447	+ #if($schoolDescription && $schoolDescription.trim() != '')
	448	+ <div class="free-note" style="margin-top:var(--sp-4);">$!escapetool.xml($schoolDescription)</div>
321	321	#end
	450	+
322	322	</div>
323	323
324		-## --- ② 生徒会基本情報（折りたたみカード） ---
	453	+## --- ② 生徒会情報（折りたたみカード） ---
325	325	<div class="school-info-card" id="card-seitokai-info">
326		- <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>
	455	+ <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>
327	327	<div class="seitokai-info-body">
328	328
329		- ## --- 組織図 ---
	458	+ ## --- 生徒会組織 ---
330	330	#set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
331	331	#if($hasOrgContent)
332	332	#set($canViewOrgChart = true)
333		- #if($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewOrgChart = false)
334		- #elseif($visibilityOrgChart == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewOrgChart = false)
	462	+ #if($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewOrgChart = false)
	463	+ #elseif($visibilityOrgChart == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewOrgChart = false)
335	335	#end
336	336	#if($canViewOrgChart)
337	337	<div class="seitokai-subsection">
338		- <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>
	467	+ <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>
339	339	<div class="seitokai-subsection-content">
340	340	#if($orgChartImage && $orgChartImage != '')
341	341	<div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
342	342	#end
343		- #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end
	472	+ #if($orgChart && $orgChart != '')<div class="free-note">$!escapetool.xml($orgChart)</div>#end
344	344	</div>
345	345	</div>
346	346	#else
347		- <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>
	476	+ <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>
348	348	#end
349	349	#end
350	350
	480	+ ## --- 活動環境 ---
	481	+ #set($hasActivityEnv = ($activityPlace && !$activityPlace.isEmpty()) || ($activityRoomEquipment && $activityRoomEquipment != '') || ($activityRoomImage && $activityRoomImage != '') || ($ictTools && !$ictTools.isEmpty()) || ($ictUsage && !$ictUsage.isEmpty()))
	482	+ #if($hasActivityEnv)
	483	+ #set($canViewAE = true)
	484	+ #if($visibilityActivityEnv == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAE = false)
	485	+ #elseif($visibilityActivityEnv == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAE = false)
	486	+ #end
	487	+ #if($canViewAE)
	488	+ <div class="seitokai-subsection">
	489	+ <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>
	490	+ <div class="seitokai-subsection-content">
	491	+ #if($activityPlace && !$activityPlace.isEmpty())
	492	+ <div class="info-row">
	493	+ <span class="info-label">普段の活動場所</span>
	494	+ <span class="info-value">
	495	+ <div class="selection-display">
	496	+ #foreach($apo in ["専用の生徒会室","他の部活・委員会と併用した教室","空き教室を活用","インターネット中心","その他"])
	497	+ #if($activityPlace.contains($apo))
	498	+ <span class="selection-item">$!escapetool.xml($apo)</span>
	499	+ #else
	500	+ <span class="selection-item selection-item-off">$!escapetool.xml($apo)</span>
	501	+ #end
	502	+ #end
	503	+ </div>
	504	+ </span>
	505	+ </div>
	506	+ #end
	507	+ #if($activityRoomEquipment && $activityRoomEquipment != '')
	508	+ <div class="info-row">
	509	+ <span class="info-label">生徒会室の設備</span>
	510	+ <span class="info-value free-text-value">$!escapetool.xml($activityRoomEquipment)</span>
	511	+ </div>
	512	+ #end
	513	+ #if($activityRoomImage && $activityRoomImage != '')
	514	+ <div class="info-row">
	515	+ <span class="info-label">活動場所の写真</span>
	516	+ <span class="info-value"><div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($activityRoomImage)" alt="活動場所の写真" class="org-chart-img" /></div></span>
	517	+ </div>
	518	+ #end
	519	+ #if($ictTools && !$ictTools.isEmpty())
	520	+ <div class="info-row">
	521	+ <span class="info-label">利用しているICTツール</span>
	522	+ <span class="info-value">
	523	+ #set($ictCatDisplay = [
	524	+ ["連絡ツール", ["メール","LINE","LINE WORKS","Discord","Slack","Microsoft Teams","Google Chat","InstagramのDM","XのDM","その他（連絡）"]],
	525	+ ["ドキュメント作成・共有", ["Googleドキュメント","Googleスプレッドシート","Googleスライド","Googleドライブ","Word","Excel","PowerPoint","OneDrive","SharePoint","Notion","Pages","Numbers","Keynote","Dropbox","Box","その他（ドキュメント）"]],
	526	+ ["タスク管理", ["Googleカレンダー","Google ToDoリスト","Trello","Asana","Excel等スプレッドシート","その他（タスク管理）"]],
	527	+ ["ビデオ会議ツール", ["Zoom","Google Meet","その他（ビデオ会議）"]],
	528	+ ["アンケート", ["Googleフォーム","Microsoft Forms","その他（アンケート）"]],
	529	+ ["デザイン・クリエイティブ", ["Canva","各種Adobe","CapCut","LumaFusion","AviUtl","ibisPaint","その他（デザイン）"]],
	530	+ ["その他", ["独自のWebシステム・自作アプリ"]]
	531	+ ])
	532	+ #foreach($catD in $ictCatDisplay)
	533	+ #set($catHasItems = false)
	534	+ #foreach($t in $catD.get(1))
	535	+ #if($ictTools.contains($t)) #set($catHasItems = true) #end
	536	+ #end
	537	+ #if($catHasItems)
	538	+ <div style="margin-bottom:6px">
	539	+ <span style="font-size:0.8em;font-weight:600;color:var(--text-mid)">$catD.get(0):</span>
	540	+ <div class="selection-display" style="margin-top:2px">
	541	+ #foreach($t in $catD.get(1))
	542	+ #if($ictTools.contains($t))
	543	+ <span class="selection-item">$!escapetool.xml($t)</span>
	544	+ #end
	545	+ #end
	546	+ </div>
	547	+ </div>
	548	+ #end
	549	+ #end
	550	+ </span>
	551	+ </div>
	552	+ #end
	553	+ #if($ictUsage && !$ictUsage.isEmpty())
	554	+ <div class="info-row">
	555	+ <span class="info-label">ICT活用している場面</span>
	556	+ <span class="info-value">
	557	+ <div class="selection-display">
	558	+ #foreach($iu in $ictUsage)
	559	+ <span class="selection-item">$!escapetool.xml($iu.trim())</span>
	560	+ #end
	561	+ </div>
	562	+ </span>
	563	+ </div>
	564	+ #end
	565	+ </div>
	566	+ </div>
	567	+ #else
	568	+ <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>
	569	+ #end
	570	+ #end
	571	+
	572	+ ## --- 年間主要行事 ---
	573	+ #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]])
	574	+ #set($hasAnyEvent = false)
	575	+ #foreach($m in $months)
	576	+ #if($m.get(1) && $m.get(1) != '') #set($hasAnyEvent = true) #end
	577	+ #end
	578	+ #if($hasAnyEvent)
	579	+ #set($canViewAN = true)
	580	+ #if($visibilityAnnualEvents == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAN = false)
	581	+ #elseif($visibilityAnnualEvents == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAN = false)
	582	+ #end
	583	+ #if($canViewAN)
	584	+ <div class="seitokai-subsection">
	585	+ <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>
	586	+ <div class="seitokai-subsection-content">
	587	+ <table class="wiki-table school-info-table" style="margin:0">
	588	+ #foreach($m in $months)
	589	+ #if($m.get(1) && $m.get(1) != '')
	590	+ <tr><td style="width:60px;font-weight:600;white-space:nowrap">$m.get(0)</td><td>$!escapetool.xml($m.get(1))</td></tr>
	591	+ #end
	592	+ #end
	593	+ </table>
	594	+ </div>
	595	+ </div>
	596	+ #else
	597	+ <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>
	598	+ #end
	599	+ #end
	600	+
351	351	## --- 日常の活動 ---
352	352	#if($dailyActivities && !$dailyActivities.isEmpty())
	603	+ #set($canViewDA = true)
	604	+ #if($visibilityDailyActivities == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewDA = false)
	605	+ #elseif($visibilityDailyActivities == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewDA = false)
	606	+ #end
	607	+ #if($canViewDA)
353	353	<div class="seitokai-subsection">
354		- <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z"/><polyline points="14 2 14 8 20 8"/><line x1="16" y1="13" x2="8" y2="13"/><line x1="16" y1="17" x2="8" y2="17"/></svg> 日常の活動</h3>
	609	+ <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>
355	355	<div class="seitokai-subsection-content">
356		- <p class="activity-hint">活動時間の多い順に上位3つ</p>
357		- <div class="tag-container">
358		- #set($daIdx = 1)
359		- #foreach($da in $dailyActivities)
360		- <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
361		- #set($daIdx = $daIdx + 1)
	611	+ <p class="activity-hint">活動時間が多い3つ</p>
	612	+ <div class="selection-display">
	613	+ #foreach($dao in ["文化祭","体育祭","生徒会企画","歓送迎会","その他学校行事","校則改正","選挙","総会","予算編成・会計活動","教員との連携","他校との連携","地域との連携","ボランティア","広報","引き継ぎ","DX","目安箱","委員会","学級・HRとの連携","アンケート","三者協議会等","企業との連携","保護者との連携","その他"])
	614	+ #if($dailyActivities.contains($dao))
	615	+ <span class="selection-item">$!escapetool.xml($dao)</span>
	616	+ #else
	617	+ <span class="selection-item selection-item-off">$!escapetool.xml($dao)</span>
	618	+ #end
362	362	#end
363	363	</div>
364	364	#if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
...	...	@@ -366,12 +366,122 @@
366	366	#end
367	367	</div>
368	368	</div>
	626	+ #else
	627	+ <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>
	628	+ #end
369	369	#end
370	370
	631	+ ## --- 定例活動 ---
	632	+ #if($meetingFrequency && $meetingFrequency != '')
	633	+ #set($canViewMT = true)
	634	+ #if($visibilityMeeting == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewMT = false)
	635	+ #elseif($visibilityMeeting == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewMT = false)
	636	+ #end
	637	+ #if($canViewMT)
	638	+ <div class="seitokai-subsection">
	639	+ <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>
	640	+ <div class="seitokai-subsection-content">
	641	+ <div class="info-row">
	642	+ <span class="info-label">役員定例会の頻度</span>
	643	+ <span class="info-value">$!escapetool.xml($!meetingFrequency)</span>
	644	+ </div>
	645	+ #if($regularActivitiesNote && $regularActivitiesNote.trim() != '')
	646	+ <div class="free-note">$!escapetool.xml($regularActivitiesNote)</div>
	647	+ #end
	648	+ </div>
	649	+ </div>
	650	+ #else
	651	+ <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>
	652	+ #end
	653	+ #end
	654	+
	655	+ ## --- 生徒総会 ---
	656	+ #set($hasAssembly = ($assemblyFormat && $assemblyFormat != '') || ($assemblyCount && $assemblyCount > 0) || ($assemblyAgenda && !$assemblyAgenda.isEmpty()) || ($assemblyTopics && !$assemblyTopics.isEmpty()) || ($assemblyNote && $assemblyNote != ''))
	657	+ #if($hasAssembly)
	658	+ #set($canViewAS = true)
	659	+ #if($visibilityAssembly == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAS = false)
	660	+ #elseif($visibilityAssembly == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAS = false)
	661	+ #end
	662	+ #if($canViewAS)
	663	+ <div class="seitokai-subsection">
	664	+ <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>
	665	+ <div class="seitokai-subsection-content">
	666	+ #if($assemblyFormat && $assemblyFormat != '')
	667	+ <div class="info-row">
	668	+ <span class="info-label">開催方式</span>
	669	+ <span class="info-value">
	670	+ <div class="selection-display">
	671	+ #foreach($afo in ["全生徒の対面開催","オンラインと併用","完全オンライン開催","開催なし","その他"])
	672	+ #if($assemblyFormat == $afo)
	673	+ <span class="selection-item">$!escapetool.xml($afo)</span>
	674	+ #else
	675	+ <span class="selection-item selection-item-off">$!escapetool.xml($afo)</span>
	676	+ #end
	677	+ #end
	678	+ </div>
	679	+ </span>
	680	+ </div>
	681	+ #end
	682	+ #if($assemblyCount && $assemblyCount > 0)
	683	+ <div class="info-row">
	684	+ <span class="info-label">開催回数（年）</span>
	685	+ <span class="info-value">$!escapetool.xml($assemblyCount)回</span>
	686	+ </div>
	687	+ #end
	688	+ #if($assemblyAgenda && !$assemblyAgenda.isEmpty())
	689	+ <div class="info-row">
	690	+ <span class="info-label">議案の集め方</span>
	691	+ <span class="info-value">
	692	+ <div class="selection-display">
	693	+ #foreach($aao in ["教員からの提案","執行部からの提案","クラスごとの討議","目安箱","アンケート","総会時の発議","その他"])
	694	+ #if($assemblyAgenda.contains($aao))
	695	+ <span class="selection-item">$!escapetool.xml($aao)</span>
	696	+ #else
	697	+ <span class="selection-item selection-item-off">$!escapetool.xml($aao)</span>
	698	+ #end
	699	+ #end
	700	+ </div>
	701	+ </span>
	702	+ </div>
	703	+ #end
	704	+ #if($assemblyTopics && !$assemblyTopics.isEmpty())
	705	+ <div class="info-row">
	706	+ <span class="info-label">扱う内容</span>
	707	+ <span class="info-value">
	708	+ <div class="selection-display">
	709	+ #foreach($ato in ["生徒会決算案","生徒会予算案","会則/校則の改正","生徒会の活動方針","学校への要望事項","外部へのアピール（宣言の採択など）","その他"])
	710	+ #if($assemblyTopics.contains($ato))
	711	+ <span class="selection-item">$!escapetool.xml($ato)</span>
	712	+ #else
	713	+ <span class="selection-item selection-item-off">$!escapetool.xml($ato)</span>
	714	+ #end
	715	+ #end
	716	+ </div>
	717	+ </span>
	718	+ </div>
	719	+ #end
	720	+ #if($assemblyNote && $assemblyNote != '')
	721	+ <div class="info-row">
	722	+ <span class="info-label">自由記述</span>
	723	+ <span class="info-value free-text-value">$!escapetool.xml($assemblyNote)</span>
	724	+ </div>
	725	+ #end
	726	+ </div>
	727	+ </div>
	728	+ #else
	729	+ <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>
	730	+ #end
	731	+ #end
	732	+
371	371	## --- 選挙 ---
372	372	#if($electionExists && $electionExists != '')
	735	+ #set($canViewEL = true)
	736	+ #if($visibilityElection == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewEL = false)
	737	+ #elseif($visibilityElection == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewEL = false)
	738	+ #end
	739	+ #if($canViewEL)
373	373	<div class="seitokai-subsection">
374		- <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="3" width="18" height="18" rx="2"/><path d="M7 13l3 3 7-7"/></svg> 選挙</h3>
	741	+ <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>
375	375	<div class="seitokai-subsection-content">
376	376	<div class="info-row">
377	377	<span class="info-label">役員選挙</span>
...	...	@@ -388,22 +388,86 @@
388	388	#end
389	389	</div>
390	390	</div>
	758	+ #else
	759	+ <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>
	760	+ #end
391	391	#end
392	392
393		- ## --- 定例活動 ---
394		- #if($meetingFrequency && $meetingFrequency != '')
	763	+ ## --- 校則・生徒会会則の見直し ---
	764	+ #if($ruleReviewStatus && $ruleReviewStatus != '')
	765	+ #set($canViewRuleReview = true)
	766	+ #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewRuleReview = false)
	767	+ #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false)
	768	+ #end
	769	+ #if($canViewRuleReview)
395	395	<div class="seitokai-subsection">
396		- <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="4" width="18" height="18" rx="2"/><line x1="16" y1="2" x2="16" y2="6"/><line x1="8" y1="2" x2="8" y2="6"/><line x1="3" y1="10" x2="21" y2="10"/></svg> 定例活動</h3>
	771	+ <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>
397	397	<div class="seitokai-subsection-content">
398	398	<div class="info-row">
399		- <span class="info-label">役員定例会の頻度</span>
400		- <span class="info-value">$!escapetool.xml($!meetingFrequency)</span>
	774	+ <span class="info-label">見直しの有無（3年以内）</span>
	775	+ <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
401	401	</div>
402		- #if($regularActivitiesNote && $regularActivitiesNote.trim() != '')
403		- <div class="free-note">$!escapetool.xml($regularActivitiesNote)</div>
	777	+ #if($ruleReviewStatus != '実施なし')
	778	+ #if($ruleReviewContent && !$ruleReviewContent.isEmpty())
	779	+ <div class="info-row">
	780	+ <span class="info-label">見直しの内容</span>
	781	+ <span class="info-value">
	782	+ <div class="selection-display">
	783	+ #foreach($rco in ["服飾規定（制服など）","持ち物規定","校則改正の仕組み","生徒会の仕組み","その他"])
	784	+ #if($ruleReviewContent.contains($rco))
	785	+ <span class="selection-item">$!escapetool.xml($rco)</span>
	786	+ #else
	787	+ <span class="selection-item selection-item-off">$!escapetool.xml($rco)</span>
	788	+ #end
	789	+ #end
	790	+ </div>
	791	+ </span>
	792	+ </div>
404	404	#end
	794	+ #if($ruleReviewProposer && !$ruleReviewProposer.isEmpty())
	795	+ <div class="info-row">
	796	+ <span class="info-label">見直しの提案者</span>
	797	+ <span class="info-value">
	798	+ <div class="selection-display">
	799	+ #foreach($rpo in ["教員","生徒会役員","専門委員会","その他の生徒","その他"])
	800	+ #if($ruleReviewProposer.contains($rpo))
	801	+ <span class="selection-item">$!escapetool.xml($rpo)</span>
	802	+ #else
	803	+ <span class="selection-item selection-item-off">$!escapetool.xml($rpo)</span>
	804	+ #end
	805	+ #end
	806	+ </div>
	807	+ </span>
	808	+ </div>
	809	+ #end
	810	+ #if($ruleReviewImplementer && !$ruleReviewImplementer.isEmpty())
	811	+ <div class="info-row">
	812	+ <span class="info-label">見直しの実施者</span>
	813	+ <span class="info-value">
	814	+ <div class="selection-display">
	815	+ #foreach($rio in ["教員","生徒会役員","専門委員会","その他の生徒","その他"])
	816	+ #if($ruleReviewImplementer.contains($rio))
	817	+ <span class="selection-item">$!escapetool.xml($rio)</span>
	818	+ #else
	819	+ <span class="selection-item selection-item-off">$!escapetool.xml($rio)</span>
	820	+ #end
	821	+ #end
	822	+ </div>
	823	+ </span>
	824	+ </div>
	825	+ #end
	826	+ #end
	827	+ #if($ruleReviewSystem && $ruleReviewSystem != '')
	828	+ <div class="info-row">
	829	+ <span class="info-label">見直しの仕組み</span>
	830	+ <span class="info-value">$!escapetool.xml($!ruleReviewSystem)</span>
	831	+ </div>
	832	+ #end
405	405	</div>
406	406	</div>
	835	+ #else
	836	+ <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>
	837	+ #end
407	407	#end
408	408
409	409	## --- 予算 ---
...	...	@@ -410,12 +410,12 @@
410	410	#set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
411	411	#if($hasBudget)
412	412	#set($canViewBudget = true)
413		- #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewBudget = false)
414		- #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false)
	844	+ #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewBudget = false)
	845	+ #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false)
415	415	#end
416	416	#if($canViewBudget)
417	417	<div class="seitokai-subsection">
418		- <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>
	849	+ <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>
419	419	<div class="seitokai-subsection-content">
420	420	#if($budgetProcess && !$budgetProcess.isEmpty())
421	421	<div class="info-row">
...	...	@@ -422,8 +422,13 @@
422	422	<span class="info-label">作成過程の生徒関与</span>
423	423	<span class="info-value">
424	424	<div class="selection-display">
425		- #foreach($bp in $budgetProcess)
426		- <span class="selection-item">$!escapetool.xml($bp.trim())</span>
	856	+ #set($allBpOpts = ["各部・委員会等への予算希望額調査","予算額調整（折衝等）","生徒会予算案の作成","生徒総会での議決","生徒関与なし","その他"])
	857	+ #foreach($bpOpt in $allBpOpts)
	858	+ #if($budgetProcess.contains($bpOpt))
	859	+ <span class="selection-item">$!escapetool.xml($bpOpt)</span>
	860	+ #else
	861	+ <span class="selection-item selection-item-off">$!escapetool.xml($bpOpt)</span>
	862	+ #end
427	427	#end
428	428	</div>
429	429	</span>
...	...	@@ -446,8 +446,12 @@
446	446	<span class="info-label">主な予算配分</span>
447	447	<span class="info-value">
448	448	<div class="selection-display">
449		- #foreach($ba in $budgetAllocation)
450		- <span class="selection-item">$!escapetool.xml($ba.trim())</span>
	885	+ #foreach($bao in ["行事費用","部活動","寄付","HR活動","執行部等","委員会活動","その他"])
	886	+ #if($budgetAllocation.contains($bao))
	887	+ <span class="selection-item">$!escapetool.xml($bao)</span>
	888	+ #else
	889	+ <span class="selection-item selection-item-off">$!escapetool.xml($bao)</span>
	890	+ #end
451	451	#end
452	452	</div>
453	453	</span>
...	...	@@ -463,66 +463,101 @@
463	463	#end
464	464	#end
465	465
466		- ## --- 校則の見直し ---
467		- #if($ruleReviewStatus && $ruleReviewStatus != '')
468		- #set($canViewRuleReview = true)
469		- #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewRuleReview = false)
470		- #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false)
	906	+ ## --- 広報 ---
	907	+ #set($hasPublicity = ($publicityMethod && !$publicityMethod.isEmpty()) || ($publicityFrequency && $publicityFrequency != '') || ($publicityNote && $publicityNote != ''))
	908	+ #if($hasPublicity)
	909	+ #set($canViewPB = true)
	910	+ #if($visibilityPublicity == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewPB = false)
	911	+ #elseif($visibilityPublicity == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPB = false)
471	471	#end
472		- #if($canViewRuleReview)
	913	+ #if($canViewPB)
473	473	<div class="seitokai-subsection">
474		- <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>
	915	+ <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>
475	475	<div class="seitokai-subsection-content">
	917	+ #if($publicityMethod && !$publicityMethod.isEmpty())
476	476	<div class="info-row">
477		- <span class="info-label">見直しの有無（3年以内）</span>
478		- <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
479		- </div>
480		- #if($ruleReviewContent && !$ruleReviewContent.isEmpty())
481		- <div class="info-row">
482		- <span class="info-label">見直しの内容</span>
	919	+ <span class="info-label">方法</span>
483	483	<span class="info-value">
484	484	<div class="selection-display">
485		- #foreach($rc in $ruleReviewContent)
486		- <span class="selection-item">$!escapetool.xml($rc.trim())</span>
	922	+ #foreach($pm in $publicityMethod)
	923	+ <span class="selection-item">$!escapetool.xml($pm.trim())</span>
487	487	#end
488	488	</div>
489	489	</span>
490	490	</div>
491	491	#end
492		- #if($ruleReviewProposer && !$ruleReviewProposer.isEmpty())
	929	+ #if($publicityFrequency && $publicityFrequency != '')
493	493	<div class="info-row">
494		- <span class="info-label">見直しの提案者</span>
	931	+ <span class="info-label">頻度</span>
	932	+ <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($publicityFrequency)</span></span>
	933	+ </div>
	934	+ #end
	935	+ #if($publicityNote && $publicityNote != '')
	936	+ <div class="info-row">
	937	+ <span class="info-label">自由記述</span>
	938	+ <span class="info-value free-text-value">$!escapetool.xml($publicityNote)</span>
	939	+ </div>
	940	+ #end
	941	+ </div>
	942	+ </div>
	943	+ #else
	944	+ <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>
	945	+ #end
	946	+ #end
	947	+
	948	+ ## --- 外部連携 ---
	949	+ #set($hasExternal = ($externalCooperation && $externalCooperation != '') || ($externalOrgName && $externalOrgName != '') || ($socialParticipation && !$socialParticipation.isEmpty()))
	950	+ #if($hasExternal)
	951	+ #set($canViewEX = true)
	952	+ #if($visibilityExternal == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewEX = false)
	953	+ #elseif($visibilityExternal == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewEX = false)
	954	+ #end
	955	+ #if($canViewEX)
	956	+ <div class="seitokai-subsection">
	957	+ <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>
	958	+ <div class="seitokai-subsection-content">
	959	+ #if($externalCooperation && $externalCooperation != '')
	960	+ <div class="info-row">
	961	+ <span class="info-label">他校の生徒会との連携</span>
495	495	<span class="info-value">
496	496	<div class="selection-display">
497		- #foreach($rp in $ruleReviewProposer)
498		- <span class="selection-item">$!escapetool.xml($rp.trim())</span>
	964	+ #foreach($eco in ["定期的な連盟等の会合への参加","自治体等が主催するイベントへの参加","個別学校との交流","なし","その他"])
	965	+ #if($externalCooperation == $eco)
	966	+ <span class="selection-item">$!escapetool.xml($eco)</span>
	967	+ #else
	968	+ <span class="selection-item selection-item-off">$!escapetool.xml($eco)</span>
	969	+ #end
499	499	#end
500	500	</div>
501	501	</span>
502	502	</div>
503	503	#end
504		- #if($ruleReviewImplementer && !$ruleReviewImplementer.isEmpty())
	975	+ #if($externalOrgName && $externalOrgName != '')
505	505	<div class="info-row">
506		- <span class="info-label">見直しの実施者</span>
	977	+ <span class="info-label">参加している生徒会団体の名前</span>
	978	+ <span class="info-value">$!escapetool.xml($externalOrgName)</span>
	979	+ </div>
	980	+ #end
	981	+ #if($socialParticipation && !$socialParticipation.isEmpty())
	982	+ <div class="info-row">
	983	+ <span class="info-label">社会参加・地域連携・ボランティア</span>
507	507	<span class="info-value">
508	508	<div class="selection-display">
509		- #foreach($ri in $ruleReviewImplementer)
510		- <span class="selection-item">$!escapetool.xml($ri.trim())</span>
	986	+ #foreach($spo in ["三者協議会等","学校運営協議会等","町内会や商工会等との意見交換","企業や地域との商品開発","ゴミ拾い・地域清掃","募金","あいさつ運動","地域のお祭り・イベント等への協力・出展","その他"])
	987	+ #if($socialParticipation.contains($spo))
	988	+ <span class="selection-item">$!escapetool.xml($spo)</span>
	989	+ #else
	990	+ <span class="selection-item selection-item-off">$!escapetool.xml($spo)</span>
	991	+ #end
511	511	#end
512	512	</div>
513	513	</span>
514	514	</div>
515	515	#end
516		- #if($ruleReviewSystem && $ruleReviewSystem != '')
517		- <div class="info-row">
518		- <span class="info-label">見直しの仕組み</span>
519		- <span class="info-value">$!escapetool.xml($!ruleReviewSystem)</span>
520		- </div>
521		- #end
522	522	</div>
523	523	</div>
524	524	#else
525		- <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 校則の見直し情報は #if($visibilityRuleReview == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
	1000	+ <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>
526	526	#end
527	527	#end
528	528
...	...	@@ -529,12 +529,12 @@
529	529	## --- 生徒会の課題意識 ---
530	530	#if($challenges && $challenges != '')
531	531	#set($canViewChallenges = true)
532		- #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewChallenges = false)
533		- #elseif($visibilityChallenges == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewChallenges = false)
	1007	+ #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewChallenges = false)
	1008	+ #elseif($visibilityChallenges == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewChallenges = false)
534	534	#end
535	535	#if($canViewChallenges)
536	536	<div class="seitokai-subsection">
537		- <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>
	1012	+ <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>
538	538	<div class="seitokai-subsection-content">
539	539	<div class="challenge-text">$!escapetool.xml($challenges)</div>
540	540	</div>
...	...	@@ -558,6 +558,11 @@
558	558	<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>
559	559	<tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
560	560	</table>
	1036	+ #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
	1037	+ #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
	1038	+ #if($infoEditDate && $infoEditDate != '')
	1039	+ <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>
	1040	+ #end
561	561	</div>
562	562
563	563	{{/html}}
...	...	@@ -592,13 +592,13 @@
592	592
593	593	<div class="activity-toolbar">
594	594	<div class="activity-fy-tabs">
595		- <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
	1075	+ <button class="activity-fy-tab" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
596	596	#foreach($fy in $fySet)
597	597	#if($fy != $currentFYStr)
598	598	<button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button>
599	599	#end
600	600	#end
601		- <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
	1081	+ <button class="activity-fy-tab active" onclick="switchActivityFY('all', this)">全期間</button>
602	602	</div>
603	603	<div class="activity-toolbar-right">
604	604	<button class="btn-view-toggle" id="btnViewToggle" onclick="toggleCompactView()" title="タイトルのみ表示">
...	...	@@ -612,22 +612,23 @@
612	612	<div class="author-legend-body">
613	613	<div class="author-legend">
614	614	<span class="author-legend-title">投稿者の信頼度:</span>
615		- <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者</span>
616		- <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み</span>
617		- <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介</span>
618		- <span class="author-legend-item"><span class="bar bar-general"></span> 一般（未承認）</span>
	1095	+ <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者 <span class="text-hint">— 運営スタッフ</span></span>
	1096	+ <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み <span class="text-hint">— 本人確認済みのユーザー</span></span>
	1097	+ <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介 <span class="text-hint">— 承認済みユーザーからの紹介</span></span>
	1098	+ <span class="author-legend-item"><span class="bar bar-general"></span> 一般 <span class="text-hint">— 一般登録ユーザー</span></span>
619	619	</div>
620	620	<div class="author-legend">
621	621	<span class="author-legend-title">所属:</span>
622		- <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>
623		- <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>
624		- <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>
625		- <span class="author-legend-item text-hint">※一般アカウントは所属未確認のため非表示</span>
	1102	+ <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>
	1103	+ <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>
	1104	+ <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>
	1105	+ <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>
	1106	+ <span class="author-legend-item text-hint">※一般アカウントは所属バッジが表示されません</span>
626	626	</div>
627	627	<div class="author-legend">
628	628	<span class="author-legend-title">役割:</span>
629	629	<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>
630		- <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>
	1111	+ <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>
631	631	<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>
632	632	</div>
633	633	</div>
...	...	@@ -636,22 +636,67 @@
636	636
637	637	{{/html}}
638	638
639		-## 特色ある活動を先頭に表示するため、並び替え用リストを作成
640		-#set($featuredActivities = [])
641		-#set($normalActivities = [])
642		-#if($activities && $activities.size() > 0)
643		- #foreach($act in $activities)
644		- #set($isFeatured = $!act.getValue('featured'))
645		- #if($isFeatured == '1')
646		- #set($discard = $featuredActivities.add($foreach.index))
	1120	+## 活動を「年度降順 + 特色あり先頭」で並び替え
	1121	+## Step1: fySet から年度を降順ソート（Velocity ネイティブ実装）
	1122	+#set($fyNums = [])
	1123	+#foreach($fy in $fySet)
	1124	+ #if($fy && $fy != '' && $fy != 'unknown')
	1125	+ #set($fyInt = $mathtool.toInteger($fy))
	1126	+ #if($fyInt)
	1127	+ #set($discard = $fyNums.add($fyInt))
	1128	+ #end
	1129	+ #end
	1130	+#end
	1131	+## 最大値を順番に取り出して降順リストを構築（最大20年度まで対応）
	1132	+#set($fyDesc = [])
	1133	+#set($fyRemaining = [])
	1134	+#foreach($fy in $fyNums)
	1135	+ #set($discard = $fyRemaining.add($fy))
	1136	+#end
	1137	+#foreach($dummy in [1..20])
	1138	+ #if($fyRemaining.isEmpty())#break#end
	1139	+ #set($fyMax = $fyRemaining.get(0))
	1140	+ #foreach($fy in $fyRemaining)
	1141	+ #if($fy > $fyMax)#set($fyMax = $fy)#end
	1142	+ #end
	1143	+ #set($discard = $fyDesc.add($fyMax))
	1144	+ #set($fyNextRem = [])
	1145	+ #set($fyMaxRemoved = false)
	1146	+ #foreach($fy in $fyRemaining)
	1147	+ #if(!$fyMaxRemoved && $fy == $fyMax)
	1148	+ #set($fyMaxRemoved = true)
647	647	#else
648		- #set($discard = $normalActivities.add($foreach.index))
	1150	+ #set($discard = $fyNextRem.add($fy))
649	649	#end
650	650	#end
	1153	+ #set($fyRemaining = $fyNextRem)
651	651	#end
	1155	+## 年度未設定の活動は末尾に表示（fySetに'unknown'は入らないため無条件追加）
	1156	+#set($discard = $fyDesc.add('unknown'))
	1157	+## Step2: 年度降順で featured → normal の順にインデックスを収集
652	652	#set($orderedActivityIndices = [])
653		-#set($discard = $orderedActivityIndices.addAll($featuredActivities))
654		-#set($discard = $orderedActivityIndices.addAll($normalActivities))
	1159	+#foreach($curFY in $fyDesc)
	1160	+ ## 同年度の特色あり活動を先頭に
	1161	+ #set($actIdx2 = 0)
	1162	+ #foreach($act in $activities)
	1163	+ #set($aFY2 = $!act.getValue('fiscalYear'))
	1164	+ #if(!$aFY2 || $aFY2 == '') #set($aFY2 = 'unknown') #end
	1165	+ #if($aFY2 == $curFY && $act.getValue('featured') == '1')
	1166	+ #set($discard = $orderedActivityIndices.add($actIdx2))
	1167	+ #end
	1168	+ #set($actIdx2 = $actIdx2 + 1)
	1169	+ #end
	1170	+ ## 同年度の通常活動
	1171	+ #set($actIdx2 = 0)
	1172	+ #foreach($act in $activities)
	1173	+ #set($aFY2 = $!act.getValue('fiscalYear'))
	1174	+ #if(!$aFY2 || $aFY2 == '') #set($aFY2 = 'unknown') #end
	1175	+ #if($aFY2 == $curFY && $act.getValue('featured') != '1')
	1176	+ #set($discard = $orderedActivityIndices.add($actIdx2))
	1177	+ #end
	1178	+ #set($actIdx2 = $actIdx2 + 1)
	1179	+ #end
	1180	+#end
655	655
656	656	#if($activities && $activities.size() > 0)
657	657	#foreach($actIdx in $orderedActivityIndices)
...	...	@@ -696,16 +696,18 @@
696	696	<div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)">
697	697	<div class="activity-thread-header">
698	698	<div class="activity-thread-title">
699		- <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>
700		- <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
701		- #set($actTagsList = $activity.getValue('tags'))
702		- #if($actTagsList && !$actTagsList.isEmpty())
703		- #foreach($tagItem in $actTagsList)
704		- #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end
	1225	+ <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>
	1226	+ <div class="activity-meta-line">
	1227	+ <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
	1228	+ #set($actTagsList = $activity.getValue('tags'))
	1229	+ #if($actTagsList && !$actTagsList.isEmpty())
	1230	+ #foreach($tagItem in $actTagsList)
	1231	+ #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end
	1232	+ #end
705	705	#end
706		- #end
	1234	+ </div>
707	707	</div>
708		- <div class="thread-meta-row">
	1236	+ <div class="thread-meta-right">
709	709	<span class="thread-post-count">${reportCount}件の報告 ・ ${commentCount}件のコメント</span>
710	710	#if($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred')
711	711	#if($actFeatured == '1')
...	...	@@ -765,8 +765,8 @@
765	765	#set($postVis = $!post.getValue('visibility'))
766	766	#if(!$postVis || $postVis == '') #set($postVis = 'public') #end
767	767	#set($canViewPost = true)
768		- #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewPost = false)
769		- #elseif($postVis == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPost = false)
	1296	+ #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewPost = false)
	1297	+ #elseif($postVis == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPost = false)
770	770	#end
771	771	#if(!$canViewPost)
772	772	<div class="thread-post visibility-restricted-post">
...	...	@@ -810,8 +810,11 @@
810	810	<span class="badge badge-general badge-sm">一般</span>
811	811	#end
812	812	## 所属バッジ（投稿者の学校コードとページの学校コードを比較）
	1341	+ #set($postIsSchoolMatch = ($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode)))
813	813	#if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general')
814		- #if($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode))
	1343	+ #if($postUserRole == 'graduate' && $postIsSchoolMatch)
	1344	+ <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>
	1345	+ #elseif($postIsSchoolMatch && $postUserRole != 'graduate')
815	815	#if($postAccountType == 'verified' || $postAccountType == 'admin')
816	816	<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>
817	817	#else
...	...	@@ -838,6 +838,13 @@
838	838	#if($postEdited == 1 || $postEdited == '1')
839	839	<span class="post-edited-label">（編集済み）</span>
840	840	#end
	1372	+ #set($postAuthorRefH = $!post.getValue('authorRef'))
	1373	+ #set($postObjNumH = $post.number)
	1374	+ #if(!$isGuest && $xcontext.user != $postAuthorRefH)
	1375	+ <button type="button" class="btn-post-report btn-post-report-header" onclick="openReportDialog(this, '${doc.fullName}', $postObjNumH, '${services.csrf.getToken()}')" title="この投稿を通報">
	1376	+ <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> 通報
	1377	+ </button>
	1378	+ #end
841	841	</div>
842	842	<div class="thread-post-body">
843	843	$!escapetool.xml($!postContent)
...	...	@@ -902,12 +902,37 @@
902	902	#end
903	903	</div>
904	904	#if($postVis != 'public')
905		- <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>
	1443	+ <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>
906	906	#end
907		- ## 固定/解除ボタン（承認済み・管理者のみ）
908		- #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
909		- #set($postObjNum = $post.number)
910		- <div class="post-pin-action post-action-mt">
	1445	+ ## いいねボタン
	1446	+ #set($postLikeCount = $!post.getValue('likeCount'))
	1447	+ #if(!$postLikeCount || $postLikeCount == '') #set($postLikeCount = 0) #end
	1448	+ #set($postLikedBy = $!post.getValue('likedBy'))
	1449	+ #set($isLikedByMe = false)
	1450	+ #if($postLikedBy && $postLikedBy.contains($xcontext.user)) #set($isLikedByMe = true) #end
	1451	+ <div class="post-like-row post-action-mt">
	1452	+ #if($xcontext.user != 'XWiki.XWikiGuest')
	1453	+ <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)">
	1454	+ <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>
	1455	+ <span class="like-count">$postLikeCount</span>
	1456	+ </button>
	1457	+ #else
	1458	+ <span class="btn-like disabled">
	1459	+ <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>
	1460	+ <span class="like-count">$postLikeCount</span>
	1461	+ </span>
	1462	+ #end
	1463	+ </div>
	1464	+ ## 固定/編集/削除/通報/非表示ボタン（横並び）
	1465	+ #set($postAuthorRef = $!post.getValue('authorRef'))
	1466	+ #set($postObjNumED = $post.number)
	1467	+ #set($showPinBtn = ($viewerAccountType == 'admin' || $viewerAccountType == 'verified'))
	1468	+ #set($showEditDeleteBtn = ($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin'))
	1469	+ #set($showHideBtn = ($viewerAccountType == 'admin'))
	1470	+ #if($showPinBtn || $showEditDeleteBtn || $showHideBtn)
	1471	+ <div class="post-edit-actions post-action-mt">
	1472	+ #if($showPinBtn)
	1473	+ #set($postObjNum = $post.number)
911	911	#if($isPinned == '1')
912	912	<a href="$doc.getURL('view', "action=unpin&postObj=${postObjNum}&form_token=${services.csrf.getToken()}")" class="btn-pin-toggle btn-unpin" title="固定を解除">
913	913	<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> 固定を解除
...	...	@@ -917,15 +917,12 @@
917	917	<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> 固定する
918	918	</a>
919	919	#end
920		- </div>
921		- #end
922		- ## 編集・削除ボタン（投稿者本人 or 管理者）
923		- #set($postAuthorRef = $!post.getValue('authorRef'))
924		- #set($postObjNumED = $post.number)
925		- #if($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin')
926		- <div class="post-edit-actions post-action-mt">
	1483	+ #end
	1484	+ #if($showEditDeleteBtn)
927	927	#if($xcontext.user == $postAuthorRef)
928		- <button type="button" class="btn-post-edit" onclick="openEditPost(this, '${doc.fullName}', $postObjNumED, '$!escapetool.javascript($!postContent)')" title="この投稿を編集">
	1486	+ #set($editImages = $!post.getValue('images'))
	1487	+ #set($editFiles = $!post.getValue('files'))
	1488	+ <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="この投稿を編集">
929	929	<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> 編集
930	930	</button>
931	931	#end
...	...	@@ -932,6 +932,12 @@
932	932	<button type="button" class="btn-post-delete" onclick="confirmDeletePost('${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を削除">
933	933	<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> 削除
934	934	</button>
	1495	+ #end
	1496	+ #if($showHideBtn)
	1497	+ <button type="button" class="btn-post-hide" onclick="openHideDialog(this, '${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を非表示にする">
	1498	+ <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> 非表示
	1499	+ </button>
	1500	+ #end
935	935	</div>
936	936	#end
937	937	</div>
...	...	@@ -981,9 +981,11 @@
981	981
982	982	#if($xcontext.user != "XWiki.XWikiGuest")
983	983	<div class="thread-add-post">
	1550	+ #if($isSchoolMember || $isAlumniOfSchool || $isViewerAdmin)
984	984	<a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
985	985	＋ 活動報告を追加
986	986	</a>
	1554	+ #end
987	987	<a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
988	988	<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> コメントを書く
989	989	</a>
...	...	@@ -1013,10 +1013,68 @@
1013	1013	{{/html}}
1014	1014	#end
1015	1015
	1584	+## --- OGP / SNSシェア対応 ---
	1585	+#set($ogpTitle = "${schoolName} — 生徒会Wiki")
	1586	+#set($ogpDesc = "${schoolName}の生徒会活動情報。")
	1587	+#if($prefecture && $prefecture != '') #set($ogpDesc = "${ogpDesc}${prefecture}") #end
	1588	+#if($city && $city != '') #set($ogpDesc = "${ogpDesc}${city}。") #end
	1589	+#if($dailyActivities && $dailyActivities != '') #set($ogpDesc = "${ogpDesc} 主な活動: ${dailyActivities}") #end
	1590	+#set($ogpUrl = "https://${request.serverName}${doc.getURL()}")
	1591	+
1016	1016	## --- 年度タブ切り替え JavaScript ---
1017	1017	{{html clean="false"}}
1018	1018	<script>
	1595	+// OGPメタタグ挿入
	1596	+(function() {
	1597	+ var ogp = {
	1598	+ 'og:title': '$escapetool.javascript($ogpTitle)',
	1599	+ 'og:description': '$escapetool.javascript($ogpDesc)',
	1600	+ 'og:type': 'article',
	1601	+ 'og:url': '$escapetool.javascript($ogpUrl)',
	1602	+ 'og:site_name': '生徒会Wiki',
	1603	+ 'twitter:card': 'summary'
	1604	+ };
	1605	+ for (var p in ogp) {
	1606	+ var meta = document.createElement('meta');
	1607	+ meta.setAttribute('property', p);
	1608	+ meta.setAttribute('content', ogp[p]);
	1609	+ document.head.appendChild(meta);
	1610	+ }
	1611	+ // twitter用
	1612	+ var tw = document.createElement('meta');
	1613	+ tw.setAttribute('name', 'twitter:card');
	1614	+ tw.setAttribute('content', 'summary');
	1615	+ document.head.appendChild(tw);
	1616	+})();
1019	1019	// コンパクト表示（タイトルのみ）トグル
	1618	+// いいねトグル
	1619	+function toggleLike(btn) {
	1620	+ var page = btn.getAttribute('data-page');
	1621	+ var obj = btn.getAttribute('data-obj');
	1622	+ var csrf = btn.getAttribute('data-csrf');
	1623	+ btn.disabled = true;
	1624	+ var fd = new FormData();
	1625	+ fd.append('page', page);
	1626	+ fd.append('obj', obj);
	1627	+ fd.append('form_token', csrf);
	1628	+ fetch('/bin/SeitokaiCode/LikePost', { method: 'POST', body: fd })
	1629	+ .then(function(r) { return r.json(); })
	1630	+ .then(function(data) {
	1631	+ btn.querySelector('.like-count').textContent = data.count;
	1632	+ if (data.action === 'liked') {
	1633	+ btn.classList.add('liked');
	1634	+ btn.querySelector('svg').setAttribute('fill', 'currentColor');
	1635	+ btn.querySelector('svg').setAttribute('stroke', 'none');
	1636	+ } else {
	1637	+ btn.classList.remove('liked');
	1638	+ btn.querySelector('svg').removeAttribute('fill');
	1639	+ btn.querySelector('svg').setAttribute('stroke', 'currentColor');
	1640	+ }
	1641	+ })
	1642	+ .catch(function() { alert('エラーが発生しました'); })
	1643	+ .finally(function() { btn.disabled = false; });
	1644	+}
	1645	+
1020	1020	function toggleCompactView() {
1021	1021	var container = document.querySelector('.xwiki-content') || document.body;
1022	1022	var isCompact = container.classList.toggle('activity-compact-view');
...	...	@@ -1060,7 +1060,28 @@
1060	1060	}
1061	1061	// ページ読み込み時の初期化
1062	1062	document.addEventListener('DOMContentLoaded', function() {
1063		- // デフォルトで現在の年度を表示
	1689	+ // 年度タブを降順にソート（「全期間」タブは先頭に固定）
	1690	+ var tabContainer = document.querySelector('.activity-fy-tabs');
	1691	+ if (tabContainer) {
	1692	+ var tabs = Array.from(tabContainer.querySelectorAll('.activity-fy-tab'));
	1693	+ var allTab = null;
	1694	+ var fyTabs = [];
	1695	+ tabs.forEach(function(t) {
	1696	+ var onclickStr = t.getAttribute('onclick') || '';
	1697	+ if (onclickStr.indexOf("'all'") !== -1) { allTab = t; }
	1698	+ else { fyTabs.push(t); }
	1699	+ });
	1700	+ // 年度タブを数値の降順でソート
	1701	+ fyTabs.sort(function(a, b) {
	1702	+ var aYear = parseInt(a.textContent) || 0;
	1703	+ var bYear = parseInt(b.textContent) || 0;
	1704	+ return bYear - aYear;
	1705	+ });
	1706	+ // DOM再配置（全期間を先頭、年度タブを降順で続ける）
	1707	+ if (allTab) { tabContainer.appendChild(allTab); }
	1708	+ fyTabs.forEach(function(t) { tabContainer.appendChild(t); });
	1709	+ }
	1710	+ // デフォルトで全期間を表示
1064	1064	var defaultTab = document.querySelector('.activity-fy-tab.active');
1065	1065	if (defaultTab) { defaultTab.click(); }
1066	1066	// 保存成功時のトースト通知
...	...	@@ -1113,7 +1113,15 @@
1113	1113	};
1114	1114	var toast = document.createElement('div');
1115	1115	toast.className = 'toast toast-' + type;
1116		- toast.innerHTML = (icons[type] || '') + '<span>' + message + '</span>';
	1763	+ var iconSvg = icons[type] || '';
	1764	+ if (iconSvg) {
	1765	+ var iconSpan = document.createElement('span');
	1766	+ iconSpan.innerHTML = iconSvg;
	1767	+ toast.appendChild(iconSpan);
	1768	+ }
	1769	+ var msgSpan = document.createElement('span');
	1770	+ msgSpan.textContent = message;
	1771	+ toast.appendChild(msgSpan);
1117	1117	container.appendChild(toast);
1118	1118	setTimeout(function() { toast.remove(); }, 3200);
1119	1119	}
...	...	@@ -1129,37 +1129,131 @@
1129	1129	}
1130	1130
1131	1131	// 投稿の編集（インライン編集フォームを開く）
1132		-function openEditPost(btn, schoolPage, postObjNum, currentContent) {
	1787	+function openEditPost(btn) {
1133	1133	var postEl = btn.closest('.thread-post');
1134	1134	if (!postEl) return;
1135		- // 既存の編集フォームがあれば閉じる
1136	1136	var existing = postEl.querySelector('.post-edit-form');
1137	1137	if (existing) { existing.remove(); return; }
1138	1138	var bodyEl = postEl.querySelector('.thread-post-body');
1139	1139	if (!bodyEl) return;
	1794	+
	1795	+ var schoolPage = btn.getAttribute('data-school');
	1796	+ var postObjNum = btn.getAttribute('data-obj');
	1797	+ var currentContent = btn.getAttribute('data-content') || '';
	1798	+ var currentImages = btn.getAttribute('data-images') || '';
	1799	+ var currentFiles = btn.getAttribute('data-files') || '';
	1800	+ var postType = btn.getAttribute('data-post-type') || 'report';
	1801	+
1140	1140	var form = document.createElement('div');
1141	1141	form.className = 'post-edit-form';
1142		- form.innerHTML = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>' +
1143		- '<div class="post-edit-form-actions">' +
	1804	+ form.setAttribute('data-school', schoolPage);
	1805	+ form.setAttribute('data-obj', postObjNum);
	1806	+
	1807	+ var html = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>';
	1808	+
	1809	+ // コメント以外は添付ファイル編集を表示
	1810	+ function escAttr(s) { return s.replace(/&/g,'&amp;').replace(/"/g,'&quot;').replace(/'/g,'&#39;').replace(/</g,'&lt;').replace(/>/g,'&gt;'); }
	1811	+ if (postType !== 'comment') {
	1812	+ // 既存画像
	1813	+ html += '<div class="edit-attachments">';
	1814	+ if (currentImages.trim()) {
	1815	+ html += '<div class="edit-attach-section"><span class="edit-attach-label">画像</span>';
	1816	+ var imgs = currentImages.trim().split('\n');
	1817	+ for (var i = 0; i < imgs.length; i++) {
	1818	+ var img = imgs[i].trim();
	1819	+ if (!img) continue;
	1820	+ html += '<div class="edit-attach-item" data-name="' + escAttr(img) + '">' +
	1821	+ '<img src="/xwiki/bin/download/' + schoolPage.replace(/\./g,'/') + '/' + encodeURIComponent(img) + '" class="edit-attach-thumb" />' +
	1822	+ '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
	1823	+ '<input type="hidden" name="keepImages" value="' + escAttr(img) + '" />' +
	1824	+ '</div>';
	1825	+ }
	1826	+ html += '</div>';
	1827	+ }
	1828	+ // 既存ファイル
	1829	+ if (currentFiles.trim()) {
	1830	+ html += '<div class="edit-attach-section"><span class="edit-attach-label">ファイル</span>';
	1831	+ var files = currentFiles.trim().split('\n');
	1832	+ for (var j = 0; j < files.length; j++) {
	1833	+ var f = files[j].trim();
	1834	+ if (!f) continue;
	1835	+ var displayName = f;
	1836	+ if (/^file_\d{14}_\d+_/.test(f)) displayName = f.replace(/^file_\d{14}_\d+_/, '');
	1837	+ html += '<div class="edit-attach-item" data-name="' + escAttr(f) + '">' +
	1838	+ '<span class="edit-attach-fname">' + escAttr(displayName) + '</span>' +
	1839	+ '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
	1840	+ '<input type="hidden" name="keepFiles" value="' + escAttr(f) + '" />' +
	1841	+ '</div>';
	1842	+ }
	1843	+ html += '</div>';
	1844	+ }
	1845	+ // 新規追加
	1846	+ html += '<div class="edit-attach-add">' +
	1847	+ '<label class="form-label-sm">画像を追加（最大4枚まで）</label>' +
	1848	+ '<input type="file" name="editNewImages" accept="image/*" multiple class="form-file-input-sm" />' +
	1849	+ '<div class="form-hint">JPEG / PNG / GIF / WebP、各5MBまで</div>' +
	1850	+ '<label class="form-label-sm" style="margin-top:8px;">ファイルを追加（最大2つまで）</label>' +
	1851	+ '<input type="file" name="editNewFiles" accept=".pdf,.docx,.xlsx,.pptx" multiple class="form-file-input-sm" />' +
	1852	+ '<div class="form-hint">PDF / Word / Excel / PowerPoint、各10MBまで</div>' +
	1853	+ '</div>';
	1854	+ html += '</div>';
	1855	+ }
	1856	+
	1857	+ html += '<div class="post-edit-form-actions">' +
1144	1144	'<button type="button" class="btn-cancel-edit" onclick="this.closest(\'.post-edit-form\').remove()">キャンセル</button>' +
1145		- '<button type="button" class="btn-save" onclick="saveEditPost(\'' + schoolPage + '\', ' + postObjNum + ')">保存</button>' +
	1859	+ '<button type="button" class="btn-save" onclick="saveEditPost(this)">保存</button>' +
1146	1146	'</div>';
	1861	+
	1862	+ form.innerHTML = html;
1147	1147	bodyEl.parentNode.insertBefore(form, bodyEl.nextSibling);
1148	1148	form.querySelector('textarea').focus();
1149	1149	}
1150	1150
	1867	+function removeEditAttach(btn) {
	1868	+ var item = btn.closest('.edit-attach-item');
	1869	+ if (item) item.remove();
	1870	+}
	1871	+
1151	1151	// 投稿の編集を保存
1152		-function saveEditPost(schoolPage, postObjNum) {
1153		- var textarea = document.getElementById('editContent_' + postObjNum);
	1873	+function saveEditPost(btn) {
	1874	+ var formEl = btn.closest('.post-edit-form');
	1875	+ if (!formEl) return;
	1876	+ var schoolPage = formEl.getAttribute('data-school');
	1877	+ var postObjNum = formEl.getAttribute('data-obj');
	1878	+ var textarea = formEl.querySelector('textarea');
1154	1154	if (!textarea) return;
1155	1155	var newContent = textarea.value.trim();
1156	1156	if (!newContent) { alert('投稿内容を入力してください'); return; }
	1882	+
1157	1157	var csrfEl = document.querySelector('input[name="form_token"]');
1158	1158	var csrfToken = csrfEl ? csrfEl.value : '';
	1885	+
	1886	+ var fd = new FormData();
	1887	+ fd.append('schoolPage', schoolPage);
	1888	+ fd.append('postObj', postObjNum);
	1889	+ fd.append('newContent', newContent);
	1890	+ fd.append('form_token', csrfToken);
	1891	+
	1892	+ // 残す画像・ファイル
	1893	+ formEl.querySelectorAll('input[name="keepImages"]').forEach(function(el) { fd.append('keepImages', el.value); });
	1894	+ formEl.querySelectorAll('input[name="keepFiles"]').forEach(function(el) { fd.append('keepFiles', el.value); });
	1895	+
	1896	+ // 新規画像
	1897	+ var newImgInput = formEl.querySelector('input[name="editNewImages"]');
	1898	+ if (newImgInput && newImgInput.files) {
	1899	+ for (var i = 0; i < newImgInput.files.length; i++) { fd.append('editNewImages', newImgInput.files[i]); }
	1900	+ }
	1901	+ // 新規ファイル
	1902	+ var newFileInput = formEl.querySelector('input[name="editNewFiles"]');
	1903	+ if (newFileInput && newFileInput.files) {
	1904	+ for (var j = 0; j < newFileInput.files.length; j++) { fd.append('editNewFiles', newFileInput.files[j]); }
	1905	+ }
	1906	+
	1907	+ btn.disabled = true;
	1908	+ btn.textContent = '保存中...';
	1909	+
1159	1159	var xhr = new XMLHttpRequest();
1160	1160	xhr.open('POST', '/bin/get/SeitokaiCode/EditPost?outputSyntax=plain', true);
1161		- xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1162		- var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken);
1163	1163	xhr.onload = function() {
1164	1164	try {
1165	1165	var res = JSON.parse(xhr.responseText);
...	...	@@ -1167,12 +1167,13 @@
1167	1167	showToast('投稿を更新しました', 'success');
1168	1168	setTimeout(function() { location.reload(); }, 800);
1169	1169	} else {
	1919	+ btn.disabled = false; btn.textContent = '保存';
1170	1170	alert('編集に失敗しました: ' + (res.error || ''));
1171	1171	}
1172		- } catch(e) { alert('編集に失敗しました'); }
	1922	+ } catch(e) { btn.disabled = false; btn.textContent = '保存'; alert('編集に失敗しました'); }
1173	1173	};
1174		- xhr.onerror = function() { alert('通信エラーが発生しました'); };
1175		- xhr.send(editPostData);
	1924	+ xhr.onerror = function() { btn.disabled = false; btn.textContent = '保存'; alert('通信エラーが発生しました'); };
	1925	+ xhr.send(fd);
1176	1176	}
1177	1177
1178	1178	// 投稿の削除（確認ダイアログ付き）
...	...	@@ -1196,6 +1196,80 @@
1196	1196	xhr.onerror = function() { alert('通信エラーが発生しました'); };
1197	1197	xhr.send(deletePostData);
1198	1198	}
	1949	+
	1950	+/* --- 通報ダイアログ --- */
	1951	+function openReportDialog(btn, targetPage, postObjNum, token) {
	1952	+ if (document.getElementById('report-dialog-overlay')) return;
	1953	+ var reasons = ['宣伝・スパム','不適切な内容','個人情報の露出','誹謗中傷','誤情報','その他'];
	1954	+ var overlay = document.createElement('div');
	1955	+ overlay.id = 'report-dialog-overlay';
	1956	+ 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;';
	1957	+ var dialog = document.createElement('div');
	1958	+ dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;max-height:80vh;overflow-y:auto;';
	1959	+ var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を通報</h3>';
	1960	+ html += '<p style="margin:0 0 12px;font-size:0.9em;color:#4b5563;">通報された投稿は管理者が確認するまで一時的に非表示になります。</p>';
	1961	+ html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">通報理由</label>';
	1962	+ html += '<select id="report-reason" style="width:100%;padding:8px;border:1px solid #d1d5db;border-radius:8px;margin-bottom:12px;font-size:0.9em;">';
	1963	+ for (var i=0; i<reasons.length; i++) html += '<option value="'+reasons[i]+'">'+reasons[i]+'</option>';
	1964	+ html += '</select>';
	1965	+ html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">補足コメント（任意）</label>';
	1966	+ 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>';
	1967	+ html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
	1968	+ html += '<button type="button" id="report-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
	1969	+ 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>';
	1970	+ html += '</div>';
	1971	+ dialog.innerHTML = html;
	1972	+ overlay.appendChild(dialog);
	1973	+ document.body.appendChild(overlay);
	1974	+ overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
	1975	+ document.getElementById('report-cancel-btn').addEventListener('click', function() { overlay.remove(); });
	1976	+ document.getElementById('report-submit-btn').addEventListener('click', function() {
	1977	+ var reason = document.getElementById('report-reason').value;
	1978	+ var detail = document.getElementById('report-detail').value;
	1979	+ var submitBtn = document.getElementById('report-submit-btn');
	1980	+ submitBtn.disabled = true; submitBtn.textContent = '送信中...';
	1981	+ var xhr = new XMLHttpRequest();
	1982	+ xhr.open('POST', '/bin/get/SeitokaiCode/ReportAction?outputSyntax=plain', true);
	1983	+ xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
	1984	+ var data = 'targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&detail=' + encodeURIComponent(detail) + '&form_token=' + encodeURIComponent(token);
	1985	+ xhr.onload = function() {
	1986	+ overlay.remove();
	1987	+ showToast('通報を受け付けました', 'success');
	1988	+ setTimeout(function() { location.reload(); }, 1000);
	1989	+ };
	1990	+ xhr.onerror = function() { overlay.remove(); alert('通信エラーが発生しました'); };
	1991	+ xhr.send(data);
	1992	+ });
	1993	+}
	1994	+
	1995	+/* --- 非表示ダイアログ（管理者用） --- */
	1996	+function openHideDialog(btn, targetPage, postObjNum, token) {
	1997	+ if (document.getElementById('hide-dialog-overlay')) return;
	1998	+ var overlay = document.createElement('div');
	1999	+ overlay.id = 'hide-dialog-overlay';
	2000	+ 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;';
	2001	+ var dialog = document.createElement('div');
	2002	+ dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;';
	2003	+ var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を非表示にする</h3>';
	2004	+ html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">非表示の理由</label>';
	2005	+ 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="理由を入力" />';
	2006	+ html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
	2007	+ html += '<button type="button" id="hide-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
	2008	+ 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>';
	2009	+ 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>';
	2010	+ html += '</div>';
	2011	+ dialog.innerHTML = html;
	2012	+ overlay.appendChild(dialog);
	2013	+ document.body.appendChild(overlay);
	2014	+ overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
	2015	+ document.getElementById('hide-cancel-btn').addEventListener('click', function() { overlay.remove(); });
	2016	+ function doHide(action) {
	2017	+ var reason = document.getElementById('hide-reason').value || '管理者判断';
	2018	+ window.location.href = '/bin/view/SeitokaiCode/ModerationAction?action=' + action + '&targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&form_token=' + encodeURIComponent(token);
	2019	+ }
	2020	+ document.getElementById('hide-submit-btn').addEventListener('click', function() { doHide('hide'); });
	2021	+ document.getElementById('hide-warn-btn').addEventListener('click', function() { doHide('hide-warn'); });
	2022	+}
1199	1199	</script>
1200	1200	{{/html}}
1201	1201	{{/velocity}}