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

Summary

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

Details

Page properties

Content

...	...	@@ -1,5 +1,11 @@
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"}}
4	4	## メンテナンスバナー（{{include}}ではなくインラインで記述し、<p>タグ挿入を回避）
5	5	#set($bannerDoc = $xwiki.getDocument('SeitokaiAdmin.MaintenanceBanner'))
...	...	@@ -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'))
	37	+#set($schoolPhoto = $doc.getValue('schoolPhoto'))
	38	+#set($schoolDescription = $doc.getValue('schoolDescription'))
31	31
32		-## --- 組織図 ---
	40	+## --- 生徒会組織 ---
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		-## --- 校則の見直し ---
	60	+## --- 校則・生徒会会則の見直し ---
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
	67	+## --- 活動環境 ---
	68	+#set($activityPlace = $doc.getValue('activityPlace'))
	69	+#set($activityRoomEquipment = $doc.getValue('activityRoomEquipment'))
	70	+#set($activityRoomImage = $doc.getValue('activityRoomImage'))
	71	+#set($ictTools = $doc.getValue('ictTools'))
	72	+#set($ictUsage = $doc.getValue('ictUsage'))
	73	+
	74	+## --- 生徒総会 ---
	75	+#set($assemblyFormat = $doc.getValue('assemblyFormat'))
	76	+#set($assemblyCount = $doc.getValue('assemblyCount'))
	77	+#set($assemblyAgenda = $doc.getValue('assemblyAgenda'))
	78	+#set($assemblyTopics = $doc.getValue('assemblyTopics'))
	79	+#set($assemblyNote = $doc.getValue('assemblyNote'))
	80	+
	81	+## --- 広報 ---
	82	+#set($publicityMethod = $doc.getValue('publicityMethod'))
	83	+#set($publicityFrequency = $doc.getValue('publicityFrequency'))
	84	+#set($publicityNote = $doc.getValue('publicityNote'))
	85	+
	86	+## --- 外部連携 ---
	87	+#set($externalCooperation = $doc.getValue('externalCooperation'))
	88	+#set($externalOrgName = $doc.getValue('externalOrgName'))
	89	+#set($socialParticipation = $doc.getValue('socialParticipation'))
	90	+
	91	+## --- 年間主要行事 ---
	92	+#set($eventApril = $doc.getValue('eventApril'))
	93	+#set($eventMay = $doc.getValue('eventMay'))
	94	+#set($eventJune = $doc.getValue('eventJune'))
	95	+#set($eventJuly = $doc.getValue('eventJuly'))
	96	+#set($eventAugust = $doc.getValue('eventAugust'))
	97	+#set($eventSeptember = $doc.getValue('eventSeptember'))
	98	+#set($eventOctober = $doc.getValue('eventOctober'))
	99	+#set($eventNovember = $doc.getValue('eventNovember'))
	100	+#set($eventDecember = $doc.getValue('eventDecember'))
	101	+#set($eventJanuary = $doc.getValue('eventJanuary'))
	102	+#set($eventFebruary = $doc.getValue('eventFebruary'))
	103	+#set($eventMarch = $doc.getValue('eventMarch'))
	104	+
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'))
	129	+#set($visibilityDailyActivities = $!doc.getValue('visibilityDailyActivities'))
	130	+#set($visibilityElection = $!doc.getValue('visibilityElection'))
	131	+#set($visibilityMeeting = $!doc.getValue('visibilityMeeting'))
	132	+#set($visibilityActivityEnv = $!doc.getValue('visibilityActivityEnv'))
	133	+#set($visibilityAssembly = $!doc.getValue('visibilityAssembly'))
	134	+#set($visibilityPublicity = $!doc.getValue('visibilityPublicity'))
	135	+#set($visibilityExternal = $!doc.getValue('visibilityExternal'))
	136	+#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
...	...	@@ -95,15 +95,81 @@
95	95	#set($viewerDoc = $xwiki.getDocument($viewerUser))
96	96	#set($viewerAccountType = $!viewerDoc.getValue('accountType'))
97	97	#set($viewerSchoolCode = $!viewerDoc.getValue('schoolCode'))
	152	+ #set($viewerSecondarySchoolCode = $!viewerDoc.getValue('secondarySchoolCode'))
	153	+ #set($viewerUserRole = $!viewerDoc.getValue('userRole'))
98	98	#if($viewerAccountType == 'admin')
99	99	#set($isViewerAdmin = true)
100	100	#end
101	101	#end
102	102
	159	+## --- 関連校（中高一貫校）情報 ---
	160	+#set($affiliatedSchoolCode = $!doc.getValue('affiliatedSchoolCode'))
	161	+#set($affiliatedSchoolName = $!doc.getValue('affiliatedSchoolName'))
	162	+#set($isAffiliated = false)
	163	+#if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
	164	+ #if($viewerSchoolCode == $affiliatedSchoolCode)
	165	+ #set($isAffiliated = true)
	166	+ #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode)
	167	+ #set($isAffiliated = true)
	168	+ #end
	169	+#end
	170	+
	171	+## --- 校内判定（卒業生を除外、secondarySchoolCodeも含む） ---
	172	+#set($isSchoolMember = false)
	173	+#if(!$isGuest && $viewerUserRole != 'graduate')
	174	+ #if($viewerSchoolCode == $schoolCode || $isAffiliated)
	175	+ #set($isSchoolMember = true)
	176	+ #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode)
	177	+ #set($isSchoolMember = true)
	178	+ #end
	179	+#end
	180	+## 卒業生の母校判定（投稿バッジ用）
	181	+#set($isAlumniOfSchool = false)
	182	+#if(!$isGuest && $viewerUserRole == 'graduate')
	183	+ #if($viewerSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $viewerSchoolCode == $affiliatedSchoolCode))
	184	+ #set($isAlumniOfSchool = true)
	185	+ #end
	186	+#end
	187	+
	188	+## --- 学校ページ非表示チェック ---
	189	+#set($schoolHidden = $doc.getValue('hidden'))
	190	+#if($schoolHidden == 1)
	191	+ #if($isViewerAdmin)
	192	+ ## 管理者: 黄色バナー + ページ内容は通常表示（プレビュー）
	193	+<div class="school-hidden-banner admin">
	194	+ <svg class="ico" 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 01-4.24-4.24"/><line x1="1" y1="1" x2="23" y2="23"/></svg>
	195	+ <div>
	196	+ <strong>このページは非表示になっています</strong>（管理者のみ閲覧可能）
	197	+ #set($hBy = $!doc.getValue('hiddenBy'))
	198	+ #set($hAt = $!doc.getValue('hiddenAt'))
	199	+ #set($hReason = $!doc.getValue('hiddenReason'))
	200	+ <div class="school-hidden-detail">
	201	+ 非表示: $!escapetool.xml($hAt) / $!escapetool.xml($hBy)
	202	+ #if($hReason && $hReason != '') ・ 理由: $!escapetool.xml($hReason)#end
	203	+ </div>
	204	+ <a href="$xwiki.getURL('SeitokaiAdmin.SchoolManagement', 'view')" style="color:#92400e;text-decoration:underline">学校ページ管理へ</a>
	205	+ </div>
	206	+</div>
	207	+ #else
	208	+ ## 一般ユーザー・ゲスト: 非公開メッセージを表示して停止
	209	+<div class="school-hidden-public">
	210	+ <svg class="ico" viewBox="0 0 24 24" style="width:2.5em;height:2.5em"><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 01-4.24-4.24"/><line x1="1" y1="1" x2="23" y2="23"/></svg>
	211	+ <h2>このページは現在公開されていません</h2>
	212	+ <p>このページは管理者により非公開に設定されています。</p>
	213	+ <a href="$xwiki.getURL('Schools.WebHome', 'view')" class="btn-back-list">学校一覧に戻る</a>
	214	+</div>
	215	+#stop
	216	+ #end
	217	+#end
	218	+
103	103	## --- 投稿固定/解除処理 ---
104	104	#set($pinAction = $!request.action)
105		-#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || $viewerAccountType == 'verified') && $services.csrf.isTokenValid($request.form_token))
106		- #set($postObjNum = $mathtool.toInteger($!request.postObj))
	221	+#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $isSchoolMember)) && $services.csrf.isTokenValid($request.form_token))
	222	+ #set($pinPostObjStr = $!request.postObj)
	223	+ #if(!$pinPostObjStr.matches('^\d+$'))
	224	+ ## 不正な値 → 無視
	225	+ #else
	226	+ #set($postObjNum = $mathtool.toInteger($pinPostObjStr))
107	107	#set($postObj = $doc.getObject('SeitokaiCode.ActivityPostClass', $postObjNum))
108	108	#if($postObj)
109	109	#if($pinAction == 'pin')
...	...	@@ -123,12 +123,15 @@
123	123	$response.sendRedirect($doc.getURL('view'))
124	124	#stop
125	125	#end
	246	+ #end## /matches
126	126	#end
127	127
128	128	## --- 特色ある活動 選定/解除処理 ---
129	129	#set($featAction = $!request.action)
130		-#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $services.csrf.isTokenValid($request.form_token))
131		- #set($actObjNum = $mathtool.toInteger($!request.actObj))
	251	+#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $isSchoolMember)) && $services.csrf.isTokenValid($request.form_token))
	252	+ #set($featActObjStr = $!request.actObj)
	253	+ #if($featActObjStr.matches('^\d+$'))
	254	+ #set($actObjNum = $mathtool.toInteger($featActObjStr))
132	132	#set($actObj = $doc.getObject('SeitokaiCode.ActivityClass', $actObjNum))
133	133	#if($actObj)
134	134	#if($featAction == 'feature')
...	...	@@ -160,6 +160,7 @@
160	160	$response.sendRedirect($doc.getURL('view'))
161	161	#stop
162	162	#end
	286	+ #end## /matches
163	163	#end
164	164
165	165	## --- ユーザー情報取得 ---
...	...	@@ -226,7 +226,7 @@
226	226
227	227	## --- 編集ボタン（権限があるユーザーのみ表示） ---
228	228	#set($canEditSchool = false)
229		-#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode))
	353	+#if(!$isGuest && ($isViewerAdmin || $isSchoolMember || $isAlumniOfSchool))
