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

Summary

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

Details

Page properties

Content

...	...	@@ -7,6 +7,19 @@
7	7	#stop
8	8	#end
9	9	{{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)" />
10	10	## メンテナンスバナー（{{include}}ではなくインラインで記述し、<p>タグ挿入を回避）
11	11	#set($bannerDoc = $xwiki.getDocument('SeitokaiAdmin.MaintenanceBanner'))
12	12	#set($bannerObj = $bannerDoc.getObject('SeitokaiCode.MaintenanceBannerClass'))
...	...	@@ -34,8 +34,10 @@
34	34	#set($schoolLevel = $doc.getValue('schoolLevel'))
35	35	#set($schoolSystem = $doc.getValue('schoolSystem'))
36	36	#set($website = $doc.getValue('website'))
	50	+#set($schoolPhoto = $doc.getValue('schoolPhoto'))
	51	+#set($schoolDescription = $doc.getValue('schoolDescription'))
37	37
38		-## --- 組織図 ---
	53	+## --- 生徒会組織 ---
39	39	#set($orgChart = $doc.getValue('orgChart'))
40	40	#set($orgChartImage = $doc.getValue('orgChartImage'))
41	41
...	...	@@ -55,7 +55,7 @@
55	55	#set($budgetAllocation = $doc.getValue('budgetAllocation'))
56	56	#set($budgetNote = $doc.getValue('budgetNote'))
57	57
58		-## --- 校則の見直し ---
	73	+## --- 校則・生徒会会則の見直し ---
59	59	#set($ruleReviewStatus = $doc.getValue('ruleReviewStatus'))
60	60	#set($ruleReviewContent = $doc.getValue('ruleReviewContent'))
61	61	#set($ruleReviewProposer = $doc.getValue('ruleReviewProposer'))
...	...	@@ -62,6 +62,44 @@
62	62	#set($ruleReviewImplementer = $doc.getValue('ruleReviewImplementer'))
63	63	#set($ruleReviewSystem = $doc.getValue('ruleReviewSystem'))
64	64
	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	+
65	65	## --- 課題・連絡先 ---
66	66	#set($challenges = $doc.getValue('challenges'))
67	67	#set($contactInfo = $doc.getValue('contactInfo'))
...	...	@@ -86,6 +86,14 @@
86	86	#set($visibilityBudget = $!doc.getValue('visibilityBudget'))
87	87	#set($visibilityRuleReview = $!doc.getValue('visibilityRuleReview'))
88	88	#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'))
89	89	## デフォルト値（未設定なら全体公開）
90	90	#if(!$visibilityOrgChart || $visibilityOrgChart == '') #set($visibilityOrgChart = 'public') #end
91	91	#if(!$visibilityBudget || $visibilityBudget == '') #set($visibilityBudget = 'public') #end
...	...	@@ -97,13 +97,34 @@
97	97	#set($isGuest = $viewerUser == 'XWiki.XWikiGuest')
98	98	#set($isViewerAdmin = false)
99	99	#set($viewerSchoolCode = '')
	161	+#set($viewerSecondaryGraduated = false)
100	100	#if(!$isGuest)
101	101	#set($viewerDoc = $xwiki.getDocument($viewerUser))
102	102	#set($viewerAccountType = $!viewerDoc.getValue('accountType'))
103	103	#set($viewerSchoolCode = $!viewerDoc.getValue('schoolCode'))
	166	+ #set($viewerSecondarySchoolCode = $!viewerDoc.getValue('secondarySchoolCode'))
	167	+ #set($viewerUserRole = $!viewerDoc.getValue('userRole'))
104	104	#if($viewerAccountType == 'admin')
105	105	#set($isViewerAdmin = true)
106	106	#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
107	107	#end
108	108
109	109	## --- 関連校（中高一貫校）情報 ---
...	...	@@ -110,10 +110,31 @@
110	110	#set($affiliatedSchoolCode = $!doc.getValue('affiliatedSchoolCode'))
111	111	#set($affiliatedSchoolName = $!doc.getValue('affiliatedSchoolName'))
112	112	#set($isAffiliated = false)
113		-#if($affiliatedSchoolCode && $affiliatedSchoolCode != '' && $viewerSchoolCode == $affiliatedSchoolCode)
114		- #set($isAffiliated = true)
	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
115	115	#end
116	116
	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	+
117	117	## --- 学校ページ非表示チェック ---
118	118	#set($schoolHidden = $doc.getValue('hidden'))
119	119	#if($schoolHidden == 1)
...	...	@@ -147,7 +147,7 @@
147	147
148	148	## --- 投稿固定/解除処理 ---
149	149	#set($pinAction = $!request.action)
150		-#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && ($viewerSchoolCode == $schoolCode || $isAffiliated))) && $services.csrf.isTokenValid($request.form_token))
	253	+#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $isSchoolMember)) && $services.csrf.isTokenValid($request.form_token))
151	151	#set($pinPostObjStr = $!request.postObj)
152	152	#if(!$pinPostObjStr.matches('^\d+$'))
153	153	## 不正な値 → 無視
...	...	@@ -177,7 +177,7 @@
177	177
178	178	## --- 特色ある活動 選定/解除処理 ---
179	179	#set($featAction = $!request.action)
180		-#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))
181	181	#set($featActObjStr = $!request.actObj)
182	182	#if($featActObjStr.matches('^\d+$'))
183	183	#set($actObjNum = $mathtool.toInteger($featActObjStr))
...	...	@@ -279,7 +279,7 @@
279	279
280	280	## --- 編集ボタン（権限があるユーザーのみ表示） ---
281	281	#set($canEditSchool = false)
282		-#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode || $isAffiliated))
	385	+#if(!$isGuest && ($isViewerAdmin || $isSchoolMember || $isAlumniOfSchool))
283	283	#set($canEditSchool = true)
284	284	#end
285	285	#if($canEditSchool)
...	...	@@ -306,65 +306,293 @@
306	306	</div>
307	307	#end
308	308
	412	+## --- 入力進捗ガイド（自校ユーザー向け） ---
	413	+#if(!$isGuest && $canEdit)
	414	+ #set($stepItems = [])
	415	+ #set($completedCount = 0)
	416	+ #set($totalSteps = 8)
	417	+ ## 1. 基本情報（生徒数）
	418	+ #if($studentCount && $studentCount != '' && $studentCount != '0')
	419	+ #set($discard = $stepItems.add({'name': '基本情報（生徒数・学級数）', 'done': true}))
	420	+ #set($completedCount = $completedCount + 1)
	421	+ #else
	422	+ #set($discard = $stepItems.add({'name': '基本情報（生徒数・学級数）', 'done': false}))
	423	+ #end
	424	+ ## 2. 生徒会組織
	425	+ #if($orgChart && $orgChart != '')
	426	+ #set($discard = $stepItems.add({'name': '生徒会組織', 'done': true}))
	427	+ #set($completedCount = $completedCount + 1)
	428	+ #else
	429	+ #set($discard = $stepItems.add({'name': '生徒会組織', 'done': false}))
	430	+ #end
	431	+ ## 3. 日常の活動
	432	+ #if($dailyActivities && $dailyActivities != '')
	433	+ #set($discard = $stepItems.add({'name': '日常の活動', 'done': true}))
	434	+ #set($completedCount = $completedCount + 1)
	435	+ #else
	436	+ #set($discard = $stepItems.add({'name': '日常の活動', 'done': false}))
	437	+ #end
	438	+ ## 4. 生徒総会
	439	+ #if($assemblyFormat && $assemblyFormat != '')
	440	+ #set($discard = $stepItems.add({'name': '生徒総会', 'done': true}))
	441	+ #set($completedCount = $completedCount + 1)
	442	+ #else
	443	+ #set($discard = $stepItems.add({'name': '生徒総会', 'done': false}))
	444	+ #end
	445	+ ## 5. 選挙
	446	+ #if($electionExists && $electionExists != '')
	447	+ #set($discard = $stepItems.add({'name': '選挙', 'done': true}))
	448	+ #set($completedCount = $completedCount + 1)
	449	+ #else
	450	+ #set($discard = $stepItems.add({'name': '選挙', 'done': false}))
	451	+ #end
	452	+ ## 6. 校則の見直し
	453	+ #if($ruleReviewStatus && $ruleReviewStatus != '')
	454	+ #set($discard = $stepItems.add({'name': '校則・生徒会会則の見直し', 'done': true}))
	455	+ #set($completedCount = $completedCount + 1)
	456	+ #else
	457	+ #set($discard = $stepItems.add({'name': '校則・生徒会会則の見直し', 'done': false}))
	458	+ #end
	459	+ ## 7. 予算
	460	+ #set($budgetFilled = false)
	461	+ #if(($budgetScale && $budgetScale != '') || ($studentFee && $studentFee != '')) #set($budgetFilled = true) #end
	462	+ #if($budgetFilled)
	463	+ #set($discard = $stepItems.add({'name': '予算', 'done': true}))
	464	+ #set($completedCount = $completedCount + 1)
	465	+ #else
	466	+ #set($discard = $stepItems.add({'name': '予算', 'done': false}))
	467	+ #end
	468	+ ## 8. 活動報告
	469	+ #set($activityCount = $doc.getObjects('SeitokaiCode.ActivityClass').size())
	470	+ #if($activityCount > 0)
	471	+ #set($discard = $stepItems.add({'name': '活動報告', 'done': true}))
	472	+ #set($completedCount = $completedCount + 1)
	473	+ #else
	474	+ #set($discard = $stepItems.add({'name': '活動報告（まだ投稿がありません）', 'done': false}))
	475	+ #end
	476	+ ## 全完了なら非表示
	477	+ #if($completedCount < $totalSteps)
	478	+ #set($progressPct = $mathtool.mul($mathtool.div($completedCount, $totalSteps), 100))
	479	+ #set($progressPctInt = $mathtool.toInteger($progressPct))
	480	+ #set($firstMissing = false)
	481	+<div class="progress-guide" style="margin-bottom:var(--sp-4);">
	482	+ <div class="progress-guide-header">
	483	+ <span class="progress-guide-title"><svg class="ico" viewBox="0 0 24 24" style="width:1.1em;height:1.1em;vertical-align:-2px;"><circle cx="12" cy="12" r="10"/><polyline points="12 6 12 12 16 14"/></svg> 学校情報の入力状況</span>
	484	+ <span class="progress-guide-count">${completedCount} / ${totalSteps} 完了</span>
	485	+ </div>
	486	+ <div class="progress-bar-track">
	487	+ <div class="progress-bar-fill" style="width:${progressPctInt}%"></div>
	488	+ </div>
	489	+ <ul class="progress-step-list">
	490	+ #foreach($step in $stepItems)
	491	+ #if($step.done)
	492	+ <li class="progress-step done"><svg class="ico" viewBox="0 0 24 24" style="width:0.9em;height:0.9em;"><path d="M20 6L9 17l-5-5"/></svg> $step.name</li>
	493	+ #else
	494	+ #if(!$firstMissing)
	495	+ <li class="progress-step next"><svg class="ico" viewBox="0 0 24 24" style="width:0.9em;height:0.9em;"><circle cx="12" cy="12" r="10"/></svg> $step.name <span class="progress-next-label">← 次はここ！</span></li>
	496	+ #set($firstMissing = true)
	497	+ #else
	498	+ <li class="progress-step pending"><svg class="ico" viewBox="0 0 24 24" style="width:0.9em;height:0.9em;"><rect x="3" y="3" width="18" height="18" rx="2"/></svg> $step.name</li>
	499	+ #end
	500	+ #end
	501	+ #end
	502	+ </ul>
	503	+ <div style="margin-top:var(--sp-3);">
	504	+ <a href="$doc.getURL('view', 'sheet=SeitokaiCode.SchoolEditForm')" class="btn-primary-sm">
	505	+ <svg class="ico" viewBox="0 0 24 24" style="width:0.9em;height:0.9em;"><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> 編集画面を開く
	506	+ </a>
	507	+ </div>
	508	+</div>
	509	+ #end
	510	+#end
	511	+
309	309	## --- ① 学校基本情報 ---
310	310	<div class="school-info-card collapsed" id="card-basic-info">
311	311	<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>
312		- <table class="wiki-table school-info-table">
313		- <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
314		- <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
315		- <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
316		- <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
317		- <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
318		- <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
319		- <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
320		- <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
321		- <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>
322		- </table>
323		- #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
324		- #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
325		- #if($infoEditDate && $infoEditDate != '')
326		- <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>
	515	+ <div class="school-basic-info-layout">
	516	+ <div class="school-basic-info-table">
	517	+ <table class="wiki-table school-info-table">
	518	+ <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
	519	+ <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
	520	+ <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
	521	+ <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
	522	+ <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
	523	+ <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
	524	+ <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
	525	+ <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
	526	+ <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>
	527	+ </table>
	528	+ </div>
	529	+ #if($schoolPhoto && $schoolPhoto != '')
	530	+ <div class="school-photo-area">
	531	+ <img src="$doc.getAttachmentURL($schoolPhoto)" alt="$!escapetool.xml($schoolName)" class="school-photo" />
	532	+ </div>
	533	+ #end
	534	+ </div>
	535	+ #if($schoolDescription && $schoolDescription.trim() != '')
	536	+ <div class="free-note" style="margin-top:var(--sp-4);">$!escapetool.xml($schoolDescription)</div>
327	327	#end
	538	+
328	328	</div>
329	329
330		-## --- ② 生徒会基本情報（折りたたみカード） ---
	541	+## --- ② 生徒会情報（折りたたみカード） ---
331	331	<div class="school-info-card" id="card-seitokai-info">
332		- <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>
	543	+ <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>
333	333	<div class="seitokai-info-body">
334	334
335		- ## --- 組織図 ---
	546	+ ## --- 生徒会組織 ---
336	336	#set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
337	337	#if($hasOrgContent)
338	338	#set($canViewOrgChart = true)
339		- #if($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewOrgChart = false)
340		- #elseif($visibilityOrgChart == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewOrgChart = false)
	550	+ #if($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewOrgChart = false)
	551	+ #elseif($visibilityOrgChart == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewOrgChart = false)
341	341	#end
342	342	#if($canViewOrgChart)
343	343	<div class="seitokai-subsection">
344		- <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>
	555	+ <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>
345	345	<div class="seitokai-subsection-content">
346	346	#if($orgChartImage && $orgChartImage != '')
347	347	<div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
348	348	#end
349		- #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end
	560	+ #if($orgChart && $orgChart != '')<div class="free-note">$!escapetool.xml($orgChart)</div>#end
350	350	</div>
351	351	</div>
352	352	#else
353		- <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>
	564	+ <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>
354	354	#end
355	355	#end
356	356
	568	+ ## --- 活動環境 ---
	569	+ #set($hasActivityEnv = ($activityPlace && !$activityPlace.isEmpty()) || ($activityRoomEquipment && $activityRoomEquipment != '') || ($activityRoomImage && $activityRoomImage != '') || ($ictTools && !$ictTools.isEmpty()) || ($ictUsage && !$ictUsage.isEmpty()))
	570	+ #if($hasActivityEnv)
	571	+ #set($canViewAE = true)
	572	+ #if($visibilityActivityEnv == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAE = false)
	573	+ #elseif($visibilityActivityEnv == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAE = false)
	574	+ #end
	575	+ #if($canViewAE)
	576	+ <div class="seitokai-subsection">
	577	+ <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>
	578	+ <div class="seitokai-subsection-content">
	579	+ #if($activityPlace && !$activityPlace.isEmpty())
	580	+ <div class="info-row">
	581	+ <span class="info-label">普段の活動場所</span>
	582	+ <span class="info-value">
	583	+ <div class="selection-display">
	584	+ #foreach($ap in $activityPlace)
	585	+ <span class="selection-item">$!escapetool.xml($ap.trim())</span>
	586	+ #end
	587	+ </div>
	588	+ </span>
	589	+ </div>
	590	+ #end
	591	+ #if($activityRoomEquipment && $activityRoomEquipment != '')
	592	+ <div class="info-row">
	593	+ <span class="info-label">生徒会室の設備</span>
	594	+ <span class="info-value free-text-value">$!escapetool.xml($activityRoomEquipment)</span>
	595	+ </div>
	596	+ #end
	597	+ #if($activityRoomImage && $activityRoomImage != '')
	598	+ <div class="info-row">
	599	+ <span class="info-label">活動場所の写真</span>
	600	+ <span class="info-value"><div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($activityRoomImage)" alt="活動場所の写真" class="org-chart-img" /></div></span>
	601	+ </div>
	602	+ #end
	603	+ #if($ictTools && !$ictTools.isEmpty())
	604	+ <div class="info-row">
	605	+ <span class="info-label">利用しているICTツール</span>
	606	+ <span class="info-value">
	607	+ #set($ictCatDisplay = [
	608	+ ["連絡ツール", ["メール","LINE","LINE WORKS","Discord","Slack","Microsoft Teams","Google Chat","InstagramのDM","XのDM","その他（連絡）"]],
	609	+ ["ドキュメント作成・共有", ["Googleドキュメント","Googleスプレッドシート","Googleスライド","Googleドライブ","Word","Excel","PowerPoint","OneDrive","SharePoint","Notion","Pages","Numbers","Keynote","Dropbox","Box","その他（ドキュメント）"]],
	610	+ ["タスク管理", ["Googleカレンダー","Google ToDoリスト","Trello","Asana","Excel等スプレッドシート","その他（タスク管理）"]],
	611	+ ["ビデオ会議ツール", ["Zoom","Google Meet","その他（ビデオ会議）"]],
	612	+ ["アンケート", ["Googleフォーム","Microsoft Forms","その他（アンケート）"]],
	613	+ ["デザイン・クリエイティブ", ["Canva","各種Adobe","CapCut","LumaFusion","AviUtl","ibisPaint","その他（デザイン）"]],
	614	+ ["その他", ["独自のWebシステム・自作アプリ"]]
	615	+ ])
	616	+ #foreach($catD in $ictCatDisplay)
	617	+ #set($catHasItems = false)
	618	+ #foreach($t in $catD.get(1))
	619	+ #if($ictTools.contains($t)) #set($catHasItems = true) #end
	620	+ #end
	621	+ #if($catHasItems)
	622	+ <div style="margin-bottom:6px">
	623	+ <span style="font-size:0.8em;font-weight:600;color:var(--text-mid)">$catD.get(0):</span>
	624	+ <div class="selection-display" style="margin-top:2px">
	625	+ #foreach($t in $catD.get(1))
	626	+ #if($ictTools.contains($t))
	627	+ <span class="selection-item">$!escapetool.xml($t)</span>
	628	+ #end
	629	+ #end
	630	+ </div>
	631	+ </div>
	632	+ #end
	633	+ #end
	634	+ </span>
	635	+ </div>
	636	+ #end
	637	+ #if($ictUsage && !$ictUsage.isEmpty())
	638	+ <div class="info-row">
	639	+ <span class="info-label">ICT活用している場面</span>
	640	+ <span class="info-value">
	641	+ <div class="selection-display">
	642	+ #foreach($iu in $ictUsage)
	643	+ <span class="selection-item">$!escapetool.xml($iu.trim())</span>
	644	+ #end
	645	+ </div>
	646	+ </span>
	647	+ </div>
	648	+ #end
	649	+ </div>
	650	+ </div>
	651	+ #else
	652	+ <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>
	653	+ #end
	654	+ #end
	655	+
	656	+ ## --- 年間主要行事 ---
	657	+ #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]])
	658	+ #set($hasAnyEvent = false)
	659	+ #foreach($m in $months)
	660	+ #if($m.get(1) && $m.get(1) != '') #set($hasAnyEvent = true) #end
	661	+ #end
	662	+ #if($hasAnyEvent)
	663	+ #set($canViewAN = true)
	664	+ #if($visibilityAnnualEvents == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAN = false)
	665	+ #elseif($visibilityAnnualEvents == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAN = false)
	666	+ #end
	667	+ #if($canViewAN)
	668	+ <div class="seitokai-subsection">
	669	+ <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>
	670	+ <div class="seitokai-subsection-content">
	671	+ <table class="wiki-table school-info-table" style="margin:0">
	672	+ #foreach($m in $months)
	673	+ #if($m.get(1) && $m.get(1) != '')
	674	+ <tr><td style="width:60px;font-weight:600;white-space:nowrap">$m.get(0)</td><td>$!escapetool.xml($m.get(1))</td></tr>
	675	+ #end
	676	+ #end
	677	+ </table>
	678	+ </div>
	679	+ </div>
	680	+ #else
	681	+ <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>
	682	+ #end
	683	+ #end
	684	+
