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

Summary

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

Details

Page properties

Content

...	...	@@ -1,6 +1,25 @@
1	1	{{velocity}}
2	2	## ===== 学校ページ テンプレート =====
	3	+## ゲストが ?sheet= 付きURL（編集フォーム等）に直接アクセスした場合、ログインページへリダイレクト
	4	+#if($xcontext.user == 'XWiki.XWikiGuest' && $request.sheet && $request.sheet != '')
	5	+ #set($currentUrl = $doc.getURL('view', "sheet=${request.sheet}"))
	6	+ $response.sendRedirect("/bin/login/XWiki/XWikiLogin?srid=$escapetool.url($currentUrl)")
	7	+ #stop
	8	+#end
3	3	{{html clean="false"}}
	10	+## --- OGP メタタグ（SNSシェア対応） ---
	11	+#set($ogTitle = "$!{schoolName} — 生徒会Wiki")
	12	+#set($ogDesc = "$!{schoolName}の生徒会活動情報。全国の高校の生徒会活動事例を集積・共有するプラットフォーム。")
	13	+#set($ogUrl = "https://${request.serverName}${doc.getURL('view')}")
	14	+<meta property="og:type" content="article" />
	15	+<meta property="og:title" content="$escapetool.xml($ogTitle)" />
	16	+<meta property="og:description" content="$escapetool.xml($ogDesc)" />
	17	+<meta property="og:url" content="$escapetool.xml($ogUrl)" />
	18	+<meta property="og:site_name" content="生徒会Wiki" />
	19	+<meta property="og:locale" content="ja_JP" />
	20	+<meta name="twitter:card" content="summary" />
	21	+<meta name="twitter:title" content="$escapetool.xml($ogTitle)" />
	22	+<meta name="twitter:description" content="$escapetool.xml($ogDesc)" />
4	4	## メンテナンスバナー（{{include}}ではなくインラインで記述し、<p>タグ挿入を回避）
5	5	#set($bannerDoc = $xwiki.getDocument('SeitokaiAdmin.MaintenanceBanner'))
6	6	#set($bannerObj = $bannerDoc.getObject('SeitokaiCode.MaintenanceBannerClass'))
...	...	@@ -28,8 +28,10 @@
28	28	#set($schoolLevel = $doc.getValue('schoolLevel'))
29	29	#set($schoolSystem = $doc.getValue('schoolSystem'))
30	30	#set($website = $doc.getValue('website'))
	50	+#set($schoolPhoto = $doc.getValue('schoolPhoto'))
	51	+#set($schoolDescription = $doc.getValue('schoolDescription'))
31	31
32		-## --- 組織図 ---
	53	+## --- 生徒会組織 ---
33	33	#set($orgChart = $doc.getValue('orgChart'))
34	34	#set($orgChartImage = $doc.getValue('orgChartImage'))
35	35
...	...	@@ -49,7 +49,7 @@
49	49	#set($budgetAllocation = $doc.getValue('budgetAllocation'))
50	50	#set($budgetNote = $doc.getValue('budgetNote'))
51	51
52		-## --- 校則の見直し ---
	73	+## --- 校則・生徒会会則の見直し ---
53	53	#set($ruleReviewStatus = $doc.getValue('ruleReviewStatus'))
54	54	#set($ruleReviewContent = $doc.getValue('ruleReviewContent'))
55	55	#set($ruleReviewProposer = $doc.getValue('ruleReviewProposer'))
...	...	@@ -56,6 +56,44 @@
56	56	#set($ruleReviewImplementer = $doc.getValue('ruleReviewImplementer'))
57	57	#set($ruleReviewSystem = $doc.getValue('ruleReviewSystem'))
58	58
	80	+## --- 活動環境 ---
	81	+#set($activityPlace = $doc.getValue('activityPlace'))
	82	+#set($activityRoomEquipment = $doc.getValue('activityRoomEquipment'))
	83	+#set($activityRoomImage = $doc.getValue('activityRoomImage'))
	84	+#set($ictTools = $doc.getValue('ictTools'))
	85	+#set($ictUsage = $doc.getValue('ictUsage'))
	86	+
	87	+## --- 生徒総会 ---
	88	+#set($assemblyFormat = $doc.getValue('assemblyFormat'))
	89	+#set($assemblyCount = $doc.getValue('assemblyCount'))
	90	+#set($assemblyAgenda = $doc.getValue('assemblyAgenda'))
	91	+#set($assemblyTopics = $doc.getValue('assemblyTopics'))
	92	+#set($assemblyNote = $doc.getValue('assemblyNote'))
	93	+
	94	+## --- 広報 ---
	95	+#set($publicityMethod = $doc.getValue('publicityMethod'))
	96	+#set($publicityFrequency = $doc.getValue('publicityFrequency'))
	97	+#set($publicityNote = $doc.getValue('publicityNote'))
	98	+
	99	+## --- 外部連携 ---
	100	+#set($externalCooperation = $doc.getValue('externalCooperation'))
	101	+#set($externalOrgName = $doc.getValue('externalOrgName'))
	102	+#set($socialParticipation = $doc.getValue('socialParticipation'))
	103	+
	104	+## --- 年間主要行事 ---
	105	+#set($eventApril = $doc.getValue('eventApril'))
	106	+#set($eventMay = $doc.getValue('eventMay'))
	107	+#set($eventJune = $doc.getValue('eventJune'))
	108	+#set($eventJuly = $doc.getValue('eventJuly'))
	109	+#set($eventAugust = $doc.getValue('eventAugust'))
	110	+#set($eventSeptember = $doc.getValue('eventSeptember'))
	111	+#set($eventOctober = $doc.getValue('eventOctober'))
	112	+#set($eventNovember = $doc.getValue('eventNovember'))
	113	+#set($eventDecember = $doc.getValue('eventDecember'))
	114	+#set($eventJanuary = $doc.getValue('eventJanuary'))
	115	+#set($eventFebruary = $doc.getValue('eventFebruary'))
	116	+#set($eventMarch = $doc.getValue('eventMarch'))
	117	+
59	59	## --- 課題・連絡先 ---
60	60	#set($challenges = $doc.getValue('challenges'))
61	61	#set($contactInfo = $doc.getValue('contactInfo'))
...	...	@@ -80,6 +80,14 @@
80	80	#set($visibilityBudget = $!doc.getValue('visibilityBudget'))
81	81	#set($visibilityRuleReview = $!doc.getValue('visibilityRuleReview'))
82	82	#set($visibilityChallenges = $!doc.getValue('visibilityChallenges'))
	142	+#set($visibilityDailyActivities = $!doc.getValue('visibilityDailyActivities'))
	143	+#set($visibilityElection = $!doc.getValue('visibilityElection'))
	144	+#set($visibilityMeeting = $!doc.getValue('visibilityMeeting'))
	145	+#set($visibilityActivityEnv = $!doc.getValue('visibilityActivityEnv'))
	146	+#set($visibilityAssembly = $!doc.getValue('visibilityAssembly'))
	147	+#set($visibilityPublicity = $!doc.getValue('visibilityPublicity'))
	148	+#set($visibilityExternal = $!doc.getValue('visibilityExternal'))
	149	+#set($visibilityAnnualEvents = $!doc.getValue('visibilityAnnualEvents'))
83	83	## デフォルト値（未設定なら全体公開）
84	84	#if(!$visibilityOrgChart || $visibilityOrgChart == '') #set($visibilityOrgChart = 'public') #end
85	85	#if(!$visibilityBudget || $visibilityBudget == '') #set($visibilityBudget = 'public') #end
...	...	@@ -91,15 +91,65 @@
91	91	#set($isGuest = $viewerUser == 'XWiki.XWikiGuest')
92	92	#set($isViewerAdmin = false)
93	93	#set($viewerSchoolCode = '')
	161	+#set($viewerSecondaryGraduated = false)
94	94	#if(!$isGuest)
95	95	#set($viewerDoc = $xwiki.getDocument($viewerUser))
96	96	#set($viewerAccountType = $!viewerDoc.getValue('accountType'))
97	97	#set($viewerSchoolCode = $!viewerDoc.getValue('schoolCode'))
	166	+ #set($viewerSecondarySchoolCode = $!viewerDoc.getValue('secondarySchoolCode'))
	167	+ #set($viewerUserRole = $!viewerDoc.getValue('userRole'))
98	98	#if($viewerAccountType == 'admin')
99	99	#set($isViewerAdmin = true)
100	100	#end
	171	+ ## 第2所属校の在学年数超過チェック
	172	+ #set($viewerSecEnrollYear = $!viewerDoc.getValue('secondaryEnrollmentYear'))
	173	+ #if($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecEnrollYear && $viewerSecEnrollYear != '')
	174	+ #set($vNow = $datetool.date)
	175	+ #set($vCurYear = $mathtool.toInteger($datetool.format('yyyy', $vNow)))
	176	+ #set($vCurMonth = $mathtool.toInteger($datetool.format('MM', $vNow)))
	177	+ #if($vCurMonth >= 4)#set($vSchoolYear = $vCurYear)#else#set($vSchoolYear = $mathtool.sub($vCurYear, 1))#end
	178	+ #set($vSecEnroll = $mathtool.toInteger($viewerSecEnrollYear))
	179	+ #set($vSecMax = 3)
	180	+ #if($viewerSecondarySchoolCode.length() >= 2)
	181	+ #set($vSecType = $viewerSecondarySchoolCode.substring(0, 2))
	182	+ #if($vSecType == 'C2')#set($vSecMax = 9)#elseif($vSecType == 'D2')#set($vSecMax = 6)#end
	183	+ #end
	184	+ #set($vSecGrade = $mathtool.add($mathtool.sub($vSchoolYear, $vSecEnroll), 1))
	185	+ #if($vSecGrade > $vSecMax)
	186	+ #set($viewerSecondaryGraduated = true)
	187	+ #end
	188	+ #end
