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

Summary

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

Details

Page properties

Content

...	...	@@ -1,10 +1,27 @@
1	1	{{velocity}}
2	2	## ===== 学校ページ テンプレート =====
3		-## このテンプレートは学校ページの表示と入力フォームを制御します。
4		-
5		-## メンテナンスバナー
6		-{{include reference="SeitokaiCode.MaintenanceBannerInclude" /}}
7		-
	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
	9	+{{html clean="false"}}
	10	+## メンテナンスバナー（{{include}}ではなくインラインで記述し、<p>タグ挿入を回避）
	11	+#set($bannerDoc = $xwiki.getDocument('SeitokaiAdmin.MaintenanceBanner'))
	12	+#set($bannerObj = $bannerDoc.getObject('SeitokaiCode.MaintenanceBannerClass'))
	13	+#if($bannerObj && $bannerObj.getValue('enabled') == 1)
	14	+#set($bannerMsg = $bannerObj.getValue('message'))
	15	+#set($bannerLevel = $bannerObj.getValue('level'))
	16	+#if(!$bannerLevel || $bannerLevel == '')#set($bannerLevel = 'warning')#end
	17	+<div class="maintenance-banner active maintenance-${bannerLevel}" id="maintenance-banner">
	18	+ <div class="maintenance-banner-inner">
	19	+ <span class="maintenance-icon">#if($bannerLevel == 'urgent')<svg class="ico-banner" viewBox="0 0 24 24"><path d="M10.29 3.86L1.82 18a2 2 0 001.71 3h16.94a2 2 0 001.71-3L13.71 3.86a2 2 0 00-3.42 0z"/><line x1="12" y1="9" x2="12" y2="13"/><line x1="12" y1="17" x2="12.01" y2="17"/></svg>#elseif($bannerLevel == 'info')<svg class="ico-banner" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><line x1="12" y1="16" x2="12" y2="12"/><line x1="12" y1="8" x2="12.01" y2="8"/></svg>#else<svg class="ico-banner" viewBox="0 0 24 24"><path d="M14.7 6.3a1 1 0 000 1.4l1.6 1.6a1 1 0 001.4 0l3.77-3.77a6 6 0 01-7.94 7.94l-6.91 6.91a2.12 2.12 0 01-3-3l6.91-6.91a6 6 0 017.94-7.94l-3.76 3.76z"/></svg>#end</span>
	20	+ <span class="maintenance-text">$!escapetool.xml($bannerMsg)</span>
	21	+ <button class="maintenance-close" onclick="document.getElementById('maintenance-banner').style.display='none'">&times;</button>
	22	+ </div>
	23	+</div>
	24	+#end
8	8	## --- 学校基本情報フィールド ---
9	9	#set($schoolCode = $doc.getValue('schoolCode'))
10	10	#set($schoolName = $doc.getValue('schoolName'))
...	...	@@ -17,8 +17,10 @@
17	17	#set($schoolLevel = $doc.getValue('schoolLevel'))
18	18	#set($schoolSystem = $doc.getValue('schoolSystem'))
19	19	#set($website = $doc.getValue('website'))
	37	+#set($schoolPhoto = $doc.getValue('schoolPhoto'))
	38	+#set($schoolDescription = $doc.getValue('schoolDescription'))
20	20
21		-## --- 組織図 ---
	40	+## --- 生徒会組織 ---
22	22	#set($orgChart = $doc.getValue('orgChart'))
23	23	#set($orgChartImage = $doc.getValue('orgChartImage'))
24	24
...	...	@@ -54,9 +54,7 @@
54	54	#set($seitokaiYoutube = $doc.getValue('seitokaiYoutube'))
55	55	#set($seitokaiOtherSns = $doc.getValue('seitokaiOtherSns'))
56	56
57		-## --- 年度アーカイブ ---
58		-#set($pageFiscalYear = $!doc.getValue('fiscalYear'))
59		-## 現在の年度を計算（4月始まり）
	76	+## --- 現在の年度を計算（4月始まり） ---
60	60	#set($nowFY = $datetool.date)
61	61	#set($currentFYMonth = $mathtool.toInteger($datetool.format('MM', $nowFY)))
62	62	#set($currentFYYear = $mathtool.toInteger($datetool.format('yyyy', $nowFY)))
...	...	@@ -65,10 +65,6 @@
65	65	#else
66	66	#set($currentFiscalYear = $mathtool.sub($currentFYYear, 1))
67	67	#end
68		-## fiscalYear 未設定時はデフォルトとして現在の年度を使う
69		-#if(!$pageFiscalYear || $pageFiscalYear == '')
70		- #set($pageFiscalYear = $currentFiscalYear.toString())
71		-#end
72	72
73	73	## --- 公開範囲フィールド ---
74	74	#set($visibilityOrgChart = $!doc.getValue('visibilityOrgChart'))
...	...	@@ -90,15 +90,81 @@
90	90	#set($viewerDoc = $xwiki.getDocument($viewerUser))
91	91	#set($viewerAccountType = $!viewerDoc.getValue('accountType'))
92	92	#set($viewerSchoolCode = $!viewerDoc.getValue('schoolCode'))
	106	+ #set($viewerSecondarySchoolCode = $!viewerDoc.getValue('secondarySchoolCode'))
	107	+ #set($viewerUserRole = $!viewerDoc.getValue('userRole'))
93	93	#if($viewerAccountType == 'admin')
94	94	#set($isViewerAdmin = true)
95	95	#end
96	96	#end
97	97
	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	+
98	98	## --- 投稿固定/解除処理 ---
99	99	#set($pinAction = $!request.action)
100		-#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || $viewerAccountType == 'verified') && $services.csrf.isTokenValid($request.form_token))
101		- #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))
102	102	#set($postObj = $doc.getObject('SeitokaiCode.ActivityPostClass', $postObjNum))
103	103	#if($postObj)
104	104	#if($pinAction == 'pin')
...	...	@@ -118,12 +118,15 @@
118	118	$response.sendRedirect($doc.getURL('view'))
119	119	#stop
120	120	#end
	200	+ #end## /matches
121	121	#end
122	122
123	123	## --- 特色ある活動 選定/解除処理 ---
124	124	#set($featAction = $!request.action)
125		-#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $services.csrf.isTokenValid($request.form_token))
126		- #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))
127	127	#set($actObj = $doc.getObject('SeitokaiCode.ActivityClass', $actObjNum))
128	128	#if($actObj)
129	129	#if($featAction == 'feature')
...	...	@@ -155,12 +155,13 @@
155	155	$response.sendRedirect($doc.getURL('view'))
156	156	#stop
157	157	#end
	240	+ #end## /matches
158	158	#end
159	159
160	160	## --- ユーザー情報取得 ---
161	161	## displayName: Wiki上の表示名（ニックネーム）。本名(firstName/lastName)は管理者のみ閲覧可能。
162	162	#set($lastAuthor = $doc.author)
163		-#set($lastAuthorDoc = $xwiki.getDocument("XWiki.${lastAuthor}"))
	246	+#set($lastAuthorDoc = $xwiki.getDocument($lastAuthor))
164	164	#set($authorAccountType = '')
165	165	#set($authorUserRole = '')
166	166	#set($authorUserStatus = '')
...	...	@@ -174,7 +174,8 @@
174	174	#set($authorEnrollmentYear = $!lastAuthorDoc.getValue('enrollmentYear'))
175	175	#set($authorDisplayName = $!lastAuthorDoc.getValue('displayName'))
176	176	#if(!$authorDisplayName || $authorDisplayName == '')
177		- #set($authorDisplayName = $xwiki.getUserName($doc.author))
	260	+ ## false引数でプレーンテキスト（HTMLリンクなし）を取得
	261	+ #set($authorDisplayName = $xwiki.getUserName($doc.author, false))
178	178	#end
179	179	## --- 学年の動的計算（学校種別対応） ---
180	180	## 日本の学校年度: 4月始まり。currentSchoolYear = (月>=4) ? 今年 : 去年
...	...	@@ -212,338 +212,320 @@
212	212	#end
213	213	#end
214	214
215		-## --- 信頼性バッジ + ユーザー情報 ---
216		-{{html clean="false"}}
217		-<div class="seitokai-badge-container">
218		- ## 承認バッジ
219		- #if($authorAccountType == 'admin')
220		- <span class="badge badge-admin"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 管理者</span>
221		- #elseif($authorAccountType == 'verified')
222		- <span class="badge badge-verified"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"><path d="M20 6L9 17l-5-5"/></svg> 承認済み</span>
223		- #elseif($authorAccountType == 'referred')
224		- <span class="badge badge-referred"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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>
225		- #else
226		- <span class="badge badge-general">一般</span>
227		- #end
228		- ## 役割バッジ
229		- #if($authorUserRole == 'student')
230		- <span class="badge badge-role-student"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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>
231		- #elseif($authorUserRole == 'teacher')
232		- <span class="badge badge-role-teacher"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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>
233		- #elseif($authorUserRole == 'graduate')
234		- <span class="badge badge-role-graduate"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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>
235		- #end
236		- ## 学年（生徒のみ公開）
237		- #if($authorGrade && $authorGrade != '')
238		- <span class="badge badge-grade">$authorGrade</span>
239		- #end
240		- ## 在籍状態（卒業・休学等の場合のみ表示）
241		- #if($authorUserStatus == 'graduated')
242		- <span class="badge badge-status-graduated"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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>
243		- #elseif($authorUserStatus == 'on_leave')
244		- <span class="badge badge-status-onleave"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" 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>
245		- #elseif($authorUserStatus == 'transferred')
246		- <span class="badge badge-status-transferred"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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>
247		- #end
248		- <span class="badge-info">最終編集: $escapetool.xml($authorDisplayName) ($xwiki.formatDate($doc.date, "yyyy/MM/dd"))</span>
249		-</div>
250		-{{/html}}
	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
