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'))
...	...	@@ -64,43 +64,6 @@
64	64	#set($ruleReviewImplementer = $doc.getValue('ruleReviewImplementer'))
65	65	#set($ruleReviewSystem = $doc.getValue('ruleReviewSystem'))
66	66
67		-## --- 活動環境 ---
68		-#set($activityPlace = $doc.getValue('activityPlace'))
69		-#set($activityRoomEquipment = $doc.getValue('activityRoomEquipment'))
70		-#set($activityRoomImage = $doc.getValue('activityRoomImage'))
71		-#set($ictUsage = $doc.getValue('ictUsage'))
72		-
73		-## --- 生徒総会 ---
74		-#set($assemblyFormat = $doc.getValue('assemblyFormat'))
75		-#set($assemblyCount = $doc.getValue('assemblyCount'))
76		-#set($assemblyAgenda = $doc.getValue('assemblyAgenda'))
77		-#set($assemblyTopics = $doc.getValue('assemblyTopics'))
78		-#set($assemblyNote = $doc.getValue('assemblyNote'))
79		-
80		-## --- 広報 ---
81		-#set($publicityMethod = $doc.getValue('publicityMethod'))
82		-#set($publicityFrequency = $doc.getValue('publicityFrequency'))
83		-#set($publicityNote = $doc.getValue('publicityNote'))
84		-
85		-## --- 外部連携 ---
86		-#set($externalCooperation = $doc.getValue('externalCooperation'))
87		-#set($externalOrgName = $doc.getValue('externalOrgName'))
88		-#set($socialParticipation = $doc.getValue('socialParticipation'))
89		-
90		-## --- 年間主要行事 ---
91		-#set($eventApril = $doc.getValue('eventApril'))
92		-#set($eventMay = $doc.getValue('eventMay'))
93		-#set($eventJune = $doc.getValue('eventJune'))
94		-#set($eventJuly = $doc.getValue('eventJuly'))
95		-#set($eventAugust = $doc.getValue('eventAugust'))
96		-#set($eventSeptember = $doc.getValue('eventSeptember'))
97		-#set($eventOctober = $doc.getValue('eventOctober'))
98		-#set($eventNovember = $doc.getValue('eventNovember'))
99		-#set($eventDecember = $doc.getValue('eventDecember'))
100		-#set($eventJanuary = $doc.getValue('eventJanuary'))
101		-#set($eventFebruary = $doc.getValue('eventFebruary'))
102		-#set($eventMarch = $doc.getValue('eventMarch'))
103		-
104	104	## --- 課題・連絡先 ---
105	105	#set($challenges = $doc.getValue('challenges'))
106	106	#set($contactInfo = $doc.getValue('contactInfo'))
...	...	@@ -110,7 +110,9 @@
110	110	#set($seitokaiYoutube = $doc.getValue('seitokaiYoutube'))
111	111	#set($seitokaiOtherSns = $doc.getValue('seitokaiOtherSns'))
112	112
113		-## --- 現在の年度を計算（4月始まり） ---
	68	+## --- 年度アーカイブ ---
	69	+#set($pageFiscalYear = $!doc.getValue('fiscalYear'))
	70	+## 現在の年度を計算（4月始まり）
114	114	#set($nowFY = $datetool.date)
115	115	#set($currentFYMonth = $mathtool.toInteger($datetool.format('MM', $nowFY)))
116	116	#set($currentFYYear = $mathtool.toInteger($datetool.format('yyyy', $nowFY)))
...	...	@@ -119,6 +119,10 @@
119	119	#else
120	120	#set($currentFiscalYear = $mathtool.sub($currentFYYear, 1))
121	121	#end
	79	+## fiscalYear 未設定時はデフォルトとして現在の年度を使う
	80	+#if(!$pageFiscalYear || $pageFiscalYear == '')
	81	+ #set($pageFiscalYear = $currentFiscalYear.toString())
	82	+#end
122	122
123	123	## --- 公開範囲フィールド ---
124	124	#set($visibilityOrgChart = $!doc.getValue('visibilityOrgChart'))
...	...	@@ -140,81 +140,15 @@
140	140	#set($viewerDoc = $xwiki.getDocument($viewerUser))
141	141	#set($viewerAccountType = $!viewerDoc.getValue('accountType'))
142	142	#set($viewerSchoolCode = $!viewerDoc.getValue('schoolCode'))
143		- #set($viewerSecondarySchoolCode = $!viewerDoc.getValue('secondarySchoolCode'))
144		- #set($viewerUserRole = $!viewerDoc.getValue('userRole'))
145	145	#if($viewerAccountType == 'admin')
146	146	#set($isViewerAdmin = true)
147	147	#end
148	148	#end
149	149
150		-## --- 関連校（中高一貫校）情報 ---
151		-#set($affiliatedSchoolCode = $!doc.getValue('affiliatedSchoolCode'))
152		-#set($affiliatedSchoolName = $!doc.getValue('affiliatedSchoolName'))
153		-#set($isAffiliated = false)
154		-#if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
155		- #if($viewerSchoolCode == $affiliatedSchoolCode)
156		- #set($isAffiliated = true)
157		- #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode)
158		- #set($isAffiliated = true)
159		- #end
160		-#end
161		-
162		-## --- 校内判定（卒業生を除外、secondarySchoolCodeも含む） ---
163		-#set($isSchoolMember = false)
164		-#if(!$isGuest && $viewerUserRole != 'graduate')
165		- #if($viewerSchoolCode == $schoolCode || $isAffiliated)
166		- #set($isSchoolMember = true)
167		- #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode)
168		- #set($isSchoolMember = true)
169		- #end
170		-#end
171		-## 卒業生の母校判定（投稿バッジ用）
172		-#set($isAlumniOfSchool = false)
173		-#if(!$isGuest && $viewerUserRole == 'graduate')
174		- #if($viewerSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $viewerSchoolCode == $affiliatedSchoolCode))
175		- #set($isAlumniOfSchool = true)
176		- #end
177		-#end
178		-
179		-## --- 学校ページ非表示チェック ---
180		-#set($schoolHidden = $doc.getValue('hidden'))
181		-#if($schoolHidden == 1)
182		- #if($isViewerAdmin)
183		- ## 管理者: 黄色バナー + ページ内容は通常表示（プレビュー）
184		-<div class="school-hidden-banner admin">
185		- <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>
186		- <div>
187		- <strong>このページは非表示になっています</strong>（管理者のみ閲覧可能）
188		- #set($hBy = $!doc.getValue('hiddenBy'))
189		- #set($hAt = $!doc.getValue('hiddenAt'))
190		- #set($hReason = $!doc.getValue('hiddenReason'))
191		- <div class="school-hidden-detail">
192		- 非表示: $!escapetool.xml($hAt) / $!escapetool.xml($hBy)
193		- #if($hReason && $hReason != '') ・ 理由: $!escapetool.xml($hReason)#end
194		- </div>
195		- <a href="$xwiki.getURL('SeitokaiAdmin.SchoolManagement', 'view')" style="color:#92400e;text-decoration:underline">学校ページ管理へ</a>
196		- </div>
197		-</div>
198		- #else
199		- ## 一般ユーザー・ゲスト: 非公開メッセージを表示して停止
200		-<div class="school-hidden-public">
201		- <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>
202		- <h2>このページは現在公開されていません</h2>
203		- <p>このページは管理者により非公開に設定されています。</p>
204		- <a href="$xwiki.getURL('Schools.WebHome', 'view')" class="btn-back-list">学校一覧に戻る</a>
205		-</div>
206		-#stop
207		- #end
208		-#end
209		-
210	210	## --- 投稿固定/解除処理 ---
211	211	#set($pinAction = $!request.action)
212		-#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $isSchoolMember)) && $services.csrf.isTokenValid($request.form_token))
213		- #set($pinPostObjStr = $!request.postObj)
214		- #if(!$pinPostObjStr.matches('^\d+$'))
215		- ## 不正な値 → 無視
216		- #else
217		- #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))
218	218	#set($postObj = $doc.getObject('SeitokaiCode.ActivityPostClass', $postObjNum))
219	219	#if($postObj)
220	220	#if($pinAction == 'pin')
...	...	@@ -234,15 +234,12 @@
234	234	$response.sendRedirect($doc.getURL('view'))
235	235	#stop
236	236	#end
237		- #end## /matches
238	238	#end
239	239
240	240	## --- 特色ある活動 選定/解除処理 ---
241	241	#set($featAction = $!request.action)
242		-#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $isSchoolMember)) && $services.csrf.isTokenValid($request.form_token))
243		- #set($featActObjStr = $!request.actObj)
244		- #if($featActObjStr.matches('^\d+$'))
245		- #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))
246	246	#set($actObj = $doc.getObject('SeitokaiCode.ActivityClass', $actObjNum))
247	247	#if($actObj)
248	248	#if($featAction == 'feature')
...	...	@@ -274,7 +274,6 @@
274	274	$response.sendRedirect($doc.getURL('view'))
275	275	#stop
276	276	#end
277		- #end## /matches
278	278	#end
279	279
280	280	## --- ユーザー情報取得 ---
...	...	@@ -341,7 +341,7 @@
341	341
342	342	## --- 編集ボタン（権限があるユーザーのみ表示） ---
343	343	#set($canEditSchool = false)
344		-#if(!$isGuest && ($isViewerAdmin || $isSchoolMember || $isAlumniOfSchool))
	235	+#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode))