101	101	#end
102	102
	191	+## --- 関連校（中高一貫校）情報 ---
	192	+#set($affiliatedSchoolCode = $!doc.getValue('affiliatedSchoolCode'))
	193	+#set($affiliatedSchoolName = $!doc.getValue('affiliatedSchoolName'))
	194	+#set($isAffiliated = false)
	195	+#if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
	196	+ #if($viewerSchoolCode == $affiliatedSchoolCode)
	197	+ #set($isAffiliated = true)
	198	+ #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode && !$viewerSecondaryGraduated)
	199	+ #set($isAffiliated = true)
	200	+ #end
	201	+#end
	202	+
	203	+## --- 校内判定（卒業生を除外、secondarySchoolCodeも含む） ---
	204	+#set($isSchoolMember = false)
	205	+#if(!$isGuest && $viewerUserRole != 'graduate')
	206	+ #if($viewerSchoolCode == $schoolCode || $isAffiliated)
	207	+ #set($isSchoolMember = true)
	208	+ #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode && !$viewerSecondaryGraduated)
	209	+ #set($isSchoolMember = true)
	210	+ #end
	211	+#end
	212	+## 卒業生の母校判定（投稿バッジ用）
	213	+#set($isAlumniOfSchool = false)
	214	+#if(!$isGuest && $viewerUserRole == 'graduate')
	215	+ #if($viewerSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $viewerSchoolCode == $affiliatedSchoolCode))
	216	+ #set($isAlumniOfSchool = true)
	217	+ #end
	218	+#end
	219	+
103	103	## --- 学校ページ非表示チェック ---
104	104	#set($schoolHidden = $doc.getValue('hidden'))
105	105	#if($schoolHidden == 1)
...	...	@@ -133,7 +133,7 @@
133	133
134	134	## --- 投稿固定/解除処理 ---
135	135	#set($pinAction = $!request.action)
136		-#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token))
	253	+#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $isSchoolMember)) && $services.csrf.isTokenValid($request.form_token))
137	137	#set($pinPostObjStr = $!request.postObj)
138	138	#if(!$pinPostObjStr.matches('^\d+$'))
139	139	## 不正な値 → 無視
...	...	@@ -163,7 +163,7 @@
163	163
164	164	## --- 特色ある活動 選定/解除処理 ---
165	165	#set($featAction = $!request.action)
166		-#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token))
	283	+#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $isSchoolMember)) && $services.csrf.isTokenValid($request.form_token))
167	167	#set($featActObjStr = $!request.actObj)
168	168	#if($featActObjStr.matches('^\d+$'))
169	169	#set($actObjNum = $mathtool.toInteger($featActObjStr))
...	...	@@ -265,7 +265,7 @@
265	265
266	266	## --- 編集ボタン（権限があるユーザーのみ表示） ---
267	267	#set($canEditSchool = false)
268		-#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode))
	385	+#if(!$isGuest && ($isViewerAdmin || $isSchoolMember || $isAlumniOfSchool))
269	269	#set($canEditSchool = true)
270	270	#end
271	271	#if($canEditSchool)
...	...	@@ -274,65 +274,211 @@
274	274	</div>
275	275	#end
276	276
	394	+## --- 関連校（中高一貫校）バナー ---
	395	+#if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
	396	+ #set($affiliatedPageRef = "Schools.${affiliatedSchoolCode}.WebHome")
	397	+ #set($affiliatedPageExists = $xwiki.exists($affiliatedPageRef))
	398	+<div class="affiliated-school-banner">
	399	+ <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>
	400	+ <div>
	401	+ <strong>中高一貫校</strong>：
	402	+ #if($affiliatedPageExists)
	403	+ <a href="$xwiki.getURL($affiliatedPageRef, 'view')">$!escapetool.xml($affiliatedSchoolName)</a>
	404	+ #else
	405	+ $!escapetool.xml($affiliatedSchoolName)
	406	+ #end
	407	+ と連携しています
	408	+ </div>
	409	+</div>
	410	+#end
	411	+
277	277	## --- ① 学校基本情報 ---
278	278	<div class="school-info-card collapsed" id="card-basic-info">
279	279	<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>
280		- <table class="wiki-table school-info-table">
281		- <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
282		- <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
283		- <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
284		- <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
285		- <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
286		- <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
287		- <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
288		- <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
289		- <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>
290		- </table>
291		- #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
292		- #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
293		- #if($infoEditDate && $infoEditDate != '')
294		- <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>
	415	+ <div class="school-basic-info-layout">
	416	+ <div class="school-basic-info-table">
	417	+ <table class="wiki-table school-info-table">
	418	+ <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
	419	+ <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
	420	+ <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
	421	+ <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
	422	+ <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
	423	+ <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
	424	+ <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
	425	+ <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
	426	+ <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>
	427	+ </table>
	428	+ </div>
	429	+ #if($schoolPhoto && $schoolPhoto != '')
	430	+ <div class="school-photo-area">
	431	+ <img src="$doc.getAttachmentURL($schoolPhoto)" alt="$!escapetool.xml($schoolName)" class="school-photo" />
	432	+ </div>
	433	+ #end
	434	+ </div>
	435	+ #if($schoolDescription && $schoolDescription.trim() != '')
	436	+ <div class="free-note" style="margin-top:var(--sp-4);">$!escapetool.xml($schoolDescription)</div>
295	295	#end
	438	+
296	296	</div>
297	297
298		-## --- ② 生徒会基本情報（折りたたみカード） ---
	441	+## --- ② 生徒会情報（折りたたみカード） ---
299	299	<div class="school-info-card" id="card-seitokai-info">
300		- <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>
	443	+ <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>
301	301	<div class="seitokai-info-body">
302	302
303		- ## --- 組織図 ---
	446	+ ## --- 生徒会組織 ---
304	304	#set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
305	305	#if($hasOrgContent)
306	306	#set($canViewOrgChart = true)
307		- #if($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewOrgChart = false)
308		- #elseif($visibilityOrgChart == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ($viewerSchoolCode != $schoolCode || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewOrgChart = false)
	450	+ #if($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewOrgChart = false)
	451	+ #elseif($visibilityOrgChart == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewOrgChart = false)
309	309	#end
310	310	#if($canViewOrgChart)
311	311	<div class="seitokai-subsection">
312		- <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>
	455	+ <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>
313	313	<div class="seitokai-subsection-content">
314	314	#if($orgChartImage && $orgChartImage != '')
315	315	<div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
316	316	#end
317		- #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end
	460	+ #if($orgChart && $orgChart != '')<div class="free-note">$!escapetool.xml($orgChart)</div>#end
318	318	</div>
319	319	</div>
320	320	#else
321		- <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>
	464	+ <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>