357	357	## --- 日常の活動 ---
358	358	#if($dailyActivities && !$dailyActivities.isEmpty())
	687	+ #set($canViewDA = true)
	688	+ #if($visibilityDailyActivities == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewDA = false)
	689	+ #elseif($visibilityDailyActivities == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewDA = false)
	690	+ #end
	691	+ #if($canViewDA)
359	359	<div class="seitokai-subsection">
360		- <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>
	693	+ <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>
361	361	<div class="seitokai-subsection-content">
362		- <p class="activity-hint">活動時間の多い順に上位3つ</p>
	695	+ <p class="activity-hint">活動時間が多い3つ</p>
363	363	<div class="tag-container">
364		- #set($daIdx = 1)
365	365	#foreach($da in $dailyActivities)
366		- <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
367		- #set($daIdx = $daIdx + 1)
	698	+ <span class="tag tag-accent">$!escapetool.xml($da.trim())</span>
368	368	#end
369	369	</div>
370	370	#if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
...	...	@@ -372,12 +372,104 @@
372	372	#end
373	373	</div>
374	374	</div>
	706	+ #else
	707	+ <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>
	708	+ #end
375	375	#end
376	376
	711	+ ## --- 定例活動 ---
	712	+ #if($meetingFrequency && $meetingFrequency != '')
	713	+ #set($canViewMT = true)
	714	+ #if($visibilityMeeting == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewMT = false)
	715	+ #elseif($visibilityMeeting == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewMT = false)
	716	+ #end
	717	+ #if($canViewMT)
	718	+ <div class="seitokai-subsection">
	719	+ <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>
	720	+ <div class="seitokai-subsection-content">
	721	+ <div class="info-row">
	722	+ <span class="info-label">役員定例会の頻度</span>
	723	+ <span class="info-value">$!escapetool.xml($!meetingFrequency)</span>
	724	+ </div>
	725	+ #if($regularActivitiesNote && $regularActivitiesNote.trim() != '')
	726	+ <div class="free-note">$!escapetool.xml($regularActivitiesNote)</div>
	727	+ #end
	728	+ </div>
	729	+ </div>
	730	+ #else
	731	+ <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>
	732	+ #end
	733	+ #end
	734	+
	735	+ ## --- 生徒総会 ---
	736	+ #set($hasAssembly = ($assemblyFormat && $assemblyFormat != '') || ($assemblyCount && $assemblyCount > 0) || ($assemblyAgenda && !$assemblyAgenda.isEmpty()) || ($assemblyTopics && !$assemblyTopics.isEmpty()) || ($assemblyNote && $assemblyNote != ''))
	737	+ #if($hasAssembly)
	738	+ #set($canViewAS = true)
	739	+ #if($visibilityAssembly == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAS = false)
	740	+ #elseif($visibilityAssembly == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAS = false)
	741	+ #end
	742	+ #if($canViewAS)
	743	+ <div class="seitokai-subsection">
	744	+ <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>
	745	+ <div class="seitokai-subsection-content">
	746	+ #if($assemblyFormat && $assemblyFormat != '')
	747	+ <div class="info-row">
	748	+ <span class="info-label">開催方式</span>
	749	+ <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($assemblyFormat)</span></span>
	750	+ </div>
	751	+ #end
	752	+ #if($assemblyCount && $assemblyCount > 0)
	753	+ <div class="info-row">
	754	+ <span class="info-label">開催回数（年）</span>
	755	+ <span class="info-value">$!escapetool.xml($assemblyCount)回</span>
	756	+ </div>
	757	+ #end
	758	+ #if($assemblyAgenda && !$assemblyAgenda.isEmpty())
	759	+ <div class="info-row">
	760	+ <span class="info-label">議案の集め方</span>
	761	+ <span class="info-value">
	762	+ <div class="selection-display">
	763	+ #foreach($aa in $assemblyAgenda)
	764	+ <span class="selection-item">$!escapetool.xml($aa.trim())</span>
	765	+ #end
	766	+ </div>
	767	+ </span>
	768	+ </div>
	769	+ #end
	770	+ #if($assemblyTopics && !$assemblyTopics.isEmpty())
	771	+ <div class="info-row">
	772	+ <span class="info-label">扱う内容</span>
	773	+ <span class="info-value">
	774	+ <div class="selection-display">
	775	+ #foreach($at in $assemblyTopics)
	776	+ <span class="selection-item">$!escapetool.xml($at.trim())</span>
	777	+ #end
	778	+ </div>
	779	+ </span>
	780	+ </div>
	781	+ #end
	782	+ #if($assemblyNote && $assemblyNote != '')
	783	+ <div class="info-row">
	784	+ <span class="info-label">自由記述</span>
	785	+ <span class="info-value free-text-value">$!escapetool.xml($assemblyNote)</span>
	786	+ </div>
	787	+ #end
	788	+ </div>
	789	+ </div>
	790	+ #else
	791	+ <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>
	792	+ #end
	793	+ #end
	794	+