251	251
252		-{{html clean="false"}}
253		-
254		-## --- ① 学校基本情報 + 連絡先（左右グリッド・折りたたみ対応） ---
255		-<div class="school-info-grid">
256		- <div class="school-info-card mobile-collapse" id="card-basic-info">
257		- <h2 onclick="toggleInfoCard('card-basic-info')"><span><svg class="ico" style="width:1.1em;height:1.1em;vertical-align:-0.15em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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>
258		- <table class="wiki-table school-info-table">
259		- <tr><th>学校コード</th><td>$escapetool.xml($!schoolCode)</td></tr>
260		- <tr><th>学校名</th><td>$escapetool.xml($!schoolName)</td></tr>
261		- <tr><th>所在地</th><td>$escapetool.xml($!prefecture) #if($city && $city != '')$escapetool.xml($city)#end</td></tr>
262		- <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
263		- <tr><th>共学・別学</th><td>$escapetool.xml($!coeducation)</td></tr>
264		- <tr><th>設置者</th><td>$escapetool.xml($!establishment)</td></tr>
265		- <tr><th>学校種</th><td>$escapetool.xml($!schoolLevel)</td></tr>
266		- <tr><th>課程</th><td>$escapetool.xml($!schoolSystem)</td></tr>
267		- <tr><th>公式サイト</th><td>#if($website && $website != '')<a href="$escapetool.xml($website)" target="_blank" rel="noopener">$escapetool.xml($website)</a>#else<span style="color:#9ca3af;">未登録</span>#end</td></tr>
268		- </table>
269		- #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
270		- #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
271		- #if($infoEditDate && $infoEditDate != '')
272		- <div class="info-last-updated"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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>
273		- #end
274		- </div>
275		-
276		- <div class="school-info-card mobile-collapse" id="card-contact">
277		- <h2 onclick="toggleInfoCard('card-contact')"><span><svg class="ico" style="width:1.1em;height:1.1em;vertical-align:-0.15em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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>
278		- <table class="wiki-table school-info-table">
279		- <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$escapetool.xml($contactInfo)#else<span style="color:#9ca3af;">未登録</span>#end</td></tr>
280		- <tr><th>生徒会Web</th><td>#if($seitokaiWebsite && $seitokaiWebsite != '')<a href="$escapetool.xml($seitokaiWebsite)" target="_blank" rel="noopener"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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 style="color:#9ca3af;">未登録</span>#end</td></tr>
281		- <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 style="color:#9ca3af;">未登録</span>#end</td></tr>
282		- <tr><th>Instagram</th><td>#if($seitokaiInstagram && $seitokaiInstagram != '')<a href="https://instagram.com/$escapetool.url($seitokaiInstagram)" target="_blank" rel="noopener"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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 style="color:#9ca3af;">未登録</span>#end</td></tr>
283		- <tr><th>YouTube</th><td>#if($seitokaiYoutube && $seitokaiYoutube != '')<a href="$escapetool.xml($seitokaiYoutube)" target="_blank" rel="noopener"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polygon points="5 3 19 12 5 21 5 3"/></svg> YouTubeチャンネル</a>#else<span style="color:#9ca3af;">未登録</span>#end</td></tr>
284		- <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$escapetool.xml($seitokaiOtherSns)#else<span style="color:#9ca3af;">未登録</span>#end</td></tr>
285		- </table>
286		- </div>
	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;">
	312	+ <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>
287	287	</div>
	314	+#end
288	288
289		-## --- 生徒会情報アコーディオン ---
290		-<div style="margin:20px 0 16px;">
291		- <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')?'▲':'▼';">
292		- <svg class="ico" style="width:1.1em;height:1.1em;vertical-align:-0.15em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/></svg>
293		- 生徒会情報を見る <span class="shortcut-arrow">▼</span>
294		- </button>
295		-</div>
296		-
297		-<div id="seitokai-info-section" class="seitokai-info-accordion">
298		-
299		-## --- ② 組織図 ---
300		-#set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
301		-#if($hasOrgContent)
302		- ## 公開範囲チェック
303		- #set($canViewOrgChart = true)
304		- #if($visibilityOrgChart == 'members' && $isGuest) #set($canViewOrgChart = false)
305		- #elseif($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewOrgChart = false)
306		- #end
307		- #if($canViewOrgChart)
308		-<h2 class="section-title"><svg class="ico" style="width:1.1em;height:1.1em;vertical-align:-0.15em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h2>
309		-<div class="school-section-card">
310		- <div class="card-inner">
311		- #if($orgChartImage && $orgChartImage != '')
312		- <div style="margin-bottom:12px;"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" style="max-width:100%; border-radius:8px;" /></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)
313	313	#end
314		- #if($orgChart && $orgChart != '')$escapetool.xml($orgChart)#end
	329	+ と連携しています
315	315	</div>
316	316	</div>
317		- #else
318		-<div class="visibility-restricted-notice"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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>
319		- #end
320	320	#end
321	321
322		-## --- ③④⑤ 日常の活動・選挙・定例活動 ---
323		-<div class="school-section-grid">
324		- #if($dailyActivities && $dailyActivities != '')
325		- <div class="school-section-card">
326		- <h3><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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>
327		- <div class="card-inner">
328		- <p style="font-size:0.88em; color:#9ca3af; margin-bottom:12px;">活動時間の多い順に上位3つ</p>
329		- <div class="tag-container">
330		- #set($daIdx = 1)
331		- #foreach($da in $dailyActivities.split(","))
332		- <span class="tag tag-accent">${daIdx}. $escapetool.xml($da.trim())</span>
333		- #set($daIdx = $daIdx + 1)
334		- #end
335		- </div>
336		- #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
337		- <div class="free-note">$escapetool.xml($dailyActivitiesNote)</div>
338		- #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>
339	339	</div>
340		- </div>
341		- #end
342		-
343		- #if($electionExists && $electionExists != '')
344		- <div class="school-section-card">
345		- <h3><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="3" width="18" height="18" rx="2"/><path d="M7 13l3 3 7-7"/></svg> 選挙</h3>
346		- <div class="card-inner">
347		- <div class="info-row">
348		- <span class="info-label">役員選挙</span>
349		- <span class="info-value">$escapetool.xml($!electionExists)</span>
350		- </div>
351		- #if($electionType && $electionType != '')
352		- <div class="info-row">
353		- <span class="info-label">直近の選挙方式</span>
354		- <span class="info-value">$escapetool.xml($!electionType)</span>
355		- </div>
356		- #end
357		- #if($electionNote && $electionNote.trim() != '')
358		- <div class="free-note">$escapetool.xml($electionNote)</div>
359		- #end
	351	+ #if($schoolPhoto && $schoolPhoto != '')
	352	+ <div class="school-photo-area">
	353	+ <img src="$doc.getAttachmentURL($schoolPhoto)" alt="$!escapetool.xml($schoolName)" class="school-photo" />
360	360	</div>
	355	+ #end
361	361	</div>
	357	+ #if($schoolDescription && $schoolDescription.trim() != '')
	358	+ <div class="free-note" style="margin-top:var(--sp-4);">$!escapetool.xml($schoolDescription)</div>
362	362	#end
	360	+ #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
	361	+ #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
	362	+ #if($infoEditDate && $infoEditDate != '')
	363	+ <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>
	364	+ #end
363	363	</div>
364	364
365		-<div class="school-section-grid">
366		- #if($meetingFrequency && $meetingFrequency != '')
367		- <div class="school-section-card">
368		- <h3><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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>
369		- <div class="card-inner">
370		- <div class="info-row">
371		- <span class="info-label">役員定例会の頻度</span>
372		- <span class="info-value">$escapetool.xml($!meetingFrequency)</span>
373		- </div>
374		- #if($regularActivitiesNote && $regularActivitiesNote.trim() != '')
375		- <div class="free-note">$escapetool.xml($regularActivitiesNote)</div>
376		- #end
377		- </div>
378		- </div>
379		- #end
	367	+## --- ② 生徒会基本情報（折りたたみカード） ---
	368	+<div class="school-info-card" id="card-seitokai-info">
	369	+ <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>
	370	+ <div class="seitokai-info-body">
380	380
381		- ## --- ⑦ 予算 ---
382		- #set($hasBudget = ($budgetProcess && $budgetProcess != '') || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
383		- #if($hasBudget)
384		- ## 公開範囲チェック
385		- #set($canViewBudget = true)
386		- #if($visibilityBudget == 'members' && $isGuest) #set($canViewBudget = false)
387		- #elseif($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewBudget = false)
388		- #end
389		- #if($canViewBudget)
390		- <div class="school-section-card">
391		- <h3><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
392		- <div class="card-inner">
393		- #if($budgetProcess && $budgetProcess != '')
394		- <div class="info-row">
395		- <span class="info-label">作成過程の生徒関与</span>
396		- <span class="info-value">
397		- <div class="selection-display">
398		- #foreach($bp in $budgetProcess.split(","))
399		- <span class="selection-item">$escapetool.xml($bp.trim())</span>
400		- #end
401		- </div>
402		- </span>
403		- </div>
	372	+ ## --- 生徒会組織 ---
	373	+ #set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
	374	+ #if($hasOrgContent)
	375	+ #set($canViewOrgChart = true)
	376	+ #if($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewOrgChart = false)
	377	+ #elseif($visibilityOrgChart == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewOrgChart = false)
404	404	#end
405		- #if($studentFee && $studentFee != '')
406		- <div class="info-row">
407		- <span class="info-label">生徒会費（年額）</span>
408		- <span class="info-value">$escapetool.xml($!studentFee)</span>
	379	+ #if($canViewOrgChart)
	380	+ <div class="seitokai-subsection">
	381	+ <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>
	382	+ <div class="seitokai-subsection-content">
	383	+ #if($orgChartImage && $orgChartImage != '')
	384	+ <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
	385	+ #end
	386	+ #if($orgChart && $orgChart != '')<div class="free-note">$!escapetool.xml($orgChart)</div>#end
409	409	</div>
	388	+ </div>
	389	+ #else
	390	+ <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>
410	410	#end
411		- #if($budgetScale && $budgetScale != '')
412		- <div class="info-row">
413		- <span class="info-label">予算規模</span>
414		- <span class="info-value">$escapetool.xml($!budgetScale)</span>
	392	+ #end
	393	+
	394	+ ## --- 日常の活動 ---
	395	+ #if($dailyActivities && !$dailyActivities.isEmpty())
	396	+ <div class="seitokai-subsection">
	397	+ <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>
	398	+ <div class="seitokai-subsection-content">
	399	+ <p class="activity-hint">活動時間が多い3つ</p>
	400	+ <div class="tag-container">
	401	+ #foreach($da in $dailyActivities)
	402	+ <span class="tag tag-accent">$!escapetool.xml($da.trim())</span>
	403	+ #end
	404	+ </div>
	405	+ #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
	406	+ <div class="free-note">$!escapetool.xml($dailyActivitiesNote)</div>
	407	+ #end