230	230	#set($canEditSchool = true)
231	231	#end
232	232	#if($canEditSchool)
...	...	@@ -235,305 +235,596 @@
235	235	</div>
236	236	#end
237	237
238		-## --- ① 学校基本情報 + 連絡先（左右グリッド・折りたたみ対応） ---
239		-<div class="school-info-grid">
240		- <div class="school-info-card collapsed" id="card-basic-info">
241		- <h2 onclick="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>
242		- <table class="wiki-table school-info-table">
243		- <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
244		- <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
245		- <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
246		- <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
247		- <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
248		- <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
249		- <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
250		- <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
251		- <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>
252		- </table>
253		- #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
254		- #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
255		- #if($infoEditDate && $infoEditDate != '')
256		- <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>
	362	+## --- 関連校（中高一貫校）バナー ---
	363	+#if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
	364	+ #set($affiliatedPageRef = "Schools.${affiliatedSchoolCode}.WebHome")
	365	+ #set($affiliatedPageExists = $xwiki.exists($affiliatedPageRef))
	366	+<div class="affiliated-school-banner">
	367	+ <svg class="ico" viewBox="0 0 24 24" stroke-width="1.5"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg>
	368	+ <div>
	369	+ <strong>中高一貫校</strong>：
	370	+ #if($affiliatedPageExists)
	371	+ <a href="$xwiki.getURL($affiliatedPageRef, 'view')">$!escapetool.xml($affiliatedSchoolName)</a>
	372	+ #else
	373	+ $!escapetool.xml($affiliatedSchoolName)
257	257	#end
	375	+ と連携しています
258	258	</div>
	377	+</div>
	378	+#end
259	259
260		- <div class="school-info-card collapsed" id="card-contact">
261		- <h2 onclick="toggleInfoCard('card-contact')"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M22 16.92v3a2 2 0 01-2.18 2 19.79 19.79 0 01-8.63-3.07 19.5 19.5 0 01-6-6 19.79 19.79 0 01-3.07-8.67A2 2 0 014.11 2h3a2 2 0 012 1.72c.127.96.361 1.903.7 2.81a2 2 0 01-.45 2.11L8.09 9.91a16 16 0 006 6l1.27-1.27a2 2 0 012.11-.45c.907.339 1.85.573 2.81.7A2 2 0 0122 16.92z"/></svg> 連絡先・SNS</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2>
262		- <table class="wiki-table school-info-table">
263		- <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr>
264		- <tr><th>生徒会Web</th><td>#if($seitokaiWebsite && $seitokaiWebsite != '')<a href="$!escapetool.xml($seitokaiWebsite)" target="_blank" rel="noopener"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M2 12h20"/><path d="M12 2a15.3 15.3 0 014 10 15.3 15.3 0 01-4 10 15.3 15.3 0 01-4-10 15.3 15.3 0 014-10z"/></svg> $!escapetool.xml($seitokaiWebsite)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
265		- <tr><th>X (Twitter)</th><td>#if($seitokaiTwitter && $seitokaiTwitter != '')<a href="https://x.com/$!escapetool.url($seitokaiTwitter)" target="_blank" rel="noopener">𝕏 @$!escapetool.xml($seitokaiTwitter)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
266		- <tr><th>Instagram</th><td>#if($seitokaiInstagram && $seitokaiInstagram != '')<a href="https://instagram.com/$!escapetool.url($seitokaiInstagram)" target="_blank" rel="noopener"><svg class="ico" viewBox="0 0 24 24"><path d="M23 19a2 2 0 01-2 2H3a2 2 0 01-2-2V8a2 2 0 012-2h4l2-3h6l2 3h4a2 2 0 012 2z"/><circle cx="12" cy="13" r="4"/></svg> @$!escapetool.xml($seitokaiInstagram)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
267		- <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>
268		- <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
269		- </table>
	380	+## --- ① 学校基本情報 ---
	381	+<div class="school-info-card collapsed" id="card-basic-info">
	382	+ <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>
	383	+ <div class="school-basic-info-layout">
	384	+ <div class="school-basic-info-table">
	385	+ <table class="wiki-table school-info-table">
	386	+ <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
	387	+ <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
	388	+ <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
	389	+ <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
	390	+ <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
	391	+ <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
	392	+ <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
	393	+ <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
	394	+ <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>
	395	+ </table>
	396	+ </div>
	397	+ #if($schoolPhoto && $schoolPhoto != '')
	398	+ <div class="school-photo-area">
	399	+ <img src="$doc.getAttachmentURL($schoolPhoto)" alt="$!escapetool.xml($schoolName)" class="school-photo" />
	400	+ </div>
	401	+ #end
270	270	</div>
271		-</div>
	403	+ #if($schoolDescription && $schoolDescription.trim() != '')
	404	+ <div class="free-note" style="margin-top:var(--sp-4);">$!escapetool.xml($schoolDescription)</div>
	405	+ #end
272	272
273		-## --- 生徒会情報アコーディオン ---
274		-<div class="school-section-divider">
275		- <button class="shortcut-btn shortcut-btn-secondary" onclick="var sec=document.getElementById('seitokai-info-section');sec.classList.toggle('open');this.querySelector('.shortcut-arrow').textContent=sec.classList.contains('open')?'▲':'▼';">
276		- <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>
277		- 生徒会情報を見る <span class="shortcut-arrow">▼</span>
278		- </button>
279	279	</div>
280	280
281		-<div id="seitokai-info-section" class="seitokai-info-accordion">
	409	+## --- ② 生徒会情報（折りたたみカード） ---
	410	+<div class="school-info-card" id="card-seitokai-info">
	411	+ <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>
	412	+ <div class="seitokai-info-body">
282	282
283		-## --- ② 組織図 ---
284		-#set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
285		-#if($hasOrgContent)
286		- ## 公開範囲チェック
287		- #set($canViewOrgChart = true)
288		- #if($visibilityOrgChart == 'members' && $isGuest) #set($canViewOrgChart = false)
289		- #elseif($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewOrgChart = false)
290		- #end
291		- #if($canViewOrgChart)
292		-<h2 class="section-title"><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/><line x1="9" y1="10" x2="9" y2="10.01"/><line x1="15" y1="10" x2="15" y2="10.01"/><line x1="9" y1="14" x2="9" y2="14.01"/><line x1="15" y1="14" x2="15" y2="14.01"/></svg> 組織図 #if($visibilityOrgChart != 'public')<span class="visibility-badge visibility-${visibilityOrgChart}">#if($visibilityOrgChart == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h2>
293		-<div class="school-section-card">
294		- <div class="card-inner">
295		- #if($orgChartImage && $orgChartImage != '')
296		- <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
	414	+ ## --- 生徒会組織 ---
	415	+ #set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
	416	+ #if($hasOrgContent)
	417	+ #set($canViewOrgChart = true)
	418	+ #if($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewOrgChart = false)
	419	+ #elseif($visibilityOrgChart == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewOrgChart = false)
	420	+ #end
	421	+ #if($canViewOrgChart)
	422	+ <div class="seitokai-subsection">
	423	+ <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>
	424	+ <div class="seitokai-subsection-content">
	425	+ #if($orgChartImage && $orgChartImage != '')
	426	+ <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
	427	+ #end
	428	+ #if($orgChart && $orgChart != '')<div class="free-note">$!escapetool.xml($orgChart)</div>#end
	429	+ </div>
	430	+ </div>
	431	+ #else
	432	+ <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>
	433	+ #end
297	297	#end
298		- #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end
299		- </div>
300		-</div>
301		- #else
302		-<div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 組織図は #if($visibilityOrgChart == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
303		- #end
304		-#end
305	305
306		-## --- ③④⑤ 日常の活動・選挙・定例活動 ---
307		-<div class="school-section-grid">
308		- #if($dailyActivities && !$dailyActivities.isEmpty())
309		- <div class="school-section-card">
310		- <h3><svg class="ico" viewBox="0 0 24 24"><path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z"/><polyline points="14 2 14 8 20 8"/><line x1="16" y1="13" x2="8" y2="13"/><line x1="16" y1="17" x2="8" y2="17"/></svg> 日常の活動</h3>
311		- <div class="card-inner">
312		- <p class="activity-hint">活動時間の多い順に上位3つ</p>
313		- <div class="tag-container">
314		- #set($daIdx = 1)
315		- #foreach($da in $dailyActivities)
316		- <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
317		- #set($daIdx = $daIdx + 1)
	436	+ ## --- 日常の活動 ---
	437	+ #if($dailyActivities && !$dailyActivities.isEmpty())
	438	+ #set($canViewDA = true)
	439	+ #if($visibilityDailyActivities == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewDA = false)
	440	+ #elseif($visibilityDailyActivities == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewDA = false)
	441	+ #end
	442	+ #if($canViewDA)
	443	+ <div class="seitokai-subsection">
	444	+ <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>
	445	+ <div class="seitokai-subsection-content">
	446	+ <p class="activity-hint">活動時間が多い3つ</p>
	447	+ <div class="tag-container">
	448	+ #foreach($da in $dailyActivities)
	449	+ <span class="tag tag-accent">$!escapetool.xml($da.trim())</span>
	450	+ #end
	451	+ </div>
	452	+ #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
	453	+ <div class="free-note">$!escapetool.xml($dailyActivitiesNote)</div>
318	318	#end
319	319	</div>
320		- #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
321		- <div class="free-note">$!escapetool.xml($dailyActivitiesNote)</div>
322		- #end
323	323	</div>
324		- </div>
325		- #end
	457	+ #else
	458	+ <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 日常の活動情報は #if($visibilityDailyActivities == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
	459	+ #end
	460	+ #end
326	326
327		- #if($electionExists && $electionExists != '')
328		- <div class="school-section-card">
329		- <h3><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="3" width="18" height="18" rx="2"/><path d="M7 13l3 3 7-7"/></svg> 選挙</h3>
330		- <div class="card-inner">
331		- <div class="info-row">
332		- <span class="info-label">役員選挙</span>
333		- <span class="info-value">$!escapetool.xml($!electionExists)</span>
	462	+ ## --- 選挙 ---
	463	+ #if($electionExists && $electionExists != '')
	464	+ #set($canViewEL = true)
	465	+ #if($visibilityElection == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewEL = false)
	466	+ #elseif($visibilityElection == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewEL = false)
	467	+ #end
	468	+ #if($canViewEL)
	469	+ <div class="seitokai-subsection">
	470	+ <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>
	471	+ <div class="seitokai-subsection-content">
	472	+ <div class="info-row">
	473	+ <span class="info-label">役員選挙</span>
	474	+ <span class="info-value">$!escapetool.xml($!electionExists)</span>
	475	+ </div>
	476	+ #if($electionType && $electionType != '')
	477	+ <div class="info-row">
	478	+ <span class="info-label">直近の選挙方式</span>
	479	+ <span class="info-value">$!escapetool.xml($!electionType)</span>
	480	+ </div>
	481	+ #end
	482	+ #if($electionNote && $electionNote.trim() != '')
	483	+ <div class="free-note">$!escapetool.xml($electionNote)</div>
	484	+ #end