345	345	#set($canEditSchool = true)
346	346	#end
347	347	#if($canEditSchool)
...	...	@@ -350,498 +350,305 @@
350	350	</div>
351	351	#end
352	352
353		-## --- 関連校（中高一貫校）バナー ---
354		-#if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
355		- #set($affiliatedPageRef = "Schools.${affiliatedSchoolCode}.WebHome")
356		- #set($affiliatedPageExists = $xwiki.exists($affiliatedPageRef))
357		-<div class="affiliated-school-banner">
358		- <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>
359		- <div>
360		- <strong>中高一貫校</strong>：
361		- #if($affiliatedPageExists)
362		- <a href="$xwiki.getURL($affiliatedPageRef, 'view')">$!escapetool.xml($affiliatedSchoolName)</a>
363		- #else
364		- $!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>
365	365	#end
366		- と連携しています
367	367	</div>
368		-</div>
369		-#end
370	370
371		-## --- ① 学校基本情報 ---
372		-<div class="school-info-card collapsed" id="card-basic-info">
373		- <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>
374		- <div class="school-basic-info-layout">
375		- <div class="school-basic-info-table">
376		- <table class="wiki-table school-info-table">
377		- <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
378		- <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
379		- <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
380		- <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
381		- <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
382		- <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
383		- <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
384		- <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
385		- <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>
386		- </table>
387		- </div>
388		- #if($schoolPhoto && $schoolPhoto != '')
389		- <div class="school-photo-area">
390		- <img src="$doc.getAttachmentURL($schoolPhoto)" alt="$!escapetool.xml($schoolName)" class="school-photo" />
391		- </div>
392		- #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>
393	393	</div>
394		- #if($schoolDescription && $schoolDescription.trim() != '')
395		- <div class="free-note" style="margin-top:var(--sp-4);">$!escapetool.xml($schoolDescription)</div>
396		- #end
	277	+</div>
397	397
	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>
398	398	</div>
399	399
400		-## --- ② 生徒会情報（折りたたみカード） ---
401		-<div class="school-info-card" id="card-seitokai-info">
402		- <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>
403		- <div class="seitokai-info-body">
	287	+<div id="seitokai-info-section" class="seitokai-info-accordion">
404	404
405		- ## --- 生徒会組織 ---
406		- #set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
407		- #if($hasOrgContent)
408		- #set($canViewOrgChart = true)
409		- #if($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewOrgChart = false)
410		- #elseif($visibilityOrgChart == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewOrgChart = false)
411		- #end
412		- #if($canViewOrgChart)
413		- <div class="seitokai-subsection">
414		- <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>
415		- <div class="seitokai-subsection-content">
416		- #if($orgChartImage && $orgChartImage != '')
417		- <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
418		- #end
419		- #if($orgChart && $orgChart != '')<div class="free-note">$!escapetool.xml($orgChart)</div>#end
420		- </div>
421		- </div>
422		- #else
423		- <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 生徒会組織は #if($visibilityOrgChart == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
424		- #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>
425	425	#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
426	426
427		- ## --- 日常の活動 ---
428		- #if($dailyActivities && !$dailyActivities.isEmpty())
429		- <div class="seitokai-subsection">
430		- <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>
431		- <div class="seitokai-subsection-content">
432		- <p class="activity-hint">活動時間が多い3つ</p>
433		- <div class="tag-container">
434		- #foreach($da in $dailyActivities)
435		- <span class="tag tag-accent">$!escapetool.xml($da.trim())</span>
436		- #end
437		- </div>
438		- #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
439		- <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)
440	440	#end
441	441	</div>
	326	+ #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
	327	+ <div class="free-note">$!escapetool.xml($dailyActivitiesNote)</div>
	328	+ #end
442	442	</div>
443		- #end
	330	+ </div>
	331	+ #end
444	444
445		- ## --- 選挙 ---
446		- #if($electionExists && $electionExists != '')
447		- <div class="seitokai-subsection">
448		- <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>
449		- <div class="seitokai-subsection-content">
450		- <div class="info-row">
451		- <span class="info-label">役員選挙</span>
452		- <span class="info-value">$!escapetool.xml($!electionExists)</span>
453		- </div>
454		- #if($electionType && $electionType != '')
455		- <div class="info-row">
456		- <span class="info-label">直近の選挙方式</span>
457		- <span class="info-value">$!escapetool.xml($!electionType)</span>
458		- </div>
459		- #end
460		- #if($electionNote && $electionNote.trim() != '')
461		- <div class="free-note">$!escapetool.xml($electionNote)</div>
462		- #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>
463	463	</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
464	464	</div>
465		- #end
	351	+ </div>
	352	+ #end
	353	+</div>
466	466
467		- ## --- 定例活動 ---
468		- #if($meetingFrequency && $meetingFrequency != '')
469		- <div class="seitokai-subsection">
470		- <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>
471		- <div class="seitokai-subsection-content">
472		- <div class="info-row">
473		- <span class="info-label">役員定例会の頻度</span>
474		- <span class="info-value">$!escapetool.xml($!meetingFrequency)</span>
475		- </div>
476		- #if($regularActivitiesNote && $regularActivitiesNote.trim() != '')
477		- <div class="free-note">$!escapetool.xml($regularActivitiesNote)</div>
478		- #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>
479	479	</div>
	364	+ #if($regularActivitiesNote && $regularActivitiesNote.trim() != '')
	365	+ <div class="free-note">$!escapetool.xml($regularActivitiesNote)</div>
	366	+ #end
480	480	</div>
481		- #end
	368	+ </div>
	369	+ #end
