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

Summary

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

Details

Page properties

Content

...	...	@@ -1,11 +1,5 @@
1	1	{{velocity}}
2	2	## ===== 学校ページ テンプレート =====
3		-## ゲストが ?sheet= 付きURL（編集フォーム等）に直接アクセスした場合、ログインページへリダイレクト
4		-#if($xcontext.user == 'XWiki.XWikiGuest' && $request.sheet && $request.sheet != '')
5		- #set($currentUrl = $doc.getURL('view', "sheet=${request.sheet}"))
6		- $response.sendRedirect("/bin/login/XWiki/XWikiLogin?srid=$escapetool.url($currentUrl)")
7		- #stop
8		-#end
9	9	{{html clean="false"}}
10	10	## メンテナンスバナー（{{include}}ではなくインラインで記述し、<p>タグ挿入を回避）
11	11	#set($bannerDoc = $xwiki.getDocument('SeitokaiAdmin.MaintenanceBanner'))
...	...	@@ -34,10 +34,8 @@
34	34	#set($schoolLevel = $doc.getValue('schoolLevel'))
35	35	#set($schoolSystem = $doc.getValue('schoolSystem'))
36	36	#set($website = $doc.getValue('website'))
37		-#set($schoolPhoto = $doc.getValue('schoolPhoto'))
38		-#set($schoolDescription = $doc.getValue('schoolDescription'))
39	39
40		-## --- 生徒会組織 ---
	32	+## --- 組織図 ---
41	41	#set($orgChart = $doc.getValue('orgChart'))
42	42	#set($orgChartImage = $doc.getValue('orgChartImage'))
43	43
...	...	@@ -57,7 +57,7 @@
57	57	#set($budgetAllocation = $doc.getValue('budgetAllocation'))
58	58	#set($budgetNote = $doc.getValue('budgetNote'))
59	59
60		-## --- 校則・生徒会会則の見直し ---
	52	+## --- 校則の見直し ---
61	61	#set($ruleReviewStatus = $doc.getValue('ruleReviewStatus'))
62	62	#set($ruleReviewContent = $doc.getValue('ruleReviewContent'))
63	63	#set($ruleReviewProposer = $doc.getValue('ruleReviewProposer'))
...	...	@@ -73,7 +73,9 @@
73	73	#set($seitokaiYoutube = $doc.getValue('seitokaiYoutube'))
74	74	#set($seitokaiOtherSns = $doc.getValue('seitokaiOtherSns'))
75	75
76		-## --- 現在の年度を計算（4月始まり） ---
	68	+## --- 年度アーカイブ ---
	69	+#set($pageFiscalYear = $!doc.getValue('fiscalYear'))
	70	+## 現在の年度を計算（4月始まり）
77	77	#set($nowFY = $datetool.date)
78	78	#set($currentFYMonth = $mathtool.toInteger($datetool.format('MM', $nowFY)))
79	79	#set($currentFYYear = $mathtool.toInteger($datetool.format('yyyy', $nowFY)))
...	...	@@ -82,6 +82,10 @@
82	82	#else
83	83	#set($currentFiscalYear = $mathtool.sub($currentFYYear, 1))
84	84	#end
	79	+## fiscalYear 未設定時はデフォルトとして現在の年度を使う
	80	+#if(!$pageFiscalYear || $pageFiscalYear == '')
	81	+ #set($pageFiscalYear = $currentFiscalYear.toString())
	82	+#end
85	85
86	86	## --- 公開範囲フィールド ---
87	87	#set($visibilityOrgChart = $!doc.getValue('visibilityOrgChart'))
...	...	@@ -103,81 +103,15 @@
103	103	#set($viewerDoc = $xwiki.getDocument($viewerUser))
104	104	#set($viewerAccountType = $!viewerDoc.getValue('accountType'))
105	105	#set($viewerSchoolCode = $!viewerDoc.getValue('schoolCode'))
106		- #set($viewerSecondarySchoolCode = $!viewerDoc.getValue('secondarySchoolCode'))
107		- #set($viewerUserRole = $!viewerDoc.getValue('userRole'))
108	108	#if($viewerAccountType == 'admin')
109	109	#set($isViewerAdmin = true)
110	110	#end
111	111	#end
112	112
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		-
173	173	## --- 投稿固定/解除処理 ---
174	174	#set($pinAction = $!request.action)
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))
	111	+#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || $viewerAccountType == 'verified') && $services.csrf.isTokenValid($request.form_token))
	112	+ #set($postObjNum = $mathtool.toInteger($!request.postObj))
181	181	#set($postObj = $doc.getObject('SeitokaiCode.ActivityPostClass', $postObjNum))
182	182	#if($postObj)
183	183	#if($pinAction == 'pin')
...	...	@@ -197,15 +197,12 @@
197	197	$response.sendRedirect($doc.getURL('view'))
198	198	#stop
199	199	#end
200		- #end## /matches
201	201	#end
202	202
203	203	## --- 特色ある活動 選定/解除処理 ---
204	204	#set($featAction = $!request.action)
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))
	136	+#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $services.csrf.isTokenValid($request.form_token))
	137	+ #set($actObjNum = $mathtool.toInteger($!request.actObj))
209	209	#set($actObj = $doc.getObject('SeitokaiCode.ActivityClass', $actObjNum))
210	210	#if($actObj)
211	211	#if($featAction == 'feature')
...	...	@@ -237,7 +237,6 @@
237	237	$response.sendRedirect($doc.getURL('view'))
238	238	#stop
239	239	#end
240		- #end## /matches
241	241	#end
242	242
243	243	## --- ユーザー情報取得 ---
...	...	@@ -304,7 +304,7 @@
304	304
305	305	## --- 編集ボタン（権限があるユーザーのみ表示） ---
306	306	#set($canEditSchool = false)
307		-#if(!$isGuest && ($isViewerAdmin || $isSchoolMember || $isAlumniOfSchool))
	235	+#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode))
308	308	#set($canEditSchool = true)
309	309	#end
310	310	#if($canEditSchool)
...	...	@@ -313,311 +313,305 @@
313	313	</div>
314	314	#end
315	315
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)
	244	+## --- ① 学校基本情報 + 連絡先（左右グリッド・折りたたみ対応） ---
	245	+<div class="school-info-grid">
	246	+ <div class="school-info-card collapsed" id="card-basic-info">
	247	+ <h2 onclick="toggleInfoCard('card-basic-info')"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M4 19.5A2.5 2.5 0 016.5 17H20"/><path d="M6.5 2H20v20H6.5A2.5 2.5 0 014 19.5v-15A2.5 2.5 0 016.5 2z"/></svg> 学校基本情報</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2>
	248	+ <table class="wiki-table school-info-table">
	249	+ <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
	250	+ <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
	251	+ <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
	252	+ <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
	253	+ <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
	254	+ <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
	255	+ <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
	256	+ <tr><th>課程</th><td>#if($schoolSystem && $schoolSystem != '' && $schoolSystem != '[]')$!escapetool.xml($!schoolSystem)#end</td></tr>
	257	+ <tr><th>公式サイト</th><td>#if($website && $website != '')<a href="$!escapetool.xml($website)" target="_blank" rel="noopener">$!escapetool.xml($website)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
	258	+ </table>
	259	+ #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
	260	+ #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
	261	+ #if($infoEditDate && $infoEditDate != '')
	262	+ <div class="info-last-updated"><svg class="ico" viewBox="0 0 24 24"><path d="M11 4H4a2 2 0 00-2 2v14a2 2 0 002 2h14a2 2 0 002-2v-7"/><path d="M18.5 2.5a2.121 2.121 0 013 3L12 15l-4 1 1-4 9.5-9.5z"/></svg> 基本情報の最終更新: $!escapetool.xml($infoEditBy) — $!escapetool.xml($infoEditDate)</div>