322	322	#end
323	323	#end
324	324
	468	+ ## --- 活動環境 ---
	469	+ #set($hasActivityEnv = ($activityPlace && !$activityPlace.isEmpty()) || ($activityRoomEquipment && $activityRoomEquipment != '') || ($activityRoomImage && $activityRoomImage != '') || ($ictTools && !$ictTools.isEmpty()) || ($ictUsage && !$ictUsage.isEmpty()))
	470	+ #if($hasActivityEnv)
	471	+ #set($canViewAE = true)
	472	+ #if($visibilityActivityEnv == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAE = false)
	473	+ #elseif($visibilityActivityEnv == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAE = false)
	474	+ #end
	475	+ #if($canViewAE)
	476	+ <div class="seitokai-subsection">
	477	+ <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M3 9l9-7 9 7v11a2 2 0 01-2 2H5a2 2 0 01-2-2z"/><polyline points="9 22 9 12 15 12 15 22"/></svg> 生徒会の活動環境 #if($visibilityActivityEnv != '' && $visibilityActivityEnv != 'public')<span class="visibility-badge visibility-${visibilityActivityEnv}">#if($visibilityActivityEnv == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
	478	+ <div class="seitokai-subsection-content">
	479	+ #if($activityPlace && !$activityPlace.isEmpty())
	480	+ <div class="info-row">
	481	+ <span class="info-label">普段の活動場所</span>
	482	+ <span class="info-value">
	483	+ <div class="selection-display">
	484	+ #foreach($ap in $activityPlace)
	485	+ <span class="selection-item">$!escapetool.xml($ap.trim())</span>
	486	+ #end
	487	+ </div>
	488	+ </span>
	489	+ </div>
	490	+ #end
	491	+ #if($activityRoomEquipment && $activityRoomEquipment != '')
	492	+ <div class="info-row">
	493	+ <span class="info-label">生徒会室の設備</span>
	494	+ <span class="info-value free-text-value">$!escapetool.xml($activityRoomEquipment)</span>
	495	+ </div>
	496	+ #end
	497	+ #if($activityRoomImage && $activityRoomImage != '')
	498	+ <div class="info-row">
	499	+ <span class="info-label">活動場所の写真</span>
	500	+ <span class="info-value"><div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($activityRoomImage)" alt="活動場所の写真" class="org-chart-img" /></div></span>
	501	+ </div>
	502	+ #end
	503	+ #if($ictTools && !$ictTools.isEmpty())
	504	+ <div class="info-row">
	505	+ <span class="info-label">利用しているICTツール</span>
	506	+ <span class="info-value">
	507	+ #set($ictCatDisplay = [
	508	+ ["連絡ツール", ["メール","LINE","LINE WORKS","Discord","Slack","Microsoft Teams","Google Chat","InstagramのDM","XのDM","その他（連絡）"]],
	509	+ ["ドキュメント作成・共有", ["Googleドキュメント","Googleスプレッドシート","Googleスライド","Googleドライブ","Word","Excel","PowerPoint","OneDrive","SharePoint","Notion","Pages","Numbers","Keynote","Dropbox","Box","その他（ドキュメント）"]],
	510	+ ["タスク管理", ["Googleカレンダー","Google ToDoリスト","Trello","Asana","Excel等スプレッドシート","その他（タスク管理）"]],
	511	+ ["ビデオ会議ツール", ["Zoom","Google Meet","その他（ビデオ会議）"]],
	512	+ ["アンケート", ["Googleフォーム","Microsoft Forms","その他（アンケート）"]],
	513	+ ["デザイン・クリエイティブ", ["Canva","各種Adobe","CapCut","LumaFusion","AviUtl","ibisPaint","その他（デザイン）"]],
	514	+ ["その他", ["独自のWebシステム・自作アプリ"]]
	515	+ ])
	516	+ #foreach($catD in $ictCatDisplay)
	517	+ #set($catHasItems = false)
	518	+ #foreach($t in $catD.get(1))
	519	+ #if($ictTools.contains($t)) #set($catHasItems = true) #end
	520	+ #end
	521	+ #if($catHasItems)
	522	+ <div style="margin-bottom:6px">
	523	+ <span style="font-size:0.8em;font-weight:600;color:var(--text-mid)">$catD.get(0):</span>
	524	+ <div class="selection-display" style="margin-top:2px">
	525	+ #foreach($t in $catD.get(1))
	526	+ #if($ictTools.contains($t))
	527	+ <span class="selection-item">$!escapetool.xml($t)</span>
	528	+ #end
	529	+ #end
	530	+ </div>
	531	+ </div>
	532	+ #end
	533	+ #end
	534	+ </span>
	535	+ </div>
	536	+ #end
	537	+ #if($ictUsage && !$ictUsage.isEmpty())
	538	+ <div class="info-row">
	539	+ <span class="info-label">ICT活用している場面</span>
	540	+ <span class="info-value">
	541	+ <div class="selection-display">
	542	+ #foreach($iu in $ictUsage)
	543	+ <span class="selection-item">$!escapetool.xml($iu.trim())</span>
	544	+ #end
	545	+ </div>
	546	+ </span>
	547	+ </div>
	548	+ #end
	549	+ </div>
	550	+ </div>
	551	+ #else
	552	+ <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 活動環境情報は #if($visibilityActivityEnv == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
	553	+ #end
	554	+ #end
	555	+
	556	+ ## --- 年間主要行事 ---
	557	+ #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]])
	558	+ #set($hasAnyEvent = false)
	559	+ #foreach($m in $months)
	560	+ #if($m.get(1) && $m.get(1) != '') #set($hasAnyEvent = true) #end
	561	+ #end
	562	+ #if($hasAnyEvent)
	563	+ #set($canViewAN = true)
	564	+ #if($visibilityAnnualEvents == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAN = false)
	565	+ #elseif($visibilityAnnualEvents == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAN = false)
	566	+ #end
	567	+ #if($canViewAN)
	568	+ <div class="seitokai-subsection">
	569	+ <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="4" width="18" height="18" rx="2" ry="2"/><line x1="16" y1="2" x2="16" y2="6"/><line x1="8" y1="2" x2="8" y2="6"/><line x1="3" y1="10" x2="21" y2="10"/></svg> 年間主要行事 #if($visibilityAnnualEvents != '' && $visibilityAnnualEvents != 'public')<span class="visibility-badge visibility-${visibilityAnnualEvents}">#if($visibilityAnnualEvents == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
	570	+ <div class="seitokai-subsection-content">
	571	+ <table class="wiki-table school-info-table" style="margin:0">
	572	+ #foreach($m in $months)
	573	+ #if($m.get(1) && $m.get(1) != '')
	574	+ <tr><td style="width:60px;font-weight:600;white-space:nowrap">$m.get(0)</td><td>$!escapetool.xml($m.get(1))</td></tr>
	575	+ #end
	576	+ #end
	577	+ </table>
	578	+ </div>
	579	+ </div>
	580	+ #else
	581	+ <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 年間主要行事情報は #if($visibilityAnnualEvents == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
	582	+ #end
	583	+ #end
	584	+
325	325	## --- 日常の活動 ---
326	326	#if($dailyActivities && !$dailyActivities.isEmpty())
	587	+ #set($canViewDA = true)
	588	+ #if($visibilityDailyActivities == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewDA = false)
	589	+ #elseif($visibilityDailyActivities == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewDA = false)
	590	+ #end
	591	+ #if($canViewDA)
327	327	<div class="seitokai-subsection">
328		- <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>
	593	+ <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z"/><polyline points="14 2 14 8 20 8"/><line x1="16" y1="13" x2="8" y2="13"/><line x1="16" y1="17" x2="8" y2="17"/></svg> 日常の活動 #if($visibilityDailyActivities != '' && $visibilityDailyActivities != 'public')<span class="visibility-badge visibility-${visibilityDailyActivities}">#if($visibilityDailyActivities == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
329	329	<div class="seitokai-subsection-content">
330		- <p class="activity-hint">活動時間の多い順に上位3つ</p>
	595	+ <p class="activity-hint">活動時間が多い3つ</p>
331	331	<div class="tag-container">
332		- #set($daIdx = 1)
333	333	#foreach($da in $dailyActivities)
334		- <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
335		- #set($daIdx = $daIdx + 1)
	598	+ <span class="tag tag-accent">$!escapetool.xml($da.trim())</span>
336	336	#end
337	337	</div>
338	338	#if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
...	...	@@ -340,12 +340,104 @@
340	340	#end
341	341	</div>
342	342	</div>
	606	+ #else
	607	+ <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 日常の活動情報は #if($visibilityDailyActivities == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
	608	+ #end
343	343	#end
344	344
	611	+ ## --- 定例活動 ---
	612	+ #if($meetingFrequency && $meetingFrequency != '')
	613	+ #set($canViewMT = true)
	614	+ #if($visibilityMeeting == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewMT = false)
	615	+ #elseif($visibilityMeeting == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewMT = false)
	616	+ #end
	617	+ #if($canViewMT)
	618	+ <div class="seitokai-subsection">
	619	+ <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="4" width="18" height="18" rx="2"/><line x1="16" y1="2" x2="16" y2="6"/><line x1="8" y1="2" x2="8" y2="6"/><line x1="3" y1="10" x2="21" y2="10"/></svg> 定例活動 #if($visibilityMeeting != '' && $visibilityMeeting != 'public')<span class="visibility-badge visibility-${visibilityMeeting}">#if($visibilityMeeting == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
	620	+ <div class="seitokai-subsection-content">
	621	+ <div class="info-row">
	622	+ <span class="info-label">役員定例会の頻度</span>
	623	+ <span class="info-value">$!escapetool.xml($!meetingFrequency)</span>
	624	+ </div>
	625	+ #if($regularActivitiesNote && $regularActivitiesNote.trim() != '')
	626	+ <div class="free-note">$!escapetool.xml($regularActivitiesNote)</div>
	627	+ #end
	628	+ </div>
	629	+ </div>
	630	+ #else
	631	+ <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 定例活動情報は #if($visibilityMeeting == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
	632	+ #end
	633	+ #end
	634	+
	635	+ ## --- 生徒総会 ---
	636	+ #set($hasAssembly = ($assemblyFormat && $assemblyFormat != '') || ($assemblyCount && $assemblyCount > 0) || ($assemblyAgenda && !$assemblyAgenda.isEmpty()) || ($assemblyTopics && !$assemblyTopics.isEmpty()) || ($assemblyNote && $assemblyNote != ''))
	637	+ #if($hasAssembly)
	638	+ #set($canViewAS = true)
	639	+ #if($visibilityAssembly == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAS = false)
	640	+ #elseif($visibilityAssembly == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAS = false)
	641	+ #end
	642	+ #if($canViewAS)
	643	+ <div class="seitokai-subsection">
	644	+ <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 生徒総会 #if($visibilityAssembly != '' && $visibilityAssembly != 'public')<span class="visibility-badge visibility-${visibilityAssembly}">#if($visibilityAssembly == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
	645	+ <div class="seitokai-subsection-content">
	646	+ #if($assemblyFormat && $assemblyFormat != '')
	647	+ <div class="info-row">
	648	+ <span class="info-label">開催方式</span>
	649	+ <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($assemblyFormat)</span></span>
	650	+ </div>
	651	+ #end
	652	+ #if($assemblyCount && $assemblyCount > 0)
	653	+ <div class="info-row">
	654	+ <span class="info-label">開催回数（年）</span>
	655	+ <span class="info-value">$!escapetool.xml($assemblyCount)回</span>
	656	+ </div>
	657	+ #end
	658	+ #if($assemblyAgenda && !$assemblyAgenda.isEmpty())
	659	+ <div class="info-row">
	660	+ <span class="info-label">議案の集め方</span>
	661	+ <span class="info-value">
	662	+ <div class="selection-display">
	663	+ #foreach($aa in $assemblyAgenda)
	664	+ <span class="selection-item">$!escapetool.xml($aa.trim())</span>
	665	+ #end
	666	+ </div>
	667	+ </span>
	668	+ </div>
	669	+ #end
	670	+ #if($assemblyTopics && !$assemblyTopics.isEmpty())
	671	+ <div class="info-row">
	672	+ <span class="info-label">扱う内容</span>
	673	+ <span class="info-value">
	674	+ <div class="selection-display">
	675	+ #foreach($at in $assemblyTopics)
	676	+ <span class="selection-item">$!escapetool.xml($at.trim())</span>
	677	+ #end
	678	+ </div>
	679	+ </span>
	680	+ </div>
	681	+ #end
	682	+ #if($assemblyNote && $assemblyNote != '')
	683	+ <div class="info-row">
	684	+ <span class="info-label">自由記述</span>
	685	+ <span class="info-value free-text-value">$!escapetool.xml($assemblyNote)</span>
	686	+ </div>
	687	+ #end
	688	+ </div>
	689	+ </div>
	690	+ #else
	691	+ <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 生徒総会情報は #if($visibilityAssembly == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
	692	+ #end
	693	+ #end
	694	+