482	482
483		- ## --- 予算 ---
484		- #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
485		- #if($hasBudget)
486		- #set($canViewBudget = true)
487		- #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewBudget = false)
488		- #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>
489	489	#end
490		- #if($canViewBudget)
491		- <div class="seitokai-subsection">
492		- <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>
493		- <div class="seitokai-subsection-content">
494		- #if($budgetProcess && !$budgetProcess.isEmpty())
495		- <div class="info-row">
496		- <span class="info-label">作成過程の生徒関与</span>
497		- <span class="info-value">
498		- <div class="selection-display">
499		- #set($allBpOpts = ["各部・委員会等への予算希望額調査","予算額調整（折衝等）","生徒会予算案の作成","生徒総会での議決","生徒関与なし","その他"])
500		- #foreach($bpOpt in $allBpOpts)
501		- #if($budgetProcess.contains($bpOpt))
502		- <span class="selection-item">$!escapetool.xml($bpOpt)</span>
503		- #else
504		- <span class="selection-item selection-item-off">$!escapetool.xml($bpOpt)</span>
505		- #end
506		- #end
507		- </div>
508		- </span>
509		- </div>
510		- #end
511		- #if($studentFee && $studentFee != '')
512		- <div class="info-row">
513		- <span class="info-label">生徒会費（年額）</span>
514		- <span class="info-value">$!escapetool.xml($!studentFee)</span>
515		- </div>
516		- #end
517		- #if($budgetScale && $budgetScale != '')
518		- <div class="info-row">
519		- <span class="info-label">予算規模</span>
520		- <span class="info-value">$!escapetool.xml($!budgetScale)</span>
521		- </div>
522		- #end
523		- #if($budgetAllocation && !$budgetAllocation.isEmpty())
524		- <div class="info-row">
525		- <span class="info-label">主な予算配分</span>
526		- <span class="info-value">
527		- <div class="selection-display">
528		- #foreach($ba in $budgetAllocation)
529		- <span class="selection-item">$!escapetool.xml($ba.trim())</span>
530		- #end
531		- </div>
532		- </span>
533		- </div>
534		- #end
535		- #if($budgetNote && $budgetNote.trim() != '')
536		- <div class="free-note">$!escapetool.xml($budgetNote)</div>
537		- #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>
538	538	</div>
539		- </div>
540		- #else
541		- <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>
542	542	#end
543		- #end
544		-
545		- ## --- 校則・生徒会会則の見直し ---
546		- #if($ruleReviewStatus && $ruleReviewStatus != '')
547		- #set($canViewRuleReview = true)
548		- #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewRuleReview = false)
549		- #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false)
550		- #end
551		- #if($canViewRuleReview)
552		- <div class="seitokai-subsection">
553		- <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>
554		- <div class="seitokai-subsection-content">
555		- <div class="info-row">
556		- <span class="info-label">見直しの有無（3年以内）</span>
557		- <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
558		- </div>
559		- #if($ruleReviewStatus != '実施なし')
560		- #if($ruleReviewContent && !$ruleReviewContent.isEmpty())
561		- <div class="info-row">
562		- <span class="info-label">見直しの内容</span>
563		- <span class="info-value">
564		- <div class="selection-display">
565		- #foreach($rc in $ruleReviewContent)
566		- <span class="selection-item">$!escapetool.xml($rc.trim())</span>
567		- #end
568		- </div>
569		- </span>
570		- </div>
571		- #end
572		- #if($ruleReviewProposer && !$ruleReviewProposer.isEmpty())
573		- <div class="info-row">
574		- <span class="info-label">見直しの提案者</span>
575		- <span class="info-value">
576		- <div class="selection-display">
577		- #foreach($rp in $ruleReviewProposer)
578		- <span class="selection-item">$!escapetool.xml($rp.trim())</span>
579		- #end
580		- </div>
581		- </span>
582		- </div>
583		- #end
584		- #if($ruleReviewImplementer && !$ruleReviewImplementer.isEmpty())
585		- <div class="info-row">
586		- <span class="info-label">見直しの実施者</span>
587		- <span class="info-value">
588		- <div class="selection-display">
589		- #foreach($ri in $ruleReviewImplementer)
590		- <span class="selection-item">$!escapetool.xml($ri.trim())</span>
591		- #end
592		- </div>
593		- </span>
594		- </div>
595		- #end
596		- #end
597		- #if($ruleReviewSystem && $ruleReviewSystem != '')
598		- <div class="info-row">
599		- <span class="info-label">見直しの仕組み</span>
600		- <span class="info-value">$!escapetool.xml($!ruleReviewSystem)</span>
601		- </div>
602		- #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>
603	603	</div>
604		- </div>
605		- #else
606		- <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>
607	607	#end
608		- #end
609		-
610		- ## --- 活動環境 ---
611		- #set($hasActivityEnv = ($activityPlace && !$activityPlace.isEmpty()) || ($activityRoomEquipment && $activityRoomEquipment != '') || ($activityRoomImage && $activityRoomImage != '') || ($ictUsage && !$ictUsage.isEmpty()))
612		- #if($hasActivityEnv)
613		- <div class="seitokai-subsection">
614		- <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M3 9l9-7 9 7v11a2 2 0 01-2 2H5a2 2 0 01-2-2z"/><polyline points="9 22 9 12 15 12 15 22"/></svg> 生徒会の活動環境</h3>
615		- <div class="seitokai-subsection-content">
616		- #if($activityPlace && !$activityPlace.isEmpty())
617		- <div class="info-row">
618		- <span class="info-label">普段の活動場所</span>
619		- <span class="info-value">
620		- <div class="selection-display">
621		- #foreach($ap in $activityPlace)
622		- <span class="selection-item">$!escapetool.xml($ap.trim())</span>
623		- #end
624		- </div>
625		- </span>
626		- </div>
627		- #end
628		- #if($activityRoomEquipment && $activityRoomEquipment != '')
629		- <div class="info-row">
630		- <span class="info-label">生徒会室の設備</span>
631		- <span class="info-value free-text-value">$!escapetool.xml($activityRoomEquipment)</span>
632		- </div>
633		- #end
634		- #if($activityRoomImage && $activityRoomImage != '')
635		- <div class="info-row">
636		- <span class="info-label">活動場所の写真</span>
637		- <span class="info-value"><div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($activityRoomImage)" alt="活動場所の写真" class="org-chart-img" /></div></span>
638		- </div>
639		- #end
640		- #if($ictUsage && !$ictUsage.isEmpty())
641		- <div class="info-row">
642		- <span class="info-label">ICT活用している場面</span>
643		- <span class="info-value">
644		- <div class="selection-display">
645		- #foreach($iu in $ictUsage)
646		- <span class="selection-item">$!escapetool.xml($iu.trim())</span>
647		- #end
648		- </div>
649		- </span>
650		- </div>
651		- #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>
652	652	</div>
	418	+ #end
	419	+ #if($budgetNote && $budgetNote.trim() != '')
	420	+ <div class="free-note">$!escapetool.xml($budgetNote)</div>
	421	+ #end
653	653	</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>
654	654	#end
	427	+ #end
	428	+</div>