415	415	</div>
416		- #end
417		- #if($budgetAllocation && $budgetAllocation != '')
418		- <div class="info-row">
419		- <span class="info-label">主な予算配分</span>
420		- <span class="info-value">
421		- <div class="selection-display">
422		- #foreach($ba in $budgetAllocation.split(","))
423		- <span class="selection-item">$escapetool.xml($ba.trim())</span>
424		- #end
425		- </div>
426		- </span>
427		- </div>
428		- #end
429		- #if($budgetNote && $budgetNote.trim() != '')
430		- <div class="free-note">$escapetool.xml($budgetNote)</div>
431		- #end
432	432	</div>
433		- </div>
434		- #else
435		- <div class="visibility-restricted-notice"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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>
436	436	#end
437		- #end
438		-</div>
439	439
440		-## --- ⑧ 校則の見直し ---
441		-#if($ruleReviewStatus && $ruleReviewStatus != '')
442		- ## 公開範囲チェック
443		- #set($canViewRuleReview = true)
444		- #if($visibilityRuleReview == 'members' && $isGuest) #set($canViewRuleReview = false)
445		- #elseif($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewRuleReview = false)
446		- #end
447		- #if($canViewRuleReview)
448		-<h2 class="section-title"><svg class="ico" style="width:1.1em;height:1.1em;vertical-align:-0.15em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h2>
449		-<div class="school-section-card">
450		- <div class="card-inner">
451		- <div class="info-row">
452		- <span class="info-label">見直しの有無（3年以内）</span>
453		- <span class="info-value"><span class="tag tag-primary" style="font-size:0.9em;">$escapetool.xml($!ruleReviewStatus)</span></span>
	412	+ ## --- 選挙 ---
	413	+ #if($electionExists && $electionExists != '')
	414	+ <div class="seitokai-subsection">
	415	+ <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>
	416	+ <div class="seitokai-subsection-content">
	417	+ <div class="info-row">
	418	+ <span class="info-label">役員選挙</span>
	419	+ <span class="info-value">$!escapetool.xml($!electionExists)</span>
	420	+ </div>
	421	+ #if($electionType && $electionType != '')
	422	+ <div class="info-row">
	423	+ <span class="info-label">直近の選挙方式</span>
	424	+ <span class="info-value">$!escapetool.xml($!electionType)</span>
	425	+ </div>
	426	+ #end
	427	+ #if($electionNote && $electionNote.trim() != '')
	428	+ <div class="free-note">$!escapetool.xml($electionNote)</div>
	429	+ #end
	430	+ </div>
454	454	</div>
455		- #if($ruleReviewContent && $ruleReviewContent != '')
456		- <div class="info-row">
457		- <span class="info-label">見直しの内容</span>
458		- <span class="info-value">
459		- <div class="selection-display">
460		- #foreach($rc in $ruleReviewContent.split(","))
461		- <span class="selection-item">$escapetool.xml($rc.trim())</span>
462		- #end
	432	+ #end
	433	+
	434	+ ## --- 定例活動 ---
	435	+ #if($meetingFrequency && $meetingFrequency != '')
	436	+ <div class="seitokai-subsection">
	437	+ <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>
	438	+ <div class="seitokai-subsection-content">
	439	+ <div class="info-row">
	440	+ <span class="info-label">役員定例会の頻度</span>
	441	+ <span class="info-value">$!escapetool.xml($!meetingFrequency)</span>
463	463	</div>
464		- </span>
	443	+ #if($regularActivitiesNote && $regularActivitiesNote.trim() != '')
	444	+ <div class="free-note">$!escapetool.xml($regularActivitiesNote)</div>
	445	+ #end
	446	+ </div>
465	465	</div>
466	466	#end
467		- #if($ruleReviewProposer && $ruleReviewProposer != '')
468		- <div class="info-row">
469		- <span class="info-label">見直しの提案者</span>
470		- <span class="info-value">
471		- <div class="selection-display">
472		- #foreach($rp in $ruleReviewProposer.split(","))
473		- <span class="selection-item">$escapetool.xml($rp.trim())</span>
474		- #end
	449	+
	450	+ ## --- 予算 ---
	451	+ #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
	452	+ #if($hasBudget)
	453	+ #set($canViewBudget = true)
	454	+ #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewBudget = false)
	455	+ #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false)
	456	+ #end
	457	+ #if($canViewBudget)
	458	+ <div class="seitokai-subsection">
	459	+ <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>
	460	+ <div class="seitokai-subsection-content">
	461	+ #if($budgetProcess && !$budgetProcess.isEmpty())
	462	+ <div class="info-row">
	463	+ <span class="info-label">作成過程の生徒関与</span>
	464	+ <span class="info-value">
	465	+ <div class="selection-display">
	466	+ #foreach($bp in $budgetProcess)
	467	+ <span class="selection-item">$!escapetool.xml($bp.trim())</span>
	468	+ #end
	469	+ </div>
	470	+ </span>
475	475	</div>
476		- </span>
	472	+ #end
	473	+ #if($studentFee && $studentFee != '')
	474	+ <div class="info-row">
	475	+ <span class="info-label">生徒会費（年額）</span>
	476	+ <span class="info-value">$!escapetool.xml($!studentFee)</span>
	477	+ </div>
	478	+ #end
	479	+ #if($budgetScale && $budgetScale != '')
	480	+ <div class="info-row">
	481	+ <span class="info-label">予算規模</span>
	482	+ <span class="info-value">$!escapetool.xml($!budgetScale)</span>
	483	+ </div>
	484	+ #end
	485	+ #if($budgetAllocation && !$budgetAllocation.isEmpty())
	486	+ <div class="info-row">
	487	+ <span class="info-label">主な予算配分</span>
	488	+ <span class="info-value">
	489	+ <div class="selection-display">
	490	+ #foreach($ba in $budgetAllocation)
	491	+ <span class="selection-item">$!escapetool.xml($ba.trim())</span>
	492	+ #end
	493	+ </div>
	494	+ </span>
	495	+ </div>
	496	+ #end
	497	+ #if($budgetNote && $budgetNote.trim() != '')
	498	+ <div class="free-note">$!escapetool.xml($budgetNote)</div>
	499	+ #end
	500	+ </div>
477	477	</div>
	502	+ #else
	503	+ <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>
	504	+ #end
478	478	#end
479		- #if($ruleReviewImplementer && $ruleReviewImplementer != '')
480		- <div class="info-row">
481		- <span class="info-label">見直しの実施者</span>
482		- <span class="info-value">
483		- <div class="selection-display">
484		- #foreach($ri in $ruleReviewImplementer.split(","))
485		- <span class="selection-item">$escapetool.xml($ri.trim())</span>
486		- #end
	506	+
	507	+ ## --- 校則の見直し ---
	508	+ #if($ruleReviewStatus && $ruleReviewStatus != '')
	509	+ #set($canViewRuleReview = true)
	510	+ #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewRuleReview = false)
	511	+ #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false)
	512	+ #end
	513	+ #if($canViewRuleReview)
	514	+ <div class="seitokai-subsection">
	515	+ <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>
	516	+ <div class="seitokai-subsection-content">
	517	+ <div class="info-row">
	518	+ <span class="info-label">見直しの有無（3年以内）</span>
	519	+ <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
487	487	</div>
488		- </span>
	521	+ #if($ruleReviewContent && !$ruleReviewContent.isEmpty())
	522	+ <div class="info-row">
	523	+ <span class="info-label">見直しの内容</span>
	524	+ <span class="info-value">
	525	+ <div class="selection-display">
	526	+ #foreach($rc in $ruleReviewContent)
	527	+ <span class="selection-item">$!escapetool.xml($rc.trim())</span>
	528	+ #end
	529	+ </div>
	530	+ </span>
	531	+ </div>
	532	+ #end
	533	+ #if($ruleReviewProposer && !$ruleReviewProposer.isEmpty())
	534	+ <div class="info-row">
	535	+ <span class="info-label">見直しの提案者</span>
	536	+ <span class="info-value">
	537	+ <div class="selection-display">
	538	+ #foreach($rp in $ruleReviewProposer)
	539	+ <span class="selection-item">$!escapetool.xml($rp.trim())</span>
	540	+ #end
	541	+ </div>
	542	+ </span>
	543	+ </div>
	544	+ #end
	545	+ #if($ruleReviewImplementer && !$ruleReviewImplementer.isEmpty())
	546	+ <div class="info-row">
	547	+ <span class="info-label">見直しの実施者</span>
	548	+ <span class="info-value">
	549	+ <div class="selection-display">
	550	+ #foreach($ri in $ruleReviewImplementer)
	551	+ <span class="selection-item">$!escapetool.xml($ri.trim())</span>
	552	+ #end
	553	+ </div>
	554	+ </span>
	555	+ </div>
	556	+ #end
	557	+ #if($ruleReviewSystem && $ruleReviewSystem != '')
	558	+ <div class="info-row">
	559	+ <span class="info-label">見直しの仕組み</span>
	560	+ <span class="info-value">$!escapetool.xml($!ruleReviewSystem)</span>
	561	+ </div>
	562	+ #end
	563	+ </div>
489	489	</div>
	565	+ #else
	566	+ <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>
	567	+ #end
490	490	#end
491		- #if($ruleReviewSystem && $ruleReviewSystem != '')
492		- <div class="info-row">
493		- <span class="info-label">見直しの仕組み</span>
494		- <span class="info-value">$escapetool.xml($!ruleReviewSystem)</span>
	569	+
	570	+ ## --- 生徒会の課題意識 ---
	571	+ #if($challenges && $challenges != '')
	572	+ #set($canViewChallenges = true)
	573	+ #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewChallenges = false)
	574	+ #elseif($visibilityChallenges == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewChallenges = false)
	575	+ #end
	576	+ #if($canViewChallenges)
	577	+ <div class="seitokai-subsection">
	578	+ <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>
	579	+ <div class="seitokai-subsection-content">
	580	+ <div class="challenge-text">$!escapetool.xml($challenges)</div>
	581	+ </div>
495	495	</div>
	583	+ #else
	584	+ <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>
	585	+ #end
496	496	#end
497		- </div>
498		-</div>
499		- #else
500		-<div class="visibility-restricted-notice"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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>
501		- #end
502		-#end
503	503
504		-## --- ⑨ 課題 ---
505		-#if($challenges && $challenges != '')
506		- ## 公開範囲チェック
507		- #set($canViewChallenges = true)
508		- #if($visibilityChallenges == 'members' && $isGuest) #set($canViewChallenges = false)
509		- #elseif($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewChallenges = false)
510		- #end
511		- #if($canViewChallenges)
512		-<h2 class="section-title">生徒会の課題意識 #if($visibilityChallenges != 'public')<span class="visibility-badge visibility-${visibilityChallenges}">#if($visibilityChallenges == 'members')<svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h2>
513		-<div class="challenge-text">$escapetool.xml($challenges)</div>
514		- #else
515		-<div class="visibility-restricted-notice"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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>
516		- #end
517		-#end
	588	+ </div>## seitokai-info-body 終了
	589	+</div>## card-seitokai-info 終了