377	377	## --- 選挙 ---
378	378	#if($electionExists && $electionExists != '')
	797	+ #set($canViewEL = true)
	798	+ #if($visibilityElection == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewEL = false)
	799	+ #elseif($visibilityElection == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewEL = false)
	800	+ #end
	801	+ #if($canViewEL)
379	379	<div class="seitokai-subsection">
380		- <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>
	803	+ <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>
381	381	<div class="seitokai-subsection-content">
382	382	<div class="info-row">
383	383	<span class="info-label">役員選挙</span>
...	...	@@ -394,22 +394,74 @@
394	394	#end
395	395	</div>
396	396	</div>
	820	+ #else
	821	+ <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>
	822	+ #end
397	397	#end
398	398
399		- ## --- 定例活動 ---
400		- #if($meetingFrequency && $meetingFrequency != '')
	825	+ ## --- 校則・生徒会会則の見直し ---
	826	+ #if($ruleReviewStatus && $ruleReviewStatus != '')
	827	+ #set($canViewRuleReview = true)
	828	+ #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewRuleReview = false)
	829	+ #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false)
	830	+ #end
	831	+ #if($canViewRuleReview)
401	401	<div class="seitokai-subsection">
402		- <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>
	833	+ <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>
403	403	<div class="seitokai-subsection-content">
404	404	<div class="info-row">
405		- <span class="info-label">役員定例会の頻度</span>
406		- <span class="info-value">$!escapetool.xml($!meetingFrequency)</span>
	836	+ <span class="info-label">見直しの有無（3年以内）</span>
	837	+ <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