655	655
656		- ## --- 生徒総会 ---
657		- #set($hasAssembly = ($assemblyFormat && $assemblyFormat != '') || ($assemblyCount && $assemblyCount > 0) || ($assemblyAgenda && !$assemblyAgenda.isEmpty()) || ($assemblyTopics && !$assemblyTopics.isEmpty()) || ($assemblyNote && $assemblyNote != ''))
658		- #if($hasAssembly)
659		- <div class="seitokai-subsection">
660		- <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 生徒総会</h3>
661		- <div class="seitokai-subsection-content">
662		- #if($assemblyFormat && $assemblyFormat != '')
663		- <div class="info-row">
664		- <span class="info-label">開催方式</span>
665		- <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($assemblyFormat)</span></span>
666		- </div>
667		- #end
668		- #if($assemblyCount && $assemblyCount > 0)
669		- <div class="info-row">
670		- <span class="info-label">開催回数（年）</span>
671		- <span class="info-value">$!escapetool.xml($assemblyCount)回</span>
672		- </div>
673		- #end
674		- #if($assemblyAgenda && !$assemblyAgenda.isEmpty())
675		- <div class="info-row">
676		- <span class="info-label">議案の集め方</span>
677		- <span class="info-value">
678		- <div class="selection-display">
679		- #foreach($aa in $assemblyAgenda)
680		- <span class="selection-item">$!escapetool.xml($aa.trim())</span>
681		- #end
682		- </div>
683		- </span>
684		- </div>
685		- #end
686		- #if($assemblyTopics && !$assemblyTopics.isEmpty())
687		- <div class="info-row">
688		- <span class="info-label">扱う内容</span>
689		- <span class="info-value">
690		- <div class="selection-display">
691		- #foreach($at in $assemblyTopics)
692		- <span class="selection-item">$!escapetool.xml($at.trim())</span>
693		- #end
694		- </div>
695		- </span>
696		- </div>
697		- #end
698		- #if($assemblyNote && $assemblyNote != '')
699		- <div class="info-row">
700		- <span class="info-label">自由記述</span>
701		- <span class="info-value free-text-value">$!escapetool.xml($assemblyNote)</span>
702		- </div>
703		- #end
704		- </div>
	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>
705	705	</div>
706		- #end
707		-
708		- ## --- 広報 ---
709		- #set($hasPublicity = ($publicityMethod && !$publicityMethod.isEmpty()) || ($publicityFrequency && $publicityFrequency != '') || ($publicityNote && $publicityNote != ''))
710		- #if($hasPublicity)
711		- <div class="seitokai-subsection">
712		- <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M1 12s4-8 11-8 11 8 11 8-4 8-11 8-11-8-11-8z"/><circle cx="12" cy="12" r="3"/></svg> 広報</h3>
713		- <div class="seitokai-subsection-content">
714		- #if($publicityMethod && !$publicityMethod.isEmpty())
715		- <div class="info-row">
716		- <span class="info-label">方法</span>
717		- <span class="info-value">
718		- <div class="selection-display">
719		- #foreach($pm in $publicityMethod)
720		- <span class="selection-item">$!escapetool.xml($pm.trim())</span>
721		- #end
722		- </div>
723		- </span>
	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
724	724	</div>
725		- #end
726		- #if($publicityFrequency && $publicityFrequency != '')
727		- <div class="info-row">
728		- <span class="info-label">頻度</span>
729		- <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($publicityFrequency)</span></span>
730		- </div>
731		- #end
732		- #if($publicityNote && $publicityNote != '')
733		- <div class="info-row">
734		- <span class="info-label">自由記述</span>
735		- <span class="info-value free-text-value">$!escapetool.xml($publicityNote)</span>
736		- </div>
737		- #end
738		- </div>
	454	+ </span>
739	739	</div>
740	740	#end
741		-
742		- ## --- 外部連携 ---
743		- #set($hasExternal = ($externalCooperation && $externalCooperation != '') || ($externalOrgName && $externalOrgName != '') || ($socialParticipation && !$socialParticipation.isEmpty()))
744		- #if($hasExternal)
745		- <div class="seitokai-subsection">
746		- <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><circle cx="18" cy="5" r="3"/><circle cx="6" cy="12" r="3"/><circle cx="18" cy="19" r="3"/><line x1="8.59" y1="13.51" x2="15.42" y2="17.49"/><line x1="15.41" y1="6.51" x2="8.59" y2="10.49"/></svg> 外部連携</h3>
747		- <div class="seitokai-subsection-content">
748		- #if($externalCooperation && $externalCooperation != '')
749		- <div class="info-row">
750		- <span class="info-label">他校の生徒会との連携</span>
751		- <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($externalCooperation)</span></span>
	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
752	752	</div>
753		- #end
754		- #if($externalOrgName && $externalOrgName != '')
755		- <div class="info-row">
756		- <span class="info-label">参加している生徒会団体の名前</span>
757		- <span class="info-value">$!escapetool.xml($externalOrgName)</span>
758		- </div>
759		- #end
760		- #if($socialParticipation && !$socialParticipation.isEmpty())
761		- <div class="info-row">
762		- <span class="info-label">社会参加・地域連携・ボランティア</span>
763		- <span class="info-value">
764		- <div class="selection-display">
765		- #foreach($sp2 in $socialParticipation)
766		- <span class="selection-item">$!escapetool.xml($sp2.trim())</span>
767		- #end
768		- </div>
769		- </span>
770		- </div>
771		- #end
772		- </div>
	466	+ </span>
773	773	</div>
774	774	#end
775		-
776		- ## --- 年間主要行事 ---
777		- #set($months = [["4月", $eventApril], ["5月", $eventMay], ["6月", $eventJune], ["7月", $eventJuly], ["8月", $eventAugust], ["9月", $eventSeptember], ["10月", $eventOctober], ["11月", $eventNovember], ["12月", $eventDecember], ["1月", $eventJanuary], ["2月", $eventFebruary], ["3月", $eventMarch]])
778		- #set($hasAnyEvent = false)
779		- #foreach($m in $months)
780		- #if($m.get(1) && $m.get(1) != '') #set($hasAnyEvent = true) #end
781		- #end
782		- #if($hasAnyEvent)
783		- <div class="seitokai-subsection">
784		- <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="4" width="18" height="18" rx="2" ry="2"/><line x1="16" y1="2" x2="16" y2="6"/><line x1="8" y1="2" x2="8" y2="6"/><line x1="3" y1="10" x2="21" y2="10"/></svg> 年間主要行事</h3>
785		- <div class="seitokai-subsection-content">
786		- <table class="wiki-table school-info-table" style="margin:0">
787		- #foreach($m in $months)
788		- #if($m.get(1) && $m.get(1) != '')
789		- <tr><td style="width:60px;font-weight:600;white-space:nowrap">$m.get(0)</td><td>$!escapetool.xml($m.get(1))</td></tr>
	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>
790	790	#end
791		- #end
792		- </table>
793		- </div>
	477	+ </div>
	478	+ </span>
794	794	</div>
795	795	#end
796		-
797		- ## --- 生徒会の課題意識 ---
798		- #if($challenges && $challenges != '')
799		- #set($canViewChallenges = true)
800		- #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewChallenges = false)
801		- #elseif($visibilityChallenges == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewChallenges = false)
802		- #end
803		- #if($canViewChallenges)
804		- <div class="seitokai-subsection">
805		- <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>
806		- <div class="seitokai-subsection-content">
807		- <div class="challenge-text">$!escapetool.xml($challenges)</div>
808		- </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>
809	809	</div>
810		- #else
811		- <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>
812		- #end
813	813	#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
814	814
815		- </div>## seitokai-info-body 終了
816		-</div>## card-seitokai-info 終了
817		-
818		-## --- ③ SNS・連絡先 ---
819		-<div class="school-info-card collapsed" id="card-contact">
820		- <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>
821		- <table class="wiki-table school-info-table">
822		- <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr>
823		- <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>
824		- <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>
825		- <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>
826		- <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>
827		- <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
828		- </table>
829		- #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
830		- #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
831		- #if($infoEditDate && $infoEditDate != '')
832		- <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)
833	833	#end
834		-</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
835	835
	509	+</div>## seitokai-info-accordion 終了
	510	+