345	345	## --- 選挙 ---
346	346	#if($electionExists && $electionExists != '')
	697	+ #set($canViewEL = true)
	698	+ #if($visibilityElection == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewEL = false)
	699	+ #elseif($visibilityElection == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewEL = false)
	700	+ #end
	701	+ #if($canViewEL)
347	347	<div class="seitokai-subsection">
348		- <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>
	703	+ <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="3" width="18" height="18" rx="2"/><path d="M7 13l3 3 7-7"/></svg> 選挙 #if($visibilityElection != '' && $visibilityElection != 'public')<span class="visibility-badge visibility-${visibilityElection}">#if($visibilityElection == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
349	349	<div class="seitokai-subsection-content">
350	350	<div class="info-row">
351	351	<span class="info-label">役員選挙</span>
...	...	@@ -362,22 +362,74 @@
362	362	#end
363	363	</div>
364	364	</div>
	720	+ #else
	721	+ <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 選挙情報は #if($visibilityElection == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
	722	+ #end
365	365	#end
366	366
367		- ## --- 定例活動 ---
368		- #if($meetingFrequency && $meetingFrequency != '')
	725	+ ## --- 校則・生徒会会則の見直し ---
	726	+ #if($ruleReviewStatus && $ruleReviewStatus != '')
	727	+ #set($canViewRuleReview = true)
	728	+ #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewRuleReview = false)
	729	+ #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false)
	730	+ #end
	731	+ #if($canViewRuleReview)
369	369	<div class="seitokai-subsection">
370		- <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>
	733	+ <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>
371	371	<div class="seitokai-subsection-content">
372	372	<div class="info-row">
373		- <span class="info-label">役員定例会の頻度</span>
374		- <span class="info-value">$!escapetool.xml($!meetingFrequency)</span>
	736	+ <span class="info-label">見直しの有無（3年以内）</span>
	737	+ <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
375	375	</div>
376		- #if($regularActivitiesNote && $regularActivitiesNote.trim() != '')
377		- <div class="free-note">$!escapetool.xml($regularActivitiesNote)</div>
	739	+ #if($ruleReviewStatus != '実施なし')
	740	+ #if($ruleReviewContent && !$ruleReviewContent.isEmpty())
	741	+ <div class="info-row">
	742	+ <span class="info-label">見直しの内容</span>
	743	+ <span class="info-value">
	744	+ <div class="selection-display">
	745	+ #foreach($rc in $ruleReviewContent)
	746	+ <span class="selection-item">$!escapetool.xml($rc.trim())</span>
	747	+ #end
	748	+ </div>
	749	+ </span>
	750	+ </div>
378	378	#end
	752	+ #if($ruleReviewProposer && !$ruleReviewProposer.isEmpty())
	753	+ <div class="info-row">
	754	+ <span class="info-label">見直しの提案者</span>
	755	+ <span class="info-value">
	756	+ <div class="selection-display">
	757	+ #foreach($rp in $ruleReviewProposer)
	758	+ <span class="selection-item">$!escapetool.xml($rp.trim())</span>
	759	+ #end
	760	+ </div>
	761	+ </span>
	762	+ </div>
	763	+ #end
	764	+ #if($ruleReviewImplementer && !$ruleReviewImplementer.isEmpty())
	765	+ <div class="info-row">
	766	+ <span class="info-label">見直しの実施者</span>
	767	+ <span class="info-value">
	768	+ <div class="selection-display">
	769	+ #foreach($ri in $ruleReviewImplementer)
	770	+ <span class="selection-item">$!escapetool.xml($ri.trim())</span>
	771	+ #end
	772	+ </div>
	773	+ </span>
	774	+ </div>
	775	+ #end
	776	+ #end
	777	+ #if($ruleReviewSystem && $ruleReviewSystem != '')
	778	+ <div class="info-row">
	779	+ <span class="info-label">見直しの仕組み</span>
	780	+ <span class="info-value">$!escapetool.xml($!ruleReviewSystem)</span>
	781	+ </div>
	782	+ #end
379	379	</div>
380	380	</div>
	785	+ #else
	786	+ <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>
	787	+ #end
381	381	#end
382	382
383	383	## --- 予算 ---
...	...	@@ -384,12 +384,12 @@
384	384	#set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
385	385	#if($hasBudget)
386	386	#set($canViewBudget = true)
387		- #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewBudget = false)
388		- #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ($viewerSchoolCode != $schoolCode || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false)
	794	+ #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewBudget = false)
	795	+ #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false)
389	389	#end
390	390	#if($canViewBudget)
391	391	<div class="seitokai-subsection">
392		- <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>
	799	+ <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>
393	393	<div class="seitokai-subsection-content">
394	394	#if($budgetProcess && !$budgetProcess.isEmpty())
395	395	<div class="info-row">
...	...	@@ -396,8 +396,13 @@
396	396	<span class="info-label">作成過程の生徒関与</span>
397	397	<span class="info-value">
398	398	<div class="selection-display">
399		- #foreach($bp in $budgetProcess)
400		- <span class="selection-item">$!escapetool.xml($bp.trim())</span>
	806	+ #set($allBpOpts = ["各部・委員会等への予算希望額調査","予算額調整（折衝等）","生徒会予算案の作成","生徒総会での議決","生徒関与なし","その他"])
	807	+ #foreach($bpOpt in $allBpOpts)
	808	+ #if($budgetProcess.contains($bpOpt))
	809	+ <span class="selection-item">$!escapetool.xml($bpOpt)</span>
	810	+ #else
	811	+ <span class="selection-item selection-item-off">$!escapetool.xml($bpOpt)</span>
	812	+ #end
401	401	#end
402	402	</div>
403	403	</span>
...	...	@@ -437,66 +437,87 @@
437	437	#end
438	438	#end
439	439
440		- ## --- 校則の見直し ---
441		- #if($ruleReviewStatus && $ruleReviewStatus != '')
442		- #set($canViewRuleReview = true)
443		- #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewRuleReview = false)
444		- #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ($viewerSchoolCode != $schoolCode || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false)
	852	+ ## --- 広報 ---
	853	+ #set($hasPublicity = ($publicityMethod && !$publicityMethod.isEmpty()) || ($publicityFrequency && $publicityFrequency != '') || ($publicityNote && $publicityNote != ''))
	854	+ #if($hasPublicity)
	855	+ #set($canViewPB = true)
	856	+ #if($visibilityPublicity == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewPB = false)
	857	+ #elseif($visibilityPublicity == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPB = false)
445	445	#end
446		- #if($canViewRuleReview)
	859	+ #if($canViewPB)
447	447	<div class="seitokai-subsection">
448		- <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>
	861	+ <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M1 12s4-8 11-8 11 8 11 8-4 8-11 8-11-8-11-8z"/><circle cx="12" cy="12" r="3"/></svg> 広報 #if($visibilityPublicity != '' && $visibilityPublicity != 'public')<span class="visibility-badge visibility-${visibilityPublicity}">#if($visibilityPublicity == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
449	449	<div class="seitokai-subsection-content">
	863	+ #if($publicityMethod && !$publicityMethod.isEmpty())
450	450	<div class="info-row">
451		- <span class="info-label">見直しの有無（3年以内）</span>
452		- <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
453		- </div>
454		- #if($ruleReviewContent && !$ruleReviewContent.isEmpty())
455		- <div class="info-row">
456		- <span class="info-label">見直しの内容</span>
	865	+ <span class="info-label">方法</span>
457	457	<span class="info-value">
458	458	<div class="selection-display">
459		- #foreach($rc in $ruleReviewContent)
460		- <span class="selection-item">$!escapetool.xml($rc.trim())</span>
	868	+ #foreach($pm in $publicityMethod)
	869	+ <span class="selection-item">$!escapetool.xml($pm.trim())</span>
461	461	#end
462	462	</div>
463	463	</span>
464	464	</div>
465	465	#end
466		- #if($ruleReviewProposer && !$ruleReviewProposer.isEmpty())
	875	+ #if($publicityFrequency && $publicityFrequency != '')
467	467	<div class="info-row">
468		- <span class="info-label">見直しの提案者</span>
469		- <span class="info-value">
470		- <div class="selection-display">
471		- #foreach($rp in $ruleReviewProposer)
472		- <span class="selection-item">$!escapetool.xml($rp.trim())</span>
473		- #end
474		- </div>
475		- </span>
	877	+ <span class="info-label">頻度</span>
	878	+ <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($publicityFrequency)</span></span>
476	476	</div>
477	477	#end
478		- #if($ruleReviewImplementer && !$ruleReviewImplementer.isEmpty())
	881	+ #if($publicityNote && $publicityNote != '')
479	479	<div class="info-row">
480		- <span class="info-label">見直しの実施者</span>
	883	+ <span class="info-label">自由記述</span>
	884	+ <span class="info-value free-text-value">$!escapetool.xml($publicityNote)</span>
	885	+ </div>
	886	+ #end
	887	+ </div>
	888	+ </div>
	889	+ #else
	890	+ <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 広報情報は #if($visibilityPublicity == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
	891	+ #end
	892	+ #end
	893	+
	894	+ ## --- 外部連携 ---
	895	+ #set($hasExternal = ($externalCooperation && $externalCooperation != '') || ($externalOrgName && $externalOrgName != '') || ($socialParticipation && !$socialParticipation.isEmpty()))
	896	+ #if($hasExternal)
	897	+ #set($canViewEX = true)
	898	+ #if($visibilityExternal == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewEX = false)
	899	+ #elseif($visibilityExternal == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewEX = false)
	900	+ #end
	901	+ #if($canViewEX)
	902	+ <div class="seitokai-subsection">
	903	+ <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><circle cx="18" cy="5" r="3"/><circle cx="6" cy="12" r="3"/><circle cx="18" cy="19" r="3"/><line x1="8.59" y1="13.51" x2="15.42" y2="17.49"/><line x1="15.41" y1="6.51" x2="8.59" y2="10.49"/></svg> 外部連携 #if($visibilityExternal != '' && $visibilityExternal != 'public')<span class="visibility-badge visibility-${visibilityExternal}">#if($visibilityExternal == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
	904	+ <div class="seitokai-subsection-content">
	905	+ #if($externalCooperation && $externalCooperation != '')
	906	+ <div class="info-row">
	907	+ <span class="info-label">他校の生徒会との連携</span>
	908	+ <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($externalCooperation)</span></span>
	909	+ </div>
	910	+ #end
	911	+ #if($externalOrgName && $externalOrgName != '')
	912	+ <div class="info-row">
	913	+ <span class="info-label">参加している生徒会団体の名前</span>
	914	+ <span class="info-value">$!escapetool.xml($externalOrgName)</span>
	915	+ </div>
	916	+ #end
	917	+ #if($socialParticipation && !$socialParticipation.isEmpty())
	918	+ <div class="info-row">
	919	+ <span class="info-label">社会参加・地域連携・ボランティア</span>