407	407	</div>
408		- #if($regularActivitiesNote && $regularActivitiesNote.trim() != '')
409		- <div class="free-note">$!escapetool.xml($regularActivitiesNote)</div>
	839	+ #if($ruleReviewStatus != '実施なし')
	840	+ #if($ruleReviewContent && !$ruleReviewContent.isEmpty())
	841	+ <div class="info-row">
	842	+ <span class="info-label">見直しの内容</span>
	843	+ <span class="info-value">
	844	+ <div class="selection-display">
	845	+ #foreach($rc in $ruleReviewContent)
	846	+ <span class="selection-item">$!escapetool.xml($rc.trim())</span>
	847	+ #end
	848	+ </div>
	849	+ </span>
	850	+ </div>
410	410	#end
	852	+ #if($ruleReviewProposer && !$ruleReviewProposer.isEmpty())
	853	+ <div class="info-row">
	854	+ <span class="info-label">見直しの提案者</span>
	855	+ <span class="info-value">
	856	+ <div class="selection-display">
	857	+ #foreach($rp in $ruleReviewProposer)
	858	+ <span class="selection-item">$!escapetool.xml($rp.trim())</span>
	859	+ #end
	860	+ </div>
	861	+ </span>
	862	+ </div>
	863	+ #end
	864	+ #if($ruleReviewImplementer && !$ruleReviewImplementer.isEmpty())
	865	+ <div class="info-row">
	866	+ <span class="info-label">見直しの実施者</span>
	867	+ <span class="info-value">
	868	+ <div class="selection-display">
	869	+ #foreach($ri in $ruleReviewImplementer)
	870	+ <span class="selection-item">$!escapetool.xml($ri.trim())</span>
	871	+ #end
	872	+ </div>
	873	+ </span>
	874	+ </div>
	875	+ #end
	876	+ #end
	877	+ #if($ruleReviewSystem && $ruleReviewSystem != '')
	878	+ <div class="info-row">
	879	+ <span class="info-label">見直しの仕組み</span>
	880	+ <span class="info-value">$!escapetool.xml($!ruleReviewSystem)</span>
	881	+ </div>
	882	+ #end
411	411	</div>
412	412	</div>
	885	+ #else
	886	+ <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>
	887	+ #end
413	413	#end
414	414
415	415	## --- 予算 ---
...	...	@@ -416,12 +416,12 @@
416	416	#set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
417	417	#if($hasBudget)
418	418	#set($canViewBudget = true)
419		- #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewBudget = false)
420		- #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false)
	894	+ #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewBudget = false)
	895	+ #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false)
421	421	#end
422	422	#if($canViewBudget)
423	423	<div class="seitokai-subsection">
424		- <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>
	899	+ <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>
425	425	<div class="seitokai-subsection-content">
426	426	#if($budgetProcess && !$budgetProcess.isEmpty())
427	427	<div class="info-row">
...	...	@@ -428,8 +428,13 @@
428	428	<span class="info-label">作成過程の生徒関与</span>
429	429	<span class="info-value">
430	430	<div class="selection-display">
431		- #foreach($bp in $budgetProcess)
432		- <span class="selection-item">$!escapetool.xml($bp.trim())</span>
	906	+ #set($allBpOpts = ["各部・委員会等への予算希望額調査","予算額調整（折衝等）","生徒会予算案の作成","生徒総会での議決","生徒関与なし","その他"])
	907	+ #foreach($bpOpt in $allBpOpts)
	908	+ #if($budgetProcess.contains($bpOpt))
	909	+ <span class="selection-item">$!escapetool.xml($bpOpt)</span>
	910	+ #else
	911	+ <span class="selection-item selection-item-off">$!escapetool.xml($bpOpt)</span>
	912	+ #end
433	433	#end
434	434	</div>
435	435	</span>
...	...	@@ -469,66 +469,87 @@
469	469	#end
470	470	#end
471	471
472		- ## --- 校則の見直し ---
473		- #if($ruleReviewStatus && $ruleReviewStatus != '')
474		- #set($canViewRuleReview = true)
475		- #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewRuleReview = false)
476		- #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false)
	952	+ ## --- 広報 ---
	953	+ #set($hasPublicity = ($publicityMethod && !$publicityMethod.isEmpty()) || ($publicityFrequency && $publicityFrequency != '') || ($publicityNote && $publicityNote != ''))
	954	+ #if($hasPublicity)
	955	+ #set($canViewPB = true)
	956	+ #if($visibilityPublicity == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewPB = false)
	957	+ #elseif($visibilityPublicity == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPB = false)
477	477	#end
478		- #if($canViewRuleReview)
	959	+ #if($canViewPB)
479	479	<div class="seitokai-subsection">
480		- <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>
	961	+ <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>
481	481	<div class="seitokai-subsection-content">
	963	+ #if($publicityMethod && !$publicityMethod.isEmpty())
482	482	<div class="info-row">
483		- <span class="info-label">見直しの有無（3年以内）</span>
484		- <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
485		- </div>
486		- #if($ruleReviewContent && !$ruleReviewContent.isEmpty())
487		- <div class="info-row">
488		- <span class="info-label">見直しの内容</span>
	965	+ <span class="info-label">方法</span>