334	334	</div>
335		- #if($electionType && $electionType != '')
336		- <div class="info-row">
337		- <span class="info-label">直近の選挙方式</span>
338		- <span class="info-value">$!escapetool.xml($!electionType)</span>
339		- </div>
	486	+ </div>
	487	+ #else
	488	+ <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>
340	340	#end
341		- #if($electionNote && $electionNote.trim() != '')
342		- <div class="free-note">$!escapetool.xml($electionNote)</div>
	490	+ #end
	491	+
	492	+ ## --- 定例活動 ---
	493	+ #if($meetingFrequency && $meetingFrequency != '')
	494	+ #set($canViewMT = true)
	495	+ #if($visibilityMeeting == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewMT = false)
	496	+ #elseif($visibilityMeeting == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewMT = false)
343	343	#end
	498	+ #if($canViewMT)
	499	+ <div class="seitokai-subsection">
	500	+ <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>
	501	+ <div class="seitokai-subsection-content">
	502	+ <div class="info-row">
	503	+ <span class="info-label">役員定例会の頻度</span>
	504	+ <span class="info-value">$!escapetool.xml($!meetingFrequency)</span>
	505	+ </div>
	506	+ #if($regularActivitiesNote && $regularActivitiesNote.trim() != '')
	507	+ <div class="free-note">$!escapetool.xml($regularActivitiesNote)</div>
	508	+ #end
	509	+ </div>
344	344	</div>
345		- </div>
346		- #end
347		-</div>
	511	+ #else
	512	+ <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>
	513	+ #end
	514	+ #end
348	348
349		-<div class="school-section-grid">
350		- #if($meetingFrequency && $meetingFrequency != '')
351		- <div class="school-section-card">
352		- <h3><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="4" width="18" height="18" rx="2"/><line x1="16" y1="2" x2="16" y2="6"/><line x1="8" y1="2" x2="8" y2="6"/><line x1="3" y1="10" x2="21" y2="10"/></svg> 定例活動</h3>
353		- <div class="card-inner">
354		- <div class="info-row">
355		- <span class="info-label">役員定例会の頻度</span>
356		- <span class="info-value">$!escapetool.xml($!meetingFrequency)</span>
357		- </div>
358		- #if($regularActivitiesNote && $regularActivitiesNote.trim() != '')
359		- <div class="free-note">$!escapetool.xml($regularActivitiesNote)</div>
	516	+ ## --- 予算 ---
	517	+ #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
	518	+ #if($hasBudget)
	519	+ #set($canViewBudget = true)
	520	+ #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewBudget = false)
	521	+ #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false)
360	360	#end
	523	+ #if($canViewBudget)
	524	+ <div class="seitokai-subsection">
	525	+ <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>
	526	+ <div class="seitokai-subsection-content">
	527	+ #if($budgetProcess && !$budgetProcess.isEmpty())
	528	+ <div class="info-row">
	529	+ <span class="info-label">作成過程の生徒関与</span>
	530	+ <span class="info-value">
	531	+ <div class="selection-display">
	532	+ #set($allBpOpts = ["各部・委員会等への予算希望額調査","予算額調整（折衝等）","生徒会予算案の作成","生徒総会での議決","生徒関与なし","その他"])
	533	+ #foreach($bpOpt in $allBpOpts)
	534	+ #if($budgetProcess.contains($bpOpt))
	535	+ <span class="selection-item">$!escapetool.xml($bpOpt)</span>
	536	+ #else
	537	+ <span class="selection-item selection-item-off">$!escapetool.xml($bpOpt)</span>
	538	+ #end
	539	+ #end
	540	+ </div>
	541	+ </span>
	542	+ </div>
	543	+ #end
	544	+ #if($studentFee && $studentFee != '')
	545	+ <div class="info-row">
	546	+ <span class="info-label">生徒会費（年額）</span>
	547	+ <span class="info-value">$!escapetool.xml($!studentFee)</span>
	548	+ </div>
	549	+ #end
	550	+ #if($budgetScale && $budgetScale != '')
	551	+ <div class="info-row">
	552	+ <span class="info-label">予算規模</span>
	553	+ <span class="info-value">$!escapetool.xml($!budgetScale)</span>
	554	+ </div>
	555	+ #end
	556	+ #if($budgetAllocation && !$budgetAllocation.isEmpty())
	557	+ <div class="info-row">
	558	+ <span class="info-label">主な予算配分</span>
	559	+ <span class="info-value">
	560	+ <div class="selection-display">
	561	+ #foreach($ba in $budgetAllocation)
	562	+ <span class="selection-item">$!escapetool.xml($ba.trim())</span>
	563	+ #end
	564	+ </div>
	565	+ </span>
	566	+ </div>
	567	+ #end
	568	+ #if($budgetNote && $budgetNote.trim() != '')
	569	+ <div class="free-note">$!escapetool.xml($budgetNote)</div>
	570	+ #end
	571	+ </div>
361	361	</div>
362		- </div>
363		- #end
364		-
365		- ## --- ⑦ 予算 ---
366		- #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
367		- #if($hasBudget)
368		- ## 公開範囲チェック
369		- #set($canViewBudget = true)
370		- #if($visibilityBudget == 'members' && $isGuest) #set($canViewBudget = false)
371		- #elseif($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewBudget = false)
	573	+ #else
	574	+ <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 予算情報は #if($visibilityBudget == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
	575	+ #end
372	372	#end
373		- #if($canViewBudget)
374		- <div class="school-section-card">
375		- <h3><svg class="ico" viewBox="0 0 24 24"><line x1="12" y1="1" x2="12" y2="23"/><path d="M17 5H9.5a3.5 3.5 0 000 7h5a3.5 3.5 0 010 7H6"/></svg> 予算 #if($visibilityBudget != 'public')<span class="visibility-badge visibility-${visibilityBudget}">#if($visibilityBudget == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
376		- <div class="card-inner">
377		- #if($budgetProcess && !$budgetProcess.isEmpty())
378		- <div class="info-row">
379		- <span class="info-label">作成過程の生徒関与</span>
380		- <span class="info-value">
381		- <div class="selection-display">
382		- #foreach($bp in $budgetProcess)
383		- <span class="selection-item">$!escapetool.xml($bp.trim())</span>
384		- #end
385		- </div>
386		- </span>
387		- </div>
	577	+
	578	+ ## --- 校則・生徒会会則の見直し ---
	579	+ #if($ruleReviewStatus && $ruleReviewStatus != '')
	580	+ #set($canViewRuleReview = true)
	581	+ #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewRuleReview = false)
	582	+ #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false)
388	388	#end
389		- #if($studentFee && $studentFee != '')
390		- <div class="info-row">
391		- <span class="info-label">生徒会費（年額）</span>
392		- <span class="info-value">$!escapetool.xml($!studentFee)</span>
	584	+ #if($canViewRuleReview)
	585	+ <div class="seitokai-subsection">
	586	+ <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>
	587	+ <div class="seitokai-subsection-content">
	588	+ <div class="info-row">
	589	+ <span class="info-label">見直しの有無（3年以内）</span>
	590	+ <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
	591	+ </div>
	592	+ #if($ruleReviewStatus != '実施なし')
	593	+ #if($ruleReviewContent && !$ruleReviewContent.isEmpty())
	594	+ <div class="info-row">
	595	+ <span class="info-label">見直しの内容</span>
	596	+ <span class="info-value">
	597	+ <div class="selection-display">
	598	+ #foreach($rc in $ruleReviewContent)
	599	+ <span class="selection-item">$!escapetool.xml($rc.trim())</span>
	600	+ #end
	601	+ </div>
	602	+ </span>
	603	+ </div>
	604	+ #end
	605	+ #if($ruleReviewProposer && !$ruleReviewProposer.isEmpty())
	606	+ <div class="info-row">
	607	+ <span class="info-label">見直しの提案者</span>
	608	+ <span class="info-value">
	609	+ <div class="selection-display">
	610	+ #foreach($rp in $ruleReviewProposer)
	611	+ <span class="selection-item">$!escapetool.xml($rp.trim())</span>
	612	+ #end
	613	+ </div>
	614	+ </span>
	615	+ </div>
	616	+ #end
	617	+ #if($ruleReviewImplementer && !$ruleReviewImplementer.isEmpty())
	618	+ <div class="info-row">
	619	+ <span class="info-label">見直しの実施者</span>
	620	+ <span class="info-value">
	621	+ <div class="selection-display">
	622	+ #foreach($ri in $ruleReviewImplementer)
	623	+ <span class="selection-item">$!escapetool.xml($ri.trim())</span>
	624	+ #end
	625	+ </div>
	626	+ </span>
	627	+ </div>
	628	+ #end
	629	+ #end
	630	+ #if($ruleReviewSystem && $ruleReviewSystem != '')
	631	+ <div class="info-row">
	632	+ <span class="info-label">見直しの仕組み</span>
	633	+ <span class="info-value">$!escapetool.xml($!ruleReviewSystem)</span>
	634	+ </div>
	635	+ #end
393	393	</div>
	637	+ </div>
	638	+ #else
	639	+ <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>
394	394	#end
395		- #if($budgetScale && $budgetScale != '')
396		- <div class="info-row">
397		- <span class="info-label">予算規模</span>
398		- <span class="info-value">$!escapetool.xml($!budgetScale)</span>
399		- </div>
	641	+ #end
	642	+
	643	+ ## --- 活動環境 ---
	644	+ #set($hasActivityEnv = ($activityPlace && !$activityPlace.isEmpty()) || ($activityRoomEquipment && $activityRoomEquipment != '') || ($activityRoomImage && $activityRoomImage != '') || ($ictTools && !$ictTools.isEmpty()) || ($ictUsage && !$ictUsage.isEmpty()))
	645	+ #if($hasActivityEnv)
	646	+ #set($canViewAE = true)
	647	+ #if($visibilityActivityEnv == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAE = false)
	648	+ #elseif($visibilityActivityEnv == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAE = false)