328	328	#end
329		- と連携しています
330	330	</div>
331		-</div>
332		-#end
333	333
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>
350		- </div>
351		- #if($schoolPhoto && $schoolPhoto != '')
352		- <div class="school-photo-area">
353		- <img src="$doc.getAttachmentURL($schoolPhoto)" alt="$!escapetool.xml($schoolName)" class="school-photo" />
354		- </div>
355		- #end
	266	+ <div class="school-info-card collapsed" id="card-contact">
	267	+ <h2 onclick="toggleInfoCard('card-contact')"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M22 16.92v3a2 2 0 01-2.18 2 19.79 19.79 0 01-8.63-3.07 19.5 19.5 0 01-6-6 19.79 19.79 0 01-3.07-8.67A2 2 0 014.11 2h3a2 2 0 012 1.72c.127.96.361 1.903.7 2.81a2 2 0 01-.45 2.11L8.09 9.91a16 16 0 006 6l1.27-1.27a2 2 0 012.11-.45c.907.339 1.85.573 2.81.7A2 2 0 0122 16.92z"/></svg> 連絡先・SNS</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2>
	268	+ <table class="wiki-table school-info-table">
	269	+ <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr>
	270	+ <tr><th>生徒会Web</th><td>#if($seitokaiWebsite && $seitokaiWebsite != '')<a href="$!escapetool.xml($seitokaiWebsite)" target="_blank" rel="noopener"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M2 12h20"/><path d="M12 2a15.3 15.3 0 014 10 15.3 15.3 0 01-4 10 15.3 15.3 0 01-4-10 15.3 15.3 0 014-10z"/></svg> $!escapetool.xml($seitokaiWebsite)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
	271	+ <tr><th>X (Twitter)</th><td>#if($seitokaiTwitter && $seitokaiTwitter != '')<a href="https://x.com/$!escapetool.url($seitokaiTwitter)" target="_blank" rel="noopener">𝕏 @$!escapetool.xml($seitokaiTwitter)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
	272	+ <tr><th>Instagram</th><td>#if($seitokaiInstagram && $seitokaiInstagram != '')<a href="https://instagram.com/$!escapetool.url($seitokaiInstagram)" target="_blank" rel="noopener"><svg class="ico" viewBox="0 0 24 24"><path d="M23 19a2 2 0 01-2 2H3a2 2 0 01-2-2V8a2 2 0 012-2h4l2-3h6l2 3h4a2 2 0 012 2z"/><circle cx="12" cy="13" r="4"/></svg> @$!escapetool.xml($seitokaiInstagram)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
	273	+ <tr><th>YouTube</th><td>#if($seitokaiYoutube && $seitokaiYoutube != '')<a href="$!escapetool.xml($seitokaiYoutube)" target="_blank" rel="noopener"><svg class="ico" viewBox="0 0 24 24"><polygon points="5 3 19 12 5 21 5 3"/></svg> YouTubeチャンネル</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
	274	+ <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
	275	+ </table>
356	356	</div>
357		- #if($schoolDescription && $schoolDescription.trim() != '')
358		- <div class="free-note" style="margin-top:var(--sp-4);">$!escapetool.xml($schoolDescription)</div>
359		- #end
	277	+</div>
360	360
	279	+## --- 生徒会情報アコーディオン ---
	280	+<div class="school-section-divider">
	281	+ <button class="shortcut-btn shortcut-btn-secondary" onclick="var sec=document.getElementById('seitokai-info-section');sec.classList.toggle('open');this.querySelector('.shortcut-arrow').textContent=sec.classList.contains('open')?'▲':'▼';">
	282	+ <svg class="ico ico-md" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/></svg>
	283	+ 生徒会情報を見る <span class="shortcut-arrow">▼</span>
	284	+ </button>
361	361	</div>
362	362
363		-## --- ② 生徒会情報（折りたたみカード） ---
364		-<div class="school-info-card" id="card-seitokai-info">
365		- <h2 role="button" tabindex="0" aria-expanded="true" onclick="toggleInfoCard('card-seitokai-info')" onkeydown="if(event.key==='Enter'||event.key===' '){event.preventDefault();toggleInfoCard('card-seitokai-info')}"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/></svg> 生徒会情報</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2>
366		- <div class="seitokai-info-body">
	287	+<div id="seitokai-info-section" class="seitokai-info-accordion">
367	367
368		- ## --- 生徒会組織 ---
369		- #set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
370		- #if($hasOrgContent)
371		- #set($canViewOrgChart = true)
372		- #if($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewOrgChart = false)
373		- #elseif($visibilityOrgChart == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewOrgChart = false)
374		- #end
375		- #if($canViewOrgChart)
376		- <div class="seitokai-subsection">
377		- <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/><line x1="9" y1="10" x2="9" y2="10.01"/><line x1="15" y1="10" x2="15" y2="10.01"/><line x1="9" y1="14" x2="9" y2="14.01"/><line x1="15" y1="14" x2="15" y2="14.01"/></svg> 生徒会組織 #if($visibilityOrgChart != 'public')<span class="visibility-badge visibility-${visibilityOrgChart}">#if($visibilityOrgChart == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
378		- <div class="seitokai-subsection-content">
379		- #if($orgChartImage && $orgChartImage != '')
380		- <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
381		- #end
382		- #if($orgChart && $orgChart != '')<div class="free-note">$!escapetool.xml($orgChart)</div>#end
383		- </div>
384		- </div>
385		- #else
386		- <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 生徒会組織は #if($visibilityOrgChart == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
387		- #end
	289	+## --- ② 組織図 ---
	290	+#set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
	291	+#if($hasOrgContent)
	292	+ ## 公開範囲チェック
	293	+ #set($canViewOrgChart = true)
	294	+ #if($visibilityOrgChart == 'members' && $isGuest) #set($canViewOrgChart = false)
	295	+ #elseif($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewOrgChart = false)
	296	+ #end
	297	+ #if($canViewOrgChart)
	298	+<h2 class="section-title"><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/><line x1="9" y1="10" x2="9" y2="10.01"/><line x1="15" y1="10" x2="15" y2="10.01"/><line x1="9" y1="14" x2="9" y2="14.01"/><line x1="15" y1="14" x2="15" y2="14.01"/></svg> 組織図 #if($visibilityOrgChart != 'public')<span class="visibility-badge visibility-${visibilityOrgChart}">#if($visibilityOrgChart == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h2>
	299	+<div class="school-section-card">
	300	+ <div class="card-inner">
	301	+ #if($orgChartImage && $orgChartImage != '')
	302	+ <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
388	388	#end
	304	+ #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end
	305	+ </div>
	306	+</div>
	307	+ #else
	308	+<div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 組織図は #if($visibilityOrgChart == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
	309	+ #end
	310	+#end
389	389
390		- ## --- 日常の活動 ---
391		- #if($dailyActivities && !$dailyActivities.isEmpty())
392		- <div class="seitokai-subsection">
393		- <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z"/><polyline points="14 2 14 8 20 8"/><line x1="16" y1="13" x2="8" y2="13"/><line x1="16" y1="17" x2="8" y2="17"/></svg> 日常の活動</h3>
394		- <div class="seitokai-subsection-content">
395		- <p class="activity-hint">活動時間が多い3つ</p>
396		- <div class="tag-container">
397		- #foreach($da in $dailyActivities)
398		- <span class="tag tag-accent">$!escapetool.xml($da.trim())</span>
399		- #end
400		- </div>
401		- #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
402		- <div class="free-note">$!escapetool.xml($dailyActivitiesNote)</div>
	312	+## --- ③④⑤ 日常の活動・選挙・定例活動 ---
	313	+<div class="school-section-grid">
	314	+ #if($dailyActivities && $dailyActivities != '')
	315	+ <div class="school-section-card">
	316	+ <h3><svg class="ico" viewBox="0 0 24 24"><path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z"/><polyline points="14 2 14 8 20 8"/><line x1="16" y1="13" x2="8" y2="13"/><line x1="16" y1="17" x2="8" y2="17"/></svg> 日常の活動</h3>
	317	+ <div class="card-inner">
	318	+ <p class="activity-hint">活動時間の多い順に上位3つ</p>
	319	+ <div class="tag-container">
	320	+ #set($daIdx = 1)
	321	+ #foreach($da in $dailyActivities.split(","))
	322	+ <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
	323	+ #set($daIdx = $daIdx + 1)
403	403	#end
404	404	</div>
	326	+ #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
	327	+ <div class="free-note">$!escapetool.xml($dailyActivitiesNote)</div>
	328	+ #end
405	405	</div>
406		- #end
	330	+ </div>
	331	+ #end
407	407
408		- ## --- 選挙 ---
409		- #if($electionExists && $electionExists != '')
410		- <div class="seitokai-subsection">
411		- <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="3" width="18" height="18" rx="2"/><path d="M7 13l3 3 7-7"/></svg> 選挙</h3>
412		- <div class="seitokai-subsection-content">
413		- <div class="info-row">
414		- <span class="info-label">役員選挙</span>
415		- <span class="info-value">$!escapetool.xml($!electionExists)</span>
416		- </div>
417		- #if($electionType && $electionType != '')
418		- <div class="info-row">
419		- <span class="info-label">直近の選挙方式</span>
420		- <span class="info-value">$!escapetool.xml($!electionType)</span>
421		- </div>
422		- #end
423		- #if($electionNote && $electionNote.trim() != '')
424		- <div class="free-note">$!escapetool.xml($electionNote)</div>
425		- #end
	333	+ #if($electionExists && $electionExists != '')
	334	+ <div class="school-section-card">
	335	+ <h3><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="3" width="18" height="18" rx="2"/><path d="M7 13l3 3 7-7"/></svg> 選挙</h3>
	336	+ <div class="card-inner">
	337	+ <div class="info-row">
	338	+ <span class="info-label">役員選挙</span>
	339	+ <span class="info-value">$!escapetool.xml($!electionExists)</span>