489	489	<span class="info-value">
490	490	<div class="selection-display">
491		- #foreach($rc in $ruleReviewContent)
492		- <span class="selection-item">$!escapetool.xml($rc.trim())</span>
	968	+ #foreach($pm in $publicityMethod)
	969	+ <span class="selection-item">$!escapetool.xml($pm.trim())</span>
493	493	#end
494	494	</div>
495	495	</span>
496	496	</div>
497	497	#end
498		- #if($ruleReviewProposer && !$ruleReviewProposer.isEmpty())
	975	+ #if($publicityFrequency && $publicityFrequency != '')
499	499	<div class="info-row">
500		- <span class="info-label">見直しの提案者</span>
501		- <span class="info-value">
502		- <div class="selection-display">
503		- #foreach($rp in $ruleReviewProposer)
504		- <span class="selection-item">$!escapetool.xml($rp.trim())</span>
505		- #end
506		- </div>
507		- </span>
	977	+ <span class="info-label">頻度</span>
	978	+ <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($publicityFrequency)</span></span>
508	508	</div>
509	509	#end
510		- #if($ruleReviewImplementer && !$ruleReviewImplementer.isEmpty())
	981	+ #if($publicityNote && $publicityNote != '')
511	511	<div class="info-row">
512		- <span class="info-label">見直しの実施者</span>
	983	+ <span class="info-label">自由記述</span>
	984	+ <span class="info-value free-text-value">$!escapetool.xml($publicityNote)</span>
	985	+ </div>
	986	+ #end
	987	+ </div>
	988	+ </div>
	989	+ #else
	990	+ <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>
	991	+ #end
	992	+ #end
	993	+
	994	+ ## --- 外部連携 ---
	995	+ #set($hasExternal = ($externalCooperation && $externalCooperation != '') || ($externalOrgName && $externalOrgName != '') || ($socialParticipation && !$socialParticipation.isEmpty()))
	996	+ #if($hasExternal)
	997	+ #set($canViewEX = true)
	998	+ #if($visibilityExternal == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewEX = false)
	999	+ #elseif($visibilityExternal == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewEX = false)
	1000	+ #end
	1001	+ #if($canViewEX)
	1002	+ <div class="seitokai-subsection">
	1003	+ <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>
	1004	+ <div class="seitokai-subsection-content">
	1005	+ #if($externalCooperation && $externalCooperation != '')
	1006	+ <div class="info-row">
	1007	+ <span class="info-label">他校の生徒会との連携</span>
	1008	+ <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($externalCooperation)</span></span>
	1009	+ </div>
	1010	+ #end
	1011	+ #if($externalOrgName && $externalOrgName != '')
	1012	+ <div class="info-row">
	1013	+ <span class="info-label">参加している生徒会団体の名前</span>
	1014	+ <span class="info-value">$!escapetool.xml($externalOrgName)</span>
	1015	+ </div>
	1016	+ #end
	1017	+ #if($socialParticipation && !$socialParticipation.isEmpty())
	1018	+ <div class="info-row">
	1019	+ <span class="info-label">社会参加・地域連携・ボランティア</span>
513	513	<span class="info-value">
514	514	<div class="selection-display">
515		- #foreach($ri in $ruleReviewImplementer)
516		- <span class="selection-item">$!escapetool.xml($ri.trim())</span>
	1022	+ #foreach($sp2 in $socialParticipation)
	1023	+ <span class="selection-item">$!escapetool.xml($sp2.trim())</span>
517	517	#end
518	518	</div>
519	519	</span>
520	520	</div>
521	521	#end
522		- #if($ruleReviewSystem && $ruleReviewSystem != '')
523		- <div class="info-row">
524		- <span class="info-label">見直しの仕組み</span>
525		- <span class="info-value">$!escapetool.xml($!ruleReviewSystem)</span>
526		- </div>
527		- #end
528	528	</div>
529	529	</div>
530	530	#else
531		- <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>
	1032	+ <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>
532	532	#end
533	533	#end
534	534
...	...	@@ -535,12 +535,12 @@
535	535	## --- 生徒会の課題意識 ---
536	536	#if($challenges && $challenges != '')
537	537	#set($canViewChallenges = true)
538		- #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewChallenges = false)
539		- #elseif($visibilityChallenges == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewChallenges = false)
	1039	+ #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewChallenges = false)
	1040	+ #elseif($visibilityChallenges == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewChallenges = false)
540	540	#end
541	541	#if($canViewChallenges)
542	542	<div class="seitokai-subsection">
543		- <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>
	1044	+ <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>
544	544	<div class="seitokai-subsection-content">
545	545	<div class="challenge-text">$!escapetool.xml($challenges)</div>
546	546	</div>
...	...	@@ -564,6 +564,11 @@
564	564	<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>
565	565	<tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
566	566	</table>
	1068	+ #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
	1069	+ #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
	1070	+ #if($infoEditDate && $infoEditDate != '')
	1071	+ <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>
	1072	+ #end
567	567	</div>
568	568
569	569	{{/html}}
...	...	@@ -627,6 +627,7 @@
627	627	<span class="author-legend-title">所属:</span>
628	628	<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>
629	629	<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>
	1136	+ <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>
630	630	<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>
631	631	<span class="author-legend-item text-hint">※一般アカウントは所属バッジが表示されません</span>
632	632	</div>
...	...	@@ -702,16 +702,18 @@
702	702	<div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)">
703	703	<div class="activity-thread-header">
704	704	<div class="activity-thread-title">
705		- <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>
706		- <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
707		- #set($actTagsList = $activity.getValue('tags'))
708		- #if($actTagsList && !$actTagsList.isEmpty())
709		- #foreach($tagItem in $actTagsList)
710		- #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end
	1212	+ <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>
	1213	+ <div class="activity-meta-line">
	1214	+ <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
	1215	+ #set($actTagsList = $activity.getValue('tags'))
	1216	+ #if($actTagsList && !$actTagsList.isEmpty())
	1217	+ #foreach($tagItem in $actTagsList)
	1218	+ #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end
	1219	+ #end
711	711	#end
712		- #end
	1221	+ </div>
713	713	</div>
714		- <div class="thread-meta-row">
	1223	+ <div class="thread-meta-right">
715	715	<span class="thread-post-count">${reportCount}件の報告 ・ ${commentCount}件のコメント</span>
716	716	#if($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred')
717	717	#if($actFeatured == '1')
...	...	@@ -771,8 +771,8 @@
771	771	#set($postVis = $!post.getValue('visibility'))
772	772	#if(!$postVis || $postVis == '') #set($postVis = 'public') #end
773	773	#set($canViewPost = true)
774		- #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewPost = false)
775		- #elseif($postVis == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPost = false)
	1283	+ #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewPost = false)
	1284	+ #elseif($postVis == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPost = false)
776	776	#end
777	777	#if(!$canViewPost)
778	778	<div class="thread-post visibility-restricted-post">
...	...	@@ -816,8 +816,11 @@
816	816	<span class="badge badge-general badge-sm">一般</span>
817	817	#end
818	818	## 所属バッジ（投稿者の学校コードとページの学校コードを比較）
	1328	+ #set($postIsSchoolMatch = ($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode)))
819	819	#if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general')
820		- #if($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode))
	1330	+ #if($postUserRole == 'graduate' && $postIsSchoolMatch)
	1331	+ <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>
	1332	+ #elseif($postIsSchoolMatch && $postUserRole != 'graduate')
821	821	#if($postAccountType == 'verified' || $postAccountType == 'admin')
822	822	<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>
823	823	#else
...	...	@@ -844,6 +844,13 @@
844	844	#if($postEdited == 1 || $postEdited == '1')
845	845	<span class="post-edited-label">（編集済み）</span>
846	846	#end
	1359	+ #set($postAuthorRefH = $!post.getValue('authorRef'))
	1360	+ #set($postObjNumH = $post.number)
	1361	+ #if(!$isGuest && $xcontext.user != $postAuthorRefH)
	1362	+ <button type="button" class="btn-post-report btn-post-report-header" onclick="openReportDialog(this, '${doc.fullName}', $postObjNumH, '${services.csrf.getToken()}')" title="この投稿を通報">
	1363	+ <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> 通報
	1364	+ </button>
	1365	+ #end