400	400	#end
401		- #if($budgetAllocation && !$budgetAllocation.isEmpty())
402		- <div class="info-row">
403		- <span class="info-label">主な予算配分</span>
404		- <span class="info-value">
405		- <div class="selection-display">
406		- #foreach($ba in $budgetAllocation)
407		- <span class="selection-item">$!escapetool.xml($ba.trim())</span>
	650	+ #if($canViewAE)
	651	+ <div class="seitokai-subsection">
	652	+ <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>
	653	+ <div class="seitokai-subsection-content">
	654	+ #if($activityPlace && !$activityPlace.isEmpty())
	655	+ <div class="info-row">
	656	+ <span class="info-label">普段の活動場所</span>
	657	+ <span class="info-value">
	658	+ <div class="selection-display">
	659	+ #foreach($ap in $activityPlace)
	660	+ <span class="selection-item">$!escapetool.xml($ap.trim())</span>
	661	+ #end
	662	+ </div>
	663	+ </span>
	664	+ </div>
	665	+ #end
	666	+ #if($activityRoomEquipment && $activityRoomEquipment != '')
	667	+ <div class="info-row">
	668	+ <span class="info-label">生徒会室の設備</span>
	669	+ <span class="info-value free-text-value">$!escapetool.xml($activityRoomEquipment)</span>
	670	+ </div>
	671	+ #end
	672	+ #if($activityRoomImage && $activityRoomImage != '')
	673	+ <div class="info-row">
	674	+ <span class="info-label">活動場所の写真</span>
	675	+ <span class="info-value"><div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($activityRoomImage)" alt="活動場所の写真" class="org-chart-img" /></div></span>
	676	+ </div>
	677	+ #end
	678	+ #if($ictTools && !$ictTools.isEmpty())
	679	+ <div class="info-row">
	680	+ <span class="info-label">利用しているICTツール</span>
	681	+ <span class="info-value">
	682	+ #set($ictCatDisplay = [
	683	+ ["連絡ツール", ["メール","LINE","LINE WORKS","Discord","Slack","Microsoft Teams","Google Chat","InstagramのDM","XのDM","その他（連絡）"]],
	684	+ ["ドキュメント作成・共有", ["Googleドキュメント","Googleスプレッドシート","Googleスライド","Googleドライブ","Word","Excel","PowerPoint","OneDrive","SharePoint","Notion","Pages","Numbers","Keynote","Dropbox","Box","その他（ドキュメント）"]],
	685	+ ["タスク管理", ["Googleカレンダー","Google ToDoリスト","Trello","Asana","Excel等スプレッドシート","その他（タスク管理）"]],
	686	+ ["ビデオ会議ツール", ["Zoom","Google Meet","その他（ビデオ会議）"]],
	687	+ ["アンケート", ["Googleフォーム","Microsoft Forms","その他（アンケート）"]],
	688	+ ["デザイン・クリエイティブ", ["Canva","各種Adobe","CapCut","LumaFusion","AviUtl","ibisPaint","その他（デザイン）"]],
	689	+ ["その他", ["独自のWebシステム・自作アプリ"]]
	690	+ ])
	691	+ #foreach($catD in $ictCatDisplay)
	692	+ #set($catHasItems = false)
	693	+ #foreach($t in $catD.get(1))
	694	+ #if($ictTools.contains($t)) #set($catHasItems = true) #end
	695	+ #end
	696	+ #if($catHasItems)
	697	+ <div style="margin-bottom:6px">
	698	+ <span style="font-size:0.8em;font-weight:600;color:var(--text-mid)">$catD.get(0):</span>
	699	+ <div class="selection-display" style="margin-top:2px">
	700	+ #foreach($t in $catD.get(1))
	701	+ #if($ictTools.contains($t))
	702	+ <span class="selection-item">$!escapetool.xml($t)</span>
	703	+ #end
	704	+ #end
	705	+ </div>
	706	+ </div>
	707	+ #end
408	408	#end
409		- </div>
410		- </span>
	709	+ </span>
	710	+ </div>
	711	+ #end
	712	+ #if($ictUsage && !$ictUsage.isEmpty())
	713	+ <div class="info-row">
	714	+ <span class="info-label">ICT活用している場面</span>
	715	+ <span class="info-value">
	716	+ <div class="selection-display">
	717	+ #foreach($iu in $ictUsage)
	718	+ <span class="selection-item">$!escapetool.xml($iu.trim())</span>
	719	+ #end
	720	+ </div>
	721	+ </span>
	722	+ </div>
	723	+ #end
411	411	</div>
	725	+ </div>
	726	+ #else
	727	+ <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>
412	412	#end
413		- #if($budgetNote && $budgetNote.trim() != '')
414		- <div class="free-note">$!escapetool.xml($budgetNote)</div>
	729	+ #end
	730	+
	731	+ ## --- 生徒総会 ---
	732	+ #set($hasAssembly = ($assemblyFormat && $assemblyFormat != '') || ($assemblyCount && $assemblyCount > 0) || ($assemblyAgenda && !$assemblyAgenda.isEmpty()) || ($assemblyTopics && !$assemblyTopics.isEmpty()) || ($assemblyNote && $assemblyNote != ''))
	733	+ #if($hasAssembly)
	734	+ #set($canViewAS = true)
	735	+ #if($visibilityAssembly == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAS = false)
	736	+ #elseif($visibilityAssembly == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAS = false)
415	415	#end
	738	+ #if($canViewAS)
	739	+ <div class="seitokai-subsection">
	740	+ <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>
	741	+ <div class="seitokai-subsection-content">
	742	+ #if($assemblyFormat && $assemblyFormat != '')
	743	+ <div class="info-row">
	744	+ <span class="info-label">開催方式</span>
	745	+ <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($assemblyFormat)</span></span>
	746	+ </div>
	747	+ #end
	748	+ #if($assemblyCount && $assemblyCount > 0)
	749	+ <div class="info-row">
	750	+ <span class="info-label">開催回数（年）</span>
	751	+ <span class="info-value">$!escapetool.xml($assemblyCount)回</span>
	752	+ </div>
	753	+ #end
	754	+ #if($assemblyAgenda && !$assemblyAgenda.isEmpty())
	755	+ <div class="info-row">
	756	+ <span class="info-label">議案の集め方</span>
	757	+ <span class="info-value">
	758	+ <div class="selection-display">
	759	+ #foreach($aa in $assemblyAgenda)
	760	+ <span class="selection-item">$!escapetool.xml($aa.trim())</span>
	761	+ #end
	762	+ </div>
	763	+ </span>
	764	+ </div>
	765	+ #end
	766	+ #if($assemblyTopics && !$assemblyTopics.isEmpty())
	767	+ <div class="info-row">
	768	+ <span class="info-label">扱う内容</span>
	769	+ <span class="info-value">
	770	+ <div class="selection-display">
	771	+ #foreach($at in $assemblyTopics)
	772	+ <span class="selection-item">$!escapetool.xml($at.trim())</span>
	773	+ #end
	774	+ </div>
	775	+ </span>
	776	+ </div>
	777	+ #end
	778	+ #if($assemblyNote && $assemblyNote != '')
	779	+ <div class="info-row">
	780	+ <span class="info-label">自由記述</span>
	781	+ <span class="info-value free-text-value">$!escapetool.xml($assemblyNote)</span>
	782	+ </div>
	783	+ #end
	784	+ </div>
416	416	</div>
417		- </div>
418		- #else
419		- <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 予算情報は #if($visibilityBudget == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
	786	+ #else
	787	+ <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>
	788	+ #end
420	420	#end
421		- #end
422		-</div>
423	423
424		-## --- ⑧ 校則の見直し ---
425		-#if($ruleReviewStatus && $ruleReviewStatus != '')
426		- ## 公開範囲チェック
427		- #set($canViewRuleReview = true)
428		- #if($visibilityRuleReview == 'members' && $isGuest) #set($canViewRuleReview = false)
429		- #elseif($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewRuleReview = false)
430		- #end
431		- #if($canViewRuleReview)
432		-<h2 class="section-title"><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M16 4h2a2 2 0 012 2v12a2 2 0 01-2 2h-2"/><path d="M8 4H6a2 2 0 00-2 2v12a2 2 0 002 2h2"/><line x1="12" y1="4" x2="12" y2="8"/><line x1="12" y1="16" x2="12" y2="20"/><line x1="8" y1="8" x2="16" y2="8"/><line x1="8" y1="16" x2="16" y2="16"/></svg> 校則の見直し #if($visibilityRuleReview != 'public')<span class="visibility-badge visibility-${visibilityRuleReview}">#if($visibilityRuleReview == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h2>
433		-<div class="school-section-card">
434		- <div class="card-inner">
435		- <div class="info-row">
436		- <span class="info-label">見直しの有無（3年以内）</span>
437		- <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
438		- </div>
439		- #if($ruleReviewContent && !$ruleReviewContent.isEmpty())
440		- <div class="info-row">
441		- <span class="info-label">見直しの内容</span>
442		- <span class="info-value">
443		- <div class="selection-display">
444		- #foreach($rc in $ruleReviewContent)
445		- <span class="selection-item">$!escapetool.xml($rc.trim())</span>
446		- #end
	791	+ ## --- 広報 ---
	792	+ #set($hasPublicity = ($publicityMethod && !$publicityMethod.isEmpty()) || ($publicityFrequency && $publicityFrequency != '') || ($publicityNote && $publicityNote != ''))
	793	+ #if($hasPublicity)
	794	+ #set($canViewPB = true)
	795	+ #if($visibilityPublicity == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewPB = false)
	796	+ #elseif($visibilityPublicity == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPB = false)
	797	+ #end
	798	+ #if($canViewPB)
	799	+ <div class="seitokai-subsection">
	800	+ <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>
	801	+ <div class="seitokai-subsection-content">
	802	+ #if($publicityMethod && !$publicityMethod.isEmpty())
	803	+ <div class="info-row">
	804	+ <span class="info-label">方法</span>
	805	+ <span class="info-value">
	806	+ <div class="selection-display">
	807	+ #foreach($pm in $publicityMethod)
	808	+ <span class="selection-item">$!escapetool.xml($pm.trim())</span>
	809	+ #end
	810	+ </div>
	811	+ </span>