836	836	{{/html}}
837	837
838		-----
839		-
840	840	## --- ⑩ 活動報告一覧（スレッド型・年度タブ付き） ---
841	841	= 活動報告 =
842	842
843		-## --- 年度タブ + 投稿者ステータス凡例 ---
	516	+## --- 投稿者ステータス凡例（折りたたみ） ---
844	844	{{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>
845	845
846	846	## --- 年度タブ ---
847	847	## 全活動から年度一覧を収集
...	...	@@ -863,49 +863,14 @@
863	863	#end
864	864	## ソート（降順にしたいが Velocity にはないので JS で制御）
865	865
866		-<div class="activity-toolbar">
867		- <div class="activity-fy-tabs">
868		- <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
869		- #foreach($fy in $fySet)
870		- #if($fy != $currentFYStr)
871		- <button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button>
872		- #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>
873	873	#end
874		- <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
875		- </div>
876		- <div class="activity-toolbar-right">
877		- <button class="btn-view-toggle" id="btnViewToggle" onclick="toggleCompactView()" title="タイトルのみ表示">
878		- <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>
879		- <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>
880		- <span class="toggle-label">一覧表示</span>
881		- </button>
882		- </div>
883		- <div class="author-legend-wrapper">
884		- <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>
885		- <div class="author-legend-body">
886		- <div class="author-legend">
887		- <span class="author-legend-title">投稿者の信頼度:</span>
888		- <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者 <span class="text-hint">— 運営スタッフ</span></span>
889		- <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み <span class="text-hint">— 本人確認済みのユーザー</span></span>
890		- <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介 <span class="text-hint">— 承認済みユーザーからの紹介</span></span>
891		- <span class="author-legend-item"><span class="bar bar-general"></span> 一般 <span class="text-hint">— 一般登録ユーザー</span></span>
892		- </div>
893		- <div class="author-legend">
894		- <span class="author-legend-title">所属:</span>
895		- <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>
896		- <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>
897		- <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>
898		- <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>
899		- <span class="author-legend-item text-hint">※一般アカウントは所属バッジが表示されません</span>
900		- </div>
901		- <div class="author-legend">
902		- <span class="author-legend-title">役割:</span>
903		- <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>
904		- <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>
905		- <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>
906		- </div>
907		- </div>
908		- </div>
	570	+ #end
	571	+ <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
909	909	</div>
910	910
911	911	{{/html}}
...	...	@@ -970,18 +970,10 @@
970	970	<div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)">
971	971	<div class="activity-thread-header">
972	972	<div class="activity-thread-title">
973		- <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>
974		- <div class="activity-meta-line">
975		- <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
976		- #set($actTagsList = $activity.getValue('tags'))
977		- #if($actTagsList && !$actTagsList.isEmpty())
978		- #foreach($tagItem in $actTagsList)
979		- #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end
980		- #end
981		- #end
982		- </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>
983	983	</div>
984		- <div class="thread-meta-right">
	639	+ <div class="thread-meta-row">
985	985	<span class="thread-post-count">${reportCount}件の報告 ・ ${commentCount}件のコメント</span>
986	986	#if($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred')
987	987	#if($actFeatured == '1')
...	...	@@ -1041,12 +1041,12 @@
1041	1041	#set($postVis = $!post.getValue('visibility'))
1042	1042	#if(!$postVis || $postVis == '') #set($postVis = 'public') #end
1043	1043	#set($canViewPost = true)
1044		- #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewPost = false)
1045		- #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)
1046	1046	#end
1047	1047	#if(!$canViewPost)
1048	1048	<div class="thread-post visibility-restricted-post">
1049		- <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>
1050	1050	</div>
1051	1051	#else
1052	1052	## 投稿者のアカウント種別に基づいたCSSクラス
...	...	@@ -1086,11 +1086,8 @@
1086	1086	<span class="badge badge-general badge-sm">一般</span>
1087	1087	#end
1088	1088	## 所属バッジ（投稿者の学校コードとページの学校コードを比較）
1089		- #set($postIsSchoolMatch = ($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode)))
1090	1090	#if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general')
1091		- #if($postUserRole == 'graduate' && $postIsSchoolMatch)
1092		- <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>
1093		- #elseif($postIsSchoolMatch && $postUserRole != 'graduate')
	745	+ #if($postSchoolCode == $schoolCode)
1094	1094	#if($postAccountType == 'verified' || $postAccountType == 'admin')
1095	1095	<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>
1096	1096	#else
...	...	@@ -1111,6 +1111,9 @@
1111	1111	#elseif($postUserRole == 'graduate')
1112	1112	<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>
1113	1113	#end
	766	+ #if($postGrade && $postGrade != '')
	767	+ <span class="badge badge-grade badge-sm">$postGrade</span>
	768	+ #end
1114	1114	</span>
1115	1115	<span class="thread-post-date">$!postDate</span>
1116	1116	#set($postEdited = $!post.getValue('edited'))
...	...	@@ -1117,13 +1117,6 @@
1117	1117	#if($postEdited == 1 || $postEdited == '1')
1118	1118	<span class="post-edited-label">（編集済み）</span>
1119	1119	#end
1120		- #set($postAuthorRefH = $!post.getValue('authorRef'))
1121		- #set($postObjNumH = $post.number)
1122		- #if(!$isGuest && $xcontext.user != $postAuthorRefH)
1123		- <button type="button" class="btn-post-report btn-post-report-header" onclick="openReportDialog(this, '${doc.fullName}', $postObjNumH, '${services.csrf.getToken()}')" title="この投稿を通報">
1124		- <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> 通報
1125		- </button>
1126		- #end
1127	1127	</div>
1128	1128	<div class="thread-post-body">
1129	1129	$!escapetool.xml($!postContent)
...	...	@@ -1188,18 +1188,12 @@
1188	1188	#end
1189	1189	</div>
1190	1190	#if($postVis != 'public')
1191		- <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>
1192	1192	#end
1193		- ## 固定/編集/削除/通報/非表示ボタン（横並び）
1194		- #set($postAuthorRef = $!post.getValue('authorRef'))
1195		- #set($postObjNumED = $post.number)
1196		- #set($showPinBtn = ($viewerAccountType == 'admin' || $viewerAccountType == 'verified'))
1197		- #set($showEditDeleteBtn = ($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin'))
1198		- #set($showHideBtn = ($viewerAccountType == 'admin'))
1199		- #if($showPinBtn || $showEditDeleteBtn || $showHideBtn)
1200		- <div class="post-edit-actions post-action-mt">
1201		- #if($showPinBtn)
1202		- #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">
1203	1203	#if($isPinned == '1')
1204	1204	<a href="$doc.getURL('view', "action=unpin&postObj=${postObjNum}&form_token=${services.csrf.getToken()}")" class="btn-pin-toggle btn-unpin" title="固定を解除">
1205	1205	<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> 固定を解除
...	...	@@ -1209,12 +1209,15 @@
1209	1209	<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> 固定する
1210	1210	</a>
1211	1211	#end
1212		- #end
1213		- #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">
1214	1214	#if($xcontext.user == $postAuthorRef)
1215		- #set($editImages = $!post.getValue('images'))
1216		- #set($editFiles = $!post.getValue('files'))
1217		- <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="この投稿を編集">
1218	1218	<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> 編集
1219	1219	</button>
1220	1220	#end
...	...	@@ -1221,12 +1221,6 @@
1221	1221	<button type="button" class="btn-post-delete" onclick="confirmDeletePost('${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を削除">
1222	1222	<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> 削除
1223	1223	</button>
1224		- #end
1225		- #if($showHideBtn)
1226		- <button type="button" class="btn-post-hide" onclick="openHideDialog(this, '${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を非表示にする">
1227		- <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> 非表示
1228		- </button>
1229		- #end
1230	1230	</div>
1231	1231	#end
1232	1232	</div>
...	...	@@ -1276,11 +1276,9 @@
1276	1276
1277	1277	#if($xcontext.user != "XWiki.XWikiGuest")
1278	1278	<div class="thread-add-post">
1279		- #if($isSchoolMember || $isAlumniOfSchool || $isViewerAdmin)
1280	1280	<a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
1281	1281	＋ 活動報告を追加
1282	1282	</a>
1283		- #end
1284	1284	<a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
1285	1285	<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> コメントを書く
1286	1286	</a>
...	...	@@ -1310,38 +1310,62 @@
1310	1310	{{/html}}
1311	1311	#end
1312	1312
1313		-## --- 年度タブ切り替え JavaScript ---
	950	+## --- 年度アーカイブ セクション ---
1314	1314	{{html clean="false"}}
1315		-<script>
1316		-// コンパクト表示（タイトルのみ）トグル
1317		-function toggleCompactView() {
1318		- var container = document.querySelector('.xwiki-content') || document.body;
1319		- var isCompact = container.classList.toggle('activity-compact-view');
1320		- var btn = document.getElementById('btnViewToggle');
1321		- if (btn) {
1322		- btn.querySelector('.toggle-label').textContent = isCompact ? '詳細表示' : '一覧表示';
1323		- btn.title = isCompact ? '詳細表示に戻す' : 'タイトルのみ表示';
1324		- }
1325		- // コンパクトモードでは各スレッドヘッダーをクリックで個別展開可能にする
1326		- document.querySelectorAll('.activity-thread').forEach(function(thread) {
1327		- if (isCompact) {
1328		- thread.classList.remove('compact-expanded');
1329		- }
1330		- });
1331		-}
	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>
1332	1332
1333		-// コンパクトモードで個別スレッドを展開/折りたたみ
1334		-function toggleThreadExpand(e) {
1335		- var container = document.querySelector('.xwiki-content') || document.body;
1336		- if (!container.classList.contains('activity-compact-view')) return;
1337		- // リンクやボタンのクリックはスルー
1338		- if (e.target.closest('a, button, .btn-featured-toggle')) return;
1339		- var thread = e.target.closest('.activity-thread');
1340		- if (thread) {
1341		- thread.classList.toggle('compact-expanded');
1342		- }
1343		-}
	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())