481	481	<span class="info-value">
482	482	<div class="selection-display">
483		- #foreach($ri in $ruleReviewImplementer)
484		- <span class="selection-item">$!escapetool.xml($ri.trim())</span>
	922	+ #foreach($sp2 in $socialParticipation)
	923	+ <span class="selection-item">$!escapetool.xml($sp2.trim())</span>
485	485	#end
486	486	</div>
487	487	</span>
488	488	</div>
489	489	#end
490		- #if($ruleReviewSystem && $ruleReviewSystem != '')
491		- <div class="info-row">
492		- <span class="info-label">見直しの仕組み</span>
493		- <span class="info-value">$!escapetool.xml($!ruleReviewSystem)</span>
494		- </div>
495		- #end
496	496	</div>
497	497	</div>
498	498	#else
499		- <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 校則の見直し情報は #if($visibilityRuleReview == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
	932	+ <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 外部連携情報は #if($visibilityExternal == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
500	500	#end
501	501	#end
502	502
...	...	@@ -503,12 +503,12 @@
503	503	## --- 生徒会の課題意識 ---
504	504	#if($challenges && $challenges != '')
505	505	#set($canViewChallenges = true)
506		- #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewChallenges = false)
507		- #elseif($visibilityChallenges == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ($viewerSchoolCode != $schoolCode || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewChallenges = false)
	939	+ #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewChallenges = false)
	940	+ #elseif($visibilityChallenges == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewChallenges = false)
508	508	#end
509	509	#if($canViewChallenges)
510	510	<div class="seitokai-subsection">
511		- <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>
	944	+ <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>
512	512	<div class="seitokai-subsection-content">
513	513	<div class="challenge-text">$!escapetool.xml($challenges)</div>
514	514	</div>
...	...	@@ -532,6 +532,11 @@
532	532	<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>
533	533	<tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
534	534	</table>
	968	+ #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
	969	+ #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
	970	+ #if($infoEditDate && $infoEditDate != '')
	971	+ <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>
	972	+ #end
535	535	</div>
536	536
537	537	{{/html}}
...	...	@@ -566,13 +566,13 @@
566	566
567	567	<div class="activity-toolbar">
568	568	<div class="activity-fy-tabs">
569		- <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
	1007	+ <button class="activity-fy-tab" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
570	570	#foreach($fy in $fySet)
571	571	#if($fy != $currentFYStr)
572	572	<button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button>
573	573	#end
574	574	#end
575		- <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
	1013	+ <button class="activity-fy-tab active" onclick="switchActivityFY('all', this)">全期間</button>
576	576	</div>
577	577	<div class="activity-toolbar-right">
578	578	<button class="btn-view-toggle" id="btnViewToggle" onclick="toggleCompactView()" title="タイトルのみ表示">
...	...	@@ -586,22 +586,23 @@
586	586	<div class="author-legend-body">
587	587	<div class="author-legend">
588	588	<span class="author-legend-title">投稿者の信頼度:</span>
589		- <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者</span>
590		- <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み</span>
591		- <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介</span>
592		- <span class="author-legend-item"><span class="bar bar-general"></span> 一般（未承認）</span>
	1027	+ <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者 <span class="text-hint">— 運営スタッフ</span></span>
	1028	+ <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み <span class="text-hint">— 本人確認済みのユーザー</span></span>
	1029	+ <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介 <span class="text-hint">— 承認済みユーザーからの紹介</span></span>
	1030	+ <span class="author-legend-item"><span class="bar bar-general"></span> 一般 <span class="text-hint">— 一般登録ユーザー</span></span>
593	593	</div>
594	594	<div class="author-legend">
595	595	<span class="author-legend-title">所属:</span>
596		- <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>
597		- <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>
598		- <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>
599		- <span class="author-legend-item text-hint">※一般アカウントは所属未確認のため非表示</span>
	1034	+ <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>
	1035	+ <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>
	1036	+ <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>
	1037	+ <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>
	1038	+ <span class="author-legend-item text-hint">※一般アカウントは所属バッジが表示されません</span>
600	600	</div>
601	601	<div class="author-legend">
602	602	<span class="author-legend-title">役割:</span>
603	603	<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>
604		- <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>
	1043	+ <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>
605	605	<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>
606	606	</div>
607	607	</div>
...	...	@@ -610,22 +610,64 @@
610	610
611	611	{{/html}}
612	612
613		-## 特色ある活動を先頭に表示するため、並び替え用リストを作成
614		-#set($featuredActivities = [])
615		-#set($normalActivities = [])
616		-#if($activities && $activities.size() > 0)
617		- #foreach($act in $activities)
618		- #set($isFeatured = $!act.getValue('featured'))
619		- #if($isFeatured == '1')
620		- #set($discard = $featuredActivities.add($foreach.index))
	1052	+## 活動を「年度降順 + 特色あり先頭」で並び替え
	1053	+## Step1: fySet から年度を降順ソート（Velocity ネイティブ実装）
	1054	+#set($fyNums = [])
	1055	+#foreach($fy in $fySet)
	1056	+ #if($fy && $fy != '' && $fy != 'unknown')
	1057	+ #set($discard = $fyNums.add($fy))
	1058	+ #end
	1059	+#end
	1060	+## 最大値を順番に取り出して降順リストを構築（最大20年度まで対応）
	1061	+#set($fyDesc = [])
	1062	+#set($fyRemaining = [])
	1063	+#foreach($fy in $fyNums)
	1064	+ #set($discard = $fyRemaining.add($fy))
	1065	+#end
	1066	+#foreach($dummy in [1..20])
	1067	+ #if($fyRemaining.isEmpty())#break#end
	1068	+ #set($fyMax = $fyRemaining.get(0))
	1069	+ #foreach($fy in $fyRemaining)
	1070	+ #if($fy > $fyMax)#set($fyMax = $fy)#end
	1071	+ #end
	1072	+ #set($discard = $fyDesc.add($fyMax))
	1073	+ #set($fyNextRem = [])
	1074	+ #set($fyMaxRemoved = false)
	1075	+ #foreach($fy in $fyRemaining)
	1076	+ #if(!$fyMaxRemoved && $fy == $fyMax)
	1077	+ #set($fyMaxRemoved = true)
621	621	#else
622		- #set($discard = $normalActivities.add($foreach.index))
	1079	+ #set($discard = $fyNextRem.add($fy))
623	623	#end
624	624	#end
	1082	+ #set($fyRemaining = $fyNextRem)
625	625	#end
	1084	+## 年度未設定の活動は末尾に表示（fySetに'unknown'は入らないため無条件追加）
	1085	+#set($discard = $fyDesc.add('unknown'))
	1086	+## Step2: 年度降順で featured → normal の順にインデックスを収集
626	626	#set($orderedActivityIndices = [])
627		-#set($discard = $orderedActivityIndices.addAll($featuredActivities))
628		-#set($discard = $orderedActivityIndices.addAll($normalActivities))
	1088	+#foreach($curFY in $fyDesc)
	1089	+ ## 同年度の特色あり活動を先頭に
	1090	+ #set($actIdx2 = 0)
	1091	+ #foreach($act in $activities)
	1092	+ #set($aFY2 = $!act.getValue('fiscalYear'))
	1093	+ #if(!$aFY2 || $aFY2 == '') #set($aFY2 = 'unknown') #end
	1094	+ #if($aFY2 == $curFY && $act.getValue('featured') == '1')
	1095	+ #set($discard = $orderedActivityIndices.add($actIdx2))
	1096	+ #end
	1097	+ #set($actIdx2 = $actIdx2 + 1)
	1098	+ #end
	1099	+ ## 同年度の通常活動
	1100	+ #set($actIdx2 = 0)
	1101	+ #foreach($act in $activities)
	1102	+ #set($aFY2 = $!act.getValue('fiscalYear'))
	1103	+ #if(!$aFY2 || $aFY2 == '') #set($aFY2 = 'unknown') #end
	1104	+ #if($aFY2 == $curFY && $act.getValue('featured') != '1')
	1105	+ #set($discard = $orderedActivityIndices.add($actIdx2))
	1106	+ #end
	1107	+ #set($actIdx2 = $actIdx2 + 1)
	1108	+ #end
	1109	+#end
629	629
630	630	#if($activities && $activities.size() > 0)
631	631	#foreach($actIdx in $orderedActivityIndices)
...	...	@@ -670,16 +670,18 @@
670	670	<div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)">
671	671	<div class="activity-thread-header">
672	672	<div class="activity-thread-title">
673		- <h3 #if($actFeatured == '1')class="featured-title"#end>$!escapetool.xml($!actTitle) #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</h3>
674		- <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
675		- #set($actTagsList = $activity.getValue('tags'))
676		- #if($actTagsList && !$actTagsList.isEmpty())
677		- #foreach($tagItem in $actTagsList)
678		- #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end
	1154	+ <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>
	1155	+ <div class="activity-meta-line">
	1156	+ <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
	1157	+ #set($actTagsList = $activity.getValue('tags'))
	1158	+ #if($actTagsList && !$actTagsList.isEmpty())
	1159	+ #foreach($tagItem in $actTagsList)
	1160	+ #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end
	1161	+ #end