447	447	</div>
448		- </span>
	813	+ #end
	814	+ #if($publicityFrequency && $publicityFrequency != '')
	815	+ <div class="info-row">
	816	+ <span class="info-label">頻度</span>
	817	+ <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($publicityFrequency)</span></span>
	818	+ </div>
	819	+ #end
	820	+ #if($publicityNote && $publicityNote != '')
	821	+ <div class="info-row">
	822	+ <span class="info-label">自由記述</span>
	823	+ <span class="info-value free-text-value">$!escapetool.xml($publicityNote)</span>
	824	+ </div>
	825	+ #end
	826	+ </div>
449	449	</div>
	828	+ #else
	829	+ <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>
	830	+ #end
450	450	#end
451		- #if($ruleReviewProposer && !$ruleReviewProposer.isEmpty())
452		- <div class="info-row">
453		- <span class="info-label">見直しの提案者</span>
454		- <span class="info-value">
455		- <div class="selection-display">
456		- #foreach($rp in $ruleReviewProposer)
457		- <span class="selection-item">$!escapetool.xml($rp.trim())</span>
458		- #end
	832	+
	833	+ ## --- 外部連携 ---
	834	+ #set($hasExternal = ($externalCooperation && $externalCooperation != '') || ($externalOrgName && $externalOrgName != '') || ($socialParticipation && !$socialParticipation.isEmpty()))
	835	+ #if($hasExternal)
	836	+ #set($canViewEX = true)
	837	+ #if($visibilityExternal == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewEX = false)
	838	+ #elseif($visibilityExternal == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewEX = false)
	839	+ #end
	840	+ #if($canViewEX)
	841	+ <div class="seitokai-subsection">
	842	+ <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>
	843	+ <div class="seitokai-subsection-content">
	844	+ #if($externalCooperation && $externalCooperation != '')
	845	+ <div class="info-row">
	846	+ <span class="info-label">他校の生徒会との連携</span>
	847	+ <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($externalCooperation)</span></span>
459	459	</div>
460		- </span>
	849	+ #end
	850	+ #if($externalOrgName && $externalOrgName != '')
	851	+ <div class="info-row">
	852	+ <span class="info-label">参加している生徒会団体の名前</span>
	853	+ <span class="info-value">$!escapetool.xml($externalOrgName)</span>
	854	+ </div>
	855	+ #end
	856	+ #if($socialParticipation && !$socialParticipation.isEmpty())
	857	+ <div class="info-row">
	858	+ <span class="info-label">社会参加・地域連携・ボランティア</span>
	859	+ <span class="info-value">
	860	+ <div class="selection-display">
	861	+ #foreach($sp2 in $socialParticipation)
	862	+ <span class="selection-item">$!escapetool.xml($sp2.trim())</span>
	863	+ #end
	864	+ </div>
	865	+ </span>
	866	+ </div>
	867	+ #end
	868	+ </div>
461	461	</div>
	870	+ #else
	871	+ <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>
	872	+ #end
462	462	#end
463		- #if($ruleReviewImplementer && !$ruleReviewImplementer.isEmpty())
464		- <div class="info-row">
465		- <span class="info-label">見直しの実施者</span>
466		- <span class="info-value">
467		- <div class="selection-display">
468		- #foreach($ri in $ruleReviewImplementer)
469		- <span class="selection-item">$!escapetool.xml($ri.trim())</span>
	874	+
	875	+ ## --- 年間主要行事 ---
	876	+ #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]])
	877	+ #set($hasAnyEvent = false)
	878	+ #foreach($m in $months)
	879	+ #if($m.get(1) && $m.get(1) != '') #set($hasAnyEvent = true) #end
	880	+ #end
	881	+ #if($hasAnyEvent)
	882	+ #set($canViewAN = true)
	883	+ #if($visibilityAnnualEvents == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAN = false)
	884	+ #elseif($visibilityAnnualEvents == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAN = false)
	885	+ #end
	886	+ #if($canViewAN)
	887	+ <div class="seitokai-subsection">
	888	+ <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>
	889	+ <div class="seitokai-subsection-content">
	890	+ <table class="wiki-table school-info-table" style="margin:0">
	891	+ #foreach($m in $months)
	892	+ #if($m.get(1) && $m.get(1) != '')
	893	+ <tr><td style="width:60px;font-weight:600;white-space:nowrap">$m.get(0)</td><td>$!escapetool.xml($m.get(1))</td></tr>
470	470	#end
471		- </div>
472		- </span>
	895	+ #end
	896	+ </table>
	897	+ </div>
473	473	</div>
	899	+ #else
	900	+ <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>
	901	+ #end
474	474	#end
475		- #if($ruleReviewSystem && $ruleReviewSystem != '')
476		- <div class="info-row">
477		- <span class="info-label">見直しの仕組み</span>
478		- <span class="info-value">$!escapetool.xml($!ruleReviewSystem)</span>
	903	+
	904	+ ## --- 生徒会の課題意識 ---
	905	+ #if($challenges && $challenges != '')
	906	+ #set($canViewChallenges = true)
	907	+ #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewChallenges = false)
	908	+ #elseif($visibilityChallenges == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewChallenges = false)
	909	+ #end
	910	+ #if($canViewChallenges)
	911	+ <div class="seitokai-subsection">
	912	+ <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>
	913	+ <div class="seitokai-subsection-content">
	914	+ <div class="challenge-text">$!escapetool.xml($challenges)</div>
	915	+ </div>
479	479	</div>
	917	+ #else
	918	+ <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 課題情報は #if($visibilityChallenges == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
	919	+ #end
480	480	#end
481		- </div>
482		-</div>
483		- #else
484		-<div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 校則の見直し情報は #if($visibilityRuleReview == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
485		- #end
486		-#end
487	487
488		-## --- ⑨ 課題 ---
489		-#if($challenges && $challenges != '')
490		- ## 公開範囲チェック
491		- #set($canViewChallenges = true)
492		- #if($visibilityChallenges == 'members' && $isGuest) #set($canViewChallenges = false)
493		- #elseif($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewChallenges = false)
	922	+ </div>## seitokai-info-body 終了
	923	+</div>## card-seitokai-info 終了
	924	+
	925	+## --- ③ SNS・連絡先 ---
	926	+<div class="school-info-card collapsed" id="card-contact">
	927	+ <h2 role="button" tabindex="0" aria-expanded="false" onclick="toggleInfoCard('card-contact')" onkeydown="if(event.key==='Enter'||event.key===' '){event.preventDefault();toggleInfoCard('card-contact')}"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M22 16.92v3a2 2 0 01-2.18 2 19.79 19.79 0 01-8.63-3.07 19.5 19.5 0 01-6-6 19.79 19.79 0 01-3.07-8.67A2 2 0 014.11 2h3a2 2 0 012 1.72c.127.96.361 1.903.7 2.81a2 2 0 01-.45 2.11L8.09 9.91a16 16 0 006 6l1.27-1.27a2 2 0 012.11-.45c.907.339 1.85.573 2.81.7A2 2 0 0122 16.92z"/></svg> SNS・連絡先</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2>
	928	+ <table class="wiki-table school-info-table">
	929	+ <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr>
	930	+ <tr><th>生徒会Web</th><td>#if($seitokaiWebsite && $seitokaiWebsite != '')<a href="$!escapetool.xml($seitokaiWebsite)" target="_blank" rel="noopener"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M2 12h20"/><path d="M12 2a15.3 15.3 0 014 10 15.3 15.3 0 01-4 10 15.3 15.3 0 01-4-10 15.3 15.3 0 014-10z"/></svg> $!escapetool.xml($seitokaiWebsite)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
	931	+ <tr><th>X (Twitter)</th><td>#if($seitokaiTwitter && $seitokaiTwitter != '')<a href="https://x.com/$!escapetool.url($seitokaiTwitter)" target="_blank" rel="noopener">𝕏 @$!escapetool.xml($seitokaiTwitter)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
	932	+ <tr><th>Instagram</th><td>#if($seitokaiInstagram && $seitokaiInstagram != '')<a href="https://instagram.com/$!escapetool.url($seitokaiInstagram)" target="_blank" rel="noopener"><svg class="ico" viewBox="0 0 24 24"><path d="M23 19a2 2 0 01-2 2H3a2 2 0 01-2-2V8a2 2 0 012-2h4l2-3h6l2 3h4a2 2 0 012 2z"/><circle cx="12" cy="13" r="4"/></svg> @$!escapetool.xml($seitokaiInstagram)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
	933	+ <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>
	934	+ <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
	935	+ </table>
	936	+ #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
	937	+ #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
	938	+ #if($infoEditDate && $infoEditDate != '')
	939	+ <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>
494	494	#end
495		- #if($canViewChallenges)
496		-<h2 class="section-title">生徒会の課題意識 #if($visibilityChallenges != 'public')<span class="visibility-badge visibility-${visibilityChallenges}">#if($visibilityChallenges == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h2>
497		-<div class="challenge-text">$!escapetool.xml($challenges)</div>
498		- #else
499		-<div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 課題情報は #if($visibilityChallenges == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
500		- #end
501		-#end
	941	+</div>
502	502
503		-</div>## seitokai-info-accordion 終了
504		-
505	505	{{/html}}
506	506
	945	+----
	946	+
507	507	## --- ⑩ 活動報告一覧（スレッド型・年度タブ付き） ---
508	508	= 活動報告 =
509	509
510		-## --- 投稿者ステータス凡例（折りたたみ） ---
	950	+## --- 年度タブ + 投稿者ステータス凡例 ---