1344	1344
	969	+ #if($archivePages && $archivePages.size() > 0)
	970	+ <div class="archive-card-field-lg">
	971	+ <div class="archive-list-label">過去の年度アーカイブ</div>
	972	+ <div class="archive-list">
	973	+ #foreach($archPage in $archivePages)
	974	+ #set($archPageDoc = $xwiki.getDocument($archPage))
	975	+ #set($archPageObj = $archPageDoc.getObject('SeitokaiCode.SchoolClass'))
	976	+ #if($archPageObj)
	977	+ #set($archPageFY = $!archPageObj.getValue('fiscalYear'))
	978	+ <a href="$archPageDoc.getURL('view')" class="archive-link">
	979	+ <svg class="ico" viewBox="0 0 24 24"><path d="M19 21H5a2 2 0 01-2-2V5a2 2 0 012-2h11l5 5v11a2 2 0 01-2 2z"/><polyline points="17 21 17 13 7 13 7 21"/><polyline points="7 3 7 8 15 8"/></svg>
	980	+ ${archPageFY}年度
	981	+ </a>
	982	+ #end
	983	+ #end
	984	+ </div>
	985	+ </div>
	986	+ #else
	987	+ <div class="archive-empty">過去のアーカイブはまだありません</div>
	988	+ #end
	989	+
	990	+ ## 新年度に移行ボタン（承認済み・管理者のみ）
	991	+ #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
	992	+ <div class="archive-action">
	993	+ <a href="/bin/SeitokaiCode/YearArchiveAction?schoolPage=${doc.fullName}" class="btn-accent">
	994	+ <svg class="ico" viewBox="0 0 24 24" stroke-width="2.5"><path d="M19 21H5a2 2 0 01-2-2V5a2 2 0 012-2h11l5 5v11a2 2 0 01-2 2z"/><polyline points="17 21 17 13 7 13 7 21"/><polyline points="7 3 7 8 15 8"/></svg>
	995	+ ${pageFiscalYear}年度をアーカイブして新年度に移行
	996	+ </a>
	997	+ <div class="archive-action-hint">現在の学校情報を${pageFiscalYear}年度として保存し、新しい年度に移行します。</div>
	998	+ </div>
	999	+ #end
	1000	+</div>
	1001	+{{/html}}
	1002	+
	1003	+## --- 年度タブ切り替え JavaScript ---
	1004	+{{html clean="false"}}
	1005	+<script>