426	426	</div>
	341	+ #if($electionType && $electionType != '')
	342	+ <div class="info-row">
	343	+ <span class="info-label">直近の選挙方式</span>
	344	+ <span class="info-value">$!escapetool.xml($!electionType)</span>
	345	+ </div>
	346	+ #end
	347	+ #if($electionNote && $electionNote.trim() != '')
	348	+ <div class="free-note">$!escapetool.xml($electionNote)</div>
	349	+ #end
427	427	</div>
428		- #end
	351	+ </div>
	352	+ #end
	353	+</div>
429	429
430		- ## --- 定例活動 ---
431		- #if($meetingFrequency && $meetingFrequency != '')
432		- <div class="seitokai-subsection">
433		- <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="4" width="18" height="18" rx="2"/><line x1="16" y1="2" x2="16" y2="6"/><line x1="8" y1="2" x2="8" y2="6"/><line x1="3" y1="10" x2="21" y2="10"/></svg> 定例活動</h3>
434		- <div class="seitokai-subsection-content">
435		- <div class="info-row">
436		- <span class="info-label">役員定例会の頻度</span>
437		- <span class="info-value">$!escapetool.xml($!meetingFrequency)</span>
438		- </div>
439		- #if($regularActivitiesNote && $regularActivitiesNote.trim() != '')
440		- <div class="free-note">$!escapetool.xml($regularActivitiesNote)</div>
441		- #end
	355	+<div class="school-section-grid">
	356	+ #if($meetingFrequency && $meetingFrequency != '')
	357	+ <div class="school-section-card">
	358	+ <h3><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="4" width="18" height="18" rx="2"/><line x1="16" y1="2" x2="16" y2="6"/><line x1="8" y1="2" x2="8" y2="6"/><line x1="3" y1="10" x2="21" y2="10"/></svg> 定例活動</h3>
	359	+ <div class="card-inner">
	360	+ <div class="info-row">
	361	+ <span class="info-label">役員定例会の頻度</span>
	362	+ <span class="info-value">$!escapetool.xml($!meetingFrequency)</span>
442	442	</div>
	364	+ #if($regularActivitiesNote && $regularActivitiesNote.trim() != '')
	365	+ <div class="free-note">$!escapetool.xml($regularActivitiesNote)</div>
	366	+ #end
443	443	</div>
444		- #end
	368	+ </div>
	369	+ #end
445	445
446		- ## --- 予算 ---
447		- #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
448		- #if($hasBudget)
449		- #set($canViewBudget = true)
450		- #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewBudget = false)
451		- #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false)
	371	+ ## --- ⑦ 予算 ---
	372	+ #set($hasBudget = ($budgetProcess && $budgetProcess != '') || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
	373	+ #if($hasBudget)
	374	+ ## 公開範囲チェック
	375	+ #set($canViewBudget = true)
	376	+ #if($visibilityBudget == 'members' && $isGuest) #set($canViewBudget = false)
	377	+ #elseif($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewBudget = false)
	378	+ #end
	379	+ #if($canViewBudget)
	380	+ <div class="school-section-card">
	381	+ <h3><svg class="ico" viewBox="0 0 24 24"><line x1="12" y1="1" x2="12" y2="23"/><path d="M17 5H9.5a3.5 3.5 0 000 7h5a3.5 3.5 0 010 7H6"/></svg> 予算 #if($visibilityBudget != 'public')<span class="visibility-badge visibility-${visibilityBudget}">#if($visibilityBudget == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
	382	+ <div class="card-inner">
	383	+ #if($budgetProcess && $budgetProcess != '')
	384	+ <div class="info-row">
	385	+ <span class="info-label">作成過程の生徒関与</span>
	386	+ <span class="info-value">
	387	+ <div class="selection-display">
	388	+ #foreach($bp in $budgetProcess.split(","))
	389	+ <span class="selection-item">$!escapetool.xml($bp.trim())</span>
	390	+ #end
	391	+ </div>
	392	+ </span>
	393	+ </div>
452	452	#end
453		- #if($canViewBudget)
454		- <div class="seitokai-subsection">
455		- <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><line x1="12" y1="1" x2="12" y2="23"/><path d="M17 5H9.5a3.5 3.5 0 000 7h5a3.5 3.5 0 010 7H6"/></svg> 予算 #if($visibilityBudget != 'public')<span class="visibility-badge visibility-${visibilityBudget}">#if($visibilityBudget == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
456		- <div class="seitokai-subsection-content">
457		- #if($budgetProcess && !$budgetProcess.isEmpty())
458		- <div class="info-row">
459		- <span class="info-label">作成過程の生徒関与</span>
460		- <span class="info-value">
461		- <div class="selection-display">
462		- #set($allBpOpts = ["各部・委員会等への予算希望額調査","予算額調整（折衝等）","生徒会予算案の作成","生徒総会での議決","生徒関与なし","その他"])
463		- #foreach($bpOpt in $allBpOpts)
464		- #if($budgetProcess.contains($bpOpt))
465		- <span class="selection-item">$!escapetool.xml($bpOpt)</span>
466		- #else
467		- <span class="selection-item selection-item-off">$!escapetool.xml($bpOpt)</span>
468		- #end
469		- #end
470		- </div>
471		- </span>
472		- </div>
473		- #end
474		- #if($studentFee && $studentFee != '')
475		- <div class="info-row">
476		- <span class="info-label">生徒会費（年額）</span>
477		- <span class="info-value">$!escapetool.xml($!studentFee)</span>
478		- </div>
479		- #end
480		- #if($budgetScale && $budgetScale != '')
481		- <div class="info-row">
482		- <span class="info-label">予算規模</span>
483		- <span class="info-value">$!escapetool.xml($!budgetScale)</span>
484		- </div>
485		- #end
486		- #if($budgetAllocation && !$budgetAllocation.isEmpty())
487		- <div class="info-row">
488		- <span class="info-label">主な予算配分</span>
489		- <span class="info-value">
490		- <div class="selection-display">
491		- #foreach($ba in $budgetAllocation)
492		- <span class="selection-item">$!escapetool.xml($ba.trim())</span>
493		- #end
494		- </div>
495		- </span>
496		- </div>
497		- #end
498		- #if($budgetNote && $budgetNote.trim() != '')
499		- <div class="free-note">$!escapetool.xml($budgetNote)</div>
500		- #end
	395	+ #if($studentFee && $studentFee != '')
	396	+ <div class="info-row">
	397	+ <span class="info-label">生徒会費（年額）</span>
	398	+ <span class="info-value">$!escapetool.xml($!studentFee)</span>
501	501	</div>
502		- </div>
503		- #else
504		- <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>
505	505	#end
	401	+ #if($budgetScale && $budgetScale != '')
	402	+ <div class="info-row">
	403	+ <span class="info-label">予算規模</span>
	404	+ <span class="info-value">$!escapetool.xml($!budgetScale)</span>
	405	+ </div>
	406	+ #end
	407	+ #if($budgetAllocation && $budgetAllocation != '')
	408	+ <div class="info-row">
	409	+ <span class="info-label">主な予算配分</span>
	410	+ <span class="info-value">
	411	+ <div class="selection-display">
	412	+ #foreach($ba in $budgetAllocation.split(","))
	413	+ <span class="selection-item">$!escapetool.xml($ba.trim())</span>
	414	+ #end
	415	+ </div>
	416	+ </span>
	417	+ </div>
	418	+ #end
	419	+ #if($budgetNote && $budgetNote.trim() != '')
	420	+ <div class="free-note">$!escapetool.xml($budgetNote)</div>
	421	+ #end
	422	+ </div>
	423	+ </div>
	424	+ #else
	425	+ <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 予算情報は #if($visibilityBudget == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
506	506	#end
	427	+ #end
	428	+</div>