518	518
519		-</div>## seitokai-info-accordion 終了
	591	+## --- ③ SNS・連絡先 ---
	592	+<div class="school-info-card collapsed" id="card-contact">
	593	+ <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>
	594	+ <table class="wiki-table school-info-table">
	595	+ <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr>
	596	+ <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>
	597	+ <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>
	598	+ <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>
	599	+ <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>
	600	+ <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
	601	+ </table>
	602	+</div>
520	520
521	521	{{/html}}
522	522
	606	+----
	607	+
523	523	## --- ⑩ 活動報告一覧（スレッド型・年度タブ付き） ---
524		-= <svg class="ico" style="width:1.1em;height:1.1em;vertical-align:-0.15em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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> 活動報告 =
	609	+= 活動報告 =
525	525
526		-## --- 投稿者ステータス凡例（折りたたみ） ---
	611	+## --- 年度タブ + 投稿者ステータス凡例 ---
527	527	{{html clean="false"}}
528		-<div class="author-legend-wrapper">
529		- <button class="author-legend-toggle" onclick="this.classList.toggle('open');this.nextElementSibling.classList.toggle('open')"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="10"/><path d="M12 16v-4"/><path d="M12 8h.01"/></svg> バッジの見方 <span class="chevron">▼</span></button>
530		- <div class="author-legend-body">
531		- <div class="author-legend">
532		- <span class="author-legend-title">投稿者の信頼度:</span>
533		- <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者</span>
534		- <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み</span>
535		- <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介</span>
536		- <span class="author-legend-item"><span class="bar bar-general"></span> 一般（未承認）</span>
537		- </div>
538		- <div class="author-legend">
539		- <span class="author-legend-title">所属:</span>
540		- <span class="author-legend-item"><span class="badge badge-school-internal-confirmed" style="font-size:0.72em; padding: 1px 7px;"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内（確認済）</span> 承認済み＋同校</span>
541		- <span class="author-legend-item"><span class="badge badge-school-internal" style="font-size:0.72em; padding: 1px 7px;"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内</span> 紹介＋同校</span>
542		- <span class="author-legend-item"><span class="badge badge-school-external" style="font-size:0.72em; padding: 1px 7px;"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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>
543		- <span class="author-legend-item" style="color:var(--text-light);font-size:0.85em;">※一般アカウントは所属未確認のため非表示</span>
544		- </div>
545		- </div>
546		-</div>
547	547
548	548	## --- 年度タブ ---
549	549	## 全活動から年度一覧を収集
...	...	@@ -565,14 +565,49 @@
565	565	#end
566	566	## ソート（降順にしたいが Velocity にはないので JS で制御）
567	567
568		-<div class="activity-fy-tabs">
569		- <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
570		- #foreach($fy in $fySet)
571		- #if($fy != $currentFYStr)
572		- <button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button>
	634	+<div class="activity-toolbar">
	635	+ <div class="activity-fy-tabs">
	636	+ <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
	637	+ #foreach($fy in $fySet)
	638	+ #if($fy != $currentFYStr)
	639	+ <button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button>
	640	+ #end
573	573	#end
574		- #end
575		- <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
	642	+ <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
	643	+ </div>
	644	+ <div class="activity-toolbar-right">
	645	+ <button class="btn-view-toggle" id="btnViewToggle" onclick="toggleCompactView()" title="タイトルのみ表示">
	646	+ <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>
	647	+ <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>
	648	+ <span class="toggle-label">一覧表示</span>
	649	+ </button>
	650	+ </div>
	651	+ <div class="author-legend-wrapper">
	652	+ <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>
	653	+ <div class="author-legend-body">
	654	+ <div class="author-legend">
	655	+ <span class="author-legend-title">投稿者の信頼度:</span>
	656	+ <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者 <span class="text-hint">— 運営スタッフ</span></span>
	657	+ <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み <span class="text-hint">— 本人確認済みのユーザー</span></span>
	658	+ <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介 <span class="text-hint">— 承認済みユーザーからの紹介</span></span>
	659	+ <span class="author-legend-item"><span class="bar bar-general"></span> 一般 <span class="text-hint">— 一般登録ユーザー</span></span>
	660	+ </div>
	661	+ <div class="author-legend">
	662	+ <span class="author-legend-title">所属:</span>
	663	+ <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>
	664	+ <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>
	665	+ <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>
	666	+ <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>
	667	+ <span class="author-legend-item text-hint">※一般アカウントは所属バッジが表示されません</span>
	668	+ </div>
	669	+ <div class="author-legend">
	670	+ <span class="author-legend-title">役割:</span>
	671	+ <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>
	672	+ <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>
	673	+ <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>
	674	+ </div>
	675	+ </div>
	676	+ </div>
576	576	</div>
577	577
578	578	{{/html}}
...	...	@@ -621,27 +621,49 @@
621	621	#set($threadPosts = [])
622	622	#set($discard = $threadPosts.addAll($pinnedPosts))
623	623	#set($discard = $threadPosts.addAll($normalPosts))
	725	+ ## report/comment カウント
	726	+ #set($reportCount = 0)
	727	+ #set($commentCount = 0)
	728	+ #foreach($tp in $threadPosts)
	729	+ #set($tpType = $!tp.getValue('postType'))
	730	+ #if($tpType == 'comment')
	731	+ #set($commentCount = $commentCount + 1)
	732	+ #else
	733	+ #set($reportCount = $reportCount + 1)
	734	+ #end
	735	+ #end
624	624
625	625	{{html clean="false"}}
626		-<div class="activity-thread" data-fiscal-year="$escapetool.xml($actFY)">
	738	+<div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)">
627	627	<div class="activity-thread-header">
628	628	<div class="activity-thread-title">
629		- <h3 #if($actFeatured == '1')class="featured-title"#end>$escapetool.xml($!actTitle) #if($actFeatured == '1')<svg style="width:14px;height:14px;vertical-align:-1px;margin-left:4px;" viewBox="0 0 24 24" fill="currentColor" stroke="none"><polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"/></svg>#end</h3>
630		- <span class="activity-meta">$escapetool.xml($!actCommittee) | $escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $escapetool.xml($actFY)年度#end</span>
	741	+ <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>
	742	+ <div class="activity-meta-line">
	743	+ <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
	744	+ #set($actTagsList = $activity.getValue('tags'))
	745	+ #if($actTagsList && !$actTagsList.isEmpty())
	746	+ #foreach($tagItem in $actTagsList)
	747	+ #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end
	748	+ #end
	749	+ #end
	750	+ </div>
631	631	</div>
632		- <div style="display:flex;align-items:center;gap:8px;">
633		- <span class="thread-post-count">${threadPosts.size()}件の投稿</span>
	752	+ <div class="thread-meta-right">
	753	+ <span class="thread-post-count">${reportCount}件の報告 ・ ${commentCount}件のコメント</span>
634	634	#if($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred')
635	635	#if($actFeatured == '1')
636		- <a href="$doc.getURL('view', "action=unfeature&actObj=${actIdx}&form_token=${services.csrf.getToken()}")" class="btn-featured-toggle btn-unfeature" title="特色ある活動の選定を解除"><svg style="width:14px;height:14px;" 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> 特色解除</a>
	756	+ <a href="$doc.getURL('view', "action=unfeature&actObj=${actIdx}&form_token=${services.csrf.getToken()}")" class="btn-featured-toggle btn-unfeature" title="特色ある活動の選定を解除"><svg class="ico ico-fixed-14" 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> 特色解除</a>
637	637	#else
638		- <a href="$doc.getURL('view', "action=feature&actObj=${actIdx}&form_token=${services.csrf.getToken()}")" class="btn-featured-toggle btn-feature" title="特色ある活動に選定（最大3件）"><svg style="width:14px;height:14px;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><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> 特色設定</a>
	758	+ <a href="$doc.getURL('view', "action=feature&actObj=${actIdx}&form_token=${services.csrf.getToken()}")" class="btn-featured-toggle btn-feature" title="特色ある活動に選定（最大3件）"><svg class="ico ico-fixed-14" 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> 特色設定</a>
639	639	#end
640	640	#end
641	641	</div>
642	642	</div>
643	643
	764	+ ## --- 活動報告セクション ---
644	644	#foreach($post in $threadPosts)
	766	+ #set($thisPostType = $!post.getValue('postType'))
	767	+ #if($thisPostType != 'comment')
645	645	#set($postContent = $post.getValue('content'))
646	646	#set($postAuthor = $post.getValue('author'))
647	647	#set($postAccountType = $!post.getValue('authorAccountType'))
...	...	@@ -649,15 +649,35 @@
649	649	#set($postGrade = $!post.getValue('authorGrade'))
650	650	#set($postSchoolCode = $!post.getValue('authorSchoolCode'))
651	651	#set($postDate = $post.getValue('createdDate'))
	775	+ ## 論理削除チェック
	776	+ #set($postDeleted = $!post.getValue('deleted'))
	777	+ #if($postDeleted == 1 || $postDeleted == '1')
	778	+ #if($viewerAccountType == 'admin')
	779	+ <div class="thread-post thread-post-deleted thread-post-admin-deleted">
	780	+ <div class="thread-post-admin-deleted-content">
	781	+ <svg class="ico" 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>
	782	+ <strong>投稿者により削除済み</strong>（$!post.getValue('deletedAt')）
	783	+ <div class="thread-post-restored-content">$!escapetool.xml($!postContent)</div>
	784	+ </div>
	785	+ </div>
	786	+ #else
	787	+ <div class="thread-post thread-post-deleted thread-post-user-deleted">
	788	+ <div class="thread-post-user-deleted-content">
	789	+ <svg class="ico" 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>
	790	+ この投稿は削除されました
	791	+ </div>
	792	+ </div>
	793	+ #end
	794	+ #else