1345	1345	function switchActivityFY(fy, btn) {
1346	1346	// タブのアクティブ状態を切り替え
1347	1347	document.querySelectorAll('.activity-fy-tab').forEach(function(t) { t.classList.remove('active'); });
...	...	@@ -1357,31 +1357,13 @@
1357	1357	}
1358	1358	// ページ読み込み時の初期化
1359	1359	document.addEventListener('DOMContentLoaded', function() {
1360		- // 年度タブを降順にソート（「全期間」タブは末尾に固定）
1361		- var tabContainer = document.querySelector('.activity-fy-tabs');
1362		- if (tabContainer) {
1363		- var tabs = Array.from(tabContainer.querySelectorAll('.activity-fy-tab'));
1364		- var allTab = null;
1365		- var fyTabs = [];
1366		- tabs.forEach(function(t) {
1367		- var onclickStr = t.getAttribute('onclick') || '';
1368		- if (onclickStr.indexOf("'all'") !== -1) { allTab = t; }
1369		- else { fyTabs.push(t); }
1370		- });
1371		- // 年度タブを数値の降順でソート
1372		- fyTabs.sort(function(a, b) {
1373		- var aYear = parseInt(a.textContent) || 0;
1374		- var bYear = parseInt(b.textContent) || 0;
1375		- return bYear - aYear;
1376		- });
1377		- // DOM再配置
1378		- fyTabs.forEach(function(t) { tabContainer.appendChild(t); });
1379		- if (allTab) { tabContainer.appendChild(allTab); }
1380		- }
1381	1381	// デフォルトで現在の年度を表示
1382	1382	var defaultTab = document.querySelector('.activity-fy-tab.active');
1383	1383	if (defaultTab) { defaultTab.click(); }
1384	1384	// 保存成功時のトースト通知
	1025	+ if (window.location.search.indexOf('archived=1') !== -1) {
	1026	+ showToast('年度アーカイブを作成しました', 'success');
	1027	+ }
1385	1385	if (window.location.search.indexOf('saved=1') !== -1) {
1386	1386	showToast('学校情報を保存しました', 'success');
1387	1387	// URLパラメータをクリーンアップ（リロード時に再表示されないよう）
...	...	@@ -1389,30 +1389,6 @@
1389	1389	window.history.replaceState({}, document.title, window.location.pathname);
1390	1390	}
1391	1391	}
1392		- // コンパクトモード: スレッドヘッダークリックで個別展開
1393		- document.querySelectorAll('.activity-thread-header').forEach(function(header) {
1394		- header.addEventListener('click', toggleThreadExpand);
1395		- });
1396		- // 長文投稿の折りたたみ初期化（max-height: 12em 超で省略）
1397		- document.querySelectorAll('.thread-post-body').forEach(function(body) {
1398		- // pre-wrapのまま高さを測定し、max-height(12em ≒ ~200px)を超える場合に折りたたむ
1399		- var fullH = body.scrollHeight;
1400		- // 12em を px に変換（font-size × line-height × 行数 の近似値ではなくCSSと同じ値を取得）
1401		- body.classList.add('truncated');
1402		- var maxH = body.clientHeight; // max-height: 12em 適用後の高さ
1403		- body.classList.remove('truncated');
1404		- if (fullH > maxH + 30) {
1405		- body.classList.add('truncated');
1406		- var btn = document.createElement('button');
1407		- btn.className = 'btn-read-more';
1408		- btn.textContent = '広げて読む ▼';
1409		- btn.addEventListener('click', function() {
1410		- var isExpanded = body.classList.toggle('expanded');
1411		- btn.textContent = isExpanded ? '折りたたむ ▲' : '広げて読む ▼';
1412		- });
1413		- body.parentNode.insertBefore(btn, body.nextSibling);
1414		- }
1415		- });
1416	1416	});
1417	1417
1418	1418	// トースト通知表示
...	...	@@ -1441,136 +1441,38 @@
1441	1441	var card = document.getElementById(cardId);
1442	1442	if (!card) return;
1443	1443	card.classList.toggle('collapsed');
1444		- var isCollapsed = card.classList.contains('collapsed');
1445		- var h2 = card.querySelector('h2[role="button"]');
1446		- if (h2) h2.setAttribute('aria-expanded', !isCollapsed);
1447	1447	}
1448	1448
1449	1449	// 投稿の編集（インライン編集フォームを開く）
1450		-function openEditPost(btn) {
	1066	+function openEditPost(btn, schoolPage, postObjNum, currentContent) {
1451	1451	var postEl = btn.closest('.thread-post');
1452	1452	if (!postEl) return;
	1069	+ // 既存の編集フォームがあれば閉じる
1453	1453	var existing = postEl.querySelector('.post-edit-form');
1454	1454	if (existing) { existing.remove(); return; }
1455	1455	var bodyEl = postEl.querySelector('.thread-post-body');
1456	1456	if (!bodyEl) return;
1457		-
1458		- var schoolPage = btn.getAttribute('data-school');
1459		- var postObjNum = btn.getAttribute('data-obj');
1460		- var currentContent = btn.getAttribute('data-content') || '';
1461		- var currentImages = btn.getAttribute('data-images') || '';
1462		- var currentFiles = btn.getAttribute('data-files') || '';
1463		- var postType = btn.getAttribute('data-post-type') || 'report';
1464		-
1465	1465	var form = document.createElement('div');
1466	1466	form.className = 'post-edit-form';
1467		- form.setAttribute('data-school', schoolPage);
1468		- form.setAttribute('data-obj', postObjNum);
1469		-
1470		- var html = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>';
1471		-
1472		- // コメント以外は添付ファイル編集を表示
1473		- if (postType !== 'comment') {
1474		- // 既存画像
1475		- html += '<div class="edit-attachments">';
1476		- if (currentImages.trim()) {
1477		- html += '<div class="edit-attach-section"><span class="edit-attach-label">画像</span>';
1478		- var imgs = currentImages.trim().split('\n');
1479		- for (var i = 0; i < imgs.length; i++) {
1480		- var img = imgs[i].trim();
1481		- if (!img) continue;
1482		- html += '<div class="edit-attach-item" data-name="' + img.replace(/"/g,'&quot;') + '">' +
1483		- '<img src="/xwiki/bin/download/' + schoolPage.replace(/\./g,'/') + '/' + encodeURIComponent(img) + '" class="edit-attach-thumb" />' +
1484		- '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1485		- '<input type="hidden" name="keepImages" value="' + img.replace(/"/g,'&quot;') + '" />' +
1486		- '</div>';
1487		- }
1488		- html += '</div>';
1489		- }
1490		- // 既存ファイル
1491		- if (currentFiles.trim()) {
1492		- html += '<div class="edit-attach-section"><span class="edit-attach-label">ファイル</span>';
1493		- var files = currentFiles.trim().split('\n');
1494		- for (var j = 0; j < files.length; j++) {
1495		- var f = files[j].trim();
1496		- if (!f) continue;
1497		- var displayName = f;
1498		- if (/^file_\d{14}_\d+_/.test(f)) displayName = f.replace(/^file_\d{14}_\d+_/, '');
1499		- html += '<div class="edit-attach-item" data-name="' + f.replace(/"/g,'&quot;') + '">' +
1500		- '<span class="edit-attach-fname">' + displayName.replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</span>' +
1501		- '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1502		- '<input type="hidden" name="keepFiles" value="' + f.replace(/"/g,'&quot;') + '" />' +
1503		- '</div>';
1504		- }
1505		- html += '</div>';
1506		- }
1507		- // 新規追加
1508		- html += '<div class="edit-attach-add">' +
1509		- '<label class="form-label-sm">画像を追加（最大4枚まで）</label>' +
1510		- '<input type="file" name="editNewImages" accept="image/*" multiple class="form-file-input-sm" />' +
1511		- '<div class="form-hint">JPEG / PNG / GIF / WebP、各5MBまで</div>' +
1512		- '<label class="form-label-sm" style="margin-top:8px;">ファイルを追加（最大2つまで）</label>' +
1513		- '<input type="file" name="editNewFiles" accept=".pdf,.docx,.xlsx,.pptx" multiple class="form-file-input-sm" />' +
1514		- '<div class="form-hint">PDF / Word / Excel / PowerPoint、各10MBまで</div>' +
1515		- '</div>';
1516		- html += '</div>';
1517		- }
1518		-
1519		- 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">' +
1520	1520	'<button type="button" class="btn-cancel-edit" onclick="this.closest(\'.post-edit-form\').remove()">キャンセル</button>' +
1521		- '<button type="button" class="btn-save" onclick="saveEditPost(this)">保存</button>' +
	1079	+ '<button type="button" class="btn-save" onclick="saveEditPost(\'' + schoolPage + '\', ' + postObjNum + ')">保存</button>' +
1522	1522	'</div>';
1523		-
1524		- form.innerHTML = html;
1525	1525	bodyEl.parentNode.insertBefore(form, bodyEl.nextSibling);
1526	1526	form.querySelector('textarea').focus();
1527	1527	}
1528	1528
1529		-function removeEditAttach(btn) {
1530		- var item = btn.closest('.edit-attach-item');
1531		- if (item) item.remove();
1532		-}
1533		-
1534	1534	// 投稿の編集を保存
1535		-function saveEditPost(btn) {
1536		- var formEl = btn.closest('.post-edit-form');
1537		- if (!formEl) return;
1538		- var schoolPage = formEl.getAttribute('data-school');
1539		- var postObjNum = formEl.getAttribute('data-obj');
1540		- var textarea = formEl.querySelector('textarea');
	1086	+function saveEditPost(schoolPage, postObjNum) {
	1087	+ var textarea = document.getElementById('editContent_' + postObjNum);
1541	1541	if (!textarea) return;
1542	1542	var newContent = textarea.value.trim();
1543	1543	if (!newContent) { alert('投稿内容を入力してください'); return; }
1544		-
1545	1545	var csrfEl = document.querySelector('input[name="form_token"]');
1546	1546	var csrfToken = csrfEl ? csrfEl.value : '';
1547		-
1548		- var fd = new FormData();
1549		- fd.append('schoolPage', schoolPage);
1550		- fd.append('postObj', postObjNum);
1551		- fd.append('newContent', newContent);
1552		- fd.append('form_token', csrfToken);
1553		-
1554		- // 残す画像・ファイル
1555		- formEl.querySelectorAll('input[name="keepImages"]').forEach(function(el) { fd.append('keepImages', el.value); });
1556		- formEl.querySelectorAll('input[name="keepFiles"]').forEach(function(el) { fd.append('keepFiles', el.value); });
1557		-
1558		- // 新規画像
1559		- var newImgInput = formEl.querySelector('input[name="editNewImages"]');
1560		- if (newImgInput && newImgInput.files) {
1561		- for (var i = 0; i < newImgInput.files.length; i++) { fd.append('editNewImages', newImgInput.files[i]); }
1562		- }
1563		- // 新規ファイル
1564		- var newFileInput = formEl.querySelector('input[name="editNewFiles"]');
1565		- if (newFileInput && newFileInput.files) {
1566		- for (var j = 0; j < newFileInput.files.length; j++) { fd.append('editNewFiles', newFileInput.files[j]); }
1567		- }
1568		-
1569		- btn.disabled = true;
1570		- btn.textContent = '保存中...';
1571		-
1572	1572	var xhr = new XMLHttpRequest();
1573		- xhr.open('POST', '/bin/get/SeitokaiCode/EditPost?outputSyntax=plain', true);
	1094	+ xhr.open('GET', '/bin/SeitokaiCode/EditPost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken), true);
1574	1574	xhr.onload = function() {
1575	1575	try {
1576	1576	var res = JSON.parse(xhr.responseText);
...	...	@@ -1578,13 +1578,12 @@
1578	1578	showToast('投稿を更新しました', 'success');
1579	1579	setTimeout(function() { location.reload(); }, 800);
1580	1580	} else {
1581		- btn.disabled = false; btn.textContent = '保存';
1582	1582	alert('編集に失敗しました: ' + (res.error || ''));
1583	1583	}
1584		- } catch(e) { btn.disabled = false; btn.textContent = '保存'; alert('編集に失敗しました'); }
	1104	+ } catch(e) { alert('編集に失敗しました'); }
1585	1585	};
1586		- xhr.onerror = function() { btn.disabled = false; btn.textContent = '保存'; alert('通信エラーが発生しました'); };
1587		- xhr.send(fd);
	1106	+ xhr.onerror = function() { alert('通信エラーが発生しました'); };
	1107	+ xhr.send();
1588	1588	}
1589	1589
1590	1590	// 投稿の削除（確認ダイアログ付き）
...	...	@@ -1591,9 +1591,7 @@
1591	1591	function confirmDeletePost(schoolPage, postObjNum, token) {
1592	1592	if (!confirm('この投稿を削除しますか？\\n削除後は「この投稿は削除されました」と表示されます。')) return;
1593	1593	var xhr = new XMLHttpRequest();
1594		- xhr.open('POST', '/bin/get/SeitokaiCode/DeletePost?outputSyntax=plain', true);
1595		- xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1596		- var deletePostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token);
	1114	+ xhr.open('GET', '/bin/SeitokaiCode/DeletePost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token), true);
1597	1597	xhr.onload = function() {
1598	1598	try {
1599	1599	var res = JSON.parse(xhr.responseText);
...	...	@@ -1606,82 +1606,8 @@
1606	1606	} catch(e) { alert('削除に失敗しました'); }
1607	1607	};
1608	1608	xhr.onerror = function() { alert('通信エラーが発生しました'); };
1609		- xhr.send(deletePostData);
	1127	+ xhr.send();
1610	1610	}
1611		-
1612		-/* --- 通報ダイアログ --- */
1613		-function openReportDialog(btn, targetPage, postObjNum, token) {
1614		- if (document.getElementById('report-dialog-overlay')) return;
1615		- var reasons = ['宣伝・スパム','不適切な内容','個人情報の露出','誹謗中傷','誤情報','その他'];
1616		- var overlay = document.createElement('div');
1617		- overlay.id = 'report-dialog-overlay';
1618		- 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;';
1619		- var dialog = document.createElement('div');
1620		- dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;max-height:80vh;overflow-y:auto;';
1621		- var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を通報</h3>';
1622		- html += '<p style="margin:0 0 12px;font-size:0.9em;color:#4b5563;">通報された投稿は管理者が確認するまで一時的に非表示になります。</p>';
1623		- html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">通報理由</label>';
1624		- html += '<select id="report-reason" style="width:100%;padding:8px;border:1px solid #d1d5db;border-radius:8px;margin-bottom:12px;font-size:0.9em;">';
1625		- for (var i=0; i<reasons.length; i++) html += '<option value="'+reasons[i]+'">'+reasons[i]+'</option>';
1626		- html += '</select>';
1627		- html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">補足コメント（任意）</label>';
1628		- 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>';
1629		- html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
1630		- html += '<button type="button" id="report-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
1631		- 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>';
1632		- html += '</div>';
1633		- dialog.innerHTML = html;
1634		- overlay.appendChild(dialog);
1635		- document.body.appendChild(overlay);
1636		- overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
1637		- document.getElementById('report-cancel-btn').addEventListener('click', function() { overlay.remove(); });
1638		- document.getElementById('report-submit-btn').addEventListener('click', function() {
1639		- var reason = document.getElementById('report-reason').value;
1640		- var detail = document.getElementById('report-detail').value;
1641		- var submitBtn = document.getElementById('report-submit-btn');
1642		- submitBtn.disabled = true; submitBtn.textContent = '送信中...';
1643		- var xhr = new XMLHttpRequest();
1644		- xhr.open('POST', '/bin/get/SeitokaiCode/ReportAction?outputSyntax=plain', true);
1645		- xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1646		- var data = 'targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&detail=' + encodeURIComponent(detail) + '&form_token=' + encodeURIComponent(token);
1647		- xhr.onload = function() {
1648		- overlay.remove();
1649		- showToast('通報を受け付けました', 'success');
1650		- setTimeout(function() { location.reload(); }, 1000);
1651		- };
1652		- xhr.onerror = function() { overlay.remove(); alert('通信エラーが発生しました'); };
1653		- xhr.send(data);
1654		- });
1655		-}
1656		-
1657		-/* --- 非表示ダイアログ（管理者用） --- */
1658		-function openHideDialog(btn, targetPage, postObjNum, token) {
1659		- if (document.getElementById('hide-dialog-overlay')) return;
1660		- var overlay = document.createElement('div');
1661		- overlay.id = 'hide-dialog-overlay';
1662		- 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;';
1663		- var dialog = document.createElement('div');
1664		- dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;';
1665		- var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を非表示にする</h3>';
1666		- html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">非表示の理由</label>';
1667		- 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="理由を入力" />';
1668		- html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
1669		- html += '<button type="button" id="hide-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
1670		- 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>';
1671		- 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>';
1672		- html += '</div>';
1673		- dialog.innerHTML = html;
1674		- overlay.appendChild(dialog);
1675		- document.body.appendChild(overlay);
1676		- overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
1677		- document.getElementById('hide-cancel-btn').addEventListener('click', function() { overlay.remove(); });
1678		- function doHide(action) {
1679		- var reason = document.getElementById('hide-reason').value || '管理者判断';
1680		- window.location.href = '/bin/view/SeitokaiCode/ModerationAction?action=' + action + '&targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&form_token=' + encodeURIComponent(token);
1681		- }
1682		- document.getElementById('hide-submit-btn').addEventListener('click', function() { doHide('hide'); });
1683		- document.getElementById('hide-warn-btn').addEventListener('click', function() { doHide('hide-warn'); });
1684		-}
1685	1685	</script>
1686	1686	{{/html}}
1687	1687	{{/velocity}}