507	507
508		- ## --- 校則・生徒会会則の見直し ---
509		- #if($ruleReviewStatus && $ruleReviewStatus != '')
510		- #set($canViewRuleReview = true)
511		- #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewRuleReview = false)
512		- #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false)
513		- #end
514		- #if($canViewRuleReview)
515		- <div class="seitokai-subsection">
516		- <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>
517		- <div class="seitokai-subsection-content">
518		- <div class="info-row">
519		- <span class="info-label">見直しの有無（3年以内）</span>
520		- <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
	430	+## --- ⑧ 校則の見直し ---
	431	+#if($ruleReviewStatus && $ruleReviewStatus != '')
	432	+ ## 公開範囲チェック
	433	+ #set($canViewRuleReview = true)
	434	+ #if($visibilityRuleReview == 'members' && $isGuest) #set($canViewRuleReview = false)
	435	+ #elseif($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewRuleReview = false)
	436	+ #end
	437	+ #if($canViewRuleReview)
	438	+<h2 class="section-title"><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M16 4h2a2 2 0 012 2v12a2 2 0 01-2 2h-2"/><path d="M8 4H6a2 2 0 00-2 2v12a2 2 0 002 2h2"/><line x1="12" y1="4" x2="12" y2="8"/><line x1="12" y1="16" x2="12" y2="20"/><line x1="8" y1="8" x2="16" y2="8"/><line x1="8" y1="16" x2="16" y2="16"/></svg> 校則の見直し #if($visibilityRuleReview != 'public')<span class="visibility-badge visibility-${visibilityRuleReview}">#if($visibilityRuleReview == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h2>
	439	+<div class="school-section-card">
	440	+ <div class="card-inner">
	441	+ <div class="info-row">
	442	+ <span class="info-label">見直しの有無（3年以内）</span>
	443	+ <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
	444	+ </div>
	445	+ #if($ruleReviewContent && $ruleReviewContent != '')
	446	+ <div class="info-row">
	447	+ <span class="info-label">見直しの内容</span>
	448	+ <span class="info-value">
	449	+ <div class="selection-display">
	450	+ #foreach($rc in $ruleReviewContent.split(","))
	451	+ <span class="selection-item">$!escapetool.xml($rc.trim())</span>
	452	+ #end
521	521	</div>
522		- #if($ruleReviewStatus != '実施なし')
523		- #if($ruleReviewContent && !$ruleReviewContent.isEmpty())
524		- <div class="info-row">
525		- <span class="info-label">見直しの内容</span>
526		- <span class="info-value">
527		- <div class="selection-display">
528		- #foreach($rc in $ruleReviewContent)
529		- <span class="selection-item">$!escapetool.xml($rc.trim())</span>
530		- #end
531		- </div>
532		- </span>
	454	+ </span>
	455	+ </div>
	456	+ #end
	457	+ #if($ruleReviewProposer && $ruleReviewProposer != '')
	458	+ <div class="info-row">
	459	+ <span class="info-label">見直しの提案者</span>
	460	+ <span class="info-value">
	461	+ <div class="selection-display">
	462	+ #foreach($rp in $ruleReviewProposer.split(","))
	463	+ <span class="selection-item">$!escapetool.xml($rp.trim())</span>
	464	+ #end
533	533	</div>
534		- #end
535		- #if($ruleReviewProposer && !$ruleReviewProposer.isEmpty())
536		- <div class="info-row">
537		- <span class="info-label">見直しの提案者</span>
538		- <span class="info-value">
539		- <div class="selection-display">
540		- #foreach($rp in $ruleReviewProposer)
541		- <span class="selection-item">$!escapetool.xml($rp.trim())</span>
542		- #end
543		- </div>
544		- </span>
	466	+ </span>
	467	+ </div>
	468	+ #end
	469	+ #if($ruleReviewImplementer && $ruleReviewImplementer != '')
	470	+ <div class="info-row">
	471	+ <span class="info-label">見直しの実施者</span>
	472	+ <span class="info-value">
	473	+ <div class="selection-display">
	474	+ #foreach($ri in $ruleReviewImplementer.split(","))
	475	+ <span class="selection-item">$!escapetool.xml($ri.trim())</span>
	476	+ #end
545	545	</div>
546		- #end
547		- #if($ruleReviewImplementer && !$ruleReviewImplementer.isEmpty())
548		- <div class="info-row">
549		- <span class="info-label">見直しの実施者</span>
550		- <span class="info-value">
551		- <div class="selection-display">
552		- #foreach($ri in $ruleReviewImplementer)
553		- <span class="selection-item">$!escapetool.xml($ri.trim())</span>
554		- #end
555		- </div>
556		- </span>
557		- </div>
558		- #end
559		- #end
560		- #if($ruleReviewSystem && $ruleReviewSystem != '')
561		- <div class="info-row">
562		- <span class="info-label">見直しの仕組み</span>
563		- <span class="info-value">$!escapetool.xml($!ruleReviewSystem)</span>
564		- </div>
565		- #end
566		- </div>
	478	+ </span>
567	567	</div>
568		- #else
569		- <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>
570		- #end
571	571	#end
572		-
573		- ## --- 生徒会の課題意識 ---
574		- #if($challenges && $challenges != '')
575		- #set($canViewChallenges = true)
576		- #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewChallenges = false)
577		- #elseif($visibilityChallenges == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewChallenges = false)
578		- #end
579		- #if($canViewChallenges)
580		- <div class="seitokai-subsection">
581		- <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>
582		- <div class="seitokai-subsection-content">
583		- <div class="challenge-text">$!escapetool.xml($challenges)</div>
584		- </div>
	481	+ #if($ruleReviewSystem && $ruleReviewSystem != '')
	482	+ <div class="info-row">
	483	+ <span class="info-label">見直しの仕組み</span>
	484	+ <span class="info-value">$!escapetool.xml($!ruleReviewSystem)</span>
585	585	</div>
586		- #else
587		- <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>
588		- #end
589	589	#end
	487	+ </div>
	488	+</div>
	489	+ #else
	490	+<div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 校則の見直し情報は #if($visibilityRuleReview == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
	491	+ #end
	492	+#end
590	590
591		- </div>## seitokai-info-body 終了
592		-</div>## card-seitokai-info 終了
593		-
594		-## --- ③ SNS・連絡先 ---
595		-<div class="school-info-card collapsed" id="card-contact">
596		- <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>
597		- <table class="wiki-table school-info-table">
598		- <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr>
599		- <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>
600		- <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>
601		- <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>
602		- <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>
603		- <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
604		- </table>
605		- #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
606		- #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
607		- #if($infoEditDate && $infoEditDate != '')
608		- <div class="info-last-updated"><svg class="ico" viewBox="0 0 24 24"><path d="M11 4H4a2 2 0 00-2 2v14a2 2 0 002 2h14a2 2 0 002-2v-7"/><path d="M18.5 2.5a2.121 2.121 0 013 3L12 15l-4 1 1-4 9.5-9.5z"/></svg> 基本情報の最終更新: $!escapetool.xml($infoEditBy) — $!escapetool.xml($infoEditDate)</div>
	494	+## --- ⑨ 課題 ---
	495	+#if($challenges && $challenges != '')
	496	+ ## 公開範囲チェック
	497	+ #set($canViewChallenges = true)
	498	+ #if($visibilityChallenges == 'members' && $isGuest) #set($canViewChallenges = false)
	499	+ #elseif($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewChallenges = false)
609	609	#end
610		-</div>
	501	+ #if($canViewChallenges)
	502	+<h2 class="section-title">生徒会の課題意識 #if($visibilityChallenges != 'public')<span class="visibility-badge visibility-${visibilityChallenges}">#if($visibilityChallenges == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h2>
	503	+<div class="challenge-text">$!escapetool.xml($challenges)</div>
	504	+ #else
	505	+<div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 課題情報は #if($visibilityChallenges == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
	506	+ #end
	507	+#end
611	611
	509	+</div>## seitokai-info-accordion 終了
	510	+
612	612	{{/html}}
613	613
614		-----
615		-
616	616	## --- ⑩ 活動報告一覧（スレッド型・年度タブ付き） ---
617	617	= 活動報告 =
618	618
619		-## --- 年度タブ + 投稿者ステータス凡例 ---
	516	+## --- 投稿者ステータス凡例（折りたたみ） ---