511	511	{{html clean="false"}}
512		-<div class="author-legend-wrapper">
513		- <button class="author-legend-toggle" onclick="this.classList.toggle('open');this.nextElementSibling.classList.toggle('open')"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M12 16v-4"/><path d="M12 8h.01"/></svg> バッジの見方 <span class="chevron">▼</span></button>
514		- <div class="author-legend-body">
515		- <div class="author-legend">
516		- <span class="author-legend-title">投稿者の信頼度:</span>
517		- <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者</span>
518		- <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み</span>
519		- <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介</span>
520		- <span class="author-legend-item"><span class="bar bar-general"></span> 一般（未承認）</span>
521		- </div>
522		- <div class="author-legend">
523		- <span class="author-legend-title">所属:</span>
524		- <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>
525		- <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>
526		- <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>
527		- <span class="author-legend-item text-hint">※一般アカウントは所属未確認のため非表示</span>
528		- </div>
529		- <div class="author-legend">
530		- <span class="author-legend-title">役割:</span>
531		- <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>
532		- <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>
533		- <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>
534		- </div>
535		- </div>
536		-</div>
537	537
538	538	## --- 年度タブ ---
539	539	## 全活動から年度一覧を収集
...	...	@@ -555,14 +555,49 @@
555	555	#end
556	556	## ソート（降順にしたいが Velocity にはないので JS で制御）
557	557
558		-<div class="activity-fy-tabs">
559		- <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
560		- #foreach($fy in $fySet)
561		- #if($fy != $currentFYStr)
562		- <button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button>
	973	+<div class="activity-toolbar">
	974	+ <div class="activity-fy-tabs">
	975	+ <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
	976	+ #foreach($fy in $fySet)
	977	+ #if($fy != $currentFYStr)
	978	+ <button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button>
	979	+ #end
563	563	#end
564		- #end
565		- <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
	981	+ <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
	982	+ </div>
	983	+ <div class="activity-toolbar-right">
	984	+ <button class="btn-view-toggle" id="btnViewToggle" onclick="toggleCompactView()" title="タイトルのみ表示">
	985	+ <svg class="ico-list" viewBox="0 0 24 24" stroke="currentColor" fill="none" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><line x1="8" y1="6" x2="21" y2="6"/><line x1="8" y1="12" x2="21" y2="12"/><line x1="8" y1="18" x2="21" y2="18"/><line x1="3" y1="6" x2="3.01" y2="6"/><line x1="3" y1="12" x2="3.01" y2="12"/><line x1="3" y1="18" x2="3.01" y2="18"/></svg>
	986	+ <svg class="ico-detail" viewBox="0 0 24 24" stroke="currentColor" fill="none" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="3" width="7" height="7"/><rect x="14" y="3" width="7" height="7"/><rect x="3" y="14" width="7" height="7"/><rect x="14" y="14" width="7" height="7"/></svg>
	987	+ <span class="toggle-label">一覧表示</span>
	988	+ </button>
	989	+ </div>
	990	+ <div class="author-legend-wrapper">
	991	+ <button class="author-legend-toggle" onclick="this.classList.toggle('open');this.nextElementSibling.classList.toggle('open')"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M12 16v-4"/><path d="M12 8h.01"/></svg> バッジの見方 <span class="chevron">▼</span></button>
	992	+ <div class="author-legend-body">
	993	+ <div class="author-legend">
	994	+ <span class="author-legend-title">投稿者の信頼度:</span>
	995	+ <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者 <span class="text-hint">— 運営スタッフ</span></span>
	996	+ <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み <span class="text-hint">— 本人確認済みのユーザー</span></span>
	997	+ <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介 <span class="text-hint">— 承認済みユーザーからの紹介</span></span>
	998	+ <span class="author-legend-item"><span class="bar bar-general"></span> 一般 <span class="text-hint">— 一般登録ユーザー</span></span>
	999	+ </div>
	1000	+ <div class="author-legend">
	1001	+ <span class="author-legend-title">所属:</span>
	1002	+ <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>
	1003	+ <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>
	1004	+ <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>
	1005	+ <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>
	1006	+ <span class="author-legend-item text-hint">※一般アカウントは所属バッジが表示されません</span>
	1007	+ </div>
	1008	+ <div class="author-legend">
	1009	+ <span class="author-legend-title">役割:</span>
	1010	+ <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>
	1011	+ <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>
	1012	+ <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>
	1013	+ </div>
	1014	+ </div>
	1015	+ </div>
566	566	</div>
567	567
568	568	{{/html}}
...	...	@@ -627,10 +627,18 @@
627	627	<div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)">
628	628	<div class="activity-thread-header">
629	629	<div class="activity-thread-title">
630		- <h3 #if($actFeatured == '1')class="featured-title"#end>$!escapetool.xml($!actTitle) #if($actFeatured == '1')<svg class="ico ico-fixed-14" viewBox="0 0 24 24" fill="currentColor" stroke="none" class="ico-star-offset"><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>
631		- <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
	1080	+ <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>
	1081	+ <div class="activity-meta-line">
	1082	+ <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
	1083	+ #set($actTagsList = $activity.getValue('tags'))
	1084	+ #if($actTagsList && !$actTagsList.isEmpty())
	1085	+ #foreach($tagItem in $actTagsList)
	1086	+ #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end
	1087	+ #end
	1088	+ #end
	1089	+ </div>
632	632	</div>
633		- <div class="thread-meta-row">
	1091	+ <div class="thread-meta-right">
634	634	<span class="thread-post-count">${reportCount}件の報告 ・ ${commentCount}件のコメント</span>
635	635	#if($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred')
636	636	#if($actFeatured == '1')
...	...	@@ -690,12 +690,12 @@
690	690	#set($postVis = $!post.getValue('visibility'))
691	691	#if(!$postVis || $postVis == '') #set($postVis = 'public') #end
692	692	#set($canViewPost = true)
693		- #if($postVis == 'members' && $isGuest) #set($canViewPost = false)
694		- #elseif($postVis == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewPost = false)
	1151	+ #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewPost = false)
	1152	+ #elseif($postVis == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPost = false)
695	695	#end
696	696	#if(!$canViewPost)
697	697	<div class="thread-post visibility-restricted-post">
698		- <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> この投稿は #if($postVis == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
	1156	+ <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> この投稿は #if($postVis == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
699	699	</div>
700	700	#else
701	701	## 投稿者のアカウント種別に基づいたCSSクラス
...	...	@@ -735,8 +735,11 @@
735	735	<span class="badge badge-general badge-sm">一般</span>
736	736	#end
737	737	## 所属バッジ（投稿者の学校コードとページの学校コードを比較）
	1196	+ #set($postIsSchoolMatch = ($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode)))
738	738	#if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general')
739		- #if($postSchoolCode == $schoolCode)
	1198	+ #if($postUserRole == 'graduate' && $postIsSchoolMatch)
	1199	+ <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>
	1200	+ #elseif($postIsSchoolMatch && $postUserRole != 'graduate')
740	740	#if($postAccountType == 'verified' || $postAccountType == 'admin')
741	741	<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>
742	742	#else
...	...	@@ -757,9 +757,6 @@
757	757	#elseif($postUserRole == 'graduate')
758	758	<span class="badge badge-role-graduate 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>
759	759	#end
760		- #if($postGrade && $postGrade != '')
761		- <span class="badge badge-grade badge-sm">$postGrade</span>
762		- #end
763	763	</span>
764	764	<span class="thread-post-date">$!postDate</span>
765	765	#set($postEdited = $!post.getValue('edited'))
...	...	@@ -766,6 +766,13 @@
766	766	#if($postEdited == 1 || $postEdited == '1')
767	767	<span class="post-edited-label">（編集済み）</span>
768	768	#end
	1227	+ #set($postAuthorRefH = $!post.getValue('authorRef'))
	1228	+ #set($postObjNumH = $post.number)
	1229	+ #if(!$isGuest && $xcontext.user != $postAuthorRefH)
	1230	+ <button type="button" class="btn-post-report btn-post-report-header" onclick="openReportDialog(this, '${doc.fullName}', $postObjNumH, '${services.csrf.getToken()}')" title="この投稿を通報">
	1231	+ <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> 通報
	1232	+ </button>
	1233	+ #end
769	769	</div>
770	770	<div class="thread-post-body">
771	771	$!escapetool.xml($!postContent)
...	...	@@ -830,12 +830,18 @@
830	830	#end
831	831	</div>
832	832	#if($postVis != 'public')
833		- <div class="visibility-badge visibility-${postVis} post-action-mt">#if($postVis == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</div>
	1298	+ <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>
834	834	#end
835		- ## 固定/解除ボタン（承認済み・管理者のみ）
836		- #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
837		- #set($postObjNum = $post.number)
838		- <div class="post-pin-action post-action-mt">
	1300	+ ## 固定/編集/削除/通報/非表示ボタン（横並び）
	1301	+ #set($postAuthorRef = $!post.getValue('authorRef'))
	1302	+ #set($postObjNumED = $post.number)
	1303	+ #set($showPinBtn = ($viewerAccountType == 'admin' || $viewerAccountType == 'verified'))
	1304	+ #set($showEditDeleteBtn = ($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin'))
	1305	+ #set($showHideBtn = ($viewerAccountType == 'admin'))
	1306	+ #if($showPinBtn || $showEditDeleteBtn || $showHideBtn)
	1307	+ <div class="post-edit-actions post-action-mt">
	1308	+ #if($showPinBtn)
	1309	+ #set($postObjNum = $post.number)
839	839	#if($isPinned == '1')
840	840	<a href="$doc.getURL('view', "action=unpin&postObj=${postObjNum}&form_token=${services.csrf.getToken()}")" class="btn-pin-toggle btn-unpin" title="固定を解除">
841	841	<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> 固定を解除
...	...	@@ -845,15 +845,12 @@
845	845	<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> 固定する
846	846	</a>
847	847	#end
848		- </div>
849		- #end
850		- ## 編集・削除ボタン（投稿者本人 or 管理者）
851		- #set($postAuthorRef = $!post.getValue('authorRef'))
852		- #set($postObjNumED = $post.number)
853		- #if($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin')
854		- <div class="post-edit-actions post-action-mt">
	1319	+ #end
	1320	+ #if($showEditDeleteBtn)
855	855	#if($xcontext.user == $postAuthorRef)
856		- <button type="button" class="btn-post-edit" onclick="openEditPost(this, '${doc.fullName}', $postObjNumED, '$!escapetool.javascript($!postContent)')" title="この投稿を編集">
	1322	+ #set($editImages = $!post.getValue('images'))
	1323	+ #set($editFiles = $!post.getValue('files'))
	1324	+ <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="この投稿を編集">
857	857	<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> 編集
858	858	</button>
859	859	#end
...	...	@@ -860,6 +860,12 @@
860	860	<button type="button" class="btn-post-delete" onclick="confirmDeletePost('${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を削除">
861	861	<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> 削除
862	862	</button>
	1331	+ #end
	1332	+ #if($showHideBtn)
	1333	+ <button type="button" class="btn-post-hide" onclick="openHideDialog(this, '${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を非表示にする">
	1334	+ <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> 非表示
	1335	+ </button>
	1336	+ #end