652	652	## 通報による非表示チェック
653	653	#set($postHidden = $!post.getValue('hidden'))
654	654	#if($postHidden == 1 || $postHidden == '1')
655	655	#if($viewerAccountType == 'admin')
656		- <div class="thread-post" style="opacity:0.5;border:2px dashed #dc2626;">
657		- <div style="padding:10px 16px;font-size:0.85em;color:#dc2626;">
658		- <svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M10.29 3.86L1.82 18a2 2 0 001.71 3h16.94a2 2 0 001.71-3L13.71 3.86a2 2 0 00-3.42 0z"/><line x1="12" y1="9" x2="12" y2="13"/><line x1="12" y1="17" x2="12.01" y2="17"/></svg>
659		- <strong>通報により非表示中</strong>（理由: $escapetool.xml($!post.getValue('hiddenReason'))）
660		- <div style="margin-top:4px;font-size:0.92em;color:var(--text-mid);">$escapetool.xml($!postContent)</div>
	799	+ <div class="thread-post thread-post-admin-hidden">
	800	+ <div class="thread-post-admin-hidden-content">
	801	+ <svg class="ico" viewBox="0 0 24 24"><path d="M10.29 3.86L1.82 18a2 2 0 001.71 3h16.94a2 2 0 001.71-3L13.71 3.86a2 2 0 00-3.42 0z"/><line x1="12" y1="9" x2="12" y2="13"/><line x1="12" y1="17" x2="12.01" y2="17"/></svg>
	802	+ <strong>通報により非表示中</strong>（理由: $!escapetool.xml($!post.getValue('hiddenReason'))）
	803	+ <div class="thread-post-restored-content">$!escapetool.xml($!postContent)</div>
661	661	</div>
662	662	</div>
663	663	#end
...	...	@@ -666,12 +666,12 @@
666	666	#set($postVis = $!post.getValue('visibility'))
667	667	#if(!$postVis || $postVis == '') #set($postVis = 'public') #end
668	668	#set($canViewPost = true)
669		- #if($postVis == 'members' && $isGuest) #set($canViewPost = false)
670		- #elseif($postVis == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewPost = false)
	812	+ #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewPost = false)
	813	+ #elseif($postVis == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPost = false)
671	671	#end
672	672	#if(!$canViewPost)
673	673	<div class="thread-post visibility-restricted-post">
674		- <div class="visibility-restricted-notice" style="margin:8px 0;"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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>
	817	+ <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>
675	675	</div>
676	676	#else
677	677	## 投稿者のアカウント種別に基づいたCSSクラス
...	...	@@ -690,53 +690,68 @@
690	690	<div class="thread-post-content">
691	691	<div class="thread-post-header">
692	692	#if($isPinned == '1')
693		- <span class="pin-badge"><svg style="width:12px;height:12px;" 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> 固定</span>
	836	+ <span class="pin-badge"><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> 固定</span>
694	694	#end
695	695	#set($postAuthorRef = $!post.getValue('authorRef'))
696	696	<span class="thread-post-author">
697	697	#if($postAuthorRef && $postAuthorRef != '')
698		- <a href="$xwiki.getURL('SeitokaiCode.UserProfile', 'view', "user=${escapetool.url($postAuthorRef)}")">$escapetool.xml($!postAuthor)</a>
	841	+ <a href="$xwiki.getURL('SeitokaiCode.UserProfile', 'view', "user=${escapetool.url($postAuthorRef)}")">$!escapetool.xml($!postAuthor)</a>
699	699	#else
700		- $escapetool.xml($!postAuthor)
	843	+ $!escapetool.xml($!postAuthor)
701	701	#end
702	702	</span>
703	703	<span class="author-badge">
704	704	#if($postAccountType == 'admin')
705		- <span class="badge badge-admin" style="font-size:0.75em;padding:1px 7px;"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 管理者</span>
	848	+ <span class="badge badge-admin badge-sm"><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>
706	706	#elseif($postAccountType == 'verified')
707		- <span class="badge badge-verified" style="font-size:0.75em;padding:1px 7px;"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"><path d="M20 6L9 17l-5-5"/></svg> 承認済み</span>
	850	+ <span class="badge badge-verified badge-sm"><svg class="ico" viewBox="0 0 24 24" stroke-width="2.5"><path d="M20 6L9 17l-5-5"/></svg> 承認済み</span>
708	708	#elseif($postAccountType == 'referred')
709		- <span class="badge badge-referred" style="font-size:0.75em;padding:1px 7px;"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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>
	852	+ <span class="badge badge-referred badge-sm"><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>
710	710	#else
711		- <span class="badge badge-general" style="font-size:0.75em;padding:1px 7px;">一般</span>
	854	+ <span class="badge badge-general badge-sm">一般</span>
712	712	#end
713	713	## 所属バッジ（投稿者の学校コードとページの学校コードを比較）
	857	+ #set($postIsSchoolMatch = ($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode)))
714	714	#if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general')
715		- #if($postSchoolCode == $schoolCode)
	859	+ #if($postUserRole == 'graduate' && $postIsSchoolMatch)
	860	+ <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>
	861	+ #elseif($postIsSchoolMatch && $postUserRole != 'graduate')
716	716	#if($postAccountType == 'verified' || $postAccountType == 'admin')
717		- <span class="badge badge-school-internal-confirmed" style="font-size:0.75em;padding:1px 7px;"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内（確認済）</span>
	863	+ <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>
718	718	#else
719		- <span class="badge badge-school-internal" style="font-size:0.75em;padding:1px 7px;"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内</span>
	865	+ <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>
720	720	#end
721	721	#else
722		- <span class="badge badge-school-external" style="font-size:0.75em;padding:1px 7px;"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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>
	868	+ <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>
723	723	#end
724	724	#end
725	725	#if($postUserRole == 'student')
726		- <span class="badge badge-role-student" style="font-size:0.75em;padding:1px 7px;"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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>
	872	+ <span class="badge badge-role-student 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>
	873	+ #set($postIsOfficer = $!post.getValue('authorIsOfficer'))
	874	+ #if($postIsOfficer == 'true')
	875	+ <span class="badge badge-role-officer badge-sm"><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>
	876	+ #end
727	727	#elseif($postUserRole == 'teacher')
728		- <span class="badge badge-role-teacher" style="font-size:0.75em;padding:1px 7px;"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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>
	878	+ <span class="badge badge-role-teacher badge-sm"><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>
729	729	#elseif($postUserRole == 'graduate')
730		- <span class="badge badge-role-graduate" style="font-size:0.75em;padding:1px 7px;"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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>
	880	+ <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>
731	731	#end
732		- #if($postGrade && $postGrade != '')
733		- <span class="badge badge-grade" style="font-size:0.75em;padding:1px 7px;">$postGrade</span>
734		- #end
735	735	</span>
736	736	<span class="thread-post-date">$!postDate</span>
	884	+ #set($postEdited = $!post.getValue('edited'))
	885	+ #if($postEdited == 1 || $postEdited == '1')
	886	+ <span class="post-edited-label">（編集済み）</span>
	887	+ #end
	888	+ #set($postAuthorRefH = $!post.getValue('authorRef'))
	889	+ #set($postObjNumH = $post.number)
	890	+ #if(!$isGuest && $xcontext.user != $postAuthorRefH)
	891	+ <button type="button" class="btn-post-report btn-post-report-header" onclick="openReportDialog(this, '${doc.fullName}', $postObjNumH, '${services.csrf.getToken()}')" title="この投稿を通報">
	892	+ <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> 通報
	893	+ </button>
	894	+ #end
737	737	</div>
738	738	<div class="thread-post-body">
739		- $escapetool.xml($!postContent)
	897	+ $!escapetool.xml($!postContent)
740	740	#set($postImages = $!post.getValue('images'))
741	741	#if($postImages && $postImages.trim() != '')
742	742	<div class="post-images">
...	...	@@ -750,7 +750,7 @@
750	750	#if($imgName != '')
751	751	<div class="post-image-item">
752	752	<a href="$doc.getAttachmentURL($imgName)" target="_blank">
753		- <img src="$doc.getAttachmentURL($imgName)" alt="$escapetool.xml($imgName)" loading="lazy"/>
	911	+ <img src="$doc.getAttachmentURL($imgName)" alt="$!escapetool.xml($imgName)" loading="lazy"/>
754	754	</a>
755	755	</div>
756	756	#end
...	...	@@ -781,14 +781,14 @@
781	781	#set($displayName = $fName.replaceFirst('file_\d{14}_\d+_', ''))
782	782	#end
783	783	<div class="post-file-item">
784		- <a href="$doc.getAttachmentURL($fName)" target="_blank" download="$escapetool.xml($displayName)">
785		- #if($fIcon == 'pdf')<svg class="ico" style="width:1.1em;height:1.1em;vertical-align:-0.15em;color:${fColor};" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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"/><path d="M9 15v-2h1.5a1.5 1.5 0 010 3H9"/></svg>
786		- #elseif($fIcon == 'word')<svg class="ico" style="width:1.1em;height:1.1em;vertical-align:-0.15em;color:${fColor};" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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"/><path d="M8 15l1.5-5 1.5 5 1.5-5 1.5 5"/></svg>
787		- #elseif($fIcon == 'excel')<svg class="ico" style="width:1.1em;height:1.1em;vertical-align:-0.15em;color:${fColor};" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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="8" y1="13" x2="16" y2="13"/><line x1="8" y1="17" x2="16" y2="17"/><line x1="12" y1="13" x2="12" y2="17"/></svg>
788		- #elseif($fIcon == 'ppt')<svg class="ico" style="width:1.1em;height:1.1em;vertical-align:-0.15em;color:${fColor};" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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"/><rect x="8" y="12" width="8" height="6" rx="1"/></svg>
789		- #else<svg class="ico" style="width:1.1em;height:1.1em;vertical-align:-0.15em;color:${fColor};" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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"/></svg>
	942	+ <a href="$doc.getAttachmentURL($fName)" target="_blank" download="$!escapetool.xml($displayName)">
	943	+ #if($fIcon == 'pdf')<svg class="ico ico-md" style="color:${fColor};" 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"/><path d="M9 15v-2h1.5a1.5 1.5 0 010 3H9"/></svg>
	944	+ #elseif($fIcon == 'word')<svg class="ico ico-md" style="color:${fColor};" 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"/><path d="M8 15l1.5-5 1.5 5 1.5-5 1.5 5"/></svg>
	945	+ #elseif($fIcon == 'excel')<svg class="ico ico-md" style="color:${fColor};" 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="8" y1="13" x2="16" y2="13"/><line x1="8" y1="17" x2="16" y2="17"/><line x1="12" y1="13" x2="12" y2="17"/></svg>
	946	+ #elseif($fIcon == 'ppt')<svg class="ico ico-md" style="color:${fColor};" 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"/><rect x="8" y="12" width="8" height="6" rx="1"/></svg>
	947	+ #else<svg class="ico ico-md" style="color:${fColor};" 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"/></svg>
790	790	#end
791		- <span class="post-file-name">$escapetool.xml($displayName)</span>
	949	+ <span class="post-file-name">$!escapetool.xml($displayName)</span>