679	679	#end
680		- #end
	1163	+ </div>
681	681	</div>
682		- <div class="thread-meta-row">
	1165	+ <div class="thread-meta-right">
683	683	<span class="thread-post-count">${reportCount}件の報告 ・ ${commentCount}件のコメント</span>
684	684	#if($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred')
685	685	#if($actFeatured == '1')
...	...	@@ -739,8 +739,8 @@
739	739	#set($postVis = $!post.getValue('visibility'))
740	740	#if(!$postVis || $postVis == '') #set($postVis = 'public') #end
741	741	#set($canViewPost = true)
742		- #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewPost = false)
743		- #elseif($postVis == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ($viewerSchoolCode != $schoolCode || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPost = false)
	1225	+ #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewPost = false)
	1226	+ #elseif($postVis == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPost = false)
744	744	#end
745	745	#if(!$canViewPost)
746	746	<div class="thread-post visibility-restricted-post">
...	...	@@ -784,8 +784,11 @@
784	784	<span class="badge badge-general badge-sm">一般</span>
785	785	#end
786	786	## 所属バッジ（投稿者の学校コードとページの学校コードを比較）
	1270	+ #set($postIsSchoolMatch = ($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode)))
787	787	#if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general')
788		- #if($postSchoolCode == $schoolCode)
	1272	+ #if($postUserRole == 'graduate' && $postIsSchoolMatch)
	1273	+ <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>
	1274	+ #elseif($postIsSchoolMatch && $postUserRole != 'graduate')
789	789	#if($postAccountType == 'verified' || $postAccountType == 'admin')
790	790	<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>
791	791	#else
...	...	@@ -812,6 +812,13 @@
812	812	#if($postEdited == 1 || $postEdited == '1')
813	813	<span class="post-edited-label">（編集済み）</span>
814	814	#end
	1301	+ #set($postAuthorRefH = $!post.getValue('authorRef'))
	1302	+ #set($postObjNumH = $post.number)
	1303	+ #if(!$isGuest && $xcontext.user != $postAuthorRefH)
	1304	+ <button type="button" class="btn-post-report btn-post-report-header" onclick="openReportDialog(this, '${doc.fullName}', $postObjNumH, '${services.csrf.getToken()}')" title="この投稿を通報">
	1305	+ <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> 通報
	1306	+ </button>
	1307	+ #end
815	815	</div>
816	816	<div class="thread-post-body">
817	817	$!escapetool.xml($!postContent)
...	...	@@ -876,12 +876,37 @@
876	876	#end
877	877	</div>
878	878	#if($postVis != 'public')
879		- <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>
	1372	+ <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>
880	880	#end
881		- ## 固定/解除ボタン（承認済み・管理者のみ）
882		- #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
883		- #set($postObjNum = $post.number)
884		- <div class="post-pin-action post-action-mt">
	1374	+ ## いいねボタン
	1375	+ #set($postLikeCount = $!post.getValue('likeCount'))
	1376	+ #if(!$postLikeCount || $postLikeCount == '') #set($postLikeCount = 0) #end
	1377	+ #set($postLikedBy = $!post.getValue('likedBy'))
	1378	+ #set($isLikedByMe = false)
	1379	+ #if($postLikedBy && $postLikedBy.contains($xcontext.user)) #set($isLikedByMe = true) #end
	1380	+ <div class="post-like-row post-action-mt">
	1381	+ #if($xcontext.user != 'XWiki.XWikiGuest')
	1382	+ <button type="button" class="btn-like #if($isLikedByMe)liked#end" data-page="$escapetool.xml($doc.fullName)" data-obj="$post.number" data-csrf="$services.csrf.getToken()" onclick="toggleLike(this)">
	1383	+ <svg class="ico ico-fixed-14" viewBox="0 0 24 24" #if($isLikedByMe)fill="currentColor" stroke="none"#end><path d="M20.84 4.61a5.5 5.5 0 00-7.78 0L12 5.67l-1.06-1.06a5.5 5.5 0 00-7.78 7.78l1.06 1.06L12 21.23l7.78-7.78 1.06-1.06a5.5 5.5 0 000-7.78z"/></svg>
	1384	+ <span class="like-count">$postLikeCount</span>
	1385	+ </button>
	1386	+ #else
	1387	+ <span class="btn-like disabled">
	1388	+ <svg class="ico ico-fixed-14" viewBox="0 0 24 24"><path d="M20.84 4.61a5.5 5.5 0 00-7.78 0L12 5.67l-1.06-1.06a5.5 5.5 0 00-7.78 7.78l1.06 1.06L12 21.23l7.78-7.78 1.06-1.06a5.5 5.5 0 000-7.78z"/></svg>
	1389	+ <span class="like-count">$postLikeCount</span>
	1390	+ </span>
	1391	+ #end
	1392	+ </div>
	1393	+ ## 固定/編集/削除/通報/非表示ボタン（横並び）
	1394	+ #set($postAuthorRef = $!post.getValue('authorRef'))
	1395	+ #set($postObjNumED = $post.number)
	1396	+ #set($showPinBtn = ($viewerAccountType == 'admin' || $viewerAccountType == 'verified'))
	1397	+ #set($showEditDeleteBtn = ($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin'))
	1398	+ #set($showHideBtn = ($viewerAccountType == 'admin'))
	1399	+ #if($showPinBtn || $showEditDeleteBtn || $showHideBtn)
	1400	+ <div class="post-edit-actions post-action-mt">
	1401	+ #if($showPinBtn)
	1402	+ #set($postObjNum = $post.number)
885	885	#if($isPinned == '1')
886	886	<a href="$doc.getURL('view', "action=unpin&postObj=${postObjNum}&form_token=${services.csrf.getToken()}")" class="btn-pin-toggle btn-unpin" title="固定を解除">
887	887	<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> 固定を解除
...	...	@@ -891,15 +891,12 @@
891	891	<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> 固定する
892	892	</a>
893	893	#end
894		- </div>
895		- #end
896		- ## 編集・削除ボタン（投稿者本人 or 管理者）
897		- #set($postAuthorRef = $!post.getValue('authorRef'))
898		- #set($postObjNumED = $post.number)
899		- #if($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin')
900		- <div class="post-edit-actions post-action-mt">
	1412	+ #end
	1413	+ #if($showEditDeleteBtn)
901	901	#if($xcontext.user == $postAuthorRef)
902		- <button type="button" class="btn-post-edit" onclick="openEditPost(this, '${doc.fullName}', $postObjNumED, '$!escapetool.javascript($!postContent)')" title="この投稿を編集">
	1415	+ #set($editImages = $!post.getValue('images'))
	1416	+ #set($editFiles = $!post.getValue('files'))
	1417	+ <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="この投稿を編集">
903	903	<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> 編集
904	904	</button>
905	905	#end
...	...	@@ -906,6 +906,12 @@
906	906	<button type="button" class="btn-post-delete" onclick="confirmDeletePost('${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を削除">
907	907	<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> 削除
908	908	</button>
	1424	+ #end
	1425	+ #if($showHideBtn)
	1426	+ <button type="button" class="btn-post-hide" onclick="openHideDialog(this, '${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を非表示にする">
	1427	+ <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> 非表示
	1428	+ </button>
	1429	+ #end
909	909	</div>
910	910	#end
911	911	</div>
...	...	@@ -955,9 +955,11 @@
955	955
956	956	#if($xcontext.user != "XWiki.XWikiGuest")
957	957	<div class="thread-add-post">
	1479	+ #if($isSchoolMember || $isAlumniOfSchool || $isViewerAdmin)
958	958	<a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
959	959	＋ 活動報告を追加
960	960	</a>
	1483	+ #end
961	961	<a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
962	962	<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> コメントを書く
963	963	</a>
...	...	@@ -987,10 +987,68 @@
987	987	{{/html}}
988	988	#end
989	989
	1513	+## --- OGP / SNSシェア対応 ---
	1514	+#set($ogpTitle = "${schoolName} — 生徒会Wiki")
	1515	+#set($ogpDesc = "${schoolName}の生徒会活動情報。")
	1516	+#if($prefecture && $prefecture != '') #set($ogpDesc = "${ogpDesc}${prefecture}") #end
	1517	+#if($city && $city != '') #set($ogpDesc = "${ogpDesc}${city}。") #end
	1518	+#if($dailyActivities && $dailyActivities != '') #set($ogpDesc = "${ogpDesc} 主な活動: ${dailyActivities}") #end
	1519	+#set($ogpUrl = "https://${request.serverName}${doc.getURL()}")
	1520	+
990	990	## --- 年度タブ切り替え JavaScript ---
991	991	{{html clean="false"}}
992	992	<script>
	1524	+// OGPメタタグ挿入
	1525	+(function() {
	1526	+ var ogp = {
	1527	+ 'og:title': '$escapetool.javascript($ogpTitle)',
	1528	+ 'og:description': '$escapetool.javascript($ogpDesc)',
	1529	+ 'og:type': 'article',
	1530	+ 'og:url': '$escapetool.javascript($ogpUrl)',
	1531	+ 'og:site_name': '生徒会Wiki',
	1532	+ 'twitter:card': 'summary'
	1533	+ };
	1534	+ for (var p in ogp) {
	1535	+ var meta = document.createElement('meta');
	1536	+ meta.setAttribute('property', p);
	1537	+ meta.setAttribute('content', ogp[p]);
	1538	+ document.head.appendChild(meta);
	1539	+ }
	1540	+ // twitter用
	1541	+ var tw = document.createElement('meta');
	1542	+ tw.setAttribute('name', 'twitter:card');
	1543	+ tw.setAttribute('content', 'summary');
	1544	+ document.head.appendChild(tw);
	1545	+})();