620	620	{{html clean="false"}}
	518	+<div class="author-legend-wrapper">
	519	+ <button class="author-legend-toggle" onclick="this.classList.toggle('open');this.nextElementSibling.classList.toggle('open')"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M12 16v-4"/><path d="M12 8h.01"/></svg> バッジの見方 <span class="chevron">▼</span></button>
	520	+ <div class="author-legend-body">
	521	+ <div class="author-legend">
	522	+ <span class="author-legend-title">投稿者の信頼度:</span>
	523	+ <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者</span>
	524	+ <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み</span>
	525	+ <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介</span>
	526	+ <span class="author-legend-item"><span class="bar bar-general"></span> 一般（未承認）</span>
	527	+ </div>
	528	+ <div class="author-legend">
	529	+ <span class="author-legend-title">所属:</span>
	530	+ <span class="author-legend-item"><span class="badge badge-school-internal-confirmed badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内（確認済）</span> 承認済み＋同校</span>
	531	+ <span class="author-legend-item"><span class="badge badge-school-internal badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内</span> 紹介＋同校</span>
	532	+ <span class="author-legend-item"><span class="badge badge-school-external badge-sm"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M2 12h20"/><path d="M12 2a15.3 15.3 0 014 10 15.3 15.3 0 01-4 10 15.3 15.3 0 01-4-10 15.3 15.3 0 014-10z"/></svg> 他校</span> 他校所属</span>
	533	+ <span class="author-legend-item text-hint">※一般アカウントは所属未確認のため非表示</span>
	534	+ </div>
	535	+ <div class="author-legend">
	536	+ <span class="author-legend-title">役割:</span>
	537	+ <span class="author-legend-item"><span class="badge badge-role-student badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M22 10v6M2 10l10-5 10 5-10 5z"/><path d="M6 12v5c0 2 4 3 6 3s6-1 6-3v-5"/></svg> 生徒</span></span>
	538	+ <span class="author-legend-item"><span class="badge badge-role-officer badge-sm"><svg class="ico" viewBox="0 0 24 24"><polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"/></svg> 役員</span></span>
	539	+ <span class="author-legend-item"><span class="badge badge-role-teacher badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M20 21v-2a4 4 0 00-4-4H8a4 4 0 00-4 4v2"/><circle cx="12" cy="7" r="4"/></svg> 教員</span></span>
	540	+ </div>
	541	+ </div>
	542	+</div>
621	621
622	622	## --- 年度タブ ---
623	623	## 全活動から年度一覧を収集
...	...	@@ -639,49 +639,14 @@
639	639	#end
640	640	## ソート（降順にしたいが Velocity にはないので JS で制御）
641	641
642		-<div class="activity-toolbar">
643		- <div class="activity-fy-tabs">
644		- <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
645		- #foreach($fy in $fySet)
646		- #if($fy != $currentFYStr)
647		- <button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button>
648		- #end
	564	+<div class="activity-fy-tabs">
	565	+ <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
	566	+ #foreach($fy in $fySet)
	567	+ #if($fy != $currentFYStr)
	568	+ <button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button>
649	649	#end
650		- <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
651		- </div>
652		- <div class="activity-toolbar-right">
653		- <button class="btn-view-toggle" id="btnViewToggle" onclick="toggleCompactView()" title="タイトルのみ表示">
654		- <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>
655		- <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>
656		- <span class="toggle-label">一覧表示</span>
657		- </button>
658		- </div>
659		- <div class="author-legend-wrapper">
660		- <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>
661		- <div class="author-legend-body">
662		- <div class="author-legend">
663		- <span class="author-legend-title">投稿者の信頼度:</span>
664		- <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者 <span class="text-hint">— 運営スタッフ</span></span>
665		- <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み <span class="text-hint">— 本人確認済みのユーザー</span></span>
666		- <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介 <span class="text-hint">— 承認済みユーザーからの紹介</span></span>
667		- <span class="author-legend-item"><span class="bar bar-general"></span> 一般 <span class="text-hint">— 一般登録ユーザー</span></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-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>
672		- <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>
673		- <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>
674		- <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>
675		- <span class="author-legend-item text-hint">※一般アカウントは所属バッジが表示されません</span>
676		- </div>
677		- <div class="author-legend">
678		- <span class="author-legend-title">役割:</span>
679		- <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>
680		- <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>
681		- <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>
682		- </div>
683		- </div>
684		- </div>
	570	+ #end
	571	+ <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
685	685	</div>
686	686
687	687	{{/html}}
...	...	@@ -746,18 +746,10 @@
746	746	<div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)">
747	747	<div class="activity-thread-header">
748	748	<div class="activity-thread-title">
749		- <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>
750		- <div class="activity-meta-line">
751		- <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
752		- #set($actTagsList = $activity.getValue('tags'))
753		- #if($actTagsList && !$actTagsList.isEmpty())
754		- #foreach($tagItem in $actTagsList)
755		- #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end
756		- #end
757		- #end
758		- </div>
	636	+ <h3 #if($actFeatured == '1')class="featured-title"#end>$!escapetool.xml($!actTitle) #if($actFeatured == '1')<svg class="ico ico-fixed-14" viewBox="0 0 24 24" fill="currentColor" stroke="none" class="ico-star-offset"><polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"/></svg>#end</h3>
	637	+ <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
759	759	</div>
760		- <div class="thread-meta-right">
	639	+ <div class="thread-meta-row">
761	761	<span class="thread-post-count">${reportCount}件の報告 ・ ${commentCount}件のコメント</span>
762	762	#if($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred')
763	763	#if($actFeatured == '1')
...	...	@@ -817,12 +817,12 @@
817	817	#set($postVis = $!post.getValue('visibility'))
818	818	#if(!$postVis || $postVis == '') #set($postVis = 'public') #end
819	819	#set($canViewPost = true)
820		- #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewPost = false)
821		- #elseif($postVis == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPost = false)
	699	+ #if($postVis == 'members' && $isGuest) #set($canViewPost = false)
	700	+ #elseif($postVis == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewPost = false)
822	822	#end
823	823	#if(!$canViewPost)
824	824	<div class="thread-post visibility-restricted-post">
825		- <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>
	704	+ <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> この投稿は #if($postVis == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
826	826	</div>
827	827	#else
828	828	## 投稿者のアカウント種別に基づいたCSSクラス
...	...	@@ -862,11 +862,8 @@
862	862	<span class="badge badge-general badge-sm">一般</span>
863	863	#end
864	864	## 所属バッジ（投稿者の学校コードとページの学校コードを比較）
865		- #set($postIsSchoolMatch = ($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode)))
866	866	#if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general')
867		- #if($postUserRole == 'graduate' && $postIsSchoolMatch)
868		- <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>
869		- #elseif($postIsSchoolMatch && $postUserRole != 'graduate')
	745	+ #if($postSchoolCode == $schoolCode)
870	870	#if($postAccountType == 'verified' || $postAccountType == 'admin')
871	871	<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>
872	872	#else
...	...	@@ -887,6 +887,9 @@
887	887	#elseif($postUserRole == 'graduate')
888	888	<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>
889	889	#end
	766	+ #if($postGrade && $postGrade != '')
	767	+ <span class="badge badge-grade badge-sm">$postGrade</span>
	768	+ #end
890	890	</span>
891	891	<span class="thread-post-date">$!postDate</span>
892	892	#set($postEdited = $!post.getValue('edited'))
...	...	@@ -893,13 +893,6 @@
893	893	#if($postEdited == 1 || $postEdited == '1')
894	894	<span class="post-edited-label">（編集済み）</span>
895	895	#end
896		- #set($postAuthorRefH = $!post.getValue('authorRef'))
897		- #set($postObjNumH = $post.number)
898		- #if(!$isGuest && $xcontext.user != $postAuthorRefH)
899		- <button type="button" class="btn-post-report btn-post-report-header" onclick="openReportDialog(this, '${doc.fullName}', $postObjNumH, '${services.csrf.getToken()}')" title="この投稿を通報">
900		- <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> 通報
901		- </button>
902		- #end
903	903	</div>
904	904	<div class="thread-post-body">
905	905	$!escapetool.xml($!postContent)
...	...	@@ -964,18 +964,12 @@
964	964	#end
965	965	</div>
966	966	#if($postVis != 'public')
967		- <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>
	839	+ <div class="visibility-badge visibility-${postVis} post-action-mt">#if($postVis == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</div>
968	968	#end
969		- ## 固定/編集/削除/通報/非表示ボタン（横並び）
970		- #set($postAuthorRef = $!post.getValue('authorRef'))
971		- #set($postObjNumED = $post.number)
972		- #set($showPinBtn = ($viewerAccountType == 'admin' || $viewerAccountType == 'verified'))
973		- #set($showEditDeleteBtn = ($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin'))
974		- #set($showHideBtn = ($viewerAccountType == 'admin'))
975		- #if($showPinBtn || $showEditDeleteBtn || $showHideBtn)
976		- <div class="post-edit-actions post-action-mt">
977		- #if($showPinBtn)
978		- #set($postObjNum = $post.number)
	841	+ ## 固定/解除ボタン（承認済み・管理者のみ）
	842	+ #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
	843	+ #set($postObjNum = $post.number)
	844	+ <div class="post-pin-action post-action-mt">