792	792	</a>
793	793	</div>
794	794	#end
...	...	@@ -798,21 +798,45 @@
798	798	#end
799	799	</div>
800	800	#if($postVis != 'public')
801		- <div class="visibility-badge visibility-${postVis}" style="margin-top:6px;font-size:0.75em;">#if($postVis == 'members')<svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</div>
	959	+ <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>
802	802	#end
803		- ## 固定/解除ボタン（承認済み・管理者のみ）
804		- #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
805		- #set($postObjNum = $post.number)
806		- <div class="post-pin-action" style="margin-top:6px;">
	961	+ ## 固定/編集/削除/通報/非表示ボタン（横並び）
	962	+ #set($postAuthorRef = $!post.getValue('authorRef'))
	963	+ #set($postObjNumED = $post.number)
	964	+ #set($showPinBtn = ($viewerAccountType == 'admin' || $viewerAccountType == 'verified'))
	965	+ #set($showEditDeleteBtn = ($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin'))
	966	+ #set($showHideBtn = ($viewerAccountType == 'admin'))
	967	+ #if($showPinBtn || $showEditDeleteBtn || $showHideBtn)
	968	+ <div class="post-edit-actions post-action-mt">
	969	+ #if($showPinBtn)
	970	+ #set($postObjNum = $post.number)
807	807	#if($isPinned == '1')
808	808	<a href="$doc.getURL('view', "action=unpin&postObj=${postObjNum}&form_token=${services.csrf.getToken()}")" class="btn-pin-toggle btn-unpin" title="固定を解除">
809		- <svg style="width:13px;height:13px;" 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> 固定を解除
	973	+ <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> 固定を解除
810	810	</a>
811	811	#else
812	812	<a href="$doc.getURL('view', "action=pin&postObj=${postObjNum}&form_token=${services.csrf.getToken()}")" class="btn-pin-toggle btn-pin" title="この投稿を固定">
813		- <svg style="width:13px;height:13px;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><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> 固定する
	977	+ <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> 固定する
814	814	</a>
815	815	#end
	980	+ #end
	981	+ #if($showEditDeleteBtn)
	982	+ #if($xcontext.user == $postAuthorRef)
	983	+ #set($editImages = $!post.getValue('images'))
	984	+ #set($editFiles = $!post.getValue('files'))
	985	+ <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="この投稿を編集">
	986	+ <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> 編集
	987	+ </button>
	988	+ #end
	989	+ <button type="button" class="btn-post-delete" onclick="confirmDeletePost('${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を削除">
	990	+ <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> 削除
	991	+ </button>
	992	+ #end
	993	+ #if($showHideBtn)
	994	+ <button type="button" class="btn-post-hide" onclick="openHideDialog(this, '${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を非表示にする">
	995	+ <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> 非表示
	996	+ </button>
	997	+ #end
816	816	</div>
817	817	#end
818	818	</div>
...	...	@@ -819,15 +819,56 @@
819	819	</div>
820	820	#end## /canViewPost
821	821	#end## /postHidden
	1004	+ #end## /postDeleted
	1005	+ #end## /postType != comment
	1006	+ #end## /foreach reports
	1007	+
	1008	+ ## --- コメントセクション（折りたたみ） ---
	1009	+ #if($commentCount > 0)
	1010	+ <details class="thread-comments-section">
	1011	+ <summary class="thread-comments-toggle">
	1012	+ <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> ${commentCount}件のコメント
	1013	+ </summary>
	1014	+ #foreach($post in $threadPosts)
	1015	+ #set($thisPostType = $!post.getValue('postType'))
	1016	+ #if($thisPostType == 'comment')
	1017	+ #set($postContent = $post.getValue('content'))
	1018	+ #set($postAuthor = $post.getValue('author'))
	1019	+ #set($postAccountType = $!post.getValue('authorAccountType'))
	1020	+ #set($postDate = $post.getValue('createdDate'))
	1021	+ #set($postDeleted = $!post.getValue('deleted'))
	1022	+ #if($postDeleted == 1 || $postDeleted == '1')
	1023	+ <div class="thread-comment thread-comment-deleted">
	1024	+ <span class="thread-comment-meta">このコメントは削除されました</span>
	1025	+ </div>
	1026	+ #else
	1027	+ #set($postHidden = $!post.getValue('hidden'))
	1028	+ #if($postHidden == 1 || $postHidden == '1')
	1029	+ <div class="thread-comment thread-comment-hidden">
	1030	+ <span class="thread-comment-meta">このコメントは非表示にされました</span>
	1031	+ </div>
	1032	+ #else
	1033	+ <div class="thread-comment">
	1034	+ <span class="thread-comment-author">$!escapetool.xml($postAuthor)</span>
	1035	+ <span class="thread-comment-date">$!postDate</span>
	1036	+ <div class="thread-comment-body">$!escapetool.xml($postContent)</div>
	1037	+ </div>
	1038	+ #end
	1039	+ #end
	1040	+ #end
	1041	+ #end
	1042	+ </details>
822	822	#end
823	823
824	824	#if($xcontext.user != "XWiki.XWikiGuest")
825	825	<div class="thread-add-post">
826		- <a href="/xwiki/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
	1047	+ #if($isSchoolMember || $isViewerAdmin)
	1048	+ <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
827	827	＋ 活動報告を追加
828	828	</a>
829		- <a href="/xwiki/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
830		- <svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M21 15a2 2 0 01-2 2H7l-4 4V5a2 2 0 012-2h14a2 2 0 012 2z"/></svg> コメントを書く
	1051	+ #end
	1052	+ <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
	1053	+ <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> コメントを書く
831	831	</a>
832	832	</div>
833	833	#end
...	...	@@ -837,7 +837,7 @@
837	837	#else
838	838	{{html clean="false"}}
839	839	<div class="empty-state">
840		- <div class="empty-state-icon"><svg style="width:1em;height:1em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><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></div>
	1063	+ <div class="empty-state-icon"><svg class="ico" viewBox="0 0 24 24" stroke-width="1.5"><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></div>
841	841	<div class="empty-state-title">活動報告はまだありません</div>
842	842	<div class="empty-state-desc">この学校の活動を記録して、他校と共有しましょう。<br>「活動を追加」ボタンから最初の活動を作成できます。</div>
843	843	</div>
...	...	@@ -848,69 +848,45 @@
848	848	#if($xcontext.user != "XWiki.XWikiGuest")
849	849	{{html clean="false"}}
850	850	<div class="activity-add-section">
851		- <a href="/xwiki/bin/view/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity">
852		- <svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round"><line x1="12" y1="5" x2="12" y2="19"/><line x1="5" y1="12" x2="19" y2="12"/></svg> 活動を追加
	1074	+ <a href="/bin/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$!escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity">
	1075	+ <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> 活動を追加
853	853	</a>
854	854	</div>
855	855	{{/html}}
856	856	#end
857	857
858		-## --- 年度アーカイブ セクション ---
859		-{{html clean="false"}}
860		-<div class="school-section-card" style="margin-top:24px;">
861		- <h2 style="font-size:1.05em;font-weight:700;margin:0 0 12px;display:flex;align-items:center;gap:6px;">
862		- <svg style="width:1.1em;height:1.1em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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>
863		- 年度アーカイブ
864		- </h2>
865		- <div style="font-size:0.88em;color:var(--text-mid);margin-bottom:12px;">
866		- 現在のページ: <strong>${pageFiscalYear}年度</strong>
867		- #set($lyud = $!doc.getValue('lastYearUpdateDate'))
868		- #if($lyud && $lyud != '')
869		- | 最終年度更新: $escapetool.xml($lyud) ($escapetool.xml($!doc.getValue('lastYearUpdateBy')))
870		- #end
871		- </div>
872		-
873		- ## 過去アーカイブの検索
874		- #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))
875		- #set($archivePages = $archiveQuery.execute())
876		-
877		- #if($archivePages && $archivePages.size() > 0)
878		- <div style="margin-bottom:12px;">
879		- <div style="font-weight:600;font-size:0.9em;margin-bottom:8px;">過去の年度アーカイブ</div>
880		- <div style="display:flex;flex-wrap:wrap;gap:8px;">
881		- #foreach($archPage in $archivePages)
882		- #set($archPageDoc = $xwiki.getDocument($archPage))
883		- #set($archPageObj = $archPageDoc.getObject('SeitokaiCode.SchoolClass'))
884		- #if($archPageObj)
885		- #set($archPageFY = $!archPageObj.getValue('fiscalYear'))
886		- <a href="$archPageDoc.getURL('view')" style="display:inline-flex;align-items:center;gap:5px;padding:8px 14px;background:#e0e7ff;border:1px solid #c7d2fe;border-radius:8px;color:#4338ca;text-decoration:none;font-size:0.9em;font-weight:600;transition:all 0.15s;">
887		- <svg style="width:1em;height:1em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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>
888		- ${archPageFY}年度
889		- </a>
890		- #end
891		- #end
892		- </div>
893		- </div>
894		- #else
895		- <div style="font-size:0.88em;color:var(--text-light);margin-bottom:12px;">過去のアーカイブはまだありません</div>
896		- #end
897		-
898		- ## 新年度に移行ボタン（承認済み・管理者のみ）
899		- #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
900		- <div style="margin-top:12px;padding-top:12px;border-top:1px solid #e2e8f0;">
901		- <a href="/xwiki/bin/view/SeitokaiCode/YearArchiveAction?schoolPage=${doc.fullName}" style="display:inline-flex;align-items:center;gap:6px;padding:8px 18px;background:#4f46e5;color:white;border-radius:8px;text-decoration:none;font-size:0.9em;font-weight:600;">
902		- <svg style="width:1em;height:1em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"><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>
903		- ${pageFiscalYear}年度をアーカイブして新年度に移行
904		- </a>
905		- <div style="font-size:0.8em;color:var(--text-light);margin-top:6px;">現在の学校情報を${pageFiscalYear}年度として保存し、新しい年度に移行します。</div>
906		- </div>
907		- #end
908		-</div>
909		-{{/html}}
910		-
911	911	## --- 年度タブ切り替え JavaScript ---
912	912	{{html clean="false"}}
913	913	<script>
	1084	+// コンパクト表示（タイトルのみ）トグル
	1085	+function toggleCompactView() {
	1086	+ var container = document.querySelector('.xwiki-content') || document.body;
	1087	+ var isCompact = container.classList.toggle('activity-compact-view');
	1088	+ var btn = document.getElementById('btnViewToggle');
	1089	+ if (btn) {
	1090	+ btn.querySelector('.toggle-label').textContent = isCompact ? '詳細表示' : '一覧表示';
	1091	+ btn.title = isCompact ? '詳細表示に戻す' : 'タイトルのみ表示';
	1092	+ }
	1093	+ // コンパクトモードでは各スレッドヘッダーをクリックで個別展開可能にする
	1094	+ document.querySelectorAll('.activity-thread').forEach(function(thread) {
	1095	+ if (isCompact) {
	1096	+ thread.classList.remove('compact-expanded');
	1097	+ }
	1098	+ });
	1099	+}
	1100	+
	1101	+// コンパクトモードで個別スレッドを展開/折りたたみ
	1102	+function toggleThreadExpand(e) {
	1103	+ var container = document.querySelector('.xwiki-content') || document.body;
	1104	+ if (!container.classList.contains('activity-compact-view')) return;
	1105	+ // リンクやボタンのクリックはスルー
	1106	+ if (e.target.closest('a, button, .btn-featured-toggle')) return;
	1107	+ var thread = e.target.closest('.activity-thread');
	1108	+ if (thread) {
	1109	+ thread.classList.toggle('compact-expanded');
	1110	+ }
	1111	+}
	1112	+