863	863	</div>
864	864	#end
865	865	</div>
...	...	@@ -909,9 +909,11 @@
909	909
910	910	#if($xcontext.user != "XWiki.XWikiGuest")
911	911	<div class="thread-add-post">
	1386	+ #if($isSchoolMember || $isAlumniOfSchool || $isViewerAdmin)
912	912	<a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
913	913	＋ 活動報告を追加
914	914	</a>
	1390	+ #end
915	915	<a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
916	916	<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> コメントを書く
917	917	</a>
...	...	@@ -944,6 +944,35 @@
944	944	## --- 年度タブ切り替え JavaScript ---
945	945	{{html clean="false"}}
946	946	<script>
	1423	+// コンパクト表示（タイトルのみ）トグル
	1424	+function toggleCompactView() {
	1425	+ var container = document.querySelector('.xwiki-content') || document.body;
	1426	+ var isCompact = container.classList.toggle('activity-compact-view');
	1427	+ var btn = document.getElementById('btnViewToggle');
	1428	+ if (btn) {
	1429	+ btn.querySelector('.toggle-label').textContent = isCompact ? '詳細表示' : '一覧表示';
	1430	+ btn.title = isCompact ? '詳細表示に戻す' : 'タイトルのみ表示';
	1431	+ }
	1432	+ // コンパクトモードでは各スレッドヘッダーをクリックで個別展開可能にする
	1433	+ document.querySelectorAll('.activity-thread').forEach(function(thread) {
	1434	+ if (isCompact) {
	1435	+ thread.classList.remove('compact-expanded');
	1436	+ }
	1437	+ });
	1438	+}
	1439	+
	1440	+// コンパクトモードで個別スレッドを展開/折りたたみ
	1441	+function toggleThreadExpand(e) {
	1442	+ var container = document.querySelector('.xwiki-content') || document.body;
	1443	+ if (!container.classList.contains('activity-compact-view')) return;
	1444	+ // リンクやボタンのクリックはスルー
	1445	+ if (e.target.closest('a, button, .btn-featured-toggle')) return;
	1446	+ var thread = e.target.closest('.activity-thread');
	1447	+ if (thread) {
	1448	+ thread.classList.toggle('compact-expanded');
	1449	+ }
	1450	+}
	1451	+
947	947	function switchActivityFY(fy, btn) {
948	948	// タブのアクティブ状態を切り替え
949	949	document.querySelectorAll('.activity-fy-tab').forEach(function(t) { t.classList.remove('active'); });
...	...	@@ -959,6 +959,27 @@
959	959	}
960	960	// ページ読み込み時の初期化
961	961	document.addEventListener('DOMContentLoaded', function() {
	1467	+ // 年度タブを降順にソート（「全期間」タブは末尾に固定）
	1468	+ var tabContainer = document.querySelector('.activity-fy-tabs');
	1469	+ if (tabContainer) {
	1470	+ var tabs = Array.from(tabContainer.querySelectorAll('.activity-fy-tab'));
	1471	+ var allTab = null;
	1472	+ var fyTabs = [];
	1473	+ tabs.forEach(function(t) {
	1474	+ var onclickStr = t.getAttribute('onclick') || '';
	1475	+ if (onclickStr.indexOf("'all'") !== -1) { allTab = t; }
	1476	+ else { fyTabs.push(t); }
	1477	+ });
	1478	+ // 年度タブを数値の降順でソート
	1479	+ fyTabs.sort(function(a, b) {
	1480	+ var aYear = parseInt(a.textContent) || 0;
	1481	+ var bYear = parseInt(b.textContent) || 0;
	1482	+ return bYear - aYear;
	1483	+ });
	1484	+ // DOM再配置
	1485	+ fyTabs.forEach(function(t) { tabContainer.appendChild(t); });
	1486	+ if (allTab) { tabContainer.appendChild(allTab); }
	1487	+ }
962	962	// デフォルトで現在の年度を表示
963	963	var defaultTab = document.querySelector('.activity-fy-tab.active');
964	964	if (defaultTab) { defaultTab.click(); }
...	...	@@ -970,6 +970,30 @@
970	970	window.history.replaceState({}, document.title, window.location.pathname);
971	971	}
972	972	}
	1499	+ // コンパクトモード: スレッドヘッダークリックで個別展開
	1500	+ document.querySelectorAll('.activity-thread-header').forEach(function(header) {
	1501	+ header.addEventListener('click', toggleThreadExpand);
	1502	+ });
	1503	+ // 長文投稿の折りたたみ初期化（max-height: 12em 超で省略）
	1504	+ document.querySelectorAll('.thread-post-body').forEach(function(body) {
	1505	+ // pre-wrapのまま高さを測定し、max-height(12em ≒ ~200px)を超える場合に折りたたむ
	1506	+ var fullH = body.scrollHeight;
	1507	+ // 12em を px に変換（font-size × line-height × 行数 の近似値ではなくCSSと同じ値を取得）
	1508	+ body.classList.add('truncated');
	1509	+ var maxH = body.clientHeight; // max-height: 12em 適用後の高さ
	1510	+ body.classList.remove('truncated');
	1511	+ if (fullH > maxH + 30) {
	1512	+ body.classList.add('truncated');
	1513	+ var btn = document.createElement('button');
	1514	+ btn.className = 'btn-read-more';
	1515	+ btn.textContent = '広げて読む ▼';
	1516	+ btn.addEventListener('click', function() {
	1517	+ var isExpanded = body.classList.toggle('expanded');
	1518	+ btn.textContent = isExpanded ? '折りたたむ ▲' : '広げて読む ▼';
	1519	+ });
	1520	+ body.parentNode.insertBefore(btn, body.nextSibling);
	1521	+ }
	1522	+ });
973	973	});
974	974
975	975	// トースト通知表示
...	...	@@ -998,40 +998,136 @@
998	998	var card = document.getElementById(cardId);
999	999	if (!card) return;
1000	1000	card.classList.toggle('collapsed');
	1551	+ var isCollapsed = card.classList.contains('collapsed');
	1552	+ var h2 = card.querySelector('h2[role="button"]');
	1553	+ if (h2) h2.setAttribute('aria-expanded', !isCollapsed);