993	993	// コンパクト表示（タイトルのみ）トグル
	1547	+// いいねトグル
	1548	+function toggleLike(btn) {
	1549	+ var page = btn.getAttribute('data-page');
	1550	+ var obj = btn.getAttribute('data-obj');
	1551	+ var csrf = btn.getAttribute('data-csrf');
	1552	+ btn.disabled = true;
	1553	+ var fd = new FormData();
	1554	+ fd.append('page', page);
	1555	+ fd.append('obj', obj);
	1556	+ fd.append('form_token', csrf);
	1557	+ fetch('/bin/SeitokaiCode/LikePost', { method: 'POST', body: fd })
	1558	+ .then(function(r) { return r.json(); })
	1559	+ .then(function(data) {
	1560	+ btn.querySelector('.like-count').textContent = data.count;
	1561	+ if (data.action === 'liked') {
	1562	+ btn.classList.add('liked');
	1563	+ btn.querySelector('svg').setAttribute('fill', 'currentColor');
	1564	+ btn.querySelector('svg').setAttribute('stroke', 'none');
	1565	+ } else {
	1566	+ btn.classList.remove('liked');
	1567	+ btn.querySelector('svg').removeAttribute('fill');
	1568	+ btn.querySelector('svg').setAttribute('stroke', 'currentColor');
	1569	+ }
	1570	+ })
	1571	+ .catch(function() { alert('エラーが発生しました'); })
	1572	+ .finally(function() { btn.disabled = false; });
	1573	+}
	1574	+