914	914	function switchActivityFY(fy, btn) {
915	915	// タブのアクティブ状態を切り替え
916	916	document.querySelectorAll('.activity-fy-tab').forEach(function(t) { t.classList.remove('active'); });
...	...	@@ -917,29 +917,40 @@
917	917	btn.classList.add('active');
918	918	// 活動スレッドの表示切り替え
919	919	document.querySelectorAll('.activity-thread[data-fiscal-year]').forEach(function(thread) {
920		- if (fy === 'all') {
921		- thread.style.display = '';
922		- } else if (thread.getAttribute('data-fiscal-year') === fy) {
923		- thread.style.display = '';
	1119	+ if (fy === 'all' || thread.getAttribute('data-fiscal-year') === fy) {
	1120	+ thread.classList.remove('fy-hidden');
924	924	} else {
925		- thread.style.display = 'none';
	1122	+ thread.classList.add('fy-hidden');
926	926	}
927	927	});
928	928	}
929		-// ページ読み込み時にデフォルトで現在の年度を表示
	1126	+// ページ読み込み時の初期化
930	930	document.addEventListener('DOMContentLoaded', function() {
931		- var defaultTab = document.querySelector('.activity-fy-tab.active');
932		- if (defaultTab) { defaultTab.click(); }
933		- // モバイルでは基本情報・連絡先をデフォルト折りたたみ
934		- if (window.innerWidth <= 768) {
935		- document.querySelectorAll('.school-info-card.mobile-collapse').forEach(function(card) {
936		- card.classList.add('collapsed');
	1128	+ // 年度タブを降順にソート（「全期間」タブは末尾に固定）
	1129	+ var tabContainer = document.querySelector('.activity-fy-tabs');
	1130	+ if (tabContainer) {
	1131	+ var tabs = Array.from(tabContainer.querySelectorAll('.activity-fy-tab'));
	1132	+ var allTab = null;
	1133	+ var fyTabs = [];
	1134	+ tabs.forEach(function(t) {
	1135	+ var onclickStr = t.getAttribute('onclick') || '';
	1136	+ if (onclickStr.indexOf("'all'") !== -1) { allTab = t; }
	1137	+ else { fyTabs.push(t); }
937	937	});
	1139	+ // 年度タブを数値の降順でソート
	1140	+ fyTabs.sort(function(a, b) {
	1141	+ var aYear = parseInt(a.textContent) || 0;
	1142	+ var bYear = parseInt(b.textContent) || 0;
	1143	+ return bYear - aYear;
	1144	+ });
	1145	+ // DOM再配置
	1146	+ fyTabs.forEach(function(t) { tabContainer.appendChild(t); });
	1147	+ if (allTab) { tabContainer.appendChild(allTab); }
938	938	}
	1149	+ // デフォルトで現在の年度を表示
	1150	+ var defaultTab = document.querySelector('.activity-fy-tab.active');
	1151	+ if (defaultTab) { defaultTab.click(); }
939	939	// 保存成功時のトースト通知
940		- if (window.location.search.indexOf('archived=1') !== -1) {
941		- showToast('年度アーカイブを作成しました', 'success');
942		- }
943	943	if (window.location.search.indexOf('saved=1') !== -1) {
944	944	showToast('学校情報を保存しました', 'success');
945	945	// URLパラメータをクリーンアップ（リロード時に再表示されないよう）
...	...	@@ -947,6 +947,30 @@
947	947	window.history.replaceState({}, document.title, window.location.pathname);
948	948	}
949	949	}
	1160	+ // コンパクトモード: スレッドヘッダークリックで個別展開
	1161	+ document.querySelectorAll('.activity-thread-header').forEach(function(header) {
	1162	+ header.addEventListener('click', toggleThreadExpand);
	1163	+ });
	1164	+ // 長文投稿の折りたたみ初期化（max-height: 12em 超で省略）
	1165	+ document.querySelectorAll('.thread-post-body').forEach(function(body) {
	1166	+ // pre-wrapのまま高さを測定し、max-height(12em ≒ ~200px)を超える場合に折りたたむ
	1167	+ var fullH = body.scrollHeight;
	1168	+ // 12em を px に変換（font-size × line-height × 行数 の近似値ではなくCSSと同じ値を取得）
	1169	+ body.classList.add('truncated');
	1170	+ var maxH = body.clientHeight; // max-height: 12em 適用後の高さ
	1171	+ body.classList.remove('truncated');
	1172	+ if (fullH > maxH + 30) {
	1173	+ body.classList.add('truncated');
	1174	+ var btn = document.createElement('button');
	1175	+ btn.className = 'btn-read-more';
	1176	+ btn.textContent = '広げて読む ▼';
	1177	+ btn.addEventListener('click', function() {
	1178	+ var isExpanded = body.classList.toggle('expanded');
	1179	+ btn.textContent = isExpanded ? '折りたたむ ▲' : '広げて読む ▼';
	1180	+ });
	1181	+ body.parentNode.insertBefore(btn, body.nextSibling);
	1182	+ }
	1183	+ });
950	950	});
951	951
952	952	// トースト通知表示
...	...	@@ -960,8 +960,8 @@
960	960	document.body.appendChild(container);
961	961	}
962	962	var icons = {
963		- success: '<svg style="width:1.1em;height:1.1em;flex-shrink:0;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"><path d="M20 6L9 17l-5-5"/></svg>',
964		- error: '<svg style="width:1.1em;height:1.1em;flex-shrink:0;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="10"/><line x1="15" y1="9" x2="9" y2="15"/><line x1="9" y1="9" x2="15" y2="15"/></svg>'
	1197	+ success: '<svg class="ico ico-md" viewBox="0 0 24 24" stroke-width="2.5"><path d="M20 6L9 17l-5-5"/></svg>',
	1198	+ error: '<svg class="ico ico-md" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><line x1="15" y1="9" x2="9" y2="15"/><line x1="9" y1="9" x2="15" y2="15"/></svg>'
965	965	};
966	966	var toast = document.createElement('div');
967	967	toast.className = 'toast toast-' + type;
...	...	@@ -975,8 +975,247 @@
975	975	var card = document.getElementById(cardId);
976	976	if (!card) return;
977	977	card.classList.toggle('collapsed');
978		- card.classList.remove('mobile-collapse');
	1212	+ var isCollapsed = card.classList.contains('collapsed');
	1213	+ var h2 = card.querySelector('h2[role="button"]');
	1214	+ if (h2) h2.setAttribute('aria-expanded', !isCollapsed);
979	979	}
	1216	+
	1217	+// 投稿の編集（インライン編集フォームを開く）
	1218	+function openEditPost(btn) {
	1219	+ var postEl = btn.closest('.thread-post');
	1220	+ if (!postEl) return;
	1221	+ var existing = postEl.querySelector('.post-edit-form');
	1222	+ if (existing) { existing.remove(); return; }
	1223	+ var bodyEl = postEl.querySelector('.thread-post-body');
	1224	+ if (!bodyEl) return;
	1225	+
	1226	+ var schoolPage = btn.getAttribute('data-school');
	1227	+ var postObjNum = btn.getAttribute('data-obj');
	1228	+ var currentContent = btn.getAttribute('data-content') || '';
	1229	+ var currentImages = btn.getAttribute('data-images') || '';
	1230	+ var currentFiles = btn.getAttribute('data-files') || '';
	1231	+ var postType = btn.getAttribute('data-post-type') || 'report';
	1232	+
	1233	+ var form = document.createElement('div');
	1234	+ form.className = 'post-edit-form';
	1235	+ form.setAttribute('data-school', schoolPage);
	1236	+ form.setAttribute('data-obj', postObjNum);
	1237	+
	1238	+ var html = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>';
	1239	+
	1240	+ // コメント以外は添付ファイル編集を表示
	1241	+ if (postType !== 'comment') {
	1242	+ // 既存画像
	1243	+ html += '<div class="edit-attachments">';
	1244	+ if (currentImages.trim()) {
	1245	+ html += '<div class="edit-attach-section"><span class="edit-attach-label">画像</span>';
	1246	+ var imgs = currentImages.trim().split('\n');
	1247	+ for (var i = 0; i < imgs.length; i++) {
	1248	+ var img = imgs[i].trim();
	1249	+ if (!img) continue;
	1250	+ html += '<div class="edit-attach-item" data-name="' + img.replace(/"/g,'&quot;') + '">' +
	1251	+ '<img src="/xwiki/bin/download/' + schoolPage.replace(/\./g,'/') + '/' + encodeURIComponent(img) + '" class="edit-attach-thumb" />' +
	1252	+ '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
	1253	+ '<input type="hidden" name="keepImages" value="' + img.replace(/"/g,'&quot;') + '" />' +
	1254	+ '</div>';
	1255	+ }
	1256	+ html += '</div>';
	1257	+ }
	1258	+ // 既存ファイル
	1259	+ if (currentFiles.trim()) {
	1260	+ html += '<div class="edit-attach-section"><span class="edit-attach-label">ファイル</span>';
	1261	+ var files = currentFiles.trim().split('\n');
	1262	+ for (var j = 0; j < files.length; j++) {
	1263	+ var f = files[j].trim();
	1264	+ if (!f) continue;
	1265	+ var displayName = f;
	1266	+ if (/^file_\d{14}_\d+_/.test(f)) displayName = f.replace(/^file_\d{14}_\d+_/, '');
	1267	+ html += '<div class="edit-attach-item" data-name="' + f.replace(/"/g,'&quot;') + '">' +
	1268	+ '<span class="edit-attach-fname">' + displayName.replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</span>' +
	1269	+ '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
	1270	+ '<input type="hidden" name="keepFiles" value="' + f.replace(/"/g,'&quot;') + '" />' +
	1271	+ '</div>';
	1272	+ }
	1273	+ html += '</div>';
	1274	+ }
	1275	+ // 新規追加
	1276	+ html += '<div class="edit-attach-add">' +
	1277	+ '<label class="form-label-sm">画像を追加（最大4枚まで）</label>' +
	1278	+ '<input type="file" name="editNewImages" accept="image/*" multiple class="form-file-input-sm" />' +
	1279	+ '<div class="form-hint">JPEG / PNG / GIF / WebP、各5MBまで</div>' +
	1280	+ '<label class="form-label-sm" style="margin-top:8px;">ファイルを追加（最大2つまで）</label>' +
	1281	+ '<input type="file" name="editNewFiles" accept=".pdf,.docx,.xlsx,.pptx" multiple class="form-file-input-sm" />' +
	1282	+ '<div class="form-hint">PDF / Word / Excel / PowerPoint、各10MBまで</div>' +
	1283	+ '</div>';
	1284	+ html += '</div>';
	1285	+ }
	1286	+
	1287	+ html += '<div class="post-edit-form-actions">' +
	1288	+ '<button type="button" class="btn-cancel-edit" onclick="this.closest(\'.post-edit-form\').remove()">キャンセル</button>' +
	1289	+ '<button type="button" class="btn-save" onclick="saveEditPost(this)">保存</button>' +
	1290	+ '</div>';
	1291	+
	1292	+ form.innerHTML = html;
	1293	+ bodyEl.parentNode.insertBefore(form, bodyEl.nextSibling);
	1294	+ form.querySelector('textarea').focus();
	1295	+}
	1296	+
	1297	+function removeEditAttach(btn) {
	1298	+ var item = btn.closest('.edit-attach-item');
	1299	+ if (item) item.remove();
	1300	+}
	1301	+
	1302	+// 投稿の編集を保存
	1303	+function saveEditPost(btn) {
	1304	+ var formEl = btn.closest('.post-edit-form');
	1305	+ if (!formEl) return;
	1306	+ var schoolPage = formEl.getAttribute('data-school');
	1307	+ var postObjNum = formEl.getAttribute('data-obj');
	1308	+ var textarea = formEl.querySelector('textarea');
	1309	+ if (!textarea) return;
	1310	+ var newContent = textarea.value.trim();
	1311	+ if (!newContent) { alert('投稿内容を入力してください'); return; }
	1312	+
	1313	+ var csrfEl = document.querySelector('input[name="form_token"]');
	1314	+ var csrfToken = csrfEl ? csrfEl.value : '';
	1315	+
	1316	+ var fd = new FormData();
	1317	+ fd.append('schoolPage', schoolPage);
	1318	+ fd.append('postObj', postObjNum);
	1319	+ fd.append('newContent', newContent);
	1320	+ fd.append('form_token', csrfToken);
	1321	+
	1322	+ // 残す画像・ファイル
	1323	+ formEl.querySelectorAll('input[name="keepImages"]').forEach(function(el) { fd.append('keepImages', el.value); });
	1324	+ formEl.querySelectorAll('input[name="keepFiles"]').forEach(function(el) { fd.append('keepFiles', el.value); });
	1325	+
	1326	+ // 新規画像
	1327	+ var newImgInput = formEl.querySelector('input[name="editNewImages"]');
	1328	+ if (newImgInput && newImgInput.files) {
	1329	+ for (var i = 0; i < newImgInput.files.length; i++) { fd.append('editNewImages', newImgInput.files[i]); }
	1330	+ }
	1331	+ // 新規ファイル
	1332	+ var newFileInput = formEl.querySelector('input[name="editNewFiles"]');
	1333	+ if (newFileInput && newFileInput.files) {
	1334	+ for (var j = 0; j < newFileInput.files.length; j++) { fd.append('editNewFiles', newFileInput.files[j]); }
	1335	+ }
	1336	+
	1337	+ btn.disabled = true;
	1338	+ btn.textContent = '保存中...';
	1339	+
	1340	+ var xhr = new XMLHttpRequest();
	1341	+ xhr.open('POST', '/bin/get/SeitokaiCode/EditPost?outputSyntax=plain', true);
	1342	+ xhr.onload = function() {
	1343	+ try {
	1344	+ var res = JSON.parse(xhr.responseText);
	1345	+ if (res.success) {
	1346	+ showToast('投稿を更新しました', 'success');
	1347	+ setTimeout(function() { location.reload(); }, 800);
	1348	+ } else {
	1349	+ btn.disabled = false; btn.textContent = '保存';
	1350	+ alert('編集に失敗しました: ' + (res.error || ''));
	1351	+ }
	1352	+ } catch(e) { btn.disabled = false; btn.textContent = '保存'; alert('編集に失敗しました'); }
	1353	+ };
	1354	+ xhr.onerror = function() { btn.disabled = false; btn.textContent = '保存'; alert('通信エラーが発生しました'); };
	1355	+ xhr.send(fd);
	1356	+}
	1357	+
	1358	+// 投稿の削除（確認ダイアログ付き）
	1359	+function confirmDeletePost(schoolPage, postObjNum, token) {
	1360	+ if (!confirm('この投稿を削除しますか？\\n削除後は「この投稿は削除されました」と表示されます。')) return;
	1361	+ var xhr = new XMLHttpRequest();
	1362	+ xhr.open('POST', '/bin/get/SeitokaiCode/DeletePost?outputSyntax=plain', true);
	1363	+ xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
	1364	+ var deletePostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token);
	1365	+ xhr.onload = function() {
	1366	+ try {
	1367	+ var res = JSON.parse(xhr.responseText);
	1368	+ if (res.success) {
	1369	+ showToast('投稿を削除しました', 'success');
	1370	+ setTimeout(function() { location.reload(); }, 800);
	1371	+ } else {
	1372	+ alert('削除に失敗しました: ' + (res.error || ''));
	1373	+ }
	1374	+ } catch(e) { alert('削除に失敗しました'); }
	1375	+ };
	1376	+ xhr.onerror = function() { alert('通信エラーが発生しました'); };
	1377	+ xhr.send(deletePostData);
	1378	+}
	1379	+
	1380	+/* --- 通報ダイアログ --- */
	1381	+function openReportDialog(btn, targetPage, postObjNum, token) {
	1382	+ if (document.getElementById('report-dialog-overlay')) return;
	1383	+ var reasons = ['宣伝・スパム','不適切な内容','個人情報の露出','誹謗中傷','誤情報','その他'];
	1384	+ var overlay = document.createElement('div');
	1385	+ overlay.id = 'report-dialog-overlay';
	1386	+ 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;';
	1387	+ var dialog = document.createElement('div');
	1388	+ dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;max-height:80vh;overflow-y:auto;';
	1389	+ var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を通報</h3>';
	1390	+ html += '<p style="margin:0 0 12px;font-size:0.9em;color:#4b5563;">通報された投稿は管理者が確認するまで一時的に非表示になります。</p>';
	1391	+ html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">通報理由</label>';
	1392	+ html += '<select id="report-reason" style="width:100%;padding:8px;border:1px solid #d1d5db;border-radius:8px;margin-bottom:12px;font-size:0.9em;">';
	1393	+ for (var i=0; i<reasons.length; i++) html += '<option value="'+reasons[i]+'">'+reasons[i]+'</option>';
	1394	+ html += '</select>';
	1395	+ html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">補足コメント（任意）</label>';
	1396	+ 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>';
	1397	+ html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
	1398	+ html += '<button type="button" id="report-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
	1399	+ 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>';
	1400	+ html += '</div>';
	1401	+ dialog.innerHTML = html;
	1402	+ overlay.appendChild(dialog);
	1403	+ document.body.appendChild(overlay);
	1404	+ overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
	1405	+ document.getElementById('report-cancel-btn').addEventListener('click', function() { overlay.remove(); });
	1406	+ document.getElementById('report-submit-btn').addEventListener('click', function() {
	1407	+ var reason = document.getElementById('report-reason').value;
	1408	+ var detail = document.getElementById('report-detail').value;
	1409	+ var submitBtn = document.getElementById('report-submit-btn');
	1410	+ submitBtn.disabled = true; submitBtn.textContent = '送信中...';
	1411	+ var xhr = new XMLHttpRequest();
	1412	+ xhr.open('POST', '/bin/get/SeitokaiCode/ReportAction?outputSyntax=plain', true);
	1413	+ xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
	1414	+ var data = 'targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&detail=' + encodeURIComponent(detail) + '&form_token=' + encodeURIComponent(token);
	1415	+ xhr.onload = function() {
	1416	+ overlay.remove();
	1417	+ showToast('通報を受け付けました', 'success');
	1418	+ setTimeout(function() { location.reload(); }, 1000);
	1419	+ };
	1420	+ xhr.onerror = function() { overlay.remove(); alert('通信エラーが発生しました'); };
	1421	+ xhr.send(data);
	1422	+ });
	1423	+}
	1424	+
	1425	+/* --- 非表示ダイアログ（管理者用） --- */
	1426	+function openHideDialog(btn, targetPage, postObjNum, token) {
	1427	+ if (document.getElementById('hide-dialog-overlay')) return;
	1428	+ var overlay = document.createElement('div');
	1429	+ overlay.id = 'hide-dialog-overlay';
	1430	+ 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;';
	1431	+ var dialog = document.createElement('div');
	1432	+ dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;';
	1433	+ var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を非表示にする</h3>';
	1434	+ html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">非表示の理由</label>';
	1435	+ 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="理由を入力" />';
	1436	+ html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
	1437	+ html += '<button type="button" id="hide-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
	1438	+ 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>';
	1439	+ 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>';
	1440	+ html += '</div>';
	1441	+ dialog.innerHTML = html;
	1442	+ overlay.appendChild(dialog);
	1443	+ document.body.appendChild(overlay);
	1444	+ overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
	1445	+ document.getElementById('hide-cancel-btn').addEventListener('click', function() { overlay.remove(); });
	1446	+ function doHide(action) {
	1447	+ var reason = document.getElementById('hide-reason').value || '管理者判断';
	1448	+ window.location.href = '/bin/view/SeitokaiCode/ModerationAction?action=' + action + '&targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&form_token=' + encodeURIComponent(token);
	1449	+ }
	1450	+ document.getElementById('hide-submit-btn').addEventListener('click', function() { doHide('hide'); });
	1451	+ document.getElementById('hide-warn-btn').addEventListener('click', function() { doHide('hide-warn'); });
	1452	+}
980	980	</script>
981	981	{{/html}}
982	982	{{/velocity}}