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'))
...	...	@@ -65,9 +65,7 @@
65	65	#set($seitokaiYoutube = $doc.getValue('seitokaiYoutube'))
66	66	#set($seitokaiOtherSns = $doc.getValue('seitokaiOtherSns'))
67	67
68		-## --- 年度アーカイブ ---
69		-#set($pageFiscalYear = $!doc.getValue('fiscalYear'))
70		-## 現在の年度を計算（4月始まり）
	114	+## --- 現在の年度を計算（4月始まり） ---
71	71	#set($nowFY = $datetool.date)
72	72	#set($currentFYMonth = $mathtool.toInteger($datetool.format('MM', $nowFY)))
73	73	#set($currentFYYear = $mathtool.toInteger($datetool.format('yyyy', $nowFY)))
...	...	@@ -76,10 +76,6 @@
76	76	#else
77	77	#set($currentFiscalYear = $mathtool.sub($currentFYYear, 1))
78	78	#end
79		-## fiscalYear 未設定時はデフォルトとして現在の年度を使う
80		-#if(!$pageFiscalYear || $pageFiscalYear == '')
81		- #set($pageFiscalYear = $currentFiscalYear.toString())
82		-#end
83	83
84	84	## --- 公開範囲フィールド ---
85	85	#set($visibilityOrgChart = $!doc.getValue('visibilityOrgChart'))
...	...	@@ -86,6 +86,14 @@
86	86	#set($visibilityBudget = $!doc.getValue('visibilityBudget'))
87	87	#set($visibilityRuleReview = $!doc.getValue('visibilityRuleReview'))
88	88	#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'))
89	89	## デフォルト値（未設定なら全体公開）
90	90	#if(!$visibilityOrgChart || $visibilityOrgChart == '') #set($visibilityOrgChart = 'public') #end
91	91	#if(!$visibilityBudget || $visibilityBudget == '') #set($visibilityBudget = 'public') #end
...	...	@@ -97,19 +97,104 @@
97	97	#set($isGuest = $viewerUser == 'XWiki.XWikiGuest')
98	98	#set($isViewerAdmin = false)
99	99	#set($viewerSchoolCode = '')
	148	+#set($viewerSecondaryGraduated = false)
100	100	#if(!$isGuest)
101	101	#set($viewerDoc = $xwiki.getDocument($viewerUser))
102	102	#set($viewerAccountType = $!viewerDoc.getValue('accountType'))
103	103	#set($viewerSchoolCode = $!viewerDoc.getValue('schoolCode'))
	153	+ #set($viewerSecondarySchoolCode = $!viewerDoc.getValue('secondarySchoolCode'))
	154	+ #set($viewerUserRole = $!viewerDoc.getValue('userRole'))
104	104	#if($viewerAccountType == 'admin')
105	105	#set($isViewerAdmin = true)
106	106	#end
	158	+ ## 第2所属校の在学年数超過チェック
	159	+ #set($viewerSecEnrollYear = $!viewerDoc.getValue('secondaryEnrollmentYear'))
	160	+ #if($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecEnrollYear && $viewerSecEnrollYear != '')
	161	+ #set($vNow = $datetool.date)
	162	+ #set($vCurYear = $mathtool.toInteger($datetool.format('yyyy', $vNow)))
	163	+ #set($vCurMonth = $mathtool.toInteger($datetool.format('MM', $vNow)))
	164	+ #if($vCurMonth >= 4)#set($vSchoolYear = $vCurYear)#else#set($vSchoolYear = $mathtool.sub($vCurYear, 1))#end
	165	+ #set($vSecEnroll = $mathtool.toInteger($viewerSecEnrollYear))
	166	+ #set($vSecMax = 3)
	167	+ #if($viewerSecondarySchoolCode.length() >= 2)
	168	+ #set($vSecType = $viewerSecondarySchoolCode.substring(0, 2))
	169	+ #if($vSecType == 'C2')#set($vSecMax = 9)#elseif($vSecType == 'D2')#set($vSecMax = 6)#end
	170	+ #end
	171	+ #set($vSecGrade = $mathtool.add($mathtool.sub($vSchoolYear, $vSecEnroll), 1))
	172	+ #if($vSecGrade > $vSecMax)
	173	+ #set($viewerSecondaryGraduated = true)
	174	+ #end
	175	+ #end
107	107	#end
108	108
	178	+## --- 関連校（中高一貫校）情報 ---
	179	+#set($affiliatedSchoolCode = $!doc.getValue('affiliatedSchoolCode'))
	180	+#set($affiliatedSchoolName = $!doc.getValue('affiliatedSchoolName'))
	181	+#set($isAffiliated = false)
	182	+#if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
	183	+ #if($viewerSchoolCode == $affiliatedSchoolCode)
	184	+ #set($isAffiliated = true)
	185	+ #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode && !$viewerSecondaryGraduated)
	186	+ #set($isAffiliated = true)
	187	+ #end
	188	+#end
	189	+
	190	+## --- 校内判定（卒業生を除外、secondarySchoolCodeも含む） ---
	191	+#set($isSchoolMember = false)
	192	+#if(!$isGuest && $viewerUserRole != 'graduate')
	193	+ #if($viewerSchoolCode == $schoolCode || $isAffiliated)
	194	+ #set($isSchoolMember = true)
	195	+ #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode && !$viewerSecondaryGraduated)
	196	+ #set($isSchoolMember = true)
	197	+ #end
	198	+#end
	199	+## 卒業生の母校判定（投稿バッジ用）
	200	+#set($isAlumniOfSchool = false)
	201	+#if(!$isGuest && $viewerUserRole == 'graduate')
	202	+ #if($viewerSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $viewerSchoolCode == $affiliatedSchoolCode))
	203	+ #set($isAlumniOfSchool = true)
	204	+ #end
	205	+#end
	206	+
	207	+## --- 学校ページ非表示チェック ---
	208	+#set($schoolHidden = $doc.getValue('hidden'))
	209	+#if($schoolHidden == 1)
	210	+ #if($isViewerAdmin)
	211	+ ## 管理者: 黄色バナー + ページ内容は通常表示（プレビュー）
	212	+<div class="school-hidden-banner admin">
	213	+ <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>
	214	+ <div>
	215	+ <strong>このページは非表示になっています</strong>（管理者のみ閲覧可能）
	216	+ #set($hBy = $!doc.getValue('hiddenBy'))
	217	+ #set($hAt = $!doc.getValue('hiddenAt'))
	218	+ #set($hReason = $!doc.getValue('hiddenReason'))
	219	+ <div class="school-hidden-detail">
	220	+ 非表示: $!escapetool.xml($hAt) / $!escapetool.xml($hBy)
	221	+ #if($hReason && $hReason != '') ・ 理由: $!escapetool.xml($hReason)#end
	222	+ </div>
	223	+ <a href="$xwiki.getURL('SeitokaiAdmin.SchoolManagement', 'view')" style="color:#92400e;text-decoration:underline">学校ページ管理へ</a>
	224	+ </div>
	225	+</div>
	226	+ #else
	227	+ ## 一般ユーザー・ゲスト: 非公開メッセージを表示して停止
	228	+<div class="school-hidden-public">
	229	+ <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>
	230	+ <h2>このページは現在公開されていません</h2>
	231	+ <p>このページは管理者により非公開に設定されています。</p>
	232	+ <a href="$xwiki.getURL('Schools.WebHome', 'view')" class="btn-back-list">学校一覧に戻る</a>
	233	+</div>
	234	+#stop
	235	+ #end
	236	+#end
	237	+
109	109	## --- 投稿固定/解除処理 ---
110	110	#set($pinAction = $!request.action)
111		-#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || $viewerAccountType == 'verified') && $services.csrf.isTokenValid($request.form_token))
112		- #set($postObjNum = $mathtool.toInteger($!request.postObj))
	240	+#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $isSchoolMember)) && $services.csrf.isTokenValid($request.form_token))
	241	+ #set($pinPostObjStr = $!request.postObj)
	242	+ #if(!$pinPostObjStr.matches('^\d+$'))
	243	+ ## 不正な値 → 無視
	244	+ #else
	245	+ #set($postObjNum = $mathtool.toInteger($pinPostObjStr))
113	113	#set($postObj = $doc.getObject('SeitokaiCode.ActivityPostClass', $postObjNum))
114	114	#if($postObj)
115	115	#if($pinAction == 'pin')
...	...	@@ -129,12 +129,15 @@
129	129	$response.sendRedirect($doc.getURL('view'))
130	130	#stop
131	131	#end
	265	+ #end## /matches
132	132	#end
133	133
134	134	## --- 特色ある活動 選定/解除処理 ---
135	135	#set($featAction = $!request.action)
136		-#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $services.csrf.isTokenValid($request.form_token))
137		- #set($actObjNum = $mathtool.toInteger($!request.actObj))
	270	+#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $isSchoolMember)) && $services.csrf.isTokenValid($request.form_token))
	271	+ #set($featActObjStr = $!request.actObj)
	272	+ #if($featActObjStr.matches('^\d+$'))
	273	+ #set($actObjNum = $mathtool.toInteger($featActObjStr))
138	138	#set($actObj = $doc.getObject('SeitokaiCode.ActivityClass', $actObjNum))
139	139	#if($actObj)
140	140	#if($featAction == 'feature')
...	...	@@ -166,6 +166,7 @@
166	166	$response.sendRedirect($doc.getURL('view'))
167	167	#stop
168	168	#end
	305	+ #end## /matches
169	169	#end
170	170
171	171	## --- ユーザー情報取得 ---
...	...	@@ -232,7 +232,7 @@
232	232
233	233	## --- 編集ボタン（権限があるユーザーのみ表示） ---
234	234	#set($canEditSchool = false)
235		-#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode))
	372	+#if(!$isGuest && ($isViewerAdmin || $isSchoolMember || $isAlumniOfSchool))
236	236	#set($canEditSchool = true)
237	237	#end
238	238	#if($canEditSchool)
...	...	@@ -241,305 +241,596 @@
241	241	</div>
242	242	#end
243	243
244		-## --- ① 学校基本情報 + 連絡先（左右グリッド・折りたたみ対応） ---
245		-<div class="school-info-grid">
246		- <div class="school-info-card collapsed" id="card-basic-info">
247		- <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>
248		- <table class="wiki-table school-info-table">
249		- <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
250		- <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
251		- <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
252		- <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
253		- <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
254		- <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
255		- <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
256		- <tr><th>課程</th><td>#if($schoolSystem && $schoolSystem != '' && $schoolSystem != '[]')$!escapetool.xml($!schoolSystem)#end</td></tr>
257		- <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>
258		- </table>
259		- #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
260		- #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
261		- #if($infoEditDate && $infoEditDate != '')
262		- <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>
	381	+## --- 関連校（中高一貫校）バナー ---
	382	+#if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
	383	+ #set($affiliatedPageRef = "Schools.${affiliatedSchoolCode}.WebHome")
	384	+ #set($affiliatedPageExists = $xwiki.exists($affiliatedPageRef))
	385	+<div class="affiliated-school-banner">
	386	+ <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>
	387	+ <div>
	388	+ <strong>中高一貫校</strong>：
	389	+ #if($affiliatedPageExists)
	390	+ <a href="$xwiki.getURL($affiliatedPageRef, 'view')">$!escapetool.xml($affiliatedSchoolName)</a>
	391	+ #else
	392	+ $!escapetool.xml($affiliatedSchoolName)
263	263	#end
	394	+ と連携しています
264	264	</div>
	396	+</div>
	397	+#end
265	265
266		- <div class="school-info-card collapsed" id="card-contact">
267		- <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>
268		- <table class="wiki-table school-info-table">
269		- <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr>
270		- <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>
271		- <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>
272		- <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>
273		- <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>
274		- <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
275		- </table>
	399	+## --- ① 学校基本情報 ---
	400	+<div class="school-info-card collapsed" id="card-basic-info">
	401	+ <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>
	402	+ <div class="school-basic-info-layout">
	403	+ <div class="school-basic-info-table">
	404	+ <table class="wiki-table school-info-table">
	405	+ <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
	406	+ <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
	407	+ <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
	408	+ <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
	409	+ <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
	410	+ <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
	411	+ <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
	412	+ <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
	413	+ <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>
	414	+ </table>
	415	+ </div>
	416	+ #if($schoolPhoto && $schoolPhoto != '')
	417	+ <div class="school-photo-area">
	418	+ <img src="$doc.getAttachmentURL($schoolPhoto)" alt="$!escapetool.xml($schoolName)" class="school-photo" />
	419	+ </div>
	420	+ #end
276	276	</div>
277		-</div>
	422	+ #if($schoolDescription && $schoolDescription.trim() != '')
	423	+ <div class="free-note" style="margin-top:var(--sp-4);">$!escapetool.xml($schoolDescription)</div>
	424	+ #end
278	278
279		-## --- 生徒会情報アコーディオン ---
280		-<div class="school-section-divider">
281		- <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')?'▲':'▼';">
282		- <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>
283		- 生徒会情報を見る <span class="shortcut-arrow">▼</span>
284		- </button>
285	285	</div>
286	286
287		-<div id="seitokai-info-section" class="seitokai-info-accordion">
	428	+## --- ② 生徒会情報（折りたたみカード） ---
	429	+<div class="school-info-card" id="card-seitokai-info">
	430	+ <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>
	431	+ <div class="seitokai-info-body">
288	288
289		-## --- ② 組織図 ---
290		-#set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
291		-#if($hasOrgContent)
292		- ## 公開範囲チェック
293		- #set($canViewOrgChart = true)
294		- #if($visibilityOrgChart == 'members' && $isGuest) #set($canViewOrgChart = false)
295		- #elseif($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewOrgChart = false)
296		- #end
297		- #if($canViewOrgChart)
298		-<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>
299		-<div class="school-section-card">
300		- <div class="card-inner">
301		- #if($orgChartImage && $orgChartImage != '')
302		- <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
	433	+ ## --- 生徒会組織 ---
	434	+ #set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
	435	+ #if($hasOrgContent)
	436	+ #set($canViewOrgChart = true)
	437	+ #if($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewOrgChart = false)
	438	+ #elseif($visibilityOrgChart == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewOrgChart = false)
	439	+ #end
	440	+ #if($canViewOrgChart)
	441	+ <div class="seitokai-subsection">
	442	+ <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>
	443	+ <div class="seitokai-subsection-content">
	444	+ #if($orgChartImage && $orgChartImage != '')
	445	+ <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
	446	+ #end
	447	+ #if($orgChart && $orgChart != '')<div class="free-note">$!escapetool.xml($orgChart)</div>#end
	448	+ </div>
	449	+ </div>
	450	+ #else
	451	+ <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>
	452	+ #end
303	303	#end
304		- #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end
305		- </div>
306		-</div>
307		- #else
308		-<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>
309		- #end
310		-#end
311	311
312		-## --- ③④⑤ 日常の活動・選挙・定例活動 ---
313		-<div class="school-section-grid">
314		- #if($dailyActivities && $dailyActivities != '')
315		- <div class="school-section-card">
316		- <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>
317		- <div class="card-inner">
318		- <p class="activity-hint">活動時間の多い順に上位3つ</p>
319		- <div class="tag-container">
320		- #set($daIdx = 1)
321		- #foreach($da in $dailyActivities.split(","))
322		- <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
323		- #set($daIdx = $daIdx + 1)
	455	+ ## --- 日常の活動 ---
	456	+ #if($dailyActivities && !$dailyActivities.isEmpty())
	457	+ #set($canViewDA = true)
	458	+ #if($visibilityDailyActivities == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewDA = false)
	459	+ #elseif($visibilityDailyActivities == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewDA = false)
	460	+ #end
	461	+ #if($canViewDA)
	462	+ <div class="seitokai-subsection">
	463	+ <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>
	464	+ <div class="seitokai-subsection-content">
	465	+ <p class="activity-hint">活動時間が多い3つ</p>
	466	+ <div class="tag-container">
	467	+ #foreach($da in $dailyActivities)
	468	+ <span class="tag tag-accent">$!escapetool.xml($da.trim())</span>
	469	+ #end
	470	+ </div>
	471	+ #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
	472	+ <div class="free-note">$!escapetool.xml($dailyActivitiesNote)</div>
324	324	#end
325	325	</div>
326		- #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
327		- <div class="free-note">$!escapetool.xml($dailyActivitiesNote)</div>
328		- #end
329	329	</div>
330		- </div>
331		- #end
	476	+ #else
	477	+ <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>
	478	+ #end
	479	+ #end
332	332
333		- #if($electionExists && $electionExists != '')
334		- <div class="school-section-card">
335		- <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>
336		- <div class="card-inner">
337		- <div class="info-row">
338		- <span class="info-label">役員選挙</span>
339		- <span class="info-value">$!escapetool.xml($!electionExists)</span>
	481	+ ## --- 選挙 ---
	482	+ #if($electionExists && $electionExists != '')
	483	+ #set($canViewEL = true)
	484	+ #if($visibilityElection == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewEL = false)
	485	+ #elseif($visibilityElection == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewEL = false)
	486	+ #end
	487	+ #if($canViewEL)
	488	+ <div class="seitokai-subsection">
	489	+ <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>
	490	+ <div class="seitokai-subsection-content">
	491	+ <div class="info-row">
	492	+ <span class="info-label">役員選挙</span>
	493	+ <span class="info-value">$!escapetool.xml($!electionExists)</span>
	494	+ </div>
	495	+ #if($electionType && $electionType != '')
	496	+ <div class="info-row">
	497	+ <span class="info-label">直近の選挙方式</span>
	498	+ <span class="info-value">$!escapetool.xml($!electionType)</span>
	499	+ </div>
	500	+ #end
	501	+ #if($electionNote && $electionNote.trim() != '')
	502	+ <div class="free-note">$!escapetool.xml($electionNote)</div>
	503	+ #end
340	340	</div>
341		- #if($electionType && $electionType != '')
342		- <div class="info-row">
343		- <span class="info-label">直近の選挙方式</span>
344		- <span class="info-value">$!escapetool.xml($!electionType)</span>
345		- </div>
	505	+ </div>
	506	+ #else
	507	+ <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>
346	346	#end
347		- #if($electionNote && $electionNote.trim() != '')
348		- <div class="free-note">$!escapetool.xml($electionNote)</div>
	509	+ #end
	510	+
	511	+ ## --- 定例活動 ---
	512	+ #if($meetingFrequency && $meetingFrequency != '')
	513	+ #set($canViewMT = true)
	514	+ #if($visibilityMeeting == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewMT = false)
	515	+ #elseif($visibilityMeeting == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewMT = false)
349	349	#end
	517	+ #if($canViewMT)
	518	+ <div class="seitokai-subsection">
	519	+ <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>
	520	+ <div class="seitokai-subsection-content">
	521	+ <div class="info-row">
	522	+ <span class="info-label">役員定例会の頻度</span>
	523	+ <span class="info-value">$!escapetool.xml($!meetingFrequency)</span>
	524	+ </div>
	525	+ #if($regularActivitiesNote && $regularActivitiesNote.trim() != '')
	526	+ <div class="free-note">$!escapetool.xml($regularActivitiesNote)</div>
	527	+ #end
	528	+ </div>
350	350	</div>
351		- </div>
352		- #end
353		-</div>
	530	+ #else
	531	+ <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>
	532	+ #end
	533	+ #end
354	354
355		-<div class="school-section-grid">
356		- #if($meetingFrequency && $meetingFrequency != '')
357		- <div class="school-section-card">
358		- <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>
359		- <div class="card-inner">
360		- <div class="info-row">
361		- <span class="info-label">役員定例会の頻度</span>
362		- <span class="info-value">$!escapetool.xml($!meetingFrequency)</span>
363		- </div>
364		- #if($regularActivitiesNote && $regularActivitiesNote.trim() != '')
365		- <div class="free-note">$!escapetool.xml($regularActivitiesNote)</div>
	535	+ ## --- 予算 ---
	536	+ #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
	537	+ #if($hasBudget)
	538	+ #set($canViewBudget = true)
	539	+ #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewBudget = false)
	540	+ #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false)
366	366	#end
	542	+ #if($canViewBudget)
	543	+ <div class="seitokai-subsection">
	544	+ <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>
	545	+ <div class="seitokai-subsection-content">
	546	+ #if($budgetProcess && !$budgetProcess.isEmpty())
	547	+ <div class="info-row">
	548	+ <span class="info-label">作成過程の生徒関与</span>
	549	+ <span class="info-value">
	550	+ <div class="selection-display">
	551	+ #set($allBpOpts = ["各部・委員会等への予算希望額調査","予算額調整（折衝等）","生徒会予算案の作成","生徒総会での議決","生徒関与なし","その他"])
	552	+ #foreach($bpOpt in $allBpOpts)
	553	+ #if($budgetProcess.contains($bpOpt))
	554	+ <span class="selection-item">$!escapetool.xml($bpOpt)</span>
	555	+ #else
	556	+ <span class="selection-item selection-item-off">$!escapetool.xml($bpOpt)</span>
	557	+ #end
	558	+ #end
	559	+ </div>
	560	+ </span>
	561	+ </div>
	562	+ #end
	563	+ #if($studentFee && $studentFee != '')
	564	+ <div class="info-row">
	565	+ <span class="info-label">生徒会費（年額）</span>
	566	+ <span class="info-value">$!escapetool.xml($!studentFee)</span>
	567	+ </div>
	568	+ #end
	569	+ #if($budgetScale && $budgetScale != '')
	570	+ <div class="info-row">
	571	+ <span class="info-label">予算規模</span>
	572	+ <span class="info-value">$!escapetool.xml($!budgetScale)</span>
	573	+ </div>
	574	+ #end
	575	+ #if($budgetAllocation && !$budgetAllocation.isEmpty())
	576	+ <div class="info-row">
	577	+ <span class="info-label">主な予算配分</span>
	578	+ <span class="info-value">
	579	+ <div class="selection-display">
	580	+ #foreach($ba in $budgetAllocation)
	581	+ <span class="selection-item">$!escapetool.xml($ba.trim())</span>
	582	+ #end
	583	+ </div>
	584	+ </span>
	585	+ </div>
	586	+ #end
	587	+ #if($budgetNote && $budgetNote.trim() != '')
	588	+ <div class="free-note">$!escapetool.xml($budgetNote)</div>
	589	+ #end
	590	+ </div>
367	367	</div>
368		- </div>
369		- #end
370		-
371		- ## --- ⑦ 予算 ---
372		- #set($hasBudget = ($budgetProcess && $budgetProcess != '') || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
373		- #if($hasBudget)
374		- ## 公開範囲チェック
375		- #set($canViewBudget = true)
376		- #if($visibilityBudget == 'members' && $isGuest) #set($canViewBudget = false)
377		- #elseif($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewBudget = false)
	592	+ #else
	593	+ <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>
	594	+ #end
378	378	#end
379		- #if($canViewBudget)
380		- <div class="school-section-card">
381		- <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>
382		- <div class="card-inner">
383		- #if($budgetProcess && $budgetProcess != '')
384		- <div class="info-row">
385		- <span class="info-label">作成過程の生徒関与</span>
386		- <span class="info-value">
387		- <div class="selection-display">
388		- #foreach($bp in $budgetProcess.split(","))
389		- <span class="selection-item">$!escapetool.xml($bp.trim())</span>
390		- #end
391		- </div>
392		- </span>
393		- </div>
	596	+
	597	+ ## --- 校則・生徒会会則の見直し ---
	598	+ #if($ruleReviewStatus && $ruleReviewStatus != '')
	599	+ #set($canViewRuleReview = true)
	600	+ #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewRuleReview = false)
	601	+ #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false)
394	394	#end
395		- #if($studentFee && $studentFee != '')
396		- <div class="info-row">
397		- <span class="info-label">生徒会費（年額）</span>
398		- <span class="info-value">$!escapetool.xml($!studentFee)</span>
	603	+ #if($canViewRuleReview)
	604	+ <div class="seitokai-subsection">
	605	+ <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>
	606	+ <div class="seitokai-subsection-content">
	607	+ <div class="info-row">
	608	+ <span class="info-label">見直しの有無（3年以内）</span>
	609	+ <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
	610	+ </div>
	611	+ #if($ruleReviewStatus != '実施なし')
	612	+ #if($ruleReviewContent && !$ruleReviewContent.isEmpty())
	613	+ <div class="info-row">
	614	+ <span class="info-label">見直しの内容</span>
	615	+ <span class="info-value">
	616	+ <div class="selection-display">
	617	+ #foreach($rc in $ruleReviewContent)
	618	+ <span class="selection-item">$!escapetool.xml($rc.trim())</span>
	619	+ #end
	620	+ </div>
	621	+ </span>
	622	+ </div>
	623	+ #end
	624	+ #if($ruleReviewProposer && !$ruleReviewProposer.isEmpty())
	625	+ <div class="info-row">
	626	+ <span class="info-label">見直しの提案者</span>
	627	+ <span class="info-value">
	628	+ <div class="selection-display">
	629	+ #foreach($rp in $ruleReviewProposer)
	630	+ <span class="selection-item">$!escapetool.xml($rp.trim())</span>
	631	+ #end
	632	+ </div>
	633	+ </span>
	634	+ </div>
	635	+ #end
	636	+ #if($ruleReviewImplementer && !$ruleReviewImplementer.isEmpty())
	637	+ <div class="info-row">
	638	+ <span class="info-label">見直しの実施者</span>
	639	+ <span class="info-value">
	640	+ <div class="selection-display">
	641	+ #foreach($ri in $ruleReviewImplementer)
	642	+ <span class="selection-item">$!escapetool.xml($ri.trim())</span>
	643	+ #end
	644	+ </div>
	645	+ </span>
	646	+ </div>
	647	+ #end
	648	+ #end
	649	+ #if($ruleReviewSystem && $ruleReviewSystem != '')
	650	+ <div class="info-row">
	651	+ <span class="info-label">見直しの仕組み</span>
	652	+ <span class="info-value">$!escapetool.xml($!ruleReviewSystem)</span>
	653	+ </div>
	654	+ #end
399	399	</div>
	656	+ </div>
	657	+ #else
	658	+ <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>
400	400	#end
401		- #if($budgetScale && $budgetScale != '')
402		- <div class="info-row">
403		- <span class="info-label">予算規模</span>
404		- <span class="info-value">$!escapetool.xml($!budgetScale)</span>
405		- </div>
	660	+ #end
	661	+
	662	+ ## --- 活動環境 ---
	663	+ #set($hasActivityEnv = ($activityPlace && !$activityPlace.isEmpty()) || ($activityRoomEquipment && $activityRoomEquipment != '') || ($activityRoomImage && $activityRoomImage != '') || ($ictTools && !$ictTools.isEmpty()) || ($ictUsage && !$ictUsage.isEmpty()))
	664	+ #if($hasActivityEnv)
	665	+ #set($canViewAE = true)
	666	+ #if($visibilityActivityEnv == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAE = false)
	667	+ #elseif($visibilityActivityEnv == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAE = false)
406	406	#end
407		- #if($budgetAllocation && $budgetAllocation != '')
408		- <div class="info-row">
409		- <span class="info-label">主な予算配分</span>
410		- <span class="info-value">
411		- <div class="selection-display">
412		- #foreach($ba in $budgetAllocation.split(","))
413		- <span class="selection-item">$!escapetool.xml($ba.trim())</span>
	669	+ #if($canViewAE)
	670	+ <div class="seitokai-subsection">
	671	+ <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>
	672	+ <div class="seitokai-subsection-content">
	673	+ #if($activityPlace && !$activityPlace.isEmpty())
	674	+ <div class="info-row">
	675	+ <span class="info-label">普段の活動場所</span>
	676	+ <span class="info-value">
	677	+ <div class="selection-display">
	678	+ #foreach($ap in $activityPlace)
	679	+ <span class="selection-item">$!escapetool.xml($ap.trim())</span>
	680	+ #end
	681	+ </div>
	682	+ </span>
	683	+ </div>
	684	+ #end
	685	+ #if($activityRoomEquipment && $activityRoomEquipment != '')
	686	+ <div class="info-row">
	687	+ <span class="info-label">生徒会室の設備</span>
	688	+ <span class="info-value free-text-value">$!escapetool.xml($activityRoomEquipment)</span>
	689	+ </div>
	690	+ #end
	691	+ #if($activityRoomImage && $activityRoomImage != '')
	692	+ <div class="info-row">
	693	+ <span class="info-label">活動場所の写真</span>
	694	+ <span class="info-value"><div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($activityRoomImage)" alt="活動場所の写真" class="org-chart-img" /></div></span>
	695	+ </div>
	696	+ #end
	697	+ #if($ictTools && !$ictTools.isEmpty())
	698	+ <div class="info-row">
	699	+ <span class="info-label">利用しているICTツール</span>
	700	+ <span class="info-value">
	701	+ #set($ictCatDisplay = [
	702	+ ["連絡ツール", ["メール","LINE","LINE WORKS","Discord","Slack","Microsoft Teams","Google Chat","InstagramのDM","XのDM","その他（連絡）"]],
	703	+ ["ドキュメント作成・共有", ["Googleドキュメント","Googleスプレッドシート","Googleスライド","Googleドライブ","Word","Excel","PowerPoint","OneDrive","SharePoint","Notion","Pages","Numbers","Keynote","Dropbox","Box","その他（ドキュメント）"]],
	704	+ ["タスク管理", ["Googleカレンダー","Google ToDoリスト","Trello","Asana","Excel等スプレッドシート","その他（タスク管理）"]],
	705	+ ["ビデオ会議ツール", ["Zoom","Google Meet","その他（ビデオ会議）"]],
	706	+ ["アンケート", ["Googleフォーム","Microsoft Forms","その他（アンケート）"]],
	707	+ ["デザイン・クリエイティブ", ["Canva","各種Adobe","CapCut","LumaFusion","AviUtl","ibisPaint","その他（デザイン）"]],
	708	+ ["その他", ["独自のWebシステム・自作アプリ"]]
	709	+ ])
	710	+ #foreach($catD in $ictCatDisplay)
	711	+ #set($catHasItems = false)
	712	+ #foreach($t in $catD.get(1))
	713	+ #if($ictTools.contains($t)) #set($catHasItems = true) #end
	714	+ #end
	715	+ #if($catHasItems)
	716	+ <div style="margin-bottom:6px">
	717	+ <span style="font-size:0.8em;font-weight:600;color:var(--text-mid)">$catD.get(0):</span>
	718	+ <div class="selection-display" style="margin-top:2px">
	719	+ #foreach($t in $catD.get(1))
	720	+ #if($ictTools.contains($t))
	721	+ <span class="selection-item">$!escapetool.xml($t)</span>
	722	+ #end
	723	+ #end
	724	+ </div>
	725	+ </div>
	726	+ #end
414	414	#end
415		- </div>
416		- </span>
	728	+ </span>
	729	+ </div>
	730	+ #end
	731	+ #if($ictUsage && !$ictUsage.isEmpty())
	732	+ <div class="info-row">
	733	+ <span class="info-label">ICT活用している場面</span>
	734	+ <span class="info-value">
	735	+ <div class="selection-display">
	736	+ #foreach($iu in $ictUsage)
	737	+ <span class="selection-item">$!escapetool.xml($iu.trim())</span>
	738	+ #end
	739	+ </div>
	740	+ </span>
	741	+ </div>
	742	+ #end
417	417	</div>
	744	+ </div>
	745	+ #else
	746	+ <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>
418	418	#end
419		- #if($budgetNote && $budgetNote.trim() != '')
420		- <div class="free-note">$!escapetool.xml($budgetNote)</div>
	748	+ #end
	749	+
	750	+ ## --- 生徒総会 ---
	751	+ #set($hasAssembly = ($assemblyFormat && $assemblyFormat != '') || ($assemblyCount && $assemblyCount > 0) || ($assemblyAgenda && !$assemblyAgenda.isEmpty()) || ($assemblyTopics && !$assemblyTopics.isEmpty()) || ($assemblyNote && $assemblyNote != ''))
	752	+ #if($hasAssembly)
	753	+ #set($canViewAS = true)
	754	+ #if($visibilityAssembly == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAS = false)
	755	+ #elseif($visibilityAssembly == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAS = false)
421	421	#end
	757	+ #if($canViewAS)
	758	+ <div class="seitokai-subsection">
	759	+ <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>
	760	+ <div class="seitokai-subsection-content">
	761	+ #if($assemblyFormat && $assemblyFormat != '')
	762	+ <div class="info-row">
	763	+ <span class="info-label">開催方式</span>
	764	+ <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($assemblyFormat)</span></span>
	765	+ </div>
	766	+ #end
	767	+ #if($assemblyCount && $assemblyCount > 0)
	768	+ <div class="info-row">
	769	+ <span class="info-label">開催回数（年）</span>
	770	+ <span class="info-value">$!escapetool.xml($assemblyCount)回</span>
	771	+ </div>
	772	+ #end
	773	+ #if($assemblyAgenda && !$assemblyAgenda.isEmpty())
	774	+ <div class="info-row">
	775	+ <span class="info-label">議案の集め方</span>
	776	+ <span class="info-value">
	777	+ <div class="selection-display">
	778	+ #foreach($aa in $assemblyAgenda)
	779	+ <span class="selection-item">$!escapetool.xml($aa.trim())</span>
	780	+ #end
	781	+ </div>
	782	+ </span>
	783	+ </div>
	784	+ #end
	785	+ #if($assemblyTopics && !$assemblyTopics.isEmpty())
	786	+ <div class="info-row">
	787	+ <span class="info-label">扱う内容</span>
	788	+ <span class="info-value">
	789	+ <div class="selection-display">
	790	+ #foreach($at in $assemblyTopics)
	791	+ <span class="selection-item">$!escapetool.xml($at.trim())</span>
	792	+ #end
	793	+ </div>
	794	+ </span>
	795	+ </div>
	796	+ #end
	797	+ #if($assemblyNote && $assemblyNote != '')
	798	+ <div class="info-row">
	799	+ <span class="info-label">自由記述</span>
	800	+ <span class="info-value free-text-value">$!escapetool.xml($assemblyNote)</span>
	801	+ </div>
	802	+ #end
	803	+ </div>
422	422	</div>
423		- </div>
424		- #else
425		- <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>
	805	+ #else
	806	+ <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>
	807	+ #end
426	426	#end
427		- #end
428		-</div>
429	429
430		-## --- ⑧ 校則の見直し ---
431		-#if($ruleReviewStatus && $ruleReviewStatus != '')
432		- ## 公開範囲チェック
433		- #set($canViewRuleReview = true)
434		- #if($visibilityRuleReview == 'members' && $isGuest) #set($canViewRuleReview = false)
435		- #elseif($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewRuleReview = false)
436		- #end
437		- #if($canViewRuleReview)
438		-<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>
439		-<div class="school-section-card">
440		- <div class="card-inner">
441		- <div class="info-row">
442		- <span class="info-label">見直しの有無（3年以内）</span>
443		- <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
444		- </div>
445		- #if($ruleReviewContent && $ruleReviewContent != '')
446		- <div class="info-row">
447		- <span class="info-label">見直しの内容</span>
448		- <span class="info-value">
449		- <div class="selection-display">
450		- #foreach($rc in $ruleReviewContent.split(","))
451		- <span class="selection-item">$!escapetool.xml($rc.trim())</span>
452		- #end
	810	+ ## --- 広報 ---
	811	+ #set($hasPublicity = ($publicityMethod && !$publicityMethod.isEmpty()) || ($publicityFrequency && $publicityFrequency != '') || ($publicityNote && $publicityNote != ''))
	812	+ #if($hasPublicity)
	813	+ #set($canViewPB = true)
	814	+ #if($visibilityPublicity == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewPB = false)
	815	+ #elseif($visibilityPublicity == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPB = false)
	816	+ #end
	817	+ #if($canViewPB)
	818	+ <div class="seitokai-subsection">
	819	+ <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>
	820	+ <div class="seitokai-subsection-content">
	821	+ #if($publicityMethod && !$publicityMethod.isEmpty())
	822	+ <div class="info-row">
	823	+ <span class="info-label">方法</span>
	824	+ <span class="info-value">
	825	+ <div class="selection-display">
	826	+ #foreach($pm in $publicityMethod)
	827	+ <span class="selection-item">$!escapetool.xml($pm.trim())</span>
	828	+ #end
	829	+ </div>
	830	+ </span>
453	453	</div>
454		- </span>
	832	+ #end
	833	+ #if($publicityFrequency && $publicityFrequency != '')
	834	+ <div class="info-row">
	835	+ <span class="info-label">頻度</span>
	836	+ <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($publicityFrequency)</span></span>
	837	+ </div>
	838	+ #end
	839	+ #if($publicityNote && $publicityNote != '')
	840	+ <div class="info-row">
	841	+ <span class="info-label">自由記述</span>
	842	+ <span class="info-value free-text-value">$!escapetool.xml($publicityNote)</span>
	843	+ </div>
	844	+ #end
	845	+ </div>
455	455	</div>
	847	+ #else
	848	+ <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 広報情報は #if($visibilityPublicity == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
	849	+ #end
456	456	#end
457		- #if($ruleReviewProposer && $ruleReviewProposer != '')
458		- <div class="info-row">
459		- <span class="info-label">見直しの提案者</span>
460		- <span class="info-value">
461		- <div class="selection-display">
462		- #foreach($rp in $ruleReviewProposer.split(","))
463		- <span class="selection-item">$!escapetool.xml($rp.trim())</span>
464		- #end
	851	+
	852	+ ## --- 外部連携 ---
	853	+ #set($hasExternal = ($externalCooperation && $externalCooperation != '') || ($externalOrgName && $externalOrgName != '') || ($socialParticipation && !$socialParticipation.isEmpty()))
	854	+ #if($hasExternal)
	855	+ #set($canViewEX = true)
	856	+ #if($visibilityExternal == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewEX = false)
	857	+ #elseif($visibilityExternal == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewEX = false)
	858	+ #end
	859	+ #if($canViewEX)
	860	+ <div class="seitokai-subsection">
	861	+ <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>
	862	+ <div class="seitokai-subsection-content">
	863	+ #if($externalCooperation && $externalCooperation != '')
	864	+ <div class="info-row">
	865	+ <span class="info-label">他校の生徒会との連携</span>
	866	+ <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($externalCooperation)</span></span>
465	465	</div>
466		- </span>
	868	+ #end
	869	+ #if($externalOrgName && $externalOrgName != '')
	870	+ <div class="info-row">
	871	+ <span class="info-label">参加している生徒会団体の名前</span>
	872	+ <span class="info-value">$!escapetool.xml($externalOrgName)</span>
	873	+ </div>
	874	+ #end
	875	+ #if($socialParticipation && !$socialParticipation.isEmpty())
	876	+ <div class="info-row">
	877	+ <span class="info-label">社会参加・地域連携・ボランティア</span>
	878	+ <span class="info-value">
	879	+ <div class="selection-display">
	880	+ #foreach($sp2 in $socialParticipation)
	881	+ <span class="selection-item">$!escapetool.xml($sp2.trim())</span>
	882	+ #end
	883	+ </div>
	884	+ </span>
	885	+ </div>
	886	+ #end
	887	+ </div>
467	467	</div>
	889	+ #else
	890	+ <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 外部連携情報は #if($visibilityExternal == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
	891	+ #end
468	468	#end
469		- #if($ruleReviewImplementer && $ruleReviewImplementer != '')
470		- <div class="info-row">
471		- <span class="info-label">見直しの実施者</span>
472		- <span class="info-value">
473		- <div class="selection-display">
474		- #foreach($ri in $ruleReviewImplementer.split(","))
475		- <span class="selection-item">$!escapetool.xml($ri.trim())</span>
	893	+
	894	+ ## --- 年間主要行事 ---
	895	+ #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]])
	896	+ #set($hasAnyEvent = false)
	897	+ #foreach($m in $months)
	898	+ #if($m.get(1) && $m.get(1) != '') #set($hasAnyEvent = true) #end
	899	+ #end
	900	+ #if($hasAnyEvent)
	901	+ #set($canViewAN = true)
	902	+ #if($visibilityAnnualEvents == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAN = false)
	903	+ #elseif($visibilityAnnualEvents == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAN = false)
	904	+ #end
	905	+ #if($canViewAN)
	906	+ <div class="seitokai-subsection">
	907	+ <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>
	908	+ <div class="seitokai-subsection-content">
	909	+ <table class="wiki-table school-info-table" style="margin:0">
	910	+ #foreach($m in $months)
	911	+ #if($m.get(1) && $m.get(1) != '')
	912	+ <tr><td style="width:60px;font-weight:600;white-space:nowrap">$m.get(0)</td><td>$!escapetool.xml($m.get(1))</td></tr>
476	476	#end
477		- </div>
478		- </span>
	914	+ #end
	915	+ </table>
	916	+ </div>
479	479	</div>
	918	+ #else
	919	+ <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>
	920	+ #end
480	480	#end
481		- #if($ruleReviewSystem && $ruleReviewSystem != '')
482		- <div class="info-row">
483		- <span class="info-label">見直しの仕組み</span>
484		- <span class="info-value">$!escapetool.xml($!ruleReviewSystem)</span>
	922	+
	923	+ ## --- 生徒会の課題意識 ---
	924	+ #if($challenges && $challenges != '')
	925	+ #set($canViewChallenges = true)
	926	+ #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewChallenges = false)
	927	+ #elseif($visibilityChallenges == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewChallenges = false)
	928	+ #end
	929	+ #if($canViewChallenges)
	930	+ <div class="seitokai-subsection">
	931	+ <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>
	932	+ <div class="seitokai-subsection-content">
	933	+ <div class="challenge-text">$!escapetool.xml($challenges)</div>
	934	+ </div>
485	485	</div>
	936	+ #else
	937	+ <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>
	938	+ #end
486	486	#end
487		- </div>
488		-</div>
489		- #else
490		-<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>
491		- #end
492		-#end
493	493
494		-## --- ⑨ 課題 ---
495		-#if($challenges && $challenges != '')
496		- ## 公開範囲チェック
497		- #set($canViewChallenges = true)
498		- #if($visibilityChallenges == 'members' && $isGuest) #set($canViewChallenges = false)
499		- #elseif($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewChallenges = false)
	941	+ </div>## seitokai-info-body 終了
	942	+</div>## card-seitokai-info 終了
	943	+
	944	+## --- ③ SNS・連絡先 ---
	945	+<div class="school-info-card collapsed" id="card-contact">
	946	+ <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>
	947	+ <table class="wiki-table school-info-table">
	948	+ <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr>
	949	+ <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>
	950	+ <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>
	951	+ <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>
	952	+ <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>
	953	+ <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
	954	+ </table>
	955	+ #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
	956	+ #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
	957	+ #if($infoEditDate && $infoEditDate != '')
	958	+ <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>
500	500	#end
501		- #if($canViewChallenges)
502		-<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>
503		-<div class="challenge-text">$!escapetool.xml($challenges)</div>
504		- #else
505		-<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>
506		- #end
507		-#end
	960	+</div>
508	508
509		-</div>## seitokai-info-accordion 終了
510		-
511	511	{{/html}}
512	512
	964	+----
	965	+
513	513	## --- ⑩ 活動報告一覧（スレッド型・年度タブ付き） ---
514	514	= 活動報告 =
515	515
516		-## --- 投稿者ステータス凡例（折りたたみ） ---
	969	+## --- 年度タブ + 投稿者ステータス凡例 ---
517	517	{{html clean="false"}}
518		-<div class="author-legend-wrapper">
519		- <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>
520		- <div class="author-legend-body">
521		- <div class="author-legend">
522		- <span class="author-legend-title">投稿者の信頼度:</span>
523		- <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者</span>
524		- <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み</span>
525		- <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介</span>
526		- <span class="author-legend-item"><span class="bar bar-general"></span> 一般（未承認）</span>
527		- </div>
528		- <div class="author-legend">
529		- <span class="author-legend-title">所属:</span>
530		- <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>
531		- <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>
532		- <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>
533		- <span class="author-legend-item text-hint">※一般アカウントは所属未確認のため非表示</span>
534		- </div>
535		- <div class="author-legend">
536		- <span class="author-legend-title">役割:</span>
537		- <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>
538		- <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>
539		- <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>
540		- </div>
541		- </div>
542		-</div>
543	543
544	544	## --- 年度タブ ---
545	545	## 全活動から年度一覧を収集
...	...	@@ -561,14 +561,49 @@
561	561	#end
562	562	## ソート（降順にしたいが Velocity にはないので JS で制御）
563	563
564		-<div class="activity-fy-tabs">
565		- <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
566		- #foreach($fy in $fySet)
567		- #if($fy != $currentFYStr)
568		- <button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button>
	992	+<div class="activity-toolbar">
	993	+ <div class="activity-fy-tabs">
	994	+ <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
	995	+ #foreach($fy in $fySet)
	996	+ #if($fy != $currentFYStr)
	997	+ <button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button>
	998	+ #end
569	569	#end
570		- #end
571		- <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
	1000	+ <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
	1001	+ </div>
	1002	+ <div class="activity-toolbar-right">
	1003	+ <button class="btn-view-toggle" id="btnViewToggle" onclick="toggleCompactView()" title="タイトルのみ表示">
	1004	+ <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>
	1005	+ <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>
	1006	+ <span class="toggle-label">一覧表示</span>
	1007	+ </button>
	1008	+ </div>
	1009	+ <div class="author-legend-wrapper">
	1010	+ <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>
	1011	+ <div class="author-legend-body">
	1012	+ <div class="author-legend">
	1013	+ <span class="author-legend-title">投稿者の信頼度:</span>
	1014	+ <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者 <span class="text-hint">— 運営スタッフ</span></span>
	1015	+ <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み <span class="text-hint">— 本人確認済みのユーザー</span></span>
	1016	+ <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介 <span class="text-hint">— 承認済みユーザーからの紹介</span></span>
	1017	+ <span class="author-legend-item"><span class="bar bar-general"></span> 一般 <span class="text-hint">— 一般登録ユーザー</span></span>
	1018	+ </div>
	1019	+ <div class="author-legend">
	1020	+ <span class="author-legend-title">所属:</span>
	1021	+ <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>
	1022	+ <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>
	1023	+ <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>
	1024	+ <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>
	1025	+ <span class="author-legend-item text-hint">※一般アカウントは所属バッジが表示されません</span>
	1026	+ </div>
	1027	+ <div class="author-legend">
	1028	+ <span class="author-legend-title">役割:</span>
	1029	+ <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>
	1030	+ <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>
	1031	+ <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>
	1032	+ </div>
	1033	+ </div>
	1034	+ </div>
572	572	</div>
573	573
574	574	{{/html}}
...	...	@@ -633,10 +633,18 @@
633	633	<div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)">
634	634	<div class="activity-thread-header">
635	635	<div class="activity-thread-title">
636		- <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>
637		- <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
	1099	+ <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>
	1100	+ <div class="activity-meta-line">
	1101	+ <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
	1102	+ #set($actTagsList = $activity.getValue('tags'))
	1103	+ #if($actTagsList && !$actTagsList.isEmpty())
	1104	+ #foreach($tagItem in $actTagsList)
	1105	+ #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end
	1106	+ #end
	1107	+ #end
	1108	+ </div>
638	638	</div>
639		- <div class="thread-meta-row">
	1110	+ <div class="thread-meta-right">
640	640	<span class="thread-post-count">${reportCount}件の報告 ・ ${commentCount}件のコメント</span>
641	641	#if($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred')
642	642	#if($actFeatured == '1')
...	...	@@ -696,12 +696,12 @@
696	696	#set($postVis = $!post.getValue('visibility'))
697	697	#if(!$postVis || $postVis == '') #set($postVis = 'public') #end
698	698	#set($canViewPost = true)
699		- #if($postVis == 'members' && $isGuest) #set($canViewPost = false)
700		- #elseif($postVis == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewPost = false)
	1170	+ #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewPost = false)
	1171	+ #elseif($postVis == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPost = false)
701	701	#end
702	702	#if(!$canViewPost)
703	703	<div class="thread-post visibility-restricted-post">
704		- <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>
	1175	+ <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>
705	705	</div>
706	706	#else
707	707	## 投稿者のアカウント種別に基づいたCSSクラス
...	...	@@ -741,8 +741,11 @@
741	741	<span class="badge badge-general badge-sm">一般</span>
742	742	#end
743	743	## 所属バッジ（投稿者の学校コードとページの学校コードを比較）
	1215	+ #set($postIsSchoolMatch = ($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode)))
744	744	#if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general')
745		- #if($postSchoolCode == $schoolCode)
	1217	+ #if($postUserRole == 'graduate' && $postIsSchoolMatch)
	1218	+ <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>
	1219	+ #elseif($postIsSchoolMatch && $postUserRole != 'graduate')
746	746	#if($postAccountType == 'verified' || $postAccountType == 'admin')
747	747	<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>
748	748	#else
...	...	@@ -763,9 +763,6 @@
763	763	#elseif($postUserRole == 'graduate')
764	764	<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>
765	765	#end
766		- #if($postGrade && $postGrade != '')
767		- <span class="badge badge-grade badge-sm">$postGrade</span>
768		- #end
769	769	</span>
770	770	<span class="thread-post-date">$!postDate</span>
771	771	#set($postEdited = $!post.getValue('edited'))
...	...	@@ -772,6 +772,13 @@
772	772	#if($postEdited == 1 || $postEdited == '1')
773	773	<span class="post-edited-label">（編集済み）</span>
774	774	#end
	1246	+ #set($postAuthorRefH = $!post.getValue('authorRef'))
	1247	+ #set($postObjNumH = $post.number)
	1248	+ #if(!$isGuest && $xcontext.user != $postAuthorRefH)
	1249	+ <button type="button" class="btn-post-report btn-post-report-header" onclick="openReportDialog(this, '${doc.fullName}', $postObjNumH, '${services.csrf.getToken()}')" title="この投稿を通報">
	1250	+ <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> 通報
	1251	+ </button>
	1252	+ #end
775	775	</div>
776	776	<div class="thread-post-body">
777	777	$!escapetool.xml($!postContent)
...	...	@@ -836,12 +836,18 @@
836	836	#end
837	837	</div>
838	838	#if($postVis != 'public')
839		- <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>
	1317	+ <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>
840	840	#end
841		- ## 固定/解除ボタン（承認済み・管理者のみ）
842		- #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
843		- #set($postObjNum = $post.number)
844		- <div class="post-pin-action post-action-mt">
	1319	+ ## 固定/編集/削除/通報/非表示ボタン（横並び）
	1320	+ #set($postAuthorRef = $!post.getValue('authorRef'))
	1321	+ #set($postObjNumED = $post.number)
	1322	+ #set($showPinBtn = ($viewerAccountType == 'admin' || $viewerAccountType == 'verified'))
	1323	+ #set($showEditDeleteBtn = ($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin'))
	1324	+ #set($showHideBtn = ($viewerAccountType == 'admin'))
	1325	+ #if($showPinBtn || $showEditDeleteBtn || $showHideBtn)
	1326	+ <div class="post-edit-actions post-action-mt">
	1327	+ #if($showPinBtn)
	1328	+ #set($postObjNum = $post.number)
845	845	#if($isPinned == '1')
846	846	<a href="$doc.getURL('view', "action=unpin&postObj=${postObjNum}&form_token=${services.csrf.getToken()}")" class="btn-pin-toggle btn-unpin" title="固定を解除">
847	847	<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> 固定を解除
...	...	@@ -851,15 +851,12 @@
851	851	<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> 固定する
852	852	</a>
853	853	#end
854		- </div>
855		- #end
856		- ## 編集・削除ボタン（投稿者本人 or 管理者）
857		- #set($postAuthorRef = $!post.getValue('authorRef'))
858		- #set($postObjNumED = $post.number)
859		- #if($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin')
860		- <div class="post-edit-actions post-action-mt">
	1338	+ #end
	1339	+ #if($showEditDeleteBtn)
861	861	#if($xcontext.user == $postAuthorRef)
862		- <button type="button" class="btn-post-edit" onclick="openEditPost(this, '${doc.fullName}', $postObjNumED, '$!escapetool.javascript($!postContent)')" title="この投稿を編集">
	1341	+ #set($editImages = $!post.getValue('images'))
	1342	+ #set($editFiles = $!post.getValue('files'))
	1343	+ <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="この投稿を編集">
863	863	<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> 編集
864	864	</button>
865	865	#end
...	...	@@ -866,6 +866,12 @@
866	866	<button type="button" class="btn-post-delete" onclick="confirmDeletePost('${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を削除">
867	867	<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> 削除
868	868	</button>
	1350	+ #end
	1351	+ #if($showHideBtn)
	1352	+ <button type="button" class="btn-post-hide" onclick="openHideDialog(this, '${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を非表示にする">
	1353	+ <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> 非表示
	1354	+ </button>
	1355	+ #end
869	869	</div>
870	870	#end
871	871	</div>
...	...	@@ -915,9 +915,11 @@
915	915
916	916	#if($xcontext.user != "XWiki.XWikiGuest")
917	917	<div class="thread-add-post">
	1405	+ #if($isSchoolMember || $isAlumniOfSchool || $isViewerAdmin)
918	918	<a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
919	919	＋ 活動報告を追加
920	920	</a>
	1409	+ #end
921	921	<a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
922	922	<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> コメントを書く
923	923	</a>
...	...	@@ -947,62 +947,38 @@
947	947	{{/html}}
948	948	#end
949	949
950		-## --- 年度アーカイブ セクション ---
951		-{{html clean="false"}}
952		-<div class="school-section-card school-archive-card">
953		- <h2 class="archive-section-title">
954		- <svg class="ico ico-md" viewBox="0 0 24 24"><path d="M19 21H5a2 2 0 01-2-2V5a2 2 0 012-2h11l5 5v11a2 2 0 01-2 2z"/><polyline points="17 21 17 13 7 13 7 21"/><polyline points="7 3 7 8 15 8"/></svg>
955		- 年度アーカイブ
956		- </h2>
957		- <div class="archive-meta">
958		- 現在のページ: <strong>${pageFiscalYear}年度</strong>
959		- #set($lyud = $!doc.getValue('lastYearUpdateDate'))
960		- #if($lyud && $lyud != '')
961		- | 最終年度更新: $!escapetool.xml($lyud) ($!escapetool.xml($!doc.getValue('lastYearUpdateBy')))
962		- #end
963		- </div>
964		-
965		- ## 過去アーカイブの検索
966		- #set($archiveQuery = $services.query.hql("where doc.fullName like :pattern and doc.fullName like '%Archive_%' order by doc.fullName desc").bindValue("pattern", "${doc.fullName}.Archive_%").setLimit(20))
967		- #set($archivePages = $archiveQuery.execute())
968		-
969		- #if($archivePages && $archivePages.size() > 0)
970		- <div class="archive-card-field-lg">
971		- <div class="archive-list-label">過去の年度アーカイブ</div>
972		- <div class="archive-list">
973		- #foreach($archPage in $archivePages)
974		- #set($archPageDoc = $xwiki.getDocument($archPage))
975		- #set($archPageObj = $archPageDoc.getObject('SeitokaiCode.SchoolClass'))
976		- #if($archPageObj)
977		- #set($archPageFY = $!archPageObj.getValue('fiscalYear'))
978		- <a href="$archPageDoc.getURL('view')" class="archive-link">
979		- <svg class="ico" viewBox="0 0 24 24"><path d="M19 21H5a2 2 0 01-2-2V5a2 2 0 012-2h11l5 5v11a2 2 0 01-2 2z"/><polyline points="17 21 17 13 7 13 7 21"/><polyline points="7 3 7 8 15 8"/></svg>
980		- ${archPageFY}年度
981		- </a>
982		- #end
983		- #end
984		- </div>
985		- </div>
986		- #else
987		- <div class="archive-empty">過去のアーカイブはまだありません</div>
988		- #end
989		-
990		- ## 新年度に移行ボタン（承認済み・管理者のみ）
991		- #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
992		- <div class="archive-action">
993		- <a href="/bin/SeitokaiCode/YearArchiveAction?schoolPage=${doc.fullName}" class="btn-accent">
994		- <svg class="ico" viewBox="0 0 24 24" stroke-width="2.5"><path d="M19 21H5a2 2 0 01-2-2V5a2 2 0 012-2h11l5 5v11a2 2 0 01-2 2z"/><polyline points="17 21 17 13 7 13 7 21"/><polyline points="7 3 7 8 15 8"/></svg>
995		- ${pageFiscalYear}年度をアーカイブして新年度に移行
996		- </a>
997		- <div class="archive-action-hint">現在の学校情報を${pageFiscalYear}年度として保存し、新しい年度に移行します。</div>
998		- </div>
999		- #end
1000		-</div>
1001		-{{/html}}
1002		-
1003	1003	## --- 年度タブ切り替え JavaScript ---
1004	1004	{{html clean="false"}}
1005	1005	<script>
	1442	+// コンパクト表示（タイトルのみ）トグル
	1443	+function toggleCompactView() {
	1444	+ var container = document.querySelector('.xwiki-content') || document.body;
	1445	+ var isCompact = container.classList.toggle('activity-compact-view');
	1446	+ var btn = document.getElementById('btnViewToggle');
	1447	+ if (btn) {
	1448	+ btn.querySelector('.toggle-label').textContent = isCompact ? '詳細表示' : '一覧表示';
	1449	+ btn.title = isCompact ? '詳細表示に戻す' : 'タイトルのみ表示';
	1450	+ }
	1451	+ // コンパクトモードでは各スレッドヘッダーをクリックで個別展開可能にする
	1452	+ document.querySelectorAll('.activity-thread').forEach(function(thread) {
	1453	+ if (isCompact) {
	1454	+ thread.classList.remove('compact-expanded');
	1455	+ }
	1456	+ });
	1457	+}
	1458	+
	1459	+// コンパクトモードで個別スレッドを展開/折りたたみ
	1460	+function toggleThreadExpand(e) {
	1461	+ var container = document.querySelector('.xwiki-content') || document.body;
	1462	+ if (!container.classList.contains('activity-compact-view')) return;
	1463	+ // リンクやボタンのクリックはスルー
	1464	+ if (e.target.closest('a, button, .btn-featured-toggle')) return;
	1465	+ var thread = e.target.closest('.activity-thread');
	1466	+ if (thread) {
	1467	+ thread.classList.toggle('compact-expanded');
	1468	+ }
	1469	+}
	1470	+
1006	1006	function switchActivityFY(fy, btn) {
1007	1007	// タブのアクティブ状態を切り替え
1008	1008	document.querySelectorAll('.activity-fy-tab').forEach(function(t) { t.classList.remove('active'); });
...	...	@@ -1018,13 +1018,31 @@
1018	1018	}
1019	1019	// ページ読み込み時の初期化
1020	1020	document.addEventListener('DOMContentLoaded', function() {
	1486	+ // 年度タブを降順にソート（「全期間」タブは末尾に固定）
	1487	+ var tabContainer = document.querySelector('.activity-fy-tabs');
	1488	+ if (tabContainer) {
	1489	+ var tabs = Array.from(tabContainer.querySelectorAll('.activity-fy-tab'));
	1490	+ var allTab = null;
	1491	+ var fyTabs = [];
	1492	+ tabs.forEach(function(t) {
	1493	+ var onclickStr = t.getAttribute('onclick') || '';
	1494	+ if (onclickStr.indexOf("'all'") !== -1) { allTab = t; }
	1495	+ else { fyTabs.push(t); }
	1496	+ });
	1497	+ // 年度タブを数値の降順でソート
	1498	+ fyTabs.sort(function(a, b) {
	1499	+ var aYear = parseInt(a.textContent) || 0;
	1500	+ var bYear = parseInt(b.textContent) || 0;
	1501	+ return bYear - aYear;
	1502	+ });
	1503	+ // DOM再配置
	1504	+ fyTabs.forEach(function(t) { tabContainer.appendChild(t); });
	1505	+ if (allTab) { tabContainer.appendChild(allTab); }
	1506	+ }
1021	1021	// デフォルトで現在の年度を表示
1022	1022	var defaultTab = document.querySelector('.activity-fy-tab.active');
1023	1023	if (defaultTab) { defaultTab.click(); }
1024	1024	// 保存成功時のトースト通知
1025		- if (window.location.search.indexOf('archived=1') !== -1) {
1026		- showToast('年度アーカイブを作成しました', 'success');
1027		- }
1028	1028	if (window.location.search.indexOf('saved=1') !== -1) {
1029	1029	showToast('学校情報を保存しました', 'success');
1030	1030	// URLパラメータをクリーンアップ（リロード時に再表示されないよう）
...	...	@@ -1032,6 +1032,30 @@
1032	1032	window.history.replaceState({}, document.title, window.location.pathname);
1033	1033	}
1034	1034	}
	1518	+ // コンパクトモード: スレッドヘッダークリックで個別展開
	1519	+ document.querySelectorAll('.activity-thread-header').forEach(function(header) {
	1520	+ header.addEventListener('click', toggleThreadExpand);
	1521	+ });
	1522	+ // 長文投稿の折りたたみ初期化（max-height: 12em 超で省略）
	1523	+ document.querySelectorAll('.thread-post-body').forEach(function(body) {
	1524	+ // pre-wrapのまま高さを測定し、max-height(12em ≒ ~200px)を超える場合に折りたたむ
	1525	+ var fullH = body.scrollHeight;
	1526	+ // 12em を px に変換（font-size × line-height × 行数 の近似値ではなくCSSと同じ値を取得）
	1527	+ body.classList.add('truncated');
	1528	+ var maxH = body.clientHeight; // max-height: 12em 適用後の高さ
	1529	+ body.classList.remove('truncated');
	1530	+ if (fullH > maxH + 30) {
	1531	+ body.classList.add('truncated');
	1532	+ var btn = document.createElement('button');
	1533	+ btn.className = 'btn-read-more';
	1534	+ btn.textContent = '広げて読む ▼';
	1535	+ btn.addEventListener('click', function() {
	1536	+ var isExpanded = body.classList.toggle('expanded');
	1537	+ btn.textContent = isExpanded ? '折りたたむ ▲' : '広げて読む ▼';
	1538	+ });
	1539	+ body.parentNode.insertBefore(btn, body.nextSibling);
	1540	+ }
	1541	+ });
1035	1035	});
1036	1036
1037	1037	// トースト通知表示
...	...	@@ -1060,40 +1060,136 @@
1060	1060	var card = document.getElementById(cardId);
1061	1061	if (!card) return;
1062	1062	card.classList.toggle('collapsed');
	1570	+ var isCollapsed = card.classList.contains('collapsed');
	1571	+ var h2 = card.querySelector('h2[role="button"]');
	1572	+ if (h2) h2.setAttribute('aria-expanded', !isCollapsed);
1063	1063	}
1064	1064
1065	1065	// 投稿の編集（インライン編集フォームを開く）
1066		-function openEditPost(btn, schoolPage, postObjNum, currentContent) {
	1576	+function openEditPost(btn) {
1067	1067	var postEl = btn.closest('.thread-post');
1068	1068	if (!postEl) return;
1069		- // 既存の編集フォームがあれば閉じる
1070	1070	var existing = postEl.querySelector('.post-edit-form');
1071	1071	if (existing) { existing.remove(); return; }
1072	1072	var bodyEl = postEl.querySelector('.thread-post-body');
1073	1073	if (!bodyEl) return;
	1583	+
	1584	+ var schoolPage = btn.getAttribute('data-school');
	1585	+ var postObjNum = btn.getAttribute('data-obj');
	1586	+ var currentContent = btn.getAttribute('data-content') || '';
	1587	+ var currentImages = btn.getAttribute('data-images') || '';
	1588	+ var currentFiles = btn.getAttribute('data-files') || '';
	1589	+ var postType = btn.getAttribute('data-post-type') || 'report';
	1590	+
1074	1074	var form = document.createElement('div');
1075	1075	form.className = 'post-edit-form';
1076		- form.innerHTML = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>' +
1077		- '<div class="post-edit-form-actions">' +
	1593	+ form.setAttribute('data-school', schoolPage);
	1594	+ form.setAttribute('data-obj', postObjNum);
	1595	+
	1596	+ var html = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>';
	1597	+
	1598	+ // コメント以外は添付ファイル編集を表示
	1599	+ if (postType !== 'comment') {
	1600	+ // 既存画像
	1601	+ html += '<div class="edit-attachments">';
	1602	+ if (currentImages.trim()) {
	1603	+ html += '<div class="edit-attach-section"><span class="edit-attach-label">画像</span>';
	1604	+ var imgs = currentImages.trim().split('\n');
	1605	+ for (var i = 0; i < imgs.length; i++) {
	1606	+ var img = imgs[i].trim();
	1607	+ if (!img) continue;
	1608	+ html += '<div class="edit-attach-item" data-name="' + img.replace(/"/g,'&quot;') + '">' +
	1609	+ '<img src="/xwiki/bin/download/' + schoolPage.replace(/\./g,'/') + '/' + encodeURIComponent(img) + '" class="edit-attach-thumb" />' +
	1610	+ '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
	1611	+ '<input type="hidden" name="keepImages" value="' + img.replace(/"/g,'&quot;') + '" />' +
	1612	+ '</div>';
	1613	+ }
	1614	+ html += '</div>';
	1615	+ }
	1616	+ // 既存ファイル
	1617	+ if (currentFiles.trim()) {
	1618	+ html += '<div class="edit-attach-section"><span class="edit-attach-label">ファイル</span>';
	1619	+ var files = currentFiles.trim().split('\n');
	1620	+ for (var j = 0; j < files.length; j++) {
	1621	+ var f = files[j].trim();
	1622	+ if (!f) continue;
	1623	+ var displayName = f;
	1624	+ if (/^file_\d{14}_\d+_/.test(f)) displayName = f.replace(/^file_\d{14}_\d+_/, '');
	1625	+ html += '<div class="edit-attach-item" data-name="' + f.replace(/"/g,'&quot;') + '">' +
	1626	+ '<span class="edit-attach-fname">' + displayName.replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</span>' +
	1627	+ '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
	1628	+ '<input type="hidden" name="keepFiles" value="' + f.replace(/"/g,'&quot;') + '" />' +
	1629	+ '</div>';
	1630	+ }
	1631	+ html += '</div>';
	1632	+ }
	1633	+ // 新規追加
	1634	+ html += '<div class="edit-attach-add">' +
	1635	+ '<label class="form-label-sm">画像を追加（最大4枚まで）</label>' +
	1636	+ '<input type="file" name="editNewImages" accept="image/*" multiple class="form-file-input-sm" />' +
	1637	+ '<div class="form-hint">JPEG / PNG / GIF / WebP、各5MBまで</div>' +
	1638	+ '<label class="form-label-sm" style="margin-top:8px;">ファイルを追加（最大2つまで）</label>' +
	1639	+ '<input type="file" name="editNewFiles" accept=".pdf,.docx,.xlsx,.pptx" multiple class="form-file-input-sm" />' +
	1640	+ '<div class="form-hint">PDF / Word / Excel / PowerPoint、各10MBまで</div>' +
	1641	+ '</div>';
	1642	+ html += '</div>';
	1643	+ }
	1644	+
	1645	+ html += '<div class="post-edit-form-actions">' +
1078	1078	'<button type="button" class="btn-cancel-edit" onclick="this.closest(\'.post-edit-form\').remove()">キャンセル</button>' +
1079		- '<button type="button" class="btn-save" onclick="saveEditPost(\'' + schoolPage + '\', ' + postObjNum + ')">保存</button>' +
	1647	+ '<button type="button" class="btn-save" onclick="saveEditPost(this)">保存</button>' +
1080	1080	'</div>';
	1649	+
	1650	+ form.innerHTML = html;
1081	1081	bodyEl.parentNode.insertBefore(form, bodyEl.nextSibling);
1082	1082	form.querySelector('textarea').focus();
1083	1083	}
1084	1084
	1655	+function removeEditAttach(btn) {
	1656	+ var item = btn.closest('.edit-attach-item');
	1657	+ if (item) item.remove();
	1658	+}
	1659	+
1085	1085	// 投稿の編集を保存
1086		-function saveEditPost(schoolPage, postObjNum) {
1087		- var textarea = document.getElementById('editContent_' + postObjNum);
	1661	+function saveEditPost(btn) {
	1662	+ var formEl = btn.closest('.post-edit-form');
	1663	+ if (!formEl) return;
	1664	+ var schoolPage = formEl.getAttribute('data-school');
	1665	+ var postObjNum = formEl.getAttribute('data-obj');
	1666	+ var textarea = formEl.querySelector('textarea');
1088	1088	if (!textarea) return;
1089	1089	var newContent = textarea.value.trim();
1090	1090	if (!newContent) { alert('投稿内容を入力してください'); return; }
	1670	+
1091	1091	var csrfEl = document.querySelector('input[name="form_token"]');
1092	1092	var csrfToken = csrfEl ? csrfEl.value : '';
	1673	+
	1674	+ var fd = new FormData();
	1675	+ fd.append('schoolPage', schoolPage);
	1676	+ fd.append('postObj', postObjNum);
	1677	+ fd.append('newContent', newContent);
	1678	+ fd.append('form_token', csrfToken);
	1679	+
	1680	+ // 残す画像・ファイル
	1681	+ formEl.querySelectorAll('input[name="keepImages"]').forEach(function(el) { fd.append('keepImages', el.value); });
	1682	+ formEl.querySelectorAll('input[name="keepFiles"]').forEach(function(el) { fd.append('keepFiles', el.value); });
	1683	+
	1684	+ // 新規画像
	1685	+ var newImgInput = formEl.querySelector('input[name="editNewImages"]');
	1686	+ if (newImgInput && newImgInput.files) {
	1687	+ for (var i = 0; i < newImgInput.files.length; i++) { fd.append('editNewImages', newImgInput.files[i]); }
	1688	+ }
	1689	+ // 新規ファイル
	1690	+ var newFileInput = formEl.querySelector('input[name="editNewFiles"]');
	1691	+ if (newFileInput && newFileInput.files) {
	1692	+ for (var j = 0; j < newFileInput.files.length; j++) { fd.append('editNewFiles', newFileInput.files[j]); }
	1693	+ }
	1694	+
	1695	+ btn.disabled = true;
	1696	+ btn.textContent = '保存中...';
	1697	+
1093	1093	var xhr = new XMLHttpRequest();
1094		- xhr.open('POST', '/bin/SeitokaiCode/EditPost?outputSyntax=plain', true);
1095		- xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1096		- var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken);
	1699	+ xhr.open('POST', '/bin/get/SeitokaiCode/EditPost?outputSyntax=plain', true);
1097	1097	xhr.onload = function() {
1098	1098	try {
1099	1099	var res = JSON.parse(xhr.responseText);
...	...	@@ -1101,12 +1101,13 @@
1101	1101	showToast('投稿を更新しました', 'success');
1102	1102	setTimeout(function() { location.reload(); }, 800);
1103	1103	} else {
	1707	+ btn.disabled = false; btn.textContent = '保存';
1104	1104	alert('編集に失敗しました: ' + (res.error || ''));
1105	1105	}
1106		- } catch(e) { alert('編集に失敗しました'); }
	1710	+ } catch(e) { btn.disabled = false; btn.textContent = '保存'; alert('編集に失敗しました'); }
1107	1107	};
1108		- xhr.onerror = function() { alert('通信エラーが発生しました'); };
1109		- xhr.send(editPostData);
	1712	+ xhr.onerror = function() { btn.disabled = false; btn.textContent = '保存'; alert('通信エラーが発生しました'); };
	1713	+ xhr.send(fd);
1110	1110	}
1111	1111
1112	1112	// 投稿の削除（確認ダイアログ付き）
...	...	@@ -1113,7 +1113,7 @@
1113	1113	function confirmDeletePost(schoolPage, postObjNum, token) {
1114	1114	if (!confirm('この投稿を削除しますか？\\n削除後は「この投稿は削除されました」と表示されます。')) return;
1115	1115	var xhr = new XMLHttpRequest();
1116		- xhr.open('POST', '/bin/SeitokaiCode/DeletePost?outputSyntax=plain', true);
	1720	+ xhr.open('POST', '/bin/get/SeitokaiCode/DeletePost?outputSyntax=plain', true);
1117	1117	xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1118	1118	var deletePostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token);
1119	1119	xhr.onload = function() {
...	...	@@ -1130,6 +1130,80 @@
1130	1130	xhr.onerror = function() { alert('通信エラーが発生しました'); };
1131	1131	xhr.send(deletePostData);
1132	1132	}
	1737	+
	1738	+/* --- 通報ダイアログ --- */
	1739	+function openReportDialog(btn, targetPage, postObjNum, token) {
	1740	+ if (document.getElementById('report-dialog-overlay')) return;
	1741	+ var reasons = ['宣伝・スパム','不適切な内容','個人情報の露出','誹謗中傷','誤情報','その他'];
	1742	+ var overlay = document.createElement('div');
	1743	+ overlay.id = 'report-dialog-overlay';
	1744	+ 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;';
	1745	+ var dialog = document.createElement('div');
	1746	+ dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;max-height:80vh;overflow-y:auto;';
	1747	+ var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を通報</h3>';
	1748	+ html += '<p style="margin:0 0 12px;font-size:0.9em;color:#4b5563;">通報された投稿は管理者が確認するまで一時的に非表示になります。</p>';
	1749	+ html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">通報理由</label>';
	1750	+ html += '<select id="report-reason" style="width:100%;padding:8px;border:1px solid #d1d5db;border-radius:8px;margin-bottom:12px;font-size:0.9em;">';
	1751	+ for (var i=0; i<reasons.length; i++) html += '<option value="'+reasons[i]+'">'+reasons[i]+'</option>';
	1752	+ html += '</select>';
	1753	+ html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">補足コメント（任意）</label>';
	1754	+ 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>';
	1755	+ html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
	1756	+ html += '<button type="button" id="report-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
	1757	+ 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>';
	1758	+ html += '</div>';
	1759	+ dialog.innerHTML = html;
	1760	+ overlay.appendChild(dialog);
	1761	+ document.body.appendChild(overlay);
	1762	+ overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
	1763	+ document.getElementById('report-cancel-btn').addEventListener('click', function() { overlay.remove(); });
	1764	+ document.getElementById('report-submit-btn').addEventListener('click', function() {
	1765	+ var reason = document.getElementById('report-reason').value;
	1766	+ var detail = document.getElementById('report-detail').value;
	1767	+ var submitBtn = document.getElementById('report-submit-btn');
	1768	+ submitBtn.disabled = true; submitBtn.textContent = '送信中...';
	1769	+ var xhr = new XMLHttpRequest();
	1770	+ xhr.open('POST', '/bin/get/SeitokaiCode/ReportAction?outputSyntax=plain', true);
	1771	+ xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
	1772	+ var data = 'targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&detail=' + encodeURIComponent(detail) + '&form_token=' + encodeURIComponent(token);
	1773	+ xhr.onload = function() {
	1774	+ overlay.remove();
	1775	+ showToast('通報を受け付けました', 'success');
	1776	+ setTimeout(function() { location.reload(); }, 1000);
	1777	+ };
	1778	+ xhr.onerror = function() { overlay.remove(); alert('通信エラーが発生しました'); };
	1779	+ xhr.send(data);
	1780	+ });
	1781	+}
	1782	+
	1783	+/* --- 非表示ダイアログ（管理者用） --- */
	1784	+function openHideDialog(btn, targetPage, postObjNum, token) {
	1785	+ if (document.getElementById('hide-dialog-overlay')) return;
	1786	+ var overlay = document.createElement('div');
	1787	+ overlay.id = 'hide-dialog-overlay';
	1788	+ 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;';
	1789	+ var dialog = document.createElement('div');
	1790	+ dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;';
	1791	+ var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を非表示にする</h3>';
	1792	+ html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">非表示の理由</label>';
	1793	+ 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="理由を入力" />';
	1794	+ html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
	1795	+ html += '<button type="button" id="hide-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
	1796	+ 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>';
	1797	+ 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>';
	1798	+ html += '</div>';
	1799	+ dialog.innerHTML = html;
	1800	+ overlay.appendChild(dialog);
	1801	+ document.body.appendChild(overlay);
	1802	+ overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
	1803	+ document.getElementById('hide-cancel-btn').addEventListener('click', function() { overlay.remove(); });
	1804	+ function doHide(action) {
	1805	+ var reason = document.getElementById('hide-reason').value || '管理者判断';
	1806	+ window.location.href = '/bin/view/SeitokaiCode/ModerationAction?action=' + action + '&targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&form_token=' + encodeURIComponent(token);
	1807	+ }
	1808	+ document.getElementById('hide-submit-btn').addEventListener('click', function() { doHide('hide'); });
	1809	+ document.getElementById('hide-warn-btn').addEventListener('click', function() { doHide('hide-warn'); });
	1810	+}
1133	1133	</script>
1134	1134	{{/html}}
1135	1135	{{/velocity}}