847	847	</div>
848	848	<div class="thread-post-body">
849	849	$!escapetool.xml($!postContent)
...	...	@@ -908,12 +908,37 @@
908	908	#end
909	909	</div>
910	910	#if($postVis != 'public')
911		- <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>
	1430	+ <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>
912	912	#end
913		- ## 固定/解除ボタン（承認済み・管理者のみ）
914		- #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
915		- #set($postObjNum = $post.number)
916		- <div class="post-pin-action post-action-mt">
	1432	+ ## いいねボタン
	1433	+ #set($postLikeCount = $!post.getValue('likeCount'))
	1434	+ #if(!$postLikeCount || $postLikeCount == '') #set($postLikeCount = 0) #end
	1435	+ #set($postLikedBy = $!post.getValue('likedBy'))
	1436	+ #set($isLikedByMe = false)
	1437	+ #if($postLikedBy && $postLikedBy.contains($xcontext.user)) #set($isLikedByMe = true) #end
	1438	+ <div class="post-like-row post-action-mt">
	1439	+ #if($xcontext.user != 'XWiki.XWikiGuest')
	1440	+ <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)">
	1441	+ <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>
	1442	+ <span class="like-count">$postLikeCount</span>
	1443	+ </button>
	1444	+ #else
	1445	+ <span class="btn-like disabled">
	1446	+ <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>
	1447	+ <span class="like-count">$postLikeCount</span>
	1448	+ </span>
	1449	+ #end
	1450	+ </div>
	1451	+ ## 固定/編集/削除/通報/非表示ボタン（横並び）
	1452	+ #set($postAuthorRef = $!post.getValue('authorRef'))
	1453	+ #set($postObjNumED = $post.number)
	1454	+ #set($showPinBtn = ($viewerAccountType == 'admin' || $viewerAccountType == 'verified'))
	1455	+ #set($showEditDeleteBtn = ($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin'))
	1456	+ #set($showHideBtn = ($viewerAccountType == 'admin'))
	1457	+ #if($showPinBtn || $showEditDeleteBtn || $showHideBtn)
	1458	+ <div class="post-edit-actions post-action-mt">
	1459	+ #if($showPinBtn)
	1460	+ #set($postObjNum = $post.number)
917	917	#if($isPinned == '1')
918	918	<a href="$doc.getURL('view', "action=unpin&postObj=${postObjNum}&form_token=${services.csrf.getToken()}")" class="btn-pin-toggle btn-unpin" title="固定を解除">
919	919	<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> 固定を解除
...	...	@@ -923,15 +923,12 @@
923	923	<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> 固定する
924	924	</a>
925	925	#end
926		- </div>
927		- #end
928		- ## 編集・削除ボタン（投稿者本人 or 管理者）
929		- #set($postAuthorRef = $!post.getValue('authorRef'))
930		- #set($postObjNumED = $post.number)
931		- #if($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin')
932		- <div class="post-edit-actions post-action-mt">
	1470	+ #end
	1471	+ #if($showEditDeleteBtn)
933	933	#if($xcontext.user == $postAuthorRef)
934		- <button type="button" class="btn-post-edit" onclick="openEditPost(this, '${doc.fullName}', $postObjNumED, '$!escapetool.javascript($!postContent)')" title="この投稿を編集">
	1473	+ #set($editImages = $!post.getValue('images'))
	1474	+ #set($editFiles = $!post.getValue('files'))
	1475	+ <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="この投稿を編集">
935	935	<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> 編集
936	936	</button>
937	937	#end
...	...	@@ -938,6 +938,12 @@
938	938	<button type="button" class="btn-post-delete" onclick="confirmDeletePost('${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を削除">
939	939	<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> 削除
940	940	</button>
	1482	+ #end
	1483	+ #if($showHideBtn)
	1484	+ <button type="button" class="btn-post-hide" onclick="openHideDialog(this, '${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を非表示にする">
	1485	+ <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> 非表示
	1486	+ </button>
	1487	+ #end
941	941	</div>
942	942	#end
943	943	</div>
...	...	@@ -987,9 +987,11 @@
987	987
988	988	#if($xcontext.user != "XWiki.XWikiGuest")
989	989	<div class="thread-add-post">
	1537	+ #if($isSchoolMember || $isAlumniOfSchool || $isViewerAdmin)
990	990	<a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
991	991	＋ 活動報告を追加
992	992	</a>
	1541	+ #end
993	993	<a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
994	994	<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> コメントを書く
995	995	</a>
...	...	@@ -1019,10 +1019,68 @@
1019	1019	{{/html}}
1020	1020	#end
1021	1021
	1571	+## --- OGP / SNSシェア対応 ---
	1572	+#set($ogpTitle = "${schoolName} — 生徒会Wiki")
	1573	+#set($ogpDesc = "${schoolName}の生徒会活動情報。")
	1574	+#if($prefecture && $prefecture != '') #set($ogpDesc = "${ogpDesc}${prefecture}") #end
	1575	+#if($city && $city != '') #set($ogpDesc = "${ogpDesc}${city}。") #end
	1576	+#if($dailyActivities && $dailyActivities != '') #set($ogpDesc = "${ogpDesc} 主な活動: ${dailyActivities}") #end
	1577	+#set($ogpUrl = "https://${request.serverName}${doc.getURL()}")
	1578	+
1022	1022	## --- 年度タブ切り替え JavaScript ---
1023	1023	{{html clean="false"}}
1024	1024	<script>
	1582	+// OGPメタタグ挿入
	1583	+(function() {
	1584	+ var ogp = {
	1585	+ 'og:title': '$escapetool.javascript($ogpTitle)',
	1586	+ 'og:description': '$escapetool.javascript($ogpDesc)',
	1587	+ 'og:type': 'article',
	1588	+ 'og:url': '$escapetool.javascript($ogpUrl)',
	1589	+ 'og:site_name': '生徒会Wiki',
	1590	+ 'twitter:card': 'summary'
	1591	+ };
	1592	+ for (var p in ogp) {
	1593	+ var meta = document.createElement('meta');
	1594	+ meta.setAttribute('property', p);
	1595	+ meta.setAttribute('content', ogp[p]);
	1596	+ document.head.appendChild(meta);
	1597	+ }
	1598	+ // twitter用
	1599	+ var tw = document.createElement('meta');
	1600	+ tw.setAttribute('name', 'twitter:card');
	1601	+ tw.setAttribute('content', 'summary');
	1602	+ document.head.appendChild(tw);
	1603	+})();
1025	1025	// コンパクト表示（タイトルのみ）トグル
	1605	+// いいねトグル
	1606	+function toggleLike(btn) {
	1607	+ var page = btn.getAttribute('data-page');
	1608	+ var obj = btn.getAttribute('data-obj');
	1609	+ var csrf = btn.getAttribute('data-csrf');
	1610	+ btn.disabled = true;
	1611	+ var fd = new FormData();
	1612	+ fd.append('page', page);
	1613	+ fd.append('obj', obj);
	1614	+ fd.append('form_token', csrf);
	1615	+ fetch('/bin/SeitokaiCode/LikePost', { method: 'POST', body: fd })
	1616	+ .then(function(r) { return r.json(); })
	1617	+ .then(function(data) {
	1618	+ btn.querySelector('.like-count').textContent = data.count;
	1619	+ if (data.action === 'liked') {
	1620	+ btn.classList.add('liked');
	1621	+ btn.querySelector('svg').setAttribute('fill', 'currentColor');
	1622	+ btn.querySelector('svg').setAttribute('stroke', 'none');
	1623	+ } else {
	1624	+ btn.classList.remove('liked');
	1625	+ btn.querySelector('svg').removeAttribute('fill');
	1626	+ btn.querySelector('svg').setAttribute('stroke', 'currentColor');
	1627	+ }
	1628	+ })
	1629	+ .catch(function() { alert('エラーが発生しました'); })
	1630	+ .finally(function() { btn.disabled = false; });
	1631	+}
	1632	+