979	979	#if($isPinned == '1')
980	980	<a href="$doc.getURL('view', "action=unpin&postObj=${postObjNum}&form_token=${services.csrf.getToken()}")" class="btn-pin-toggle btn-unpin" title="固定を解除">
981	981	<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> 固定を解除
...	...	@@ -985,12 +985,15 @@
985	985	<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> 固定する
986	986	</a>
987	987	#end
988		- #end
989		- #if($showEditDeleteBtn)
	854	+ </div>
	855	+ #end
	856	+ ## 編集・削除ボタン（投稿者本人 or 管理者）
	857	+ #set($postAuthorRef = $!post.getValue('authorRef'))
	858	+ #set($postObjNumED = $post.number)
	859	+ #if($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin')
	860	+ <div class="post-edit-actions post-action-mt">
990	990	#if($xcontext.user == $postAuthorRef)
991		- #set($editImages = $!post.getValue('images'))
992		- #set($editFiles = $!post.getValue('files'))
993		- <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="この投稿を編集">
	862	+ <button type="button" class="btn-post-edit" onclick="openEditPost(this, '${doc.fullName}', $postObjNumED, '$!escapetool.javascript($!postContent)')" title="この投稿を編集">
994	994	<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> 編集
995	995	</button>
996	996	#end
...	...	@@ -997,12 +997,6 @@
997	997	<button type="button" class="btn-post-delete" onclick="confirmDeletePost('${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を削除">
998	998	<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> 削除
999	999	</button>
1000		- #end
1001		- #if($showHideBtn)
1002		- <button type="button" class="btn-post-hide" onclick="openHideDialog(this, '${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を非表示にする">
1003		- <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> 非表示
1004		- </button>
1005		- #end
1006	1006	</div>
1007	1007	#end
1008	1008	</div>
...	...	@@ -1052,12 +1052,10 @@
1052	1052
1053	1053	#if($xcontext.user != "XWiki.XWikiGuest")
1054	1054	<div class="thread-add-post">
1055		- #if($isSchoolMember || $isAlumniOfSchool || $isViewerAdmin)
1056		- <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
	918	+ <a href="/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
1057	1057	＋ 活動報告を追加
1058	1058	</a>
1059		- #end
1060		- <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
	921	+ <a href="/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
1061	1061	<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> コメントを書く
1062	1062	</a>
1063	1063	</div>
...	...	@@ -1079,7 +1079,7 @@
1079	1079	#if($xcontext.user != "XWiki.XWikiGuest")
1080	1080	{{html clean="false"}}
1081	1081	<div class="activity-add-section">
1082		- <a href="/bin/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$!escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity">
	943	+ <a href="/bin/view/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$!escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity">
1083	1083	<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> 活動を追加
1084	1084	</a>
1085	1085	</div>
...	...	@@ -1086,38 +1086,62 @@
1086	1086	{{/html}}
1087	1087	#end
1088	1088
1089		-## --- 年度タブ切り替え JavaScript ---
	950	+## --- 年度アーカイブ セクション ---
1090	1090	{{html clean="false"}}
1091		-<script>
1092		-// コンパクト表示（タイトルのみ）トグル
1093		-function toggleCompactView() {
1094		- var container = document.querySelector('.xwiki-content') || document.body;
1095		- var isCompact = container.classList.toggle('activity-compact-view');
1096		- var btn = document.getElementById('btnViewToggle');
1097		- if (btn) {
1098		- btn.querySelector('.toggle-label').textContent = isCompact ? '詳細表示' : '一覧表示';
1099		- btn.title = isCompact ? '詳細表示に戻す' : 'タイトルのみ表示';
1100		- }
1101		- // コンパクトモードでは各スレッドヘッダーをクリックで個別展開可能にする
1102		- document.querySelectorAll('.activity-thread').forEach(function(thread) {
1103		- if (isCompact) {
1104		- thread.classList.remove('compact-expanded');
1105		- }
1106		- });
1107		-}
	952	+<div class="school-section-card school-archive-card">
	953	+ <h2 class="archive-section-title">
	954	+ <svg class="ico ico-md" viewBox="0 0 24 24"><path d="M19 21H5a2 2 0 01-2-2V5a2 2 0 012-2h11l5 5v11a2 2 0 01-2 2z"/><polyline points="17 21 17 13 7 13 7 21"/><polyline points="7 3 7 8 15 8"/></svg>
	955	+ 年度アーカイブ
	956	+ </h2>
	957	+ <div class="archive-meta">
	958	+ 現在のページ: <strong>${pageFiscalYear}年度</strong>
	959	+ #set($lyud = $!doc.getValue('lastYearUpdateDate'))
	960	+ #if($lyud && $lyud != '')
	961	+ | 最終年度更新: $!escapetool.xml($lyud) ($!escapetool.xml($!doc.getValue('lastYearUpdateBy')))
	962	+ #end
	963	+ </div>
1108	1108
1109		-// コンパクトモードで個別スレッドを展開/折りたたみ
1110		-function toggleThreadExpand(e) {
1111		- var container = document.querySelector('.xwiki-content') || document.body;
1112		- if (!container.classList.contains('activity-compact-view')) return;
1113		- // リンクやボタンのクリックはスルー
1114		- if (e.target.closest('a, button, .btn-featured-toggle')) return;
1115		- var thread = e.target.closest('.activity-thread');
1116		- if (thread) {
1117		- thread.classList.toggle('compact-expanded');
1118		- }
1119		-}
	965	+ ## 過去アーカイブの検索
	966	+ #set($archiveQuery = $services.query.hql("where doc.fullName like :pattern and doc.fullName like '%Archive_%' order by doc.fullName desc").bindValue("pattern", "${doc.fullName}.Archive_%").setLimit(20))
	967	+ #set($archivePages = $archiveQuery.execute())
1120	1120
	969	+ #if($archivePages && $archivePages.size() > 0)
	970	+ <div class="archive-card-field-lg">
	971	+ <div class="archive-list-label">過去の年度アーカイブ</div>
	972	+ <div class="archive-list">
	973	+ #foreach($archPage in $archivePages)
	974	+ #set($archPageDoc = $xwiki.getDocument($archPage))
	975	+ #set($archPageObj = $archPageDoc.getObject('SeitokaiCode.SchoolClass'))
	976	+ #if($archPageObj)
	977	+ #set($archPageFY = $!archPageObj.getValue('fiscalYear'))
	978	+ <a href="$archPageDoc.getURL('view')" class="archive-link">
	979	+ <svg class="ico" viewBox="0 0 24 24"><path d="M19 21H5a2 2 0 01-2-2V5a2 2 0 012-2h11l5 5v11a2 2 0 01-2 2z"/><polyline points="17 21 17 13 7 13 7 21"/><polyline points="7 3 7 8 15 8"/></svg>
	980	+ ${archPageFY}年度
	981	+ </a>
	982	+ #end
	983	+ #end
	984	+ </div>
	985	+ </div>
	986	+ #else
	987	+ <div class="archive-empty">過去のアーカイブはまだありません</div>
	988	+ #end
	989	+
	990	+ ## 新年度に移行ボタン（承認済み・管理者のみ）
	991	+ #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
	992	+ <div class="archive-action">
	993	+ <a href="/bin/view/SeitokaiCode/YearArchiveAction?schoolPage=${doc.fullName}" class="btn-accent">
	994	+ <svg class="ico" viewBox="0 0 24 24" stroke-width="2.5"><path d="M19 21H5a2 2 0 01-2-2V5a2 2 0 012-2h11l5 5v11a2 2 0 01-2 2z"/><polyline points="17 21 17 13 7 13 7 21"/><polyline points="7 3 7 8 15 8"/></svg>
	995	+ ${pageFiscalYear}年度をアーカイブして新年度に移行
	996	+ </a>
	997	+ <div class="archive-action-hint">現在の学校情報を${pageFiscalYear}年度として保存し、新しい年度に移行します。</div>
	998	+ </div>
	999	+ #end
	1000	+</div>
	1001	+{{/html}}
	1002	+
	1003	+## --- 年度タブ切り替え JavaScript ---
	1004	+{{html clean="false"}}
	1005	+<script>