1001	1001	}
1002	1002
1003	1003	// 投稿の編集（インライン編集フォームを開く）
1004		-function openEditPost(btn, schoolPage, postObjNum, currentContent) {
	1557	+function openEditPost(btn) {
1005	1005	var postEl = btn.closest('.thread-post');
1006	1006	if (!postEl) return;
1007		- // 既存の編集フォームがあれば閉じる
1008	1008	var existing = postEl.querySelector('.post-edit-form');
1009	1009	if (existing) { existing.remove(); return; }
1010	1010	var bodyEl = postEl.querySelector('.thread-post-body');
1011	1011	if (!bodyEl) return;
	1564	+
	1565	+ var schoolPage = btn.getAttribute('data-school');
	1566	+ var postObjNum = btn.getAttribute('data-obj');
	1567	+ var currentContent = btn.getAttribute('data-content') || '';
	1568	+ var currentImages = btn.getAttribute('data-images') || '';
	1569	+ var currentFiles = btn.getAttribute('data-files') || '';
	1570	+ var postType = btn.getAttribute('data-post-type') || 'report';
	1571	+
1012	1012	var form = document.createElement('div');
1013	1013	form.className = 'post-edit-form';
1014		- form.innerHTML = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>' +
1015		- '<div class="post-edit-form-actions">' +
	1574	+ form.setAttribute('data-school', schoolPage);
	1575	+ form.setAttribute('data-obj', postObjNum);
	1576	+
	1577	+ var html = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>';
	1578	+
	1579	+ // コメント以外は添付ファイル編集を表示
	1580	+ if (postType !== 'comment') {
	1581	+ // 既存画像
	1582	+ html += '<div class="edit-attachments">';
	1583	+ if (currentImages.trim()) {
	1584	+ html += '<div class="edit-attach-section"><span class="edit-attach-label">画像</span>';
	1585	+ var imgs = currentImages.trim().split('\n');
	1586	+ for (var i = 0; i < imgs.length; i++) {
	1587	+ var img = imgs[i].trim();
	1588	+ if (!img) continue;
	1589	+ html += '<div class="edit-attach-item" data-name="' + img.replace(/"/g,'&quot;') + '">' +
	1590	+ '<img src="/xwiki/bin/download/' + schoolPage.replace(/\./g,'/') + '/' + encodeURIComponent(img) + '" class="edit-attach-thumb" />' +
	1591	+ '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
	1592	+ '<input type="hidden" name="keepImages" value="' + img.replace(/"/g,'&quot;') + '" />' +
	1593	+ '</div>';
	1594	+ }
	1595	+ html += '</div>';
	1596	+ }
	1597	+ // 既存ファイル
	1598	+ if (currentFiles.trim()) {
	1599	+ html += '<div class="edit-attach-section"><span class="edit-attach-label">ファイル</span>';
	1600	+ var files = currentFiles.trim().split('\n');
	1601	+ for (var j = 0; j < files.length; j++) {
	1602	+ var f = files[j].trim();
	1603	+ if (!f) continue;
	1604	+ var displayName = f;
	1605	+ if (/^file_\d{14}_\d+_/.test(f)) displayName = f.replace(/^file_\d{14}_\d+_/, '');
	1606	+ html += '<div class="edit-attach-item" data-name="' + f.replace(/"/g,'&quot;') + '">' +
	1607	+ '<span class="edit-attach-fname">' + displayName.replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</span>' +
	1608	+ '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
	1609	+ '<input type="hidden" name="keepFiles" value="' + f.replace(/"/g,'&quot;') + '" />' +
	1610	+ '</div>';
	1611	+ }
	1612	+ html += '</div>';
	1613	+ }
	1614	+ // 新規追加
	1615	+ html += '<div class="edit-attach-add">' +
	1616	+ '<label class="form-label-sm">画像を追加（最大4枚まで）</label>' +
	1617	+ '<input type="file" name="editNewImages" accept="image/*" multiple class="form-file-input-sm" />' +
	1618	+ '<div class="form-hint">JPEG / PNG / GIF / WebP、各5MBまで</div>' +
	1619	+ '<label class="form-label-sm" style="margin-top:8px;">ファイルを追加（最大2つまで）</label>' +
	1620	+ '<input type="file" name="editNewFiles" accept=".pdf,.docx,.xlsx,.pptx" multiple class="form-file-input-sm" />' +
	1621	+ '<div class="form-hint">PDF / Word / Excel / PowerPoint、各10MBまで</div>' +
	1622	+ '</div>';
	1623	+ html += '</div>';
	1624	+ }
	1625	+
	1626	+ html += '<div class="post-edit-form-actions">' +
1016	1016	'<button type="button" class="btn-cancel-edit" onclick="this.closest(\'.post-edit-form\').remove()">キャンセル</button>' +
1017		- '<button type="button" class="btn-save" onclick="saveEditPost(\'' + schoolPage + '\', ' + postObjNum + ')">保存</button>' +
	1628	+ '<button type="button" class="btn-save" onclick="saveEditPost(this)">保存</button>' +
1018	1018	'</div>';
	1630	+
	1631	+ form.innerHTML = html;
1019	1019	bodyEl.parentNode.insertBefore(form, bodyEl.nextSibling);
1020	1020	form.querySelector('textarea').focus();
1021	1021	}
1022	1022
	1636	+function removeEditAttach(btn) {
	1637	+ var item = btn.closest('.edit-attach-item');
	1638	+ if (item) item.remove();
	1639	+}
	1640	+
1023	1023	// 投稿の編集を保存
1024		-function saveEditPost(schoolPage, postObjNum) {
1025		- var textarea = document.getElementById('editContent_' + postObjNum);
	1642	+function saveEditPost(btn) {
	1643	+ var formEl = btn.closest('.post-edit-form');
	1644	+ if (!formEl) return;
	1645	+ var schoolPage = formEl.getAttribute('data-school');
	1646	+ var postObjNum = formEl.getAttribute('data-obj');
	1647	+ var textarea = formEl.querySelector('textarea');
1026	1026	if (!textarea) return;
1027	1027	var newContent = textarea.value.trim();
1028	1028	if (!newContent) { alert('投稿内容を入力してください'); return; }
	1651	+
1029	1029	var csrfEl = document.querySelector('input[name="form_token"]');
1030	1030	var csrfToken = csrfEl ? csrfEl.value : '';
	1654	+
	1655	+ var fd = new FormData();
	1656	+ fd.append('schoolPage', schoolPage);
	1657	+ fd.append('postObj', postObjNum);
	1658	+ fd.append('newContent', newContent);
	1659	+ fd.append('form_token', csrfToken);
	1660	+
	1661	+ // 残す画像・ファイル
	1662	+ formEl.querySelectorAll('input[name="keepImages"]').forEach(function(el) { fd.append('keepImages', el.value); });
	1663	+ formEl.querySelectorAll('input[name="keepFiles"]').forEach(function(el) { fd.append('keepFiles', el.value); });
	1664	+
	1665	+ // 新規画像
	1666	+ var newImgInput = formEl.querySelector('input[name="editNewImages"]');
	1667	+ if (newImgInput && newImgInput.files) {
	1668	+ for (var i = 0; i < newImgInput.files.length; i++) { fd.append('editNewImages', newImgInput.files[i]); }
	1669	+ }
	1670	+ // 新規ファイル
	1671	+ var newFileInput = formEl.querySelector('input[name="editNewFiles"]');
	1672	+ if (newFileInput && newFileInput.files) {
	1673	+ for (var j = 0; j < newFileInput.files.length; j++) { fd.append('editNewFiles', newFileInput.files[j]); }
	1674	+ }
	1675	+
	1676	+ btn.disabled = true;
	1677	+ btn.textContent = '保存中...';
	1678	+
1031	1031	var xhr = new XMLHttpRequest();
1032		- xhr.open('POST', '/bin/SeitokaiCode/EditPost?outputSyntax=plain', true);
1033		- xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1034		- var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken);
	1680	+ xhr.open('POST', '/bin/get/SeitokaiCode/EditPost?outputSyntax=plain', true);
1035	1035	xhr.onload = function() {
1036	1036	try {
1037	1037	var res = JSON.parse(xhr.responseText);
...	...	@@ -1039,12 +1039,13 @@
1039	1039	showToast('投稿を更新しました', 'success');
1040	1040	setTimeout(function() { location.reload(); }, 800);
1041	1041	} else {
	1688	+ btn.disabled = false; btn.textContent = '保存';
1042	1042	alert('編集に失敗しました: ' + (res.error || ''));
1043	1043	}
1044		- } catch(e) { alert('編集に失敗しました'); }
	1691	+ } catch(e) { btn.disabled = false; btn.textContent = '保存'; alert('編集に失敗しました'); }
1045	1045	};
1046		- xhr.onerror = function() { alert('通信エラーが発生しました'); };
1047		- xhr.send(editPostData);
	1693	+ xhr.onerror = function() { btn.disabled = false; btn.textContent = '保存'; alert('通信エラーが発生しました'); };
	1694	+ xhr.send(fd);
1048	1048	}
1049	1049
1050	1050	// 投稿の削除（確認ダイアログ付き）
...	...	@@ -1051,7 +1051,7 @@
1051	1051	function confirmDeletePost(schoolPage, postObjNum, token) {
1052	1052	if (!confirm('この投稿を削除しますか？\\n削除後は「この投稿は削除されました」と表示されます。')) return;
1053	1053	var xhr = new XMLHttpRequest();
1054		- xhr.open('POST', '/bin/SeitokaiCode/DeletePost?outputSyntax=plain', true);
	1701	+ xhr.open('POST', '/bin/get/SeitokaiCode/DeletePost?outputSyntax=plain', true);
1055	1055	xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1056	1056	var deletePostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token);
1057	1057	xhr.onload = function() {
...	...	@@ -1068,6 +1068,80 @@
1068	1068	xhr.onerror = function() { alert('通信エラーが発生しました'); };
1069	1069	xhr.send(deletePostData);
1070	1070	}
	1718	+
	1719	+/* --- 通報ダイアログ --- */
	1720	+function openReportDialog(btn, targetPage, postObjNum, token) {
	1721	+ if (document.getElementById('report-dialog-overlay')) return;
	1722	+ var reasons = ['宣伝・スパム','不適切な内容','個人情報の露出','誹謗中傷','誤情報','その他'];
	1723	+ var overlay = document.createElement('div');
	1724	+ overlay.id = 'report-dialog-overlay';
	1725	+ 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;';
	1726	+ var dialog = document.createElement('div');
	1727	+ dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;max-height:80vh;overflow-y:auto;';
	1728	+ var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を通報</h3>';
	1729	+ html += '<p style="margin:0 0 12px;font-size:0.9em;color:#4b5563;">通報された投稿は管理者が確認するまで一時的に非表示になります。</p>';
	1730	+ html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">通報理由</label>';
	1731	+ html += '<select id="report-reason" style="width:100%;padding:8px;border:1px solid #d1d5db;border-radius:8px;margin-bottom:12px;font-size:0.9em;">';
	1732	+ for (var i=0; i<reasons.length; i++) html += '<option value="'+reasons[i]+'">'+reasons[i]+'</option>';
	1733	+ html += '</select>';
	1734	+ html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">補足コメント（任意）</label>';
	1735	+ 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>';
	1736	+ html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
	1737	+ html += '<button type="button" id="report-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
	1738	+ 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>';
	1739	+ html += '</div>';
	1740	+ dialog.innerHTML = html;
	1741	+ overlay.appendChild(dialog);
	1742	+ document.body.appendChild(overlay);
	1743	+ overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
	1744	+ document.getElementById('report-cancel-btn').addEventListener('click', function() { overlay.remove(); });
	1745	+ document.getElementById('report-submit-btn').addEventListener('click', function() {
	1746	+ var reason = document.getElementById('report-reason').value;
	1747	+ var detail = document.getElementById('report-detail').value;
	1748	+ var submitBtn = document.getElementById('report-submit-btn');
	1749	+ submitBtn.disabled = true; submitBtn.textContent = '送信中...';
	1750	+ var xhr = new XMLHttpRequest();
	1751	+ xhr.open('POST', '/bin/get/SeitokaiCode/ReportAction?outputSyntax=plain', true);
	1752	+ xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
	1753	+ var data = 'targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&detail=' + encodeURIComponent(detail) + '&form_token=' + encodeURIComponent(token);
	1754	+ xhr.onload = function() {
	1755	+ overlay.remove();
	1756	+ showToast('通報を受け付けました', 'success');
	1757	+ setTimeout(function() { location.reload(); }, 1000);
	1758	+ };
	1759	+ xhr.onerror = function() { overlay.remove(); alert('通信エラーが発生しました'); };
	1760	+ xhr.send(data);
	1761	+ });
	1762	+}
	1763	+
	1764	+/* --- 非表示ダイアログ（管理者用） --- */
	1765	+function openHideDialog(btn, targetPage, postObjNum, token) {
	1766	+ if (document.getElementById('hide-dialog-overlay')) return;
	1767	+ var overlay = document.createElement('div');
	1768	+ overlay.id = 'hide-dialog-overlay';
	1769	+ 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;';
	1770	+ var dialog = document.createElement('div');
	1771	+ dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;';
	1772	+ var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を非表示にする</h3>';
	1773	+ html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">非表示の理由</label>';
	1774	+ 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="理由を入力" />';
	1775	+ html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
	1776	+ html += '<button type="button" id="hide-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
	1777	+ 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>';
	1778	+ 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>';
	1779	+ html += '</div>';
	1780	+ dialog.innerHTML = html;
	1781	+ overlay.appendChild(dialog);
	1782	+ document.body.appendChild(overlay);
	1783	+ overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
	1784	+ document.getElementById('hide-cancel-btn').addEventListener('click', function() { overlay.remove(); });
	1785	+ function doHide(action) {
	1786	+ var reason = document.getElementById('hide-reason').value || '管理者判断';
	1787	+ window.location.href = '/bin/view/SeitokaiCode/ModerationAction?action=' + action + '&targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&form_token=' + encodeURIComponent(token);
	1788	+ }
	1789	+ document.getElementById('hide-submit-btn').addEventListener('click', function() { doHide('hide'); });
	1790	+ document.getElementById('hide-warn-btn').addEventListener('click', function() { doHide('hide-warn'); });
	1791	+}
1071	1071	</script>
1072	1072	{{/html}}
1073	1073	{{/velocity}}