994	994	function toggleCompactView() {
995	995	var container = document.querySelector('.xwiki-content') || document.body;
996	996	var isCompact = container.classList.toggle('activity-compact-view');
...	...	@@ -1034,7 +1034,28 @@
1034	1034	}
1035	1035	// ページ読み込み時の初期化
1036	1036	document.addEventListener('DOMContentLoaded', function() {
1037		- // デフォルトで現在の年度を表示
	1618	+ // 年度タブを降順にソート（「全期間」タブは先頭に固定）
	1619	+ var tabContainer = document.querySelector('.activity-fy-tabs');
	1620	+ if (tabContainer) {
	1621	+ var tabs = Array.from(tabContainer.querySelectorAll('.activity-fy-tab'));
	1622	+ var allTab = null;
	1623	+ var fyTabs = [];
	1624	+ tabs.forEach(function(t) {
	1625	+ var onclickStr = t.getAttribute('onclick') || '';
	1626	+ if (onclickStr.indexOf("'all'") !== -1) { allTab = t; }
	1627	+ else { fyTabs.push(t); }
	1628	+ });
	1629	+ // 年度タブを数値の降順でソート
	1630	+ fyTabs.sort(function(a, b) {
	1631	+ var aYear = parseInt(a.textContent) || 0;
	1632	+ var bYear = parseInt(b.textContent) || 0;
	1633	+ return bYear - aYear;
	1634	+ });
	1635	+ // DOM再配置（全期間を先頭、年度タブを降順で続ける）
	1636	+ if (allTab) { tabContainer.appendChild(allTab); }
	1637	+ fyTabs.forEach(function(t) { tabContainer.appendChild(t); });
	1638	+ }
	1639	+ // デフォルトで全期間を表示
1038	1038	var defaultTab = document.querySelector('.activity-fy-tab.active');
1039	1039	if (defaultTab) { defaultTab.click(); }
1040	1040	// 保存成功時のトースト通知
...	...	@@ -1049,14 +1049,15 @@
1049	1049	document.querySelectorAll('.activity-thread-header').forEach(function(header) {
1050	1050	header.addEventListener('click', toggleThreadExpand);
1051	1051	});
1052		- // 長文投稿の折りたたみ初期化
	1654	+ // 長文投稿の折りたたみ初期化（max-height: 12em 超で省略）
1053	1053	document.querySelectorAll('.thread-post-body').forEach(function(body) {
1054		- // 先にtruncatedを仮適用してline-clampを有効にし、高さの差分で判定
	1656	+ // pre-wrapのまま高さを測定し、max-height(12em ≒ ~200px)を超える場合に折りたたむ
1055	1055	var fullH = body.scrollHeight;
	1658	+ // 12em を px に変換（font-size × line-height × 行数 の近似値ではなくCSSと同じ値を取得）
1056	1056	body.classList.add('truncated');
1057		- var clampedH = body.clientHeight;
	1660	+ var maxH = body.clientHeight; // max-height: 12em 適用後の高さ
1058	1058	body.classList.remove('truncated');
1059		- if (fullH > clampedH + 10) {
	1662	+ if (fullH > maxH + 30) {
1060	1060	body.classList.add('truncated');
1061	1061	var btn = document.createElement('button');
1062	1062	btn.className = 'btn-read-more';
...	...	@@ -1086,7 +1086,15 @@
1086	1086	};
1087	1087	var toast = document.createElement('div');
1088	1088	toast.className = 'toast toast-' + type;
1089		- toast.innerHTML = (icons[type] || '') + '<span>' + message + '</span>';
	1692	+ var iconSvg = icons[type] || '';
	1693	+ if (iconSvg) {
	1694	+ var iconSpan = document.createElement('span');
	1695	+ iconSpan.innerHTML = iconSvg;
	1696	+ toast.appendChild(iconSpan);
	1697	+ }
	1698	+ var msgSpan = document.createElement('span');
	1699	+ msgSpan.textContent = message;
	1700	+ toast.appendChild(msgSpan);
1090	1090	container.appendChild(toast);
1091	1091	setTimeout(function() { toast.remove(); }, 3200);
1092	1092	}
...	...	@@ -1102,37 +1102,131 @@
1102	1102	}
1103	1103
1104	1104	// 投稿の編集（インライン編集フォームを開く）
1105		-function openEditPost(btn, schoolPage, postObjNum, currentContent) {
	1716	+function openEditPost(btn) {
1106	1106	var postEl = btn.closest('.thread-post');
1107	1107	if (!postEl) return;
1108		- // 既存の編集フォームがあれば閉じる
1109	1109	var existing = postEl.querySelector('.post-edit-form');
1110	1110	if (existing) { existing.remove(); return; }
1111	1111	var bodyEl = postEl.querySelector('.thread-post-body');
1112	1112	if (!bodyEl) return;
	1723	+
	1724	+ var schoolPage = btn.getAttribute('data-school');
	1725	+ var postObjNum = btn.getAttribute('data-obj');
	1726	+ var currentContent = btn.getAttribute('data-content') || '';
	1727	+ var currentImages = btn.getAttribute('data-images') || '';
	1728	+ var currentFiles = btn.getAttribute('data-files') || '';
	1729	+ var postType = btn.getAttribute('data-post-type') || 'report';
	1730	+
1113	1113	var form = document.createElement('div');
1114	1114	form.className = 'post-edit-form';
1115		- form.innerHTML = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>' +
1116		- '<div class="post-edit-form-actions">' +
	1733	+ form.setAttribute('data-school', schoolPage);
	1734	+ form.setAttribute('data-obj', postObjNum);
	1735	+
	1736	+ var html = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>';
	1737	+
	1738	+ // コメント以外は添付ファイル編集を表示
	1739	+ function escAttr(s) { return s.replace(/&/g,'&amp;').replace(/"/g,'&quot;').replace(/'/g,'&#39;').replace(/</g,'&lt;').replace(/>/g,'&gt;'); }
	1740	+ if (postType !== 'comment') {
	1741	+ // 既存画像
	1742	+ html += '<div class="edit-attachments">';
	1743	+ if (currentImages.trim()) {
	1744	+ html += '<div class="edit-attach-section"><span class="edit-attach-label">画像</span>';
	1745	+ var imgs = currentImages.trim().split('\n');
	1746	+ for (var i = 0; i < imgs.length; i++) {
	1747	+ var img = imgs[i].trim();
	1748	+ if (!img) continue;
	1749	+ html += '<div class="edit-attach-item" data-name="' + escAttr(img) + '">' +
	1750	+ '<img src="/xwiki/bin/download/' + schoolPage.replace(/\./g,'/') + '/' + encodeURIComponent(img) + '" class="edit-attach-thumb" />' +
	1751	+ '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
	1752	+ '<input type="hidden" name="keepImages" value="' + escAttr(img) + '" />' +
	1753	+ '</div>';
	1754	+ }
	1755	+ html += '</div>';
	1756	+ }
	1757	+ // 既存ファイル
	1758	+ if (currentFiles.trim()) {
	1759	+ html += '<div class="edit-attach-section"><span class="edit-attach-label">ファイル</span>';
	1760	+ var files = currentFiles.trim().split('\n');
	1761	+ for (var j = 0; j < files.length; j++) {
	1762	+ var f = files[j].trim();
	1763	+ if (!f) continue;
	1764	+ var displayName = f;
	1765	+ if (/^file_\d{14}_\d+_/.test(f)) displayName = f.replace(/^file_\d{14}_\d+_/, '');
	1766	+ html += '<div class="edit-attach-item" data-name="' + escAttr(f) + '">' +
	1767	+ '<span class="edit-attach-fname">' + escAttr(displayName) + '</span>' +
	1768	+ '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
	1769	+ '<input type="hidden" name="keepFiles" value="' + escAttr(f) + '" />' +
	1770	+ '</div>';
	1771	+ }
	1772	+ html += '</div>';
	1773	+ }
	1774	+ // 新規追加
	1775	+ html += '<div class="edit-attach-add">' +
	1776	+ '<label class="form-label-sm">画像を追加（最大4枚まで）</label>' +
	1777	+ '<input type="file" name="editNewImages" accept="image/*" multiple class="form-file-input-sm" />' +
	1778	+ '<div class="form-hint">JPEG / PNG / GIF / WebP、各5MBまで</div>' +
	1779	+ '<label class="form-label-sm" style="margin-top:8px;">ファイルを追加（最大2つまで）</label>' +
	1780	+ '<input type="file" name="editNewFiles" accept=".pdf,.docx,.xlsx,.pptx" multiple class="form-file-input-sm" />' +
	1781	+ '<div class="form-hint">PDF / Word / Excel / PowerPoint、各10MBまで</div>' +
	1782	+ '</div>';
	1783	+ html += '</div>';
	1784	+ }
	1785	+
	1786	+ html += '<div class="post-edit-form-actions">' +
1117	1117	'<button type="button" class="btn-cancel-edit" onclick="this.closest(\'.post-edit-form\').remove()">キャンセル</button>' +
1118		- '<button type="button" class="btn-save" onclick="saveEditPost(\'' + schoolPage + '\', ' + postObjNum + ')">保存</button>' +
	1788	+ '<button type="button" class="btn-save" onclick="saveEditPost(this)">保存</button>' +
1119	1119	'</div>';
	1790	+
	1791	+ form.innerHTML = html;
1120	1120	bodyEl.parentNode.insertBefore(form, bodyEl.nextSibling);
1121	1121	form.querySelector('textarea').focus();
1122	1122	}
1123	1123
	1796	+function removeEditAttach(btn) {
	1797	+ var item = btn.closest('.edit-attach-item');
	1798	+ if (item) item.remove();
	1799	+}
	1800	+
1124	1124	// 投稿の編集を保存
1125		-function saveEditPost(schoolPage, postObjNum) {
1126		- var textarea = document.getElementById('editContent_' + postObjNum);
	1802	+function saveEditPost(btn) {
	1803	+ var formEl = btn.closest('.post-edit-form');
	1804	+ if (!formEl) return;
	1805	+ var schoolPage = formEl.getAttribute('data-school');
	1806	+ var postObjNum = formEl.getAttribute('data-obj');
	1807	+ var textarea = formEl.querySelector('textarea');
1127	1127	if (!textarea) return;
1128	1128	var newContent = textarea.value.trim();
1129	1129	if (!newContent) { alert('投稿内容を入力してください'); return; }
	1811	+
1130	1130	var csrfEl = document.querySelector('input[name="form_token"]');
1131	1131	var csrfToken = csrfEl ? csrfEl.value : '';
	1814	+
	1815	+ var fd = new FormData();
	1816	+ fd.append('schoolPage', schoolPage);
	1817	+ fd.append('postObj', postObjNum);
	1818	+ fd.append('newContent', newContent);
	1819	+ fd.append('form_token', csrfToken);
	1820	+
	1821	+ // 残す画像・ファイル
	1822	+ formEl.querySelectorAll('input[name="keepImages"]').forEach(function(el) { fd.append('keepImages', el.value); });
	1823	+ formEl.querySelectorAll('input[name="keepFiles"]').forEach(function(el) { fd.append('keepFiles', el.value); });
	1824	+
	1825	+ // 新規画像
	1826	+ var newImgInput = formEl.querySelector('input[name="editNewImages"]');
	1827	+ if (newImgInput && newImgInput.files) {
	1828	+ for (var i = 0; i < newImgInput.files.length; i++) { fd.append('editNewImages', newImgInput.files[i]); }
	1829	+ }
	1830	+ // 新規ファイル
	1831	+ var newFileInput = formEl.querySelector('input[name="editNewFiles"]');
	1832	+ if (newFileInput && newFileInput.files) {
	1833	+ for (var j = 0; j < newFileInput.files.length; j++) { fd.append('editNewFiles', newFileInput.files[j]); }
	1834	+ }
	1835	+
	1836	+ btn.disabled = true;
	1837	+ btn.textContent = '保存中...';
	1838	+
1132	1132	var xhr = new XMLHttpRequest();
1133	1133	xhr.open('POST', '/bin/get/SeitokaiCode/EditPost?outputSyntax=plain', true);
1134		- xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1135		- var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken);
1136	1136	xhr.onload = function() {
1137	1137	try {
1138	1138	var res = JSON.parse(xhr.responseText);
...	...	@@ -1140,12 +1140,13 @@
1140	1140	showToast('投稿を更新しました', 'success');
1141	1141	setTimeout(function() { location.reload(); }, 800);
1142	1142	} else {
	1848	+ btn.disabled = false; btn.textContent = '保存';
1143	1143	alert('編集に失敗しました: ' + (res.error || ''));
1144	1144	}
1145		- } catch(e) { alert('編集に失敗しました'); }
	1851	+ } catch(e) { btn.disabled = false; btn.textContent = '保存'; alert('編集に失敗しました'); }
1146	1146	};
1147		- xhr.onerror = function() { alert('通信エラーが発生しました'); };
1148		- xhr.send(editPostData);
	1853	+ xhr.onerror = function() { btn.disabled = false; btn.textContent = '保存'; alert('通信エラーが発生しました'); };
	1854	+ xhr.send(fd);
1149	1149	}
1150	1150
1151	1151	// 投稿の削除（確認ダイアログ付き）
...	...	@@ -1169,6 +1169,80 @@
1169	1169	xhr.onerror = function() { alert('通信エラーが発生しました'); };
1170	1170	xhr.send(deletePostData);
1171	1171	}
	1878	+
	1879	+/* --- 通報ダイアログ --- */
	1880	+function openReportDialog(btn, targetPage, postObjNum, token) {
	1881	+ if (document.getElementById('report-dialog-overlay')) return;
	1882	+ var reasons = ['宣伝・スパム','不適切な内容','個人情報の露出','誹謗中傷','誤情報','その他'];
	1883	+ var overlay = document.createElement('div');
	1884	+ overlay.id = 'report-dialog-overlay';
	1885	+ 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;';
	1886	+ var dialog = document.createElement('div');
	1887	+ dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;max-height:80vh;overflow-y:auto;';
	1888	+ var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を通報</h3>';
	1889	+ html += '<p style="margin:0 0 12px;font-size:0.9em;color:#4b5563;">通報された投稿は管理者が確認するまで一時的に非表示になります。</p>';
	1890	+ html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">通報理由</label>';
	1891	+ html += '<select id="report-reason" style="width:100%;padding:8px;border:1px solid #d1d5db;border-radius:8px;margin-bottom:12px;font-size:0.9em;">';
	1892	+ for (var i=0; i<reasons.length; i++) html += '<option value="'+reasons[i]+'">'+reasons[i]+'</option>';
	1893	+ html += '</select>';
	1894	+ html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">補足コメント（任意）</label>';
	1895	+ 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>';
	1896	+ html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
	1897	+ html += '<button type="button" id="report-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
	1898	+ 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>';
	1899	+ html += '</div>';
	1900	+ dialog.innerHTML = html;
	1901	+ overlay.appendChild(dialog);
	1902	+ document.body.appendChild(overlay);
	1903	+ overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
	1904	+ document.getElementById('report-cancel-btn').addEventListener('click', function() { overlay.remove(); });
	1905	+ document.getElementById('report-submit-btn').addEventListener('click', function() {
	1906	+ var reason = document.getElementById('report-reason').value;
	1907	+ var detail = document.getElementById('report-detail').value;
	1908	+ var submitBtn = document.getElementById('report-submit-btn');
	1909	+ submitBtn.disabled = true; submitBtn.textContent = '送信中...';
	1910	+ var xhr = new XMLHttpRequest();
	1911	+ xhr.open('POST', '/bin/get/SeitokaiCode/ReportAction?outputSyntax=plain', true);
	1912	+ xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
	1913	+ var data = 'targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&detail=' + encodeURIComponent(detail) + '&form_token=' + encodeURIComponent(token);
	1914	+ xhr.onload = function() {
	1915	+ overlay.remove();
	1916	+ showToast('通報を受け付けました', 'success');
	1917	+ setTimeout(function() { location.reload(); }, 1000);
	1918	+ };
	1919	+ xhr.onerror = function() { overlay.remove(); alert('通信エラーが発生しました'); };
	1920	+ xhr.send(data);
	1921	+ });
	1922	+}
	1923	+
	1924	+/* --- 非表示ダイアログ（管理者用） --- */
	1925	+function openHideDialog(btn, targetPage, postObjNum, token) {
	1926	+ if (document.getElementById('hide-dialog-overlay')) return;
	1927	+ var overlay = document.createElement('div');
	1928	+ overlay.id = 'hide-dialog-overlay';
	1929	+ 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;';
	1930	+ var dialog = document.createElement('div');
	1931	+ dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;';
	1932	+ var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を非表示にする</h3>';
	1933	+ html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">非表示の理由</label>';
	1934	+ 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="理由を入力" />';
	1935	+ html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
	1936	+ html += '<button type="button" id="hide-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
	1937	+ 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>';
	1938	+ 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>';
	1939	+ html += '</div>';
	1940	+ dialog.innerHTML = html;
	1941	+ overlay.appendChild(dialog);
	1942	+ document.body.appendChild(overlay);
	1943	+ overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
	1944	+ document.getElementById('hide-cancel-btn').addEventListener('click', function() { overlay.remove(); });
	1945	+ function doHide(action) {
	1946	+ var reason = document.getElementById('hide-reason').value || '管理者判断';
	1947	+ window.location.href = '/bin/view/SeitokaiCode/ModerationAction?action=' + action + '&targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&form_token=' + encodeURIComponent(token);
	1948	+ }
	1949	+ document.getElementById('hide-submit-btn').addEventListener('click', function() { doHide('hide'); });
	1950	+ document.getElementById('hide-warn-btn').addEventListener('click', function() { doHide('hide-warn'); });
	1951	+}
1172	1172	</script>
1173	1173	{{/html}}
1174	1174	{{/velocity}}