1121	1121	function switchActivityFY(fy, btn) {
1122	1122	// タブのアクティブ状態を切り替え
1123	1123	document.querySelectorAll('.activity-fy-tab').forEach(function(t) { t.classList.remove('active'); });
...	...	@@ -1133,31 +1133,13 @@
1133	1133	}
1134	1134	// ページ読み込み時の初期化
1135	1135	document.addEventListener('DOMContentLoaded', function() {
1136		- // 年度タブを降順にソート（「全期間」タブは末尾に固定）
1137		- var tabContainer = document.querySelector('.activity-fy-tabs');
1138		- if (tabContainer) {
1139		- var tabs = Array.from(tabContainer.querySelectorAll('.activity-fy-tab'));
1140		- var allTab = null;
1141		- var fyTabs = [];
1142		- tabs.forEach(function(t) {
1143		- var onclickStr = t.getAttribute('onclick') || '';
1144		- if (onclickStr.indexOf("'all'") !== -1) { allTab = t; }
1145		- else { fyTabs.push(t); }
1146		- });
1147		- // 年度タブを数値の降順でソート
1148		- fyTabs.sort(function(a, b) {
1149		- var aYear = parseInt(a.textContent) || 0;
1150		- var bYear = parseInt(b.textContent) || 0;
1151		- return bYear - aYear;
1152		- });
1153		- // DOM再配置
1154		- fyTabs.forEach(function(t) { tabContainer.appendChild(t); });
1155		- if (allTab) { tabContainer.appendChild(allTab); }
1156		- }
1157	1157	// デフォルトで現在の年度を表示
1158	1158	var defaultTab = document.querySelector('.activity-fy-tab.active');
1159	1159	if (defaultTab) { defaultTab.click(); }
1160	1160	// 保存成功時のトースト通知
	1025	+ if (window.location.search.indexOf('archived=1') !== -1) {
	1026	+ showToast('年度アーカイブを作成しました', 'success');
	1027	+ }
1161	1161	if (window.location.search.indexOf('saved=1') !== -1) {
1162	1162	showToast('学校情報を保存しました', 'success');
1163	1163	// URLパラメータをクリーンアップ（リロード時に再表示されないよう）
...	...	@@ -1165,30 +1165,6 @@
1165	1165	window.history.replaceState({}, document.title, window.location.pathname);
1166	1166	}
1167	1167	}
1168		- // コンパクトモード: スレッドヘッダークリックで個別展開
1169		- document.querySelectorAll('.activity-thread-header').forEach(function(header) {
1170		- header.addEventListener('click', toggleThreadExpand);
1171		- });
1172		- // 長文投稿の折りたたみ初期化（max-height: 12em 超で省略）
1173		- document.querySelectorAll('.thread-post-body').forEach(function(body) {
1174		- // pre-wrapのまま高さを測定し、max-height(12em ≒ ~200px)を超える場合に折りたたむ
1175		- var fullH = body.scrollHeight;
1176		- // 12em を px に変換（font-size × line-height × 行数 の近似値ではなくCSSと同じ値を取得）
1177		- body.classList.add('truncated');
1178		- var maxH = body.clientHeight; // max-height: 12em 適用後の高さ
1179		- body.classList.remove('truncated');
1180		- if (fullH > maxH + 30) {
1181		- body.classList.add('truncated');
1182		- var btn = document.createElement('button');
1183		- btn.className = 'btn-read-more';
1184		- btn.textContent = '広げて読む ▼';
1185		- btn.addEventListener('click', function() {
1186		- var isExpanded = body.classList.toggle('expanded');
1187		- btn.textContent = isExpanded ? '折りたたむ ▲' : '広げて読む ▼';
1188		- });
1189		- body.parentNode.insertBefore(btn, body.nextSibling);
1190		- }
1191		- });
1192	1192	});
1193	1193
1194	1194	// トースト通知表示
...	...	@@ -1217,136 +1217,38 @@
1217	1217	var card = document.getElementById(cardId);
1218	1218	if (!card) return;
1219	1219	card.classList.toggle('collapsed');
1220		- var isCollapsed = card.classList.contains('collapsed');
1221		- var h2 = card.querySelector('h2[role="button"]');
1222		- if (h2) h2.setAttribute('aria-expanded', !isCollapsed);
1223	1223	}
1224	1224
1225	1225	// 投稿の編集（インライン編集フォームを開く）
1226		-function openEditPost(btn) {
	1066	+function openEditPost(btn, schoolPage, postObjNum, currentContent) {
1227	1227	var postEl = btn.closest('.thread-post');
1228	1228	if (!postEl) return;
	1069	+ // 既存の編集フォームがあれば閉じる
1229	1229	var existing = postEl.querySelector('.post-edit-form');
1230	1230	if (existing) { existing.remove(); return; }
1231	1231	var bodyEl = postEl.querySelector('.thread-post-body');
1232	1232	if (!bodyEl) return;
1233		-
1234		- var schoolPage = btn.getAttribute('data-school');
1235		- var postObjNum = btn.getAttribute('data-obj');
1236		- var currentContent = btn.getAttribute('data-content') || '';
1237		- var currentImages = btn.getAttribute('data-images') || '';
1238		- var currentFiles = btn.getAttribute('data-files') || '';
1239		- var postType = btn.getAttribute('data-post-type') || 'report';
1240		-
1241	1241	var form = document.createElement('div');
1242	1242	form.className = 'post-edit-form';
1243		- form.setAttribute('data-school', schoolPage);
1244		- form.setAttribute('data-obj', postObjNum);
1245		-
1246		- var html = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>';
1247		-
1248		- // コメント以外は添付ファイル編集を表示
1249		- if (postType !== 'comment') {
1250		- // 既存画像
1251		- html += '<div class="edit-attachments">';
1252		- if (currentImages.trim()) {
1253		- html += '<div class="edit-attach-section"><span class="edit-attach-label">画像</span>';
1254		- var imgs = currentImages.trim().split('\n');
1255		- for (var i = 0; i < imgs.length; i++) {
1256		- var img = imgs[i].trim();
1257		- if (!img) continue;
1258		- html += '<div class="edit-attach-item" data-name="' + img.replace(/"/g,'&quot;') + '">' +
1259		- '<img src="/xwiki/bin/download/' + schoolPage.replace(/\./g,'/') + '/' + encodeURIComponent(img) + '" class="edit-attach-thumb" />' +
1260		- '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1261		- '<input type="hidden" name="keepImages" value="' + img.replace(/"/g,'&quot;') + '" />' +
1262		- '</div>';
1263		- }
1264		- html += '</div>';
1265		- }
1266		- // 既存ファイル
1267		- if (currentFiles.trim()) {
1268		- html += '<div class="edit-attach-section"><span class="edit-attach-label">ファイル</span>';
1269		- var files = currentFiles.trim().split('\n');
1270		- for (var j = 0; j < files.length; j++) {
1271		- var f = files[j].trim();
1272		- if (!f) continue;
1273		- var displayName = f;
1274		- if (/^file_\d{14}_\d+_/.test(f)) displayName = f.replace(/^file_\d{14}_\d+_/, '');
1275		- html += '<div class="edit-attach-item" data-name="' + f.replace(/"/g,'&quot;') + '">' +
1276		- '<span class="edit-attach-fname">' + displayName.replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</span>' +
1277		- '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1278		- '<input type="hidden" name="keepFiles" value="' + f.replace(/"/g,'&quot;') + '" />' +
1279		- '</div>';
1280		- }
1281		- html += '</div>';
1282		- }
1283		- // 新規追加
1284		- html += '<div class="edit-attach-add">' +
1285		- '<label class="form-label-sm">画像を追加（最大4枚まで）</label>' +
1286		- '<input type="file" name="editNewImages" accept="image/*" multiple class="form-file-input-sm" />' +
1287		- '<div class="form-hint">JPEG / PNG / GIF / WebP、各5MBまで</div>' +
1288		- '<label class="form-label-sm" style="margin-top:8px;">ファイルを追加（最大2つまで）</label>' +
1289		- '<input type="file" name="editNewFiles" accept=".pdf,.docx,.xlsx,.pptx" multiple class="form-file-input-sm" />' +
1290		- '<div class="form-hint">PDF / Word / Excel / PowerPoint、各10MBまで</div>' +
1291		- '</div>';
1292		- html += '</div>';
1293		- }
1294		-
1295		- html += '<div class="post-edit-form-actions">' +
	1076	+ form.innerHTML = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>' +
	1077	+ '<div class="post-edit-form-actions">' +
1296	1296	'<button type="button" class="btn-cancel-edit" onclick="this.closest(\'.post-edit-form\').remove()">キャンセル</button>' +
1297		- '<button type="button" class="btn-save" onclick="saveEditPost(this)">保存</button>' +
	1079	+ '<button type="button" class="btn-save" onclick="saveEditPost(\'' + schoolPage + '\', ' + postObjNum + ')">保存</button>' +
1298	1298	'</div>';
1299		-
1300		- form.innerHTML = html;
1301	1301	bodyEl.parentNode.insertBefore(form, bodyEl.nextSibling);
1302	1302	form.querySelector('textarea').focus();
1303	1303	}
1304	1304
1305		-function removeEditAttach(btn) {
1306		- var item = btn.closest('.edit-attach-item');
1307		- if (item) item.remove();
1308		-}
1309		-
1310	1310	// 投稿の編集を保存
1311		-function saveEditPost(btn) {
1312		- var formEl = btn.closest('.post-edit-form');
1313		- if (!formEl) return;
1314		- var schoolPage = formEl.getAttribute('data-school');
1315		- var postObjNum = formEl.getAttribute('data-obj');
1316		- var textarea = formEl.querySelector('textarea');
	1086	+function saveEditPost(schoolPage, postObjNum) {
	1087	+ var textarea = document.getElementById('editContent_' + postObjNum);
1317	1317	if (!textarea) return;
1318	1318	var newContent = textarea.value.trim();
1319	1319	if (!newContent) { alert('投稿内容を入力してください'); return; }
1320		-
1321	1321	var csrfEl = document.querySelector('input[name="form_token"]');
1322	1322	var csrfToken = csrfEl ? csrfEl.value : '';
1323		-
1324		- var fd = new FormData();
1325		- fd.append('schoolPage', schoolPage);
1326		- fd.append('postObj', postObjNum);
1327		- fd.append('newContent', newContent);
1328		- fd.append('form_token', csrfToken);
1329		-
1330		- // 残す画像・ファイル
1331		- formEl.querySelectorAll('input[name="keepImages"]').forEach(function(el) { fd.append('keepImages', el.value); });
1332		- formEl.querySelectorAll('input[name="keepFiles"]').forEach(function(el) { fd.append('keepFiles', el.value); });
1333		-
1334		- // 新規画像
1335		- var newImgInput = formEl.querySelector('input[name="editNewImages"]');
1336		- if (newImgInput && newImgInput.files) {
1337		- for (var i = 0; i < newImgInput.files.length; i++) { fd.append('editNewImages', newImgInput.files[i]); }
1338		- }
1339		- // 新規ファイル
1340		- var newFileInput = formEl.querySelector('input[name="editNewFiles"]');
1341		- if (newFileInput && newFileInput.files) {
1342		- for (var j = 0; j < newFileInput.files.length; j++) { fd.append('editNewFiles', newFileInput.files[j]); }
1343		- }
1344		-
1345		- btn.disabled = true;
1346		- btn.textContent = '保存中...';
1347		-
1348	1348	var xhr = new XMLHttpRequest();
1349		- xhr.open('POST', '/bin/get/SeitokaiCode/EditPost?outputSyntax=plain', true);
	1094	+ xhr.open('GET', '/bin/view/SeitokaiCode/EditPost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken), true);
1350	1350	xhr.onload = function() {
1351	1351	try {
1352	1352	var res = JSON.parse(xhr.responseText);
...	...	@@ -1354,13 +1354,12 @@
1354	1354	showToast('投稿を更新しました', 'success');
1355	1355	setTimeout(function() { location.reload(); }, 800);
1356	1356	} else {
1357		- btn.disabled = false; btn.textContent = '保存';
1358	1358	alert('編集に失敗しました: ' + (res.error || ''));
1359	1359	}
1360		- } catch(e) { btn.disabled = false; btn.textContent = '保存'; alert('編集に失敗しました'); }
	1104	+ } catch(e) { alert('編集に失敗しました'); }
1361	1361	};
1362		- xhr.onerror = function() { btn.disabled = false; btn.textContent = '保存'; alert('通信エラーが発生しました'); };
1363		- xhr.send(fd);
	1106	+ xhr.onerror = function() { alert('通信エラーが発生しました'); };
	1107	+ xhr.send();
1364	1364	}
1365	1365
1366	1366	// 投稿の削除（確認ダイアログ付き）
...	...	@@ -1367,9 +1367,7 @@
1367	1367	function confirmDeletePost(schoolPage, postObjNum, token) {
1368	1368	if (!confirm('この投稿を削除しますか？\\n削除後は「この投稿は削除されました」と表示されます。')) return;
1369	1369	var xhr = new XMLHttpRequest();
1370		- xhr.open('POST', '/bin/get/SeitokaiCode/DeletePost?outputSyntax=plain', true);
1371		- xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1372		- var deletePostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token);
	1114	+ xhr.open('GET', '/bin/view/SeitokaiCode/DeletePost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token), true);
1373	1373	xhr.onload = function() {
1374	1374	try {
1375	1375	var res = JSON.parse(xhr.responseText);
...	...	@@ -1382,82 +1382,8 @@
1382	1382	} catch(e) { alert('削除に失敗しました'); }
1383	1383	};
1384	1384	xhr.onerror = function() { alert('通信エラーが発生しました'); };
1385		- xhr.send(deletePostData);
	1127	+ xhr.send();
1386	1386	}
1387		-
1388		-/* --- 通報ダイアログ --- */
1389		-function openReportDialog(btn, targetPage, postObjNum, token) {
1390		- if (document.getElementById('report-dialog-overlay')) return;
1391		- var reasons = ['宣伝・スパム','不適切な内容','個人情報の露出','誹謗中傷','誤情報','その他'];
1392		- var overlay = document.createElement('div');
1393		- overlay.id = 'report-dialog-overlay';
1394		- 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;';
1395		- var dialog = document.createElement('div');
1396		- dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;max-height:80vh;overflow-y:auto;';
1397		- var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を通報</h3>';
1398		- html += '<p style="margin:0 0 12px;font-size:0.9em;color:#4b5563;">通報された投稿は管理者が確認するまで一時的に非表示になります。</p>';
1399		- html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">通報理由</label>';
1400		- html += '<select id="report-reason" style="width:100%;padding:8px;border:1px solid #d1d5db;border-radius:8px;margin-bottom:12px;font-size:0.9em;">';
1401		- for (var i=0; i<reasons.length; i++) html += '<option value="'+reasons[i]+'">'+reasons[i]+'</option>';
1402		- html += '</select>';
1403		- html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">補足コメント（任意）</label>';
1404		- 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>';
1405		- html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
1406		- html += '<button type="button" id="report-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
1407		- 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>';
1408		- html += '</div>';
1409		- dialog.innerHTML = html;
1410		- overlay.appendChild(dialog);
1411		- document.body.appendChild(overlay);
1412		- overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
1413		- document.getElementById('report-cancel-btn').addEventListener('click', function() { overlay.remove(); });
1414		- document.getElementById('report-submit-btn').addEventListener('click', function() {
1415		- var reason = document.getElementById('report-reason').value;
1416		- var detail = document.getElementById('report-detail').value;
1417		- var submitBtn = document.getElementById('report-submit-btn');
1418		- submitBtn.disabled = true; submitBtn.textContent = '送信中...';
1419		- var xhr = new XMLHttpRequest();
1420		- xhr.open('POST', '/bin/get/SeitokaiCode/ReportAction?outputSyntax=plain', true);
1421		- xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1422		- var data = 'targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&detail=' + encodeURIComponent(detail) + '&form_token=' + encodeURIComponent(token);
1423		- xhr.onload = function() {
1424		- overlay.remove();
1425		- showToast('通報を受け付けました', 'success');
1426		- setTimeout(function() { location.reload(); }, 1000);
1427		- };
1428		- xhr.onerror = function() { overlay.remove(); alert('通信エラーが発生しました'); };
1429		- xhr.send(data);
1430		- });
1431		-}
1432		-
1433		-/* --- 非表示ダイアログ（管理者用） --- */
1434		-function openHideDialog(btn, targetPage, postObjNum, token) {
1435		- if (document.getElementById('hide-dialog-overlay')) return;
1436		- var overlay = document.createElement('div');
1437		- overlay.id = 'hide-dialog-overlay';
1438		- 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;';
1439		- var dialog = document.createElement('div');
1440		- dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;';
1441		- var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を非表示にする</h3>';
1442		- html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">非表示の理由</label>';
1443		- 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="理由を入力" />';
1444		- html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
1445		- html += '<button type="button" id="hide-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
1446		- 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>';
1447		- 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>';
1448		- html += '</div>';
1449		- dialog.innerHTML = html;
1450		- overlay.appendChild(dialog);
1451		- document.body.appendChild(overlay);
1452		- overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
1453		- document.getElementById('hide-cancel-btn').addEventListener('click', function() { overlay.remove(); });
1454		- function doHide(action) {
1455		- var reason = document.getElementById('hide-reason').value || '管理者判断';
1456		- window.location.href = '/bin/view/SeitokaiCode/ModerationAction?action=' + action + '&targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&form_token=' + encodeURIComponent(token);
1457		- }
1458		- document.getElementById('hide-submit-btn').addEventListener('click', function() { doHide('hide'); });
1459		- document.getElementById('hide-warn-btn').addEventListener('click', function() { doHide('hide-warn'); });
1460		-}
1461	1461	</script>
1462	1462	{{/html}}
1463	1463	{{/velocity}}