1026	1026	function toggleCompactView() {
1027	1027	var container = document.querySelector('.xwiki-content') || document.body;
1028	1028	var isCompact = container.classList.toggle('activity-compact-view');
...	...	@@ -1066,6 +1066,27 @@
1066	1066	}
1067	1067	// ページ読み込み時の初期化
1068	1068	document.addEventListener('DOMContentLoaded', function() {
	1676	+ // 年度タブを降順にソート（「全期間」タブは末尾に固定）
	1677	+ var tabContainer = document.querySelector('.activity-fy-tabs');
	1678	+ if (tabContainer) {
	1679	+ var tabs = Array.from(tabContainer.querySelectorAll('.activity-fy-tab'));
	1680	+ var allTab = null;
	1681	+ var fyTabs = [];
	1682	+ tabs.forEach(function(t) {
	1683	+ var onclickStr = t.getAttribute('onclick') || '';
	1684	+ if (onclickStr.indexOf("'all'") !== -1) { allTab = t; }
	1685	+ else { fyTabs.push(t); }
	1686	+ });
	1687	+ // 年度タブを数値の降順でソート
	1688	+ fyTabs.sort(function(a, b) {
	1689	+ var aYear = parseInt(a.textContent) || 0;
	1690	+ var bYear = parseInt(b.textContent) || 0;
	1691	+ return bYear - aYear;
	1692	+ });
	1693	+ // DOM再配置
	1694	+ fyTabs.forEach(function(t) { tabContainer.appendChild(t); });
	1695	+ if (allTab) { tabContainer.appendChild(allTab); }
	1696	+ }
1069	1069	// デフォルトで現在の年度を表示
1070	1070	var defaultTab = document.querySelector('.activity-fy-tab.active');
1071	1071	if (defaultTab) { defaultTab.click(); }
...	...	@@ -1119,7 +1119,15 @@
1119	1119	};
1120	1120	var toast = document.createElement('div');
1121	1121	toast.className = 'toast toast-' + type;
1122		- toast.innerHTML = (icons[type] || '') + '<span>' + message + '</span>';
	1750	+ var iconSvg = icons[type] || '';
	1751	+ if (iconSvg) {
	1752	+ var iconSpan = document.createElement('span');
	1753	+ iconSpan.innerHTML = iconSvg;
	1754	+ toast.appendChild(iconSpan);
	1755	+ }
	1756	+ var msgSpan = document.createElement('span');
	1757	+ msgSpan.textContent = message;
	1758	+ toast.appendChild(msgSpan);
1123	1123	container.appendChild(toast);
1124	1124	setTimeout(function() { toast.remove(); }, 3200);
1125	1125	}
...	...	@@ -1135,37 +1135,131 @@
1135	1135	}
1136	1136
1137	1137	// 投稿の編集（インライン編集フォームを開く）
1138		-function openEditPost(btn, schoolPage, postObjNum, currentContent) {
	1774	+function openEditPost(btn) {
1139	1139	var postEl = btn.closest('.thread-post');
1140	1140	if (!postEl) return;
1141		- // 既存の編集フォームがあれば閉じる
1142	1142	var existing = postEl.querySelector('.post-edit-form');
1143	1143	if (existing) { existing.remove(); return; }
1144	1144	var bodyEl = postEl.querySelector('.thread-post-body');
1145	1145	if (!bodyEl) return;
	1781	+
	1782	+ var schoolPage = btn.getAttribute('data-school');
	1783	+ var postObjNum = btn.getAttribute('data-obj');
	1784	+ var currentContent = btn.getAttribute('data-content') || '';
	1785	+ var currentImages = btn.getAttribute('data-images') || '';
	1786	+ var currentFiles = btn.getAttribute('data-files') || '';
	1787	+ var postType = btn.getAttribute('data-post-type') || 'report';
	1788	+
1146	1146	var form = document.createElement('div');
1147	1147	form.className = 'post-edit-form';
1148		- form.innerHTML = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>' +
1149		- '<div class="post-edit-form-actions">' +
	1791	+ form.setAttribute('data-school', schoolPage);
	1792	+ form.setAttribute('data-obj', postObjNum);
	1793	+
	1794	+ var html = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>';
	1795	+
	1796	+ // コメント以外は添付ファイル編集を表示
	1797	+ function escAttr(s) { return s.replace(/&/g,'&amp;').replace(/"/g,'&quot;').replace(/'/g,'&#39;').replace(/</g,'&lt;').replace(/>/g,'&gt;'); }
	1798	+ if (postType !== 'comment') {
	1799	+ // 既存画像
	1800	+ html += '<div class="edit-attachments">';
	1801	+ if (currentImages.trim()) {
	1802	+ html += '<div class="edit-attach-section"><span class="edit-attach-label">画像</span>';
	1803	+ var imgs = currentImages.trim().split('\n');
	1804	+ for (var i = 0; i < imgs.length; i++) {
	1805	+ var img = imgs[i].trim();
	1806	+ if (!img) continue;
	1807	+ html += '<div class="edit-attach-item" data-name="' + escAttr(img) + '">' +
	1808	+ '<img src="/xwiki/bin/download/' + schoolPage.replace(/\./g,'/') + '/' + encodeURIComponent(img) + '" class="edit-attach-thumb" />' +
	1809	+ '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
	1810	+ '<input type="hidden" name="keepImages" value="' + escAttr(img) + '" />' +
	1811	+ '</div>';
	1812	+ }
	1813	+ html += '</div>';
	1814	+ }
	1815	+ // 既存ファイル
	1816	+ if (currentFiles.trim()) {
	1817	+ html += '<div class="edit-attach-section"><span class="edit-attach-label">ファイル</span>';
	1818	+ var files = currentFiles.trim().split('\n');
	1819	+ for (var j = 0; j < files.length; j++) {
	1820	+ var f = files[j].trim();
	1821	+ if (!f) continue;
	1822	+ var displayName = f;
	1823	+ if (/^file_\d{14}_\d+_/.test(f)) displayName = f.replace(/^file_\d{14}_\d+_/, '');
	1824	+ html += '<div class="edit-attach-item" data-name="' + escAttr(f) + '">' +
	1825	+ '<span class="edit-attach-fname">' + escAttr(displayName) + '</span>' +
	1826	+ '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
	1827	+ '<input type="hidden" name="keepFiles" value="' + escAttr(f) + '" />' +
	1828	+ '</div>';
	1829	+ }
	1830	+ html += '</div>';
	1831	+ }
	1832	+ // 新規追加
	1833	+ html += '<div class="edit-attach-add">' +
	1834	+ '<label class="form-label-sm">画像を追加（最大4枚まで）</label>' +
	1835	+ '<input type="file" name="editNewImages" accept="image/*" multiple class="form-file-input-sm" />' +
	1836	+ '<div class="form-hint">JPEG / PNG / GIF / WebP、各5MBまで</div>' +
	1837	+ '<label class="form-label-sm" style="margin-top:8px;">ファイルを追加（最大2つまで）</label>' +
	1838	+ '<input type="file" name="editNewFiles" accept=".pdf,.docx,.xlsx,.pptx" multiple class="form-file-input-sm" />' +
	1839	+ '<div class="form-hint">PDF / Word / Excel / PowerPoint、各10MBまで</div>' +
	1840	+ '</div>';
	1841	+ html += '</div>';
	1842	+ }
	1843	+
	1844	+ html += '<div class="post-edit-form-actions">' +
1150	1150	'<button type="button" class="btn-cancel-edit" onclick="this.closest(\'.post-edit-form\').remove()">キャンセル</button>' +
1151		- '<button type="button" class="btn-save" onclick="saveEditPost(\'' + schoolPage + '\', ' + postObjNum + ')">保存</button>' +
	1846	+ '<button type="button" class="btn-save" onclick="saveEditPost(this)">保存</button>' +
1152	1152	'</div>';
	1848	+
	1849	+ form.innerHTML = html;
1153	1153	bodyEl.parentNode.insertBefore(form, bodyEl.nextSibling);
1154	1154	form.querySelector('textarea').focus();
1155	1155	}
1156	1156
	1854	+function removeEditAttach(btn) {
	1855	+ var item = btn.closest('.edit-attach-item');
	1856	+ if (item) item.remove();
	1857	+}
	1858	+
1157	1157	// 投稿の編集を保存
1158		-function saveEditPost(schoolPage, postObjNum) {
1159		- var textarea = document.getElementById('editContent_' + postObjNum);
	1860	+function saveEditPost(btn) {
	1861	+ var formEl = btn.closest('.post-edit-form');
	1862	+ if (!formEl) return;
	1863	+ var schoolPage = formEl.getAttribute('data-school');
	1864	+ var postObjNum = formEl.getAttribute('data-obj');
	1865	+ var textarea = formEl.querySelector('textarea');
1160	1160	if (!textarea) return;
1161	1161	var newContent = textarea.value.trim();
1162	1162	if (!newContent) { alert('投稿内容を入力してください'); return; }
	1869	+
1163	1163	var csrfEl = document.querySelector('input[name="form_token"]');
1164	1164	var csrfToken = csrfEl ? csrfEl.value : '';
	1872	+
	1873	+ var fd = new FormData();
	1874	+ fd.append('schoolPage', schoolPage);
	1875	+ fd.append('postObj', postObjNum);
	1876	+ fd.append('newContent', newContent);
	1877	+ fd.append('form_token', csrfToken);
	1878	+
	1879	+ // 残す画像・ファイル
	1880	+ formEl.querySelectorAll('input[name="keepImages"]').forEach(function(el) { fd.append('keepImages', el.value); });
	1881	+ formEl.querySelectorAll('input[name="keepFiles"]').forEach(function(el) { fd.append('keepFiles', el.value); });
	1882	+
	1883	+ // 新規画像
	1884	+ var newImgInput = formEl.querySelector('input[name="editNewImages"]');
	1885	+ if (newImgInput && newImgInput.files) {
	1886	+ for (var i = 0; i < newImgInput.files.length; i++) { fd.append('editNewImages', newImgInput.files[i]); }
	1887	+ }
	1888	+ // 新規ファイル
	1889	+ var newFileInput = formEl.querySelector('input[name="editNewFiles"]');
	1890	+ if (newFileInput && newFileInput.files) {
	1891	+ for (var j = 0; j < newFileInput.files.length; j++) { fd.append('editNewFiles', newFileInput.files[j]); }
	1892	+ }
	1893	+
	1894	+ btn.disabled = true;
	1895	+ btn.textContent = '保存中...';
	1896	+
1165	1165	var xhr = new XMLHttpRequest();
1166	1166	xhr.open('POST', '/bin/get/SeitokaiCode/EditPost?outputSyntax=plain', true);
1167		- xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1168		- var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken);
1169	1169	xhr.onload = function() {
1170	1170	try {
1171	1171	var res = JSON.parse(xhr.responseText);
...	...	@@ -1173,12 +1173,13 @@
1173	1173	showToast('投稿を更新しました', 'success');
1174	1174	setTimeout(function() { location.reload(); }, 800);
1175	1175	} else {
	1906	+ btn.disabled = false; btn.textContent = '保存';
1176	1176	alert('編集に失敗しました: ' + (res.error || ''));
1177	1177	}
1178		- } catch(e) { alert('編集に失敗しました'); }
	1909	+ } catch(e) { btn.disabled = false; btn.textContent = '保存'; alert('編集に失敗しました'); }
1179	1179	};
1180		- xhr.onerror = function() { alert('通信エラーが発生しました'); };
1181		- xhr.send(editPostData);
	1911	+ xhr.onerror = function() { btn.disabled = false; btn.textContent = '保存'; alert('通信エラーが発生しました'); };
	1912	+ xhr.send(fd);
1182	1182	}
1183	1183
1184	1184	// 投稿の削除（確認ダイアログ付き）
...	...	@@ -1202,6 +1202,80 @@
1202	1202	xhr.onerror = function() { alert('通信エラーが発生しました'); };
1203	1203	xhr.send(deletePostData);
1204	1204	}
	1936	+
	1937	+/* --- 通報ダイアログ --- */
	1938	+function openReportDialog(btn, targetPage, postObjNum, token) {
	1939	+ if (document.getElementById('report-dialog-overlay')) return;
	1940	+ var reasons = ['宣伝・スパム','不適切な内容','個人情報の露出','誹謗中傷','誤情報','その他'];
	1941	+ var overlay = document.createElement('div');
	1942	+ overlay.id = 'report-dialog-overlay';
	1943	+ 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;';
	1944	+ var dialog = document.createElement('div');
	1945	+ dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;max-height:80vh;overflow-y:auto;';
	1946	+ var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を通報</h3>';
	1947	+ html += '<p style="margin:0 0 12px;font-size:0.9em;color:#4b5563;">通報された投稿は管理者が確認するまで一時的に非表示になります。</p>';
	1948	+ html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">通報理由</label>';
	1949	+ html += '<select id="report-reason" style="width:100%;padding:8px;border:1px solid #d1d5db;border-radius:8px;margin-bottom:12px;font-size:0.9em;">';
	1950	+ for (var i=0; i<reasons.length; i++) html += '<option value="'+reasons[i]+'">'+reasons[i]+'</option>';
	1951	+ html += '</select>';
	1952	+ html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">補足コメント（任意）</label>';
	1953	+ 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>';
	1954	+ html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
	1955	+ html += '<button type="button" id="report-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
	1956	+ 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>';
	1957	+ html += '</div>';
	1958	+ dialog.innerHTML = html;
	1959	+ overlay.appendChild(dialog);
	1960	+ document.body.appendChild(overlay);
	1961	+ overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
	1962	+ document.getElementById('report-cancel-btn').addEventListener('click', function() { overlay.remove(); });
	1963	+ document.getElementById('report-submit-btn').addEventListener('click', function() {
	1964	+ var reason = document.getElementById('report-reason').value;
	1965	+ var detail = document.getElementById('report-detail').value;
	1966	+ var submitBtn = document.getElementById('report-submit-btn');
	1967	+ submitBtn.disabled = true; submitBtn.textContent = '送信中...';
	1968	+ var xhr = new XMLHttpRequest();
	1969	+ xhr.open('POST', '/bin/get/SeitokaiCode/ReportAction?outputSyntax=plain', true);
	1970	+ xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
	1971	+ var data = 'targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&detail=' + encodeURIComponent(detail) + '&form_token=' + encodeURIComponent(token);
	1972	+ xhr.onload = function() {
	1973	+ overlay.remove();
	1974	+ showToast('通報を受け付けました', 'success');
	1975	+ setTimeout(function() { location.reload(); }, 1000);
	1976	+ };
	1977	+ xhr.onerror = function() { overlay.remove(); alert('通信エラーが発生しました'); };
	1978	+ xhr.send(data);
	1979	+ });
	1980	+}
	1981	+
	1982	+/* --- 非表示ダイアログ（管理者用） --- */
	1983	+function openHideDialog(btn, targetPage, postObjNum, token) {
	1984	+ if (document.getElementById('hide-dialog-overlay')) return;
	1985	+ var overlay = document.createElement('div');
	1986	+ overlay.id = 'hide-dialog-overlay';
	1987	+ 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;';
	1988	+ var dialog = document.createElement('div');
	1989	+ dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;';
	1990	+ var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を非表示にする</h3>';
	1991	+ html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">非表示の理由</label>';
	1992	+ 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="理由を入力" />';
	1993	+ html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
	1994	+ html += '<button type="button" id="hide-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
	1995	+ 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>';
	1996	+ 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>';
	1997	+ html += '</div>';
	1998	+ dialog.innerHTML = html;
	1999	+ overlay.appendChild(dialog);
	2000	+ document.body.appendChild(overlay);
	2001	+ overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
	2002	+ document.getElementById('hide-cancel-btn').addEventListener('click', function() { overlay.remove(); });
	2003	+ function doHide(action) {
	2004	+ var reason = document.getElementById('hide-reason').value || '管理者判断';
	2005	+ window.location.href = '/bin/view/SeitokaiCode/ModerationAction?action=' + action + '&targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&form_token=' + encodeURIComponent(token);
	2006	+ }
	2007	+ document.getElementById('hide-submit-btn').addEventListener('click', function() { doHide('hide'); });
	2008	+ document.getElementById('hide-warn-btn').addEventListener('click', function() { doHide('hide-warn'); });
	2009	+}
1205	1205	</script>
1206	1206	{{/html}}
1207	1207	{{/velocity}}