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
...	...	@@ -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月始まり）
	76	+## --- 現在の年度を計算（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'))
...	...	@@ -101,15 +101,81 @@
101	101	#set($viewerDoc = $xwiki.getDocument($viewerUser))
102	102	#set($viewerAccountType = $!viewerDoc.getValue('accountType'))
103	103	#set($viewerSchoolCode = $!viewerDoc.getValue('schoolCode'))
	106	+ #set($viewerSecondarySchoolCode = $!viewerDoc.getValue('secondarySchoolCode'))
	107	+ #set($viewerUserRole = $!viewerDoc.getValue('userRole'))
104	104	#if($viewerAccountType == 'admin')
105	105	#set($isViewerAdmin = true)
106	106	#end
107	107	#end
108	108
	113	+## --- 関連校（中高一貫校）情報 ---
	114	+#set($affiliatedSchoolCode = $!doc.getValue('affiliatedSchoolCode'))
	115	+#set($affiliatedSchoolName = $!doc.getValue('affiliatedSchoolName'))
	116	+#set($isAffiliated = false)
	117	+#if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
	118	+ #if($viewerSchoolCode == $affiliatedSchoolCode)
	119	+ #set($isAffiliated = true)
	120	+ #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode)
	121	+ #set($isAffiliated = true)
	122	+ #end
	123	+#end
	124	+
	125	+## --- 校内判定（卒業生を除外、secondarySchoolCodeも含む） ---
	126	+#set($isSchoolMember = false)
	127	+#if(!$isGuest && $viewerUserRole != 'graduate')
	128	+ #if($viewerSchoolCode == $schoolCode || $isAffiliated)
	129	+ #set($isSchoolMember = true)
	130	+ #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode)
	131	+ #set($isSchoolMember = true)
	132	+ #end
	133	+#end
	134	+## 卒業生の母校判定（投稿バッジ用）
	135	+#set($isAlumniOfSchool = false)
	136	+#if(!$isGuest && $viewerUserRole == 'graduate')
	137	+ #if($viewerSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $viewerSchoolCode == $affiliatedSchoolCode))
	138	+ #set($isAlumniOfSchool = true)
	139	+ #end
	140	+#end
	141	+
	142	+## --- 学校ページ非表示チェック ---
	143	+#set($schoolHidden = $doc.getValue('hidden'))
	144	+#if($schoolHidden == 1)
	145	+ #if($isViewerAdmin)
	146	+ ## 管理者: 黄色バナー + ページ内容は通常表示（プレビュー）
	147	+<div class="school-hidden-banner admin">
	148	+ <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>
	149	+ <div>
	150	+ <strong>このページは非表示になっています</strong>（管理者のみ閲覧可能）
	151	+ #set($hBy = $!doc.getValue('hiddenBy'))
	152	+ #set($hAt = $!doc.getValue('hiddenAt'))
	153	+ #set($hReason = $!doc.getValue('hiddenReason'))
	154	+ <div class="school-hidden-detail">
	155	+ 非表示: $!escapetool.xml($hAt) / $!escapetool.xml($hBy)
	156	+ #if($hReason && $hReason != '') ・ 理由: $!escapetool.xml($hReason)#end
	157	+ </div>
	158	+ <a href="$xwiki.getURL('SeitokaiAdmin.SchoolManagement', 'view')" style="color:#92400e;text-decoration:underline">学校ページ管理へ</a>
	159	+ </div>
	160	+</div>
	161	+ #else
	162	+ ## 一般ユーザー・ゲスト: 非公開メッセージを表示して停止
	163	+<div class="school-hidden-public">
	164	+ <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>
	165	+ <h2>このページは現在公開されていません</h2>
	166	+ <p>このページは管理者により非公開に設定されています。</p>
	167	+ <a href="$xwiki.getURL('Schools.WebHome', 'view')" class="btn-back-list">学校一覧に戻る</a>
	168	+</div>
	169	+#stop
	170	+ #end
	171	+#end
	172	+
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))
	175	+#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $isSchoolMember)) && $services.csrf.isTokenValid($request.form_token))
	176	+ #set($pinPostObjStr = $!request.postObj)
	177	+ #if(!$pinPostObjStr.matches('^\d+$'))
	178	+ ## 不正な値 → 無視
	179	+ #else
	180	+ #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
	200	+ #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))
	205	+#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $isSchoolMember)) && $services.csrf.isTokenValid($request.form_token))
	206	+ #set($featActObjStr = $!request.actObj)
	207	+ #if($featActObjStr.matches('^\d+$'))
	208	+ #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
	240	+ #end## /matches
169	169	#end
170	170
171	171	## --- ユーザー情報取得 ---
...	...	@@ -224,346 +224,321 @@
224	224	#end
225	225	#end
226	226
227		-## --- 信頼性バッジ + ユーザー情報 ---
228		-<div class="seitokai-badge-container">
229		- ## 承認バッジ
230		- #if($authorAccountType == 'admin')
231		- <span class="badge badge-admin"><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> 管理者</span>
232		- #elseif($authorAccountType == 'verified')
233		- <span class="badge badge-verified"><svg class="ico" viewBox="0 0 24 24" stroke-width="2.5"><path d="M20 6L9 17l-5-5"/></svg> 承認済み</span>
234		- #elseif($authorAccountType == 'referred')
235		- <span class="badge badge-referred"><svg class="ico" viewBox="0 0 24 24"><path d="M10 13a5 5 0 007.54.54l3-3a5 5 0 00-7.07-7.07l-1.72 1.71"/><path d="M14 11a5 5 0 00-7.54-.54l-3 3a5 5 0 007.07 7.07l1.71-1.71"/></svg> 紹介</span>
236		- #else
237		- <span class="badge badge-general">一般</span>
238		- #end
239		- ## 役割バッジ
240		- #if($authorUserRole == 'student')
241		- <span class="badge badge-role-student"><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>
242		- #set($authorIsOfficer = $!lastAuthorDoc.getValue('isOfficer'))
243		- #if($authorIsOfficer == 'true')
244		- <span class="badge badge-role-officer"><svg class="ico" viewBox="0 0 24 24"><path d="M12 2l3.09 6.26L22 9.27l-5 4.87 1.18 6.88L12 17.77l-6.18 3.25L7 14.14 2 9.27l6.91-1.01L12 2z"/></svg> 役員</span>
245		- #end
246		- #elseif($authorUserRole == 'teacher')
247		- <span class="badge badge-role-teacher"><svg class="ico" 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>
248		- #elseif($authorUserRole == 'graduate')
249		- <span class="badge badge-role-graduate"><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>
250		- #end
251		- ## 学年（生徒のみ公開）
252		- #if($authorGrade && $authorGrade != '')
253		- <span class="badge badge-grade">$authorGrade</span>
254		- #end
255		- ## 在籍状態（卒業・休学等の場合のみ表示）
256		- #if($authorUserStatus == 'graduated')
257		- <span class="badge badge-status-graduated"><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>
258		- #elseif($authorUserStatus == 'on_leave')
259		- <span class="badge badge-status-onleave"><svg class="ico" viewBox="0 0 24 24" fill="currentColor"><rect x="6" y="4" width="4" height="16" rx="1"/><rect x="14" y="4" width="4" height="16" rx="1"/></svg> 休学中</span>
260		- #elseif($authorUserStatus == 'transferred')
261		- <span class="badge badge-status-transferred"><svg class="ico" viewBox="0 0 24 24"><polyline points="23 4 23 10 17 10"/><polyline points="1 20 1 14 7 14"/><path d="M3.51 9a9 9 0 0114.85-3.36L23 10M1 14l4.64 4.36A9 9 0 0020.49 15"/></svg> 転校済み</span>
262		- #end
263		- ## 編集ボタン（権限があるユーザーのみ表示）
264		- #set($canEditSchool = false)
265		- #if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode))
266		- #set($canEditSchool = true)
267		- #end
268		- #if($canEditSchool)
	299	+## --- 学校名見出し（XWikiデフォルトタイトルを非表示にし、学校名を表示） ---
	300	+#if($schoolName && $schoolName != '')
	301	+<style>.document-header { display: none !important; }</style>
	302	+<h1 class="school-page-title">$!escapetool.xml($schoolName)</h1>
	303	+#end
	304	+
	305	+## --- 編集ボタン（権限があるユーザーのみ表示） ---
	306	+#set($canEditSchool = false)
	307	+#if(!$isGuest && ($isViewerAdmin || $isSchoolMember))
	308	+ #set($canEditSchool = true)
	309	+#end
	310	+#if($canEditSchool)
	311	+<div style="text-align:right; margin-bottom:12px;">
269	269	<a href="$doc.getURL('view', 'sheet=SeitokaiCode.SchoolEditForm')" class="btn-school-edit"><svg class="ico" viewBox="0 0 24 24"><path d="M11 4H4a2 2 0 00-2 2v14a2 2 0 002 2h14a2 2 0 002-2v-7"/><path d="M18.5 2.5a2.121 2.121 0 013 3L12 15l-4 1 1-4 9.5-9.5z"/></svg> 基本情報を編集</a>
270		- #end
271	271	</div>
	314	+#end
272	272
273		-## --- ① 学校基本情報 + 連絡先（左右グリッド・折りたたみ対応） ---
274		-<div class="school-info-grid">
275		- <div class="school-info-card collapsed" id="card-basic-info">
276		- <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>
277		- <table class="wiki-table school-info-table">
278		- <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
279		- <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
280		- <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
281		- <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
282		- <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
283		- <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
284		- <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
285		- <tr><th>課程</th><td>#if($schoolSystem && $schoolSystem != '' && $schoolSystem != '[]')$!escapetool.xml($!schoolSystem)#end</td></tr>
286		- <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>
287		- </table>
288		- </div>
289		-
290		- <div class="school-info-card collapsed" id="card-contact">
291		- <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>
292		- <table class="wiki-table school-info-table">
293		- <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr>
294		- <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>
295		- <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>
296		- <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>
297		- <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>
298		- <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
299		- </table>
300		- </div>
301		-</div>
302		-
303		-## --- 生徒会情報アコーディオン ---
304		-<div class="school-section-divider">
305		- <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')?'▲':'▼';">
306		- <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>
307		- 生徒会情報を見る <span class="shortcut-arrow">▼</span>
308		- </button>
309		-</div>
310		-
311		-<div id="seitokai-info-section" class="seitokai-info-accordion">
312		-
313		-## --- ② 組織図 ---
314		-#set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
315		-#if($hasOrgContent)
316		- ## 公開範囲チェック
317		- #set($canViewOrgChart = true)
318		- #if($visibilityOrgChart == 'members' && $isGuest) #set($canViewOrgChart = false)
319		- #elseif($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewOrgChart = false)
320		- #end
321		- #if($canViewOrgChart)
322		-<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>
323		-<div class="school-section-card">
324		- <div class="card-inner">
325		- #if($orgChartImage && $orgChartImage != '')
326		- <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
	316	+## --- 関連校（中高一貫校）バナー ---
	317	+#if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
	318	+ #set($affiliatedPageRef = "Schools.${affiliatedSchoolCode}.WebHome")
	319	+ #set($affiliatedPageExists = $xwiki.exists($affiliatedPageRef))
	320	+<div class="affiliated-school-banner">
	321	+ <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>
	322	+ <div>
	323	+ <strong>中高一貫校</strong>：
	324	+ #if($affiliatedPageExists)
	325	+ <a href="$xwiki.getURL($affiliatedPageRef, 'view')">$!escapetool.xml($affiliatedSchoolName)</a>
	326	+ #else
	327	+ $!escapetool.xml($affiliatedSchoolName)
327	327	#end
328		- #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end
	329	+ と連携しています
329	329	</div>
330	330	</div>
331		- #else
332		-<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>
333		- #end
334	334	#end
335	335
336		-## --- ③④⑤ 日常の活動・選挙・定例活動 ---
337		-<div class="school-section-grid">
338		- #if($dailyActivities && $dailyActivities != '')
339		- <div class="school-section-card">
340		- <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>
341		- <div class="card-inner">
342		- <p class="activity-hint">活動時間の多い順に上位3つ</p>
343		- <div class="tag-container">
344		- #set($daIdx = 1)
345		- #foreach($da in $dailyActivities.split(","))
346		- <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
347		- #set($daIdx = $daIdx + 1)
348		- #end
349		- </div>
350		- #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
351		- <div class="free-note">$!escapetool.xml($dailyActivitiesNote)</div>
352		- #end
	334	+## --- ① 学校基本情報 ---
	335	+<div class="school-info-card collapsed" id="card-basic-info">
	336	+ <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>
	337	+ <div class="school-basic-info-layout">
	338	+ <div class="school-basic-info-table">
	339	+ <table class="wiki-table school-info-table">
	340	+ <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
	341	+ <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
	342	+ <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
	343	+ <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
	344	+ <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
	345	+ <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
	346	+ <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
	347	+ <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
	348	+ <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>
	349	+ </table>
353	353	</div>
354		- </div>
355		- #end
356		-
357		- #if($electionExists && $electionExists != '')
358		- <div class="school-section-card">
359		- <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>
360		- <div class="card-inner">
361		- <div class="info-row">
362		- <span class="info-label">役員選挙</span>
363		- <span class="info-value">$!escapetool.xml($!electionExists)</span>
364		- </div>
365		- #if($electionType && $electionType != '')
366		- <div class="info-row">
367		- <span class="info-label">直近の選挙方式</span>
368		- <span class="info-value">$!escapetool.xml($!electionType)</span>
369		- </div>
370		- #end
371		- #if($electionNote && $electionNote.trim() != '')
372		- <div class="free-note">$!escapetool.xml($electionNote)</div>
373		- #end
	351	+ #if($schoolPhoto && $schoolPhoto != '')
	352	+ <div class="school-photo-area">
	353	+ <img src="$doc.getAttachmentURL($schoolPhoto)" alt="$!escapetool.xml($schoolName)" class="school-photo" />
374	374	</div>
	355	+ #end
375	375	</div>
	357	+ #if($schoolDescription && $schoolDescription.trim() != '')
	358	+ <div class="free-note" style="margin-top:var(--sp-4);">$!escapetool.xml($schoolDescription)</div>
376	376	#end
	360	+
377	377	</div>
378	378
379		-<div class="school-section-grid">
380		- #if($meetingFrequency && $meetingFrequency != '')
381		- <div class="school-section-card">
382		- <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>
383		- <div class="card-inner">
384		- <div class="info-row">
385		- <span class="info-label">役員定例会の頻度</span>
386		- <span class="info-value">$!escapetool.xml($!meetingFrequency)</span>
387		- </div>
388		- #if($regularActivitiesNote && $regularActivitiesNote.trim() != '')
389		- <div class="free-note">$!escapetool.xml($regularActivitiesNote)</div>
390		- #end
391		- </div>
392		- </div>
393		- #end
	363	+## --- ② 生徒会基本情報（折りたたみカード） ---
	364	+<div class="school-info-card" id="card-seitokai-info">
	365	+ <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>
	366	+ <div class="seitokai-info-body">
394	394
395		- ## --- ⑦ 予算 ---
396		- #set($hasBudget = ($budgetProcess && $budgetProcess != '') || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
397		- #if($hasBudget)
398		- ## 公開範囲チェック
399		- #set($canViewBudget = true)
400		- #if($visibilityBudget == 'members' && $isGuest) #set($canViewBudget = false)
401		- #elseif($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewBudget = false)
402		- #end
403		- #if($canViewBudget)
404		- <div class="school-section-card">
405		- <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>
406		- <div class="card-inner">
407		- #if($budgetProcess && $budgetProcess != '')
408		- <div class="info-row">
409		- <span class="info-label">作成過程の生徒関与</span>
410		- <span class="info-value">
411		- <div class="selection-display">
412		- #foreach($bp in $budgetProcess.split(","))
413		- <span class="selection-item">$!escapetool.xml($bp.trim())</span>
414		- #end
415		- </div>
416		- </span>
417		- </div>
	368	+ ## --- 生徒会組織 ---
	369	+ #set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
	370	+ #if($hasOrgContent)
	371	+ #set($canViewOrgChart = true)
	372	+ #if($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewOrgChart = false)
	373	+ #elseif($visibilityOrgChart == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewOrgChart = false)
418	418	#end
419		- #if($studentFee && $studentFee != '')
420		- <div class="info-row">
421		- <span class="info-label">生徒会費（年額）</span>
422		- <span class="info-value">$!escapetool.xml($!studentFee)</span>
	375	+ #if($canViewOrgChart)
	376	+ <div class="seitokai-subsection">
	377	+ <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>
	378	+ <div class="seitokai-subsection-content">
	379	+ #if($orgChartImage && $orgChartImage != '')
	380	+ <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
	381	+ #end
	382	+ #if($orgChart && $orgChart != '')<div class="free-note">$!escapetool.xml($orgChart)</div>#end
423	423	</div>
	384	+ </div>
	385	+ #else
	386	+ <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>
424	424	#end
425		- #if($budgetScale && $budgetScale != '')
426		- <div class="info-row">
427		- <span class="info-label">予算規模</span>
428		- <span class="info-value">$!escapetool.xml($!budgetScale)</span>
	388	+ #end
	389	+
	390	+ ## --- 日常の活動 ---
	391	+ #if($dailyActivities && !$dailyActivities.isEmpty())
	392	+ <div class="seitokai-subsection">
	393	+ <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z"/><polyline points="14 2 14 8 20 8"/><line x1="16" y1="13" x2="8" y2="13"/><line x1="16" y1="17" x2="8" y2="17"/></svg> 日常の活動</h3>
	394	+ <div class="seitokai-subsection-content">
	395	+ <p class="activity-hint">活動時間が多い3つ</p>
	396	+ <div class="tag-container">
	397	+ #foreach($da in $dailyActivities)
	398	+ <span class="tag tag-accent">$!escapetool.xml($da.trim())</span>
	399	+ #end
	400	+ </div>
	401	+ #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
	402	+ <div class="free-note">$!escapetool.xml($dailyActivitiesNote)</div>
	403	+ #end
429	429	</div>
430		- #end
431		- #if($budgetAllocation && $budgetAllocation != '')
432		- <div class="info-row">
433		- <span class="info-label">主な予算配分</span>
434		- <span class="info-value">
435		- <div class="selection-display">
436		- #foreach($ba in $budgetAllocation.split(","))
437		- <span class="selection-item">$!escapetool.xml($ba.trim())</span>
438		- #end
439		- </div>
440		- </span>
441		- </div>
442		- #end
443		- #if($budgetNote && $budgetNote.trim() != '')
444		- <div class="free-note">$!escapetool.xml($budgetNote)</div>
445		- #end
446	446	</div>
447		- </div>
448		- #else
449		- <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>
450	450	#end
451		- #end
452		-</div>
453	453
454		-## --- ⑧ 校則の見直し ---
455		-#if($ruleReviewStatus && $ruleReviewStatus != '')
456		- ## 公開範囲チェック
457		- #set($canViewRuleReview = true)
458		- #if($visibilityRuleReview == 'members' && $isGuest) #set($canViewRuleReview = false)
459		- #elseif($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewRuleReview = false)
460		- #end
461		- #if($canViewRuleReview)
462		-<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>
463		-<div class="school-section-card">
464		- <div class="card-inner">
465		- <div class="info-row">
466		- <span class="info-label">見直しの有無（3年以内）</span>
467		- <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
	408	+ ## --- 選挙 ---
	409	+ #if($electionExists && $electionExists != '')
	410	+ <div class="seitokai-subsection">
	411	+ <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="3" width="18" height="18" rx="2"/><path d="M7 13l3 3 7-7"/></svg> 選挙</h3>
	412	+ <div class="seitokai-subsection-content">
	413	+ <div class="info-row">
	414	+ <span class="info-label">役員選挙</span>
	415	+ <span class="info-value">$!escapetool.xml($!electionExists)</span>
	416	+ </div>
	417	+ #if($electionType && $electionType != '')
	418	+ <div class="info-row">
	419	+ <span class="info-label">直近の選挙方式</span>
	420	+ <span class="info-value">$!escapetool.xml($!electionType)</span>
	421	+ </div>
	422	+ #end
	423	+ #if($electionNote && $electionNote.trim() != '')
	424	+ <div class="free-note">$!escapetool.xml($electionNote)</div>
	425	+ #end
	426	+ </div>
468	468	</div>
469		- #if($ruleReviewContent && $ruleReviewContent != '')
470		- <div class="info-row">
471		- <span class="info-label">見直しの内容</span>
472		- <span class="info-value">
473		- <div class="selection-display">
474		- #foreach($rc in $ruleReviewContent.split(","))
475		- <span class="selection-item">$!escapetool.xml($rc.trim())</span>
476		- #end
	428	+ #end
	429	+
	430	+ ## --- 定例活動 ---
	431	+ #if($meetingFrequency && $meetingFrequency != '')
	432	+ <div class="seitokai-subsection">
	433	+ <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="4" width="18" height="18" rx="2"/><line x1="16" y1="2" x2="16" y2="6"/><line x1="8" y1="2" x2="8" y2="6"/><line x1="3" y1="10" x2="21" y2="10"/></svg> 定例活動</h3>
	434	+ <div class="seitokai-subsection-content">
	435	+ <div class="info-row">
	436	+ <span class="info-label">役員定例会の頻度</span>
	437	+ <span class="info-value">$!escapetool.xml($!meetingFrequency)</span>
477	477	</div>
478		- </span>
	439	+ #if($regularActivitiesNote && $regularActivitiesNote.trim() != '')
	440	+ <div class="free-note">$!escapetool.xml($regularActivitiesNote)</div>
	441	+ #end
	442	+ </div>
479	479	</div>
480	480	#end
481		- #if($ruleReviewProposer && $ruleReviewProposer != '')
482		- <div class="info-row">
483		- <span class="info-label">見直しの提案者</span>
484		- <span class="info-value">
485		- <div class="selection-display">
486		- #foreach($rp in $ruleReviewProposer.split(","))
487		- <span class="selection-item">$!escapetool.xml($rp.trim())</span>
488		- #end
	445	+
	446	+ ## --- 予算 ---
	447	+ #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
	448	+ #if($hasBudget)
	449	+ #set($canViewBudget = true)
	450	+ #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewBudget = false)
	451	+ #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false)
	452	+ #end
	453	+ #if($canViewBudget)
	454	+ <div class="seitokai-subsection">
	455	+ <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>
	456	+ <div class="seitokai-subsection-content">
	457	+ #if($budgetProcess && !$budgetProcess.isEmpty())
	458	+ <div class="info-row">
	459	+ <span class="info-label">作成過程の生徒関与</span>
	460	+ <span class="info-value">
	461	+ <div class="selection-display">
	462	+ #foreach($bp in $budgetProcess)
	463	+ <span class="selection-item">$!escapetool.xml($bp.trim())</span>
	464	+ #end
	465	+ </div>
	466	+ </span>
489	489	</div>
490		- </span>
	468	+ #end
	469	+ #if($studentFee && $studentFee != '')
	470	+ <div class="info-row">
	471	+ <span class="info-label">生徒会費（年額）</span>
	472	+ <span class="info-value">$!escapetool.xml($!studentFee)</span>
	473	+ </div>
	474	+ #end
	475	+ #if($budgetScale && $budgetScale != '')
	476	+ <div class="info-row">
	477	+ <span class="info-label">予算規模</span>
	478	+ <span class="info-value">$!escapetool.xml($!budgetScale)</span>
	479	+ </div>
	480	+ #end
	481	+ #if($budgetAllocation && !$budgetAllocation.isEmpty())
	482	+ <div class="info-row">
	483	+ <span class="info-label">主な予算配分</span>
	484	+ <span class="info-value">
	485	+ <div class="selection-display">
	486	+ #foreach($ba in $budgetAllocation)
	487	+ <span class="selection-item">$!escapetool.xml($ba.trim())</span>
	488	+ #end
	489	+ </div>
	490	+ </span>
	491	+ </div>
	492	+ #end
	493	+ #if($budgetNote && $budgetNote.trim() != '')
	494	+ <div class="free-note">$!escapetool.xml($budgetNote)</div>
	495	+ #end
	496	+ </div>
491	491	</div>
	498	+ #else
	499	+ <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 予算情報は #if($visibilityBudget == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
	500	+ #end
492	492	#end
493		- #if($ruleReviewImplementer && $ruleReviewImplementer != '')
494		- <div class="info-row">
495		- <span class="info-label">見直しの実施者</span>
496		- <span class="info-value">
497		- <div class="selection-display">
498		- #foreach($ri in $ruleReviewImplementer.split(","))
499		- <span class="selection-item">$!escapetool.xml($ri.trim())</span>
500		- #end
	502	+
	503	+ ## --- 校則の見直し ---
	504	+ #if($ruleReviewStatus && $ruleReviewStatus != '')
	505	+ #set($canViewRuleReview = true)
	506	+ #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewRuleReview = false)
	507	+ #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false)
	508	+ #end
	509	+ #if($canViewRuleReview)
	510	+ <div class="seitokai-subsection">
	511	+ <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>
	512	+ <div class="seitokai-subsection-content">
	513	+ <div class="info-row">
	514	+ <span class="info-label">見直しの有無（3年以内）</span>
	515	+ <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
501	501	</div>
502		- </span>
	517	+ #if($ruleReviewContent && !$ruleReviewContent.isEmpty())
	518	+ <div class="info-row">
	519	+ <span class="info-label">見直しの内容</span>
	520	+ <span class="info-value">
	521	+ <div class="selection-display">
	522	+ #foreach($rc in $ruleReviewContent)
	523	+ <span class="selection-item">$!escapetool.xml($rc.trim())</span>
	524	+ #end
	525	+ </div>
	526	+ </span>
	527	+ </div>
	528	+ #end
	529	+ #if($ruleReviewProposer && !$ruleReviewProposer.isEmpty())
	530	+ <div class="info-row">
	531	+ <span class="info-label">見直しの提案者</span>
	532	+ <span class="info-value">
	533	+ <div class="selection-display">
	534	+ #foreach($rp in $ruleReviewProposer)
	535	+ <span class="selection-item">$!escapetool.xml($rp.trim())</span>
	536	+ #end
	537	+ </div>
	538	+ </span>
	539	+ </div>
	540	+ #end
	541	+ #if($ruleReviewImplementer && !$ruleReviewImplementer.isEmpty())
	542	+ <div class="info-row">
	543	+ <span class="info-label">見直しの実施者</span>
	544	+ <span class="info-value">
	545	+ <div class="selection-display">
	546	+ #foreach($ri in $ruleReviewImplementer)
	547	+ <span class="selection-item">$!escapetool.xml($ri.trim())</span>
	548	+ #end
	549	+ </div>
	550	+ </span>
	551	+ </div>
	552	+ #end
	553	+ #if($ruleReviewSystem && $ruleReviewSystem != '')
	554	+ <div class="info-row">
	555	+ <span class="info-label">見直しの仕組み</span>
	556	+ <span class="info-value">$!escapetool.xml($!ruleReviewSystem)</span>
	557	+ </div>
	558	+ #end
	559	+ </div>
503	503	</div>
	561	+ #else
	562	+ <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>
	563	+ #end
504	504	#end
505		- #if($ruleReviewSystem && $ruleReviewSystem != '')
506		- <div class="info-row">
507		- <span class="info-label">見直しの仕組み</span>
508		- <span class="info-value">$!escapetool.xml($!ruleReviewSystem)</span>
	565	+
	566	+ ## --- 生徒会の課題意識 ---
	567	+ #if($challenges && $challenges != '')
	568	+ #set($canViewChallenges = true)
	569	+ #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewChallenges = false)
	570	+ #elseif($visibilityChallenges == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewChallenges = false)
	571	+ #end
	572	+ #if($canViewChallenges)
	573	+ <div class="seitokai-subsection">
	574	+ <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>
	575	+ <div class="seitokai-subsection-content">
	576	+ <div class="challenge-text">$!escapetool.xml($challenges)</div>
	577	+ </div>
509	509	</div>
	579	+ #else
	580	+ <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>
	581	+ #end
510	510	#end
511		- </div>
512		-</div>
513		- #else
514		-<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>
515		- #end
516		-#end
517	517
518		-## --- ⑨ 課題 ---
519		-#if($challenges && $challenges != '')
520		- ## 公開範囲チェック
521		- #set($canViewChallenges = true)
522		- #if($visibilityChallenges == 'members' && $isGuest) #set($canViewChallenges = false)
523		- #elseif($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewChallenges = false)
	584	+ </div>## seitokai-info-body 終了
	585	+</div>## card-seitokai-info 終了
	586	+
	587	+## --- ③ SNS・連絡先 ---
	588	+<div class="school-info-card collapsed" id="card-contact">
	589	+ <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>
	590	+ <table class="wiki-table school-info-table">
	591	+ <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr>
	592	+ <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>
	593	+ <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>
	594	+ <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>
	595	+ <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>
	596	+ <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
	597	+ </table>
	598	+ #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
	599	+ #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
	600	+ #if($infoEditDate && $infoEditDate != '')
	601	+ <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>
524	524	#end
525		- #if($canViewChallenges)
526		-<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>
527		-<div class="challenge-text">$!escapetool.xml($challenges)</div>
528		- #else
529		-<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>
530		- #end
531		-#end
	603	+</div>
532	532
533		-</div>## seitokai-info-accordion 終了
534		-
535	535	{{/html}}
536	536
	607	+----
	608	+
537	537	## --- ⑩ 活動報告一覧（スレッド型・年度タブ付き） ---
538	538	= 活動報告 =
539	539
540		-## --- 投稿者ステータス凡例（折りたたみ） ---
	612	+## --- 年度タブ + 投稿者ステータス凡例 ---
541	541	{{html clean="false"}}
542		-<div class="author-legend-wrapper">
543		- <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>
544		- <div class="author-legend-body">
545		- <div class="author-legend">
546		- <span class="author-legend-title">投稿者の信頼度:</span>
547		- <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者</span>
548		- <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み</span>
549		- <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介</span>
550		- <span class="author-legend-item"><span class="bar bar-general"></span> 一般（未承認）</span>
551		- </div>
552		- <div class="author-legend">
553		- <span class="author-legend-title">所属:</span>
554		- <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>
555		- <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>
556		- <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>
557		- <span class="author-legend-item text-hint">※一般アカウントは所属未確認のため非表示</span>
558		- </div>
559		- <div class="author-legend">
560		- <span class="author-legend-title">役割:</span>
561		- <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>
562		- <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>
563		- <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>
564		- </div>
565		- </div>
566		-</div>
567	567
568	568	## --- 年度タブ ---
569	569	## 全活動から年度一覧を収集
...	...	@@ -585,14 +585,49 @@
585	585	#end
586	586	## ソート（降順にしたいが Velocity にはないので JS で制御）
587	587
588		-<div class="activity-fy-tabs">
589		- <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
590		- #foreach($fy in $fySet)
591		- #if($fy != $currentFYStr)
592		- <button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button>
	635	+<div class="activity-toolbar">
	636	+ <div class="activity-fy-tabs">
	637	+ <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
	638	+ #foreach($fy in $fySet)
	639	+ #if($fy != $currentFYStr)
	640	+ <button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button>
	641	+ #end
593	593	#end
594		- #end
595		- <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
	643	+ <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
	644	+ </div>
	645	+ <div class="activity-toolbar-right">
	646	+ <button class="btn-view-toggle" id="btnViewToggle" onclick="toggleCompactView()" title="タイトルのみ表示">
	647	+ <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>
	648	+ <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>
	649	+ <span class="toggle-label">一覧表示</span>
	650	+ </button>
	651	+ </div>
	652	+ <div class="author-legend-wrapper">
	653	+ <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>
	654	+ <div class="author-legend-body">
	655	+ <div class="author-legend">
	656	+ <span class="author-legend-title">投稿者の信頼度:</span>
	657	+ <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者 <span class="text-hint">— 運営スタッフ</span></span>
	658	+ <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み <span class="text-hint">— 本人確認済みのユーザー</span></span>
	659	+ <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介 <span class="text-hint">— 承認済みユーザーからの紹介</span></span>
	660	+ <span class="author-legend-item"><span class="bar bar-general"></span> 一般 <span class="text-hint">— 一般登録ユーザー</span></span>
	661	+ </div>
	662	+ <div class="author-legend">
	663	+ <span class="author-legend-title">所属:</span>
	664	+ <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>
	665	+ <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>
	666	+ <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>
	667	+ <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>
	668	+ <span class="author-legend-item text-hint">※一般アカウントは所属バッジが表示されません</span>
	669	+ </div>
	670	+ <div class="author-legend">
	671	+ <span class="author-legend-title">役割:</span>
	672	+ <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>
	673	+ <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>
	674	+ <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>
	675	+ </div>
	676	+ </div>
	677	+ </div>
596	596	</div>
597	597
598	598	{{/html}}
...	...	@@ -657,10 +657,18 @@
657	657	<div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)">
658	658	<div class="activity-thread-header">
659	659	<div class="activity-thread-title">
660		- <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>
661		- <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
	742	+ <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>
	743	+ <div class="activity-meta-line">
	744	+ <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
	745	+ #set($actTagsList = $activity.getValue('tags'))
	746	+ #if($actTagsList && !$actTagsList.isEmpty())
	747	+ #foreach($tagItem in $actTagsList)
	748	+ #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end
	749	+ #end
	750	+ #end
	751	+ </div>
662	662	</div>
663		- <div class="thread-meta-row">
	753	+ <div class="thread-meta-right">
664	664	<span class="thread-post-count">${reportCount}件の報告 ・ ${commentCount}件のコメント</span>
665	665	#if($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred')
666	666	#if($actFeatured == '1')
...	...	@@ -720,12 +720,12 @@
720	720	#set($postVis = $!post.getValue('visibility'))
721	721	#if(!$postVis || $postVis == '') #set($postVis = 'public') #end
722	722	#set($canViewPost = true)
723		- #if($postVis == 'members' && $isGuest) #set($canViewPost = false)
724		- #elseif($postVis == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewPost = false)
	813	+ #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewPost = false)
	814	+ #elseif($postVis == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPost = false)
725	725	#end
726	726	#if(!$canViewPost)
727	727	<div class="thread-post visibility-restricted-post">
728		- <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>
	818	+ <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>
729	729	</div>
730	730	#else
731	731	## 投稿者のアカウント種別に基づいたCSSクラス
...	...	@@ -765,8 +765,11 @@
765	765	<span class="badge badge-general badge-sm">一般</span>
766	766	#end
767	767	## 所属バッジ（投稿者の学校コードとページの学校コードを比較）
	858	+ #set($postIsSchoolMatch = ($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode)))
768	768	#if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general')
769		- #if($postSchoolCode == $schoolCode)
	860	+ #if($postUserRole == 'graduate' && $postIsSchoolMatch)
	861	+ <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>
	862	+ #elseif($postIsSchoolMatch && $postUserRole != 'graduate')
770	770	#if($postAccountType == 'verified' || $postAccountType == 'admin')
771	771	<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>
772	772	#else
...	...	@@ -787,9 +787,6 @@
787	787	#elseif($postUserRole == 'graduate')
788	788	<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>
789	789	#end
790		- #if($postGrade && $postGrade != '')
791		- <span class="badge badge-grade badge-sm">$postGrade</span>
792		- #end
793	793	</span>
794	794	<span class="thread-post-date">$!postDate</span>
795	795	#set($postEdited = $!post.getValue('edited'))
...	...	@@ -796,6 +796,13 @@
796	796	#if($postEdited == 1 || $postEdited == '1')
797	797	<span class="post-edited-label">（編集済み）</span>
798	798	#end
	889	+ #set($postAuthorRefH = $!post.getValue('authorRef'))
	890	+ #set($postObjNumH = $post.number)
	891	+ #if(!$isGuest && $xcontext.user != $postAuthorRefH)
	892	+ <button type="button" class="btn-post-report btn-post-report-header" onclick="openReportDialog(this, '${doc.fullName}', $postObjNumH, '${services.csrf.getToken()}')" title="この投稿を通報">
	893	+ <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> 通報
	894	+ </button>
	895	+ #end
799	799	</div>
800	800	<div class="thread-post-body">
801	801	$!escapetool.xml($!postContent)
...	...	@@ -860,12 +860,18 @@
860	860	#end
861	861	</div>
862	862	#if($postVis != 'public')
863		- <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>
	960	+ <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>
864	864	#end
865		- ## 固定/解除ボタン（承認済み・管理者のみ）
866		- #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
867		- #set($postObjNum = $post.number)
868		- <div class="post-pin-action post-action-mt">
	962	+ ## 固定/編集/削除/通報/非表示ボタン（横並び）
	963	+ #set($postAuthorRef = $!post.getValue('authorRef'))
	964	+ #set($postObjNumED = $post.number)
	965	+ #set($showPinBtn = ($viewerAccountType == 'admin' || $viewerAccountType == 'verified'))
	966	+ #set($showEditDeleteBtn = ($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin'))
	967	+ #set($showHideBtn = ($viewerAccountType == 'admin'))
	968	+ #if($showPinBtn || $showEditDeleteBtn || $showHideBtn)
	969	+ <div class="post-edit-actions post-action-mt">
	970	+ #if($showPinBtn)
	971	+ #set($postObjNum = $post.number)
869	869	#if($isPinned == '1')
870	870	<a href="$doc.getURL('view', "action=unpin&postObj=${postObjNum}&form_token=${services.csrf.getToken()}")" class="btn-pin-toggle btn-unpin" title="固定を解除">
871	871	<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> 固定を解除
...	...	@@ -875,15 +875,12 @@
875	875	<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> 固定する
876	876	</a>
877	877	#end
878		- </div>
879		- #end
880		- ## 編集・削除ボタン（投稿者本人 or 管理者）
881		- #set($postAuthorRef = $!post.getValue('authorRef'))
882		- #set($postObjNumED = $post.number)
883		- #if($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin')
884		- <div class="post-edit-actions post-action-mt">
	981	+ #end
	982	+ #if($showEditDeleteBtn)
885	885	#if($xcontext.user == $postAuthorRef)
886		- <button type="button" class="btn-post-edit" onclick="openEditPost(this, '${doc.fullName}', $postObjNumED, '$!escapetool.javascript($!postContent)')" title="この投稿を編集">
	984	+ #set($editImages = $!post.getValue('images'))
	985	+ #set($editFiles = $!post.getValue('files'))
	986	+ <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="この投稿を編集">
887	887	<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> 編集
888	888	</button>
889	889	#end
...	...	@@ -890,6 +890,12 @@
890	890	<button type="button" class="btn-post-delete" onclick="confirmDeletePost('${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を削除">
891	891	<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> 削除
892	892	</button>
	993	+ #end
	994	+ #if($showHideBtn)
	995	+ <button type="button" class="btn-post-hide" onclick="openHideDialog(this, '${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を非表示にする">
	996	+ <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> 非表示
	997	+ </button>
	998	+ #end
893	893	</div>
894	894	#end
895	895	</div>
...	...	@@ -939,10 +939,12 @@
939	939
940	940	#if($xcontext.user != "XWiki.XWikiGuest")
941	941	<div class="thread-add-post">
942		- <a href="/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
	1048	+ #if($isSchoolMember || $isViewerAdmin)
	1049	+ <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
943	943	＋ 活動報告を追加
944	944	</a>
945		- <a href="/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
	1052	+ #end
	1053	+ <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
946	946	<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> コメントを書く
947	947	</a>
948	948	</div>
...	...	@@ -964,7 +964,7 @@
964	964	#if($xcontext.user != "XWiki.XWikiGuest")
965	965	{{html clean="false"}}
966	966	<div class="activity-add-section">
967		- <a href="/bin/view/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$!escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity">
	1075	+ <a href="/bin/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$!escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity">
968	968	<svg class="ico" viewBox="0 0 24 24" stroke-width="2.5"><line x1="12" y1="5" x2="12" y2="19"/><line x1="5" y1="12" x2="19" y2="12"/></svg> 活動を追加
969	969	</a>
970	970	</div>
...	...	@@ -971,62 +971,38 @@
971	971	{{/html}}
972	972	#end
973	973
974		-## --- 年度アーカイブ セクション ---
975		-{{html clean="false"}}
976		-<div class="school-section-card school-archive-card">
977		- <h2 class="archive-section-title">
978		- <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>
979		- 年度アーカイブ
980		- </h2>
981		- <div class="archive-meta">
982		- 現在のページ: <strong>${pageFiscalYear}年度</strong>
983		- #set($lyud = $!doc.getValue('lastYearUpdateDate'))
984		- #if($lyud && $lyud != '')
985		- | 最終年度更新: $!escapetool.xml($lyud) ($!escapetool.xml($!doc.getValue('lastYearUpdateBy')))
986		- #end
987		- </div>
988		-
989		- ## 過去アーカイブの検索
990		- #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))
991		- #set($archivePages = $archiveQuery.execute())
992		-
993		- #if($archivePages && $archivePages.size() > 0)
994		- <div class="archive-card-field-lg">
995		- <div class="archive-list-label">過去の年度アーカイブ</div>
996		- <div class="archive-list">
997		- #foreach($archPage in $archivePages)
998		- #set($archPageDoc = $xwiki.getDocument($archPage))
999		- #set($archPageObj = $archPageDoc.getObject('SeitokaiCode.SchoolClass'))
1000		- #if($archPageObj)
1001		- #set($archPageFY = $!archPageObj.getValue('fiscalYear'))
1002		- <a href="$archPageDoc.getURL('view')" class="archive-link">
1003		- <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>
1004		- ${archPageFY}年度
1005		- </a>
1006		- #end
1007		- #end
1008		- </div>
1009		- </div>
1010		- #else
1011		- <div class="archive-empty">過去のアーカイブはまだありません</div>
1012		- #end
1013		-
1014		- ## 新年度に移行ボタン（承認済み・管理者のみ）
1015		- #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
1016		- <div class="archive-action">
1017		- <a href="/bin/view/SeitokaiCode/YearArchiveAction?schoolPage=${doc.fullName}" class="btn-accent">
1018		- <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>
1019		- ${pageFiscalYear}年度をアーカイブして新年度に移行
1020		- </a>
1021		- <div class="archive-action-hint">現在の学校情報を${pageFiscalYear}年度として保存し、新しい年度に移行します。</div>
1022		- </div>
1023		- #end
1024		-</div>
1025		-{{/html}}
1026		-
1027	1027	## --- 年度タブ切り替え JavaScript ---
1028	1028	{{html clean="false"}}
1029	1029	<script>
	1085	+// コンパクト表示（タイトルのみ）トグル
	1086	+function toggleCompactView() {
	1087	+ var container = document.querySelector('.xwiki-content') || document.body;
	1088	+ var isCompact = container.classList.toggle('activity-compact-view');
	1089	+ var btn = document.getElementById('btnViewToggle');
	1090	+ if (btn) {
	1091	+ btn.querySelector('.toggle-label').textContent = isCompact ? '詳細表示' : '一覧表示';
	1092	+ btn.title = isCompact ? '詳細表示に戻す' : 'タイトルのみ表示';
	1093	+ }
	1094	+ // コンパクトモードでは各スレッドヘッダーをクリックで個別展開可能にする
	1095	+ document.querySelectorAll('.activity-thread').forEach(function(thread) {
	1096	+ if (isCompact) {
	1097	+ thread.classList.remove('compact-expanded');
	1098	+ }
	1099	+ });
	1100	+}
	1101	+
	1102	+// コンパクトモードで個別スレッドを展開/折りたたみ
	1103	+function toggleThreadExpand(e) {
	1104	+ var container = document.querySelector('.xwiki-content') || document.body;
	1105	+ if (!container.classList.contains('activity-compact-view')) return;
	1106	+ // リンクやボタンのクリックはスルー
	1107	+ if (e.target.closest('a, button, .btn-featured-toggle')) return;
	1108	+ var thread = e.target.closest('.activity-thread');
	1109	+ if (thread) {
	1110	+ thread.classList.toggle('compact-expanded');
	1111	+ }
	1112	+}
	1113	+
1030	1030	function switchActivityFY(fy, btn) {
1031	1031	// タブのアクティブ状態を切り替え
1032	1032	document.querySelectorAll('.activity-fy-tab').forEach(function(t) { t.classList.remove('active'); });
...	...	@@ -1040,14 +1040,33 @@
1040	1040	}
1041	1041	});
1042	1042	}
1043		-// ページ読み込み時にデフォルトで現在の年度を表示
	1127	+// ページ読み込み時の初期化
1044	1044	document.addEventListener('DOMContentLoaded', function() {
	1129	+ // 年度タブを降順にソート（「全期間」タブは末尾に固定）
	1130	+ var tabContainer = document.querySelector('.activity-fy-tabs');
	1131	+ if (tabContainer) {
	1132	+ var tabs = Array.from(tabContainer.querySelectorAll('.activity-fy-tab'));
	1133	+ var allTab = null;
	1134	+ var fyTabs = [];
	1135	+ tabs.forEach(function(t) {
	1136	+ var onclickStr = t.getAttribute('onclick') || '';
	1137	+ if (onclickStr.indexOf("'all'") !== -1) { allTab = t; }
	1138	+ else { fyTabs.push(t); }
	1139	+ });
	1140	+ // 年度タブを数値の降順でソート
	1141	+ fyTabs.sort(function(a, b) {
	1142	+ var aYear = parseInt(a.textContent) || 0;
	1143	+ var bYear = parseInt(b.textContent) || 0;
	1144	+ return bYear - aYear;
	1145	+ });
	1146	+ // DOM再配置
	1147	+ fyTabs.forEach(function(t) { tabContainer.appendChild(t); });
	1148	+ if (allTab) { tabContainer.appendChild(allTab); }
	1149	+ }
	1150	+ // デフォルトで現在の年度を表示
1045	1045	var defaultTab = document.querySelector('.activity-fy-tab.active');
1046	1046	if (defaultTab) { defaultTab.click(); }
1047	1047	// 保存成功時のトースト通知
1048		- if (window.location.search.indexOf('archived=1') !== -1) {
1049		- showToast('年度アーカイブを作成しました', 'success');
1050		- }
1051	1051	if (window.location.search.indexOf('saved=1') !== -1) {
1052	1052	showToast('学校情報を保存しました', 'success');
1053	1053	// URLパラメータをクリーンアップ（リロード時に再表示されないよう）
...	...	@@ -1055,6 +1055,30 @@
1055	1055	window.history.replaceState({}, document.title, window.location.pathname);
1056	1056	}
1057	1057	}
	1161	+ // コンパクトモード: スレッドヘッダークリックで個別展開
	1162	+ document.querySelectorAll('.activity-thread-header').forEach(function(header) {
	1163	+ header.addEventListener('click', toggleThreadExpand);
	1164	+ });
	1165	+ // 長文投稿の折りたたみ初期化（max-height: 12em 超で省略）
	1166	+ document.querySelectorAll('.thread-post-body').forEach(function(body) {
	1167	+ // pre-wrapのまま高さを測定し、max-height(12em ≒ ~200px)を超える場合に折りたたむ
	1168	+ var fullH = body.scrollHeight;
	1169	+ // 12em を px に変換（font-size × line-height × 行数 の近似値ではなくCSSと同じ値を取得）
	1170	+ body.classList.add('truncated');
	1171	+ var maxH = body.clientHeight; // max-height: 12em 適用後の高さ
	1172	+ body.classList.remove('truncated');
	1173	+ if (fullH > maxH + 30) {
	1174	+ body.classList.add('truncated');
	1175	+ var btn = document.createElement('button');
	1176	+ btn.className = 'btn-read-more';
	1177	+ btn.textContent = '広げて読む ▼';
	1178	+ btn.addEventListener('click', function() {
	1179	+ var isExpanded = body.classList.toggle('expanded');
	1180	+ btn.textContent = isExpanded ? '折りたたむ ▲' : '広げて読む ▼';
	1181	+ });
	1182	+ body.parentNode.insertBefore(btn, body.nextSibling);
	1183	+ }
	1184	+ });
1058	1058	});
1059	1059
1060	1060	// トースト通知表示
...	...	@@ -1083,38 +1083,136 @@
1083	1083	var card = document.getElementById(cardId);
1084	1084	if (!card) return;
1085	1085	card.classList.toggle('collapsed');
	1213	+ var isCollapsed = card.classList.contains('collapsed');
	1214	+ var h2 = card.querySelector('h2[role="button"]');
	1215	+ if (h2) h2.setAttribute('aria-expanded', !isCollapsed);
1086	1086	}
1087	1087
1088	1088	// 投稿の編集（インライン編集フォームを開く）
1089		-function openEditPost(btn, schoolPage, postObjNum, currentContent) {
	1219	+function openEditPost(btn) {
1090	1090	var postEl = btn.closest('.thread-post');
1091	1091	if (!postEl) return;
1092		- // 既存の編集フォームがあれば閉じる
1093	1093	var existing = postEl.querySelector('.post-edit-form');
1094	1094	if (existing) { existing.remove(); return; }
1095	1095	var bodyEl = postEl.querySelector('.thread-post-body');
1096	1096	if (!bodyEl) return;
	1226	+
	1227	+ var schoolPage = btn.getAttribute('data-school');
	1228	+ var postObjNum = btn.getAttribute('data-obj');
	1229	+ var currentContent = btn.getAttribute('data-content') || '';
	1230	+ var currentImages = btn.getAttribute('data-images') || '';
	1231	+ var currentFiles = btn.getAttribute('data-files') || '';
	1232	+ var postType = btn.getAttribute('data-post-type') || 'report';
	1233	+
1097	1097	var form = document.createElement('div');
1098	1098	form.className = 'post-edit-form';
1099		- form.innerHTML = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>' +
1100		- '<div class="post-edit-form-actions">' +
	1236	+ form.setAttribute('data-school', schoolPage);
	1237	+ form.setAttribute('data-obj', postObjNum);
	1238	+
	1239	+ var html = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>';
	1240	+
	1241	+ // コメント以外は添付ファイル編集を表示
	1242	+ if (postType !== 'comment') {
	1243	+ // 既存画像
	1244	+ html += '<div class="edit-attachments">';
	1245	+ if (currentImages.trim()) {
	1246	+ html += '<div class="edit-attach-section"><span class="edit-attach-label">画像</span>';
	1247	+ var imgs = currentImages.trim().split('\n');
	1248	+ for (var i = 0; i < imgs.length; i++) {
	1249	+ var img = imgs[i].trim();
	1250	+ if (!img) continue;
	1251	+ html += '<div class="edit-attach-item" data-name="' + img.replace(/"/g,'&quot;') + '">' +
	1252	+ '<img src="/xwiki/bin/download/' + schoolPage.replace(/\./g,'/') + '/' + encodeURIComponent(img) + '" class="edit-attach-thumb" />' +
	1253	+ '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
	1254	+ '<input type="hidden" name="keepImages" value="' + img.replace(/"/g,'&quot;') + '" />' +
	1255	+ '</div>';
	1256	+ }
	1257	+ html += '</div>';
	1258	+ }
	1259	+ // 既存ファイル
	1260	+ if (currentFiles.trim()) {
	1261	+ html += '<div class="edit-attach-section"><span class="edit-attach-label">ファイル</span>';
	1262	+ var files = currentFiles.trim().split('\n');
	1263	+ for (var j = 0; j < files.length; j++) {
	1264	+ var f = files[j].trim();
	1265	+ if (!f) continue;
	1266	+ var displayName = f;
	1267	+ if (/^file_\d{14}_\d+_/.test(f)) displayName = f.replace(/^file_\d{14}_\d+_/, '');
	1268	+ html += '<div class="edit-attach-item" data-name="' + f.replace(/"/g,'&quot;') + '">' +
	1269	+ '<span class="edit-attach-fname">' + displayName.replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</span>' +
	1270	+ '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
	1271	+ '<input type="hidden" name="keepFiles" value="' + f.replace(/"/g,'&quot;') + '" />' +
	1272	+ '</div>';
	1273	+ }
	1274	+ html += '</div>';
	1275	+ }
	1276	+ // 新規追加
	1277	+ html += '<div class="edit-attach-add">' +
	1278	+ '<label class="form-label-sm">画像を追加（最大4枚まで）</label>' +
	1279	+ '<input type="file" name="editNewImages" accept="image/*" multiple class="form-file-input-sm" />' +
	1280	+ '<div class="form-hint">JPEG / PNG / GIF / WebP、各5MBまで</div>' +
	1281	+ '<label class="form-label-sm" style="margin-top:8px;">ファイルを追加（最大2つまで）</label>' +
	1282	+ '<input type="file" name="editNewFiles" accept=".pdf,.docx,.xlsx,.pptx" multiple class="form-file-input-sm" />' +
	1283	+ '<div class="form-hint">PDF / Word / Excel / PowerPoint、各10MBまで</div>' +
	1284	+ '</div>';
	1285	+ html += '</div>';
	1286	+ }
	1287	+
	1288	+ html += '<div class="post-edit-form-actions">' +
1101	1101	'<button type="button" class="btn-cancel-edit" onclick="this.closest(\'.post-edit-form\').remove()">キャンセル</button>' +
1102		- '<button type="button" class="btn-save" onclick="saveEditPost(\'' + schoolPage + '\', ' + postObjNum + ')">保存</button>' +
	1290	+ '<button type="button" class="btn-save" onclick="saveEditPost(this)">保存</button>' +
1103	1103	'</div>';
	1292	+
	1293	+ form.innerHTML = html;
1104	1104	bodyEl.parentNode.insertBefore(form, bodyEl.nextSibling);
1105	1105	form.querySelector('textarea').focus();
1106	1106	}
1107	1107
	1298	+function removeEditAttach(btn) {
	1299	+ var item = btn.closest('.edit-attach-item');
	1300	+ if (item) item.remove();
	1301	+}
	1302	+
1108	1108	// 投稿の編集を保存
1109		-function saveEditPost(schoolPage, postObjNum) {
1110		- var textarea = document.getElementById('editContent_' + postObjNum);
	1304	+function saveEditPost(btn) {
	1305	+ var formEl = btn.closest('.post-edit-form');
	1306	+ if (!formEl) return;
	1307	+ var schoolPage = formEl.getAttribute('data-school');
	1308	+ var postObjNum = formEl.getAttribute('data-obj');
	1309	+ var textarea = formEl.querySelector('textarea');
1111	1111	if (!textarea) return;
1112	1112	var newContent = textarea.value.trim();
1113	1113	if (!newContent) { alert('投稿内容を入力してください'); return; }
	1313	+
1114	1114	var csrfEl = document.querySelector('input[name="form_token"]');
1115	1115	var csrfToken = csrfEl ? csrfEl.value : '';
	1316	+
	1317	+ var fd = new FormData();
	1318	+ fd.append('schoolPage', schoolPage);
	1319	+ fd.append('postObj', postObjNum);
	1320	+ fd.append('newContent', newContent);
	1321	+ fd.append('form_token', csrfToken);
	1322	+
	1323	+ // 残す画像・ファイル
	1324	+ formEl.querySelectorAll('input[name="keepImages"]').forEach(function(el) { fd.append('keepImages', el.value); });
	1325	+ formEl.querySelectorAll('input[name="keepFiles"]').forEach(function(el) { fd.append('keepFiles', el.value); });
	1326	+
	1327	+ // 新規画像
	1328	+ var newImgInput = formEl.querySelector('input[name="editNewImages"]');
	1329	+ if (newImgInput && newImgInput.files) {
	1330	+ for (var i = 0; i < newImgInput.files.length; i++) { fd.append('editNewImages', newImgInput.files[i]); }
	1331	+ }
	1332	+ // 新規ファイル
	1333	+ var newFileInput = formEl.querySelector('input[name="editNewFiles"]');
	1334	+ if (newFileInput && newFileInput.files) {
	1335	+ for (var j = 0; j < newFileInput.files.length; j++) { fd.append('editNewFiles', newFileInput.files[j]); }
	1336	+ }
	1337	+
	1338	+ btn.disabled = true;
	1339	+ btn.textContent = '保存中...';
	1340	+
1116	1116	var xhr = new XMLHttpRequest();
1117		- xhr.open('GET', '/bin/view/SeitokaiCode/EditPost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken), true);
	1342	+ xhr.open('POST', '/bin/get/SeitokaiCode/EditPost?outputSyntax=plain', true);
1118	1118	xhr.onload = function() {
1119	1119	try {
1120	1120	var res = JSON.parse(xhr.responseText);
...	...	@@ -1122,12 +1122,13 @@
1122	1122	showToast('投稿を更新しました', 'success');
1123	1123	setTimeout(function() { location.reload(); }, 800);
1124	1124	} else {
	1350	+ btn.disabled = false; btn.textContent = '保存';
1125	1125	alert('編集に失敗しました: ' + (res.error || ''));
1126	1126	}
1127		- } catch(e) { alert('編集に失敗しました'); }
	1353	+ } catch(e) { btn.disabled = false; btn.textContent = '保存'; alert('編集に失敗しました'); }
1128	1128	};
1129		- xhr.onerror = function() { alert('通信エラーが発生しました'); };
1130		- xhr.send();
	1355	+ xhr.onerror = function() { btn.disabled = false; btn.textContent = '保存'; alert('通信エラーが発生しました'); };
	1356	+ xhr.send(fd);
1131	1131	}
1132	1132
1133	1133	// 投稿の削除（確認ダイアログ付き）
...	...	@@ -1134,7 +1134,9 @@
1134	1134	function confirmDeletePost(schoolPage, postObjNum, token) {
1135	1135	if (!confirm('この投稿を削除しますか？\\n削除後は「この投稿は削除されました」と表示されます。')) return;
1136	1136	var xhr = new XMLHttpRequest();
1137		- xhr.open('GET', '/bin/view/SeitokaiCode/DeletePost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token), true);
	1363	+ xhr.open('POST', '/bin/get/SeitokaiCode/DeletePost?outputSyntax=plain', true);
	1364	+ xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
	1365	+ var deletePostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token);
1138	1138	xhr.onload = function() {
1139	1139	try {
1140	1140	var res = JSON.parse(xhr.responseText);
...	...	@@ -1147,8 +1147,82 @@
1147	1147	} catch(e) { alert('削除に失敗しました'); }
1148	1148	};
1149	1149	xhr.onerror = function() { alert('通信エラーが発生しました'); };
1150		- xhr.send();
	1378	+ xhr.send(deletePostData);
1151	1151	}
	1380	+
	1381	+/* --- 通報ダイアログ --- */
	1382	+function openReportDialog(btn, targetPage, postObjNum, token) {
	1383	+ if (document.getElementById('report-dialog-overlay')) return;
	1384	+ var reasons = ['宣伝・スパム','不適切な内容','個人情報の露出','誹謗中傷','誤情報','その他'];
	1385	+ var overlay = document.createElement('div');
	1386	+ overlay.id = 'report-dialog-overlay';
	1387	+ 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;';
	1388	+ var dialog = document.createElement('div');
	1389	+ dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;max-height:80vh;overflow-y:auto;';
	1390	+ var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を通報</h3>';
	1391	+ html += '<p style="margin:0 0 12px;font-size:0.9em;color:#4b5563;">通報された投稿は管理者が確認するまで一時的に非表示になります。</p>';
	1392	+ html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">通報理由</label>';
	1393	+ html += '<select id="report-reason" style="width:100%;padding:8px;border:1px solid #d1d5db;border-radius:8px;margin-bottom:12px;font-size:0.9em;">';
	1394	+ for (var i=0; i<reasons.length; i++) html += '<option value="'+reasons[i]+'">'+reasons[i]+'</option>';
	1395	+ html += '</select>';
	1396	+ html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">補足コメント（任意）</label>';
	1397	+ 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>';
	1398	+ html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
	1399	+ html += '<button type="button" id="report-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
	1400	+ 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>';
	1401	+ html += '</div>';
	1402	+ dialog.innerHTML = html;
	1403	+ overlay.appendChild(dialog);
	1404	+ document.body.appendChild(overlay);
	1405	+ overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
	1406	+ document.getElementById('report-cancel-btn').addEventListener('click', function() { overlay.remove(); });
	1407	+ document.getElementById('report-submit-btn').addEventListener('click', function() {
	1408	+ var reason = document.getElementById('report-reason').value;
	1409	+ var detail = document.getElementById('report-detail').value;
	1410	+ var submitBtn = document.getElementById('report-submit-btn');
	1411	+ submitBtn.disabled = true; submitBtn.textContent = '送信中...';
	1412	+ var xhr = new XMLHttpRequest();
	1413	+ xhr.open('POST', '/bin/get/SeitokaiCode/ReportAction?outputSyntax=plain', true);
	1414	+ xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
	1415	+ var data = 'targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&detail=' + encodeURIComponent(detail) + '&form_token=' + encodeURIComponent(token);
	1416	+ xhr.onload = function() {
	1417	+ overlay.remove();
	1418	+ showToast('通報を受け付けました', 'success');
	1419	+ setTimeout(function() { location.reload(); }, 1000);
	1420	+ };
	1421	+ xhr.onerror = function() { overlay.remove(); alert('通信エラーが発生しました'); };
	1422	+ xhr.send(data);
	1423	+ });
	1424	+}
	1425	+
	1426	+/* --- 非表示ダイアログ（管理者用） --- */
	1427	+function openHideDialog(btn, targetPage, postObjNum, token) {
	1428	+ if (document.getElementById('hide-dialog-overlay')) return;
	1429	+ var overlay = document.createElement('div');
	1430	+ overlay.id = 'hide-dialog-overlay';
	1431	+ 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;';
	1432	+ var dialog = document.createElement('div');
	1433	+ dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;';
	1434	+ var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を非表示にする</h3>';
	1435	+ html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">非表示の理由</label>';
	1436	+ 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="理由を入力" />';
	1437	+ html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
	1438	+ html += '<button type="button" id="hide-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
	1439	+ 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>';
	1440	+ 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>';
	1441	+ html += '</div>';
	1442	+ dialog.innerHTML = html;
	1443	+ overlay.appendChild(dialog);
	1444	+ document.body.appendChild(overlay);
	1445	+ overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
	1446	+ document.getElementById('hide-cancel-btn').addEventListener('click', function() { overlay.remove(); });
	1447	+ function doHide(action) {
	1448	+ var reason = document.getElementById('hide-reason').value || '管理者判断';
	1449	+ window.location.href = '/bin/view/SeitokaiCode/ModerationAction?action=' + action + '&targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&form_token=' + encodeURIComponent(token);
	1450	+ }
	1451	+ document.getElementById('hide-submit-btn').addEventListener('click', function() { doHide('hide'); });
	1452	+ document.getElementById('hide-warn-btn').addEventListener('click', function() { doHide('hide-warn'); });
	1453	+}
1152	1152	</script>
1153	1153	{{/html}}
1154	1154	{{/velocity}}