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'))
...	...	@@ -64,6 +64,44 @@
64	64	#set($ruleReviewImplementer = $doc.getValue('ruleReviewImplementer'))
65	65	#set($ruleReviewSystem = $doc.getValue('ruleReviewSystem'))
66	66
	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	+
67	67	## --- 課題・連絡先 ---
68	68	#set($challenges = $doc.getValue('challenges'))
69	69	#set($contactInfo = $doc.getValue('contactInfo'))
...	...	@@ -88,6 +88,14 @@
88	88	#set($visibilityBudget = $!doc.getValue('visibilityBudget'))
89	89	#set($visibilityRuleReview = $!doc.getValue('visibilityRuleReview'))
90	90	#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'))
91	91	## デフォルト値（未設定なら全体公開）
92	92	#if(!$visibilityOrgChart || $visibilityOrgChart == '') #set($visibilityOrgChart = 'public') #end
93	93	#if(!$visibilityBudget || $visibilityBudget == '') #set($visibilityBudget = 'public') #end
...	...	@@ -99,6 +99,7 @@
99	99	#set($isGuest = $viewerUser == 'XWiki.XWikiGuest')
100	100	#set($isViewerAdmin = false)
101	101	#set($viewerSchoolCode = '')
	161	+#set($viewerSecondaryGraduated = false)
102	102	#if(!$isGuest)
103	103	#set($viewerDoc = $xwiki.getDocument($viewerUser))
104	104	#set($viewerAccountType = $!viewerDoc.getValue('accountType'))
...	...	@@ -108,6 +108,24 @@
108	108	#if($viewerAccountType == 'admin')
109	109	#set($isViewerAdmin = true)
110	110	#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
111	111	#end
112	112
113	113	## --- 関連校（中高一貫校）情報 ---
...	...	@@ -117,7 +117,7 @@
117	117	#if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
118	118	#if($viewerSchoolCode == $affiliatedSchoolCode)
119	119	#set($isAffiliated = true)
120		- #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode)
	198	+ #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode && !$viewerSecondaryGraduated)
121	121	#set($isAffiliated = true)
122	122	#end
123	123	#end
...	...	@@ -127,7 +127,7 @@
127	127	#if(!$isGuest && $viewerUserRole != 'graduate')
128	128	#if($viewerSchoolCode == $schoolCode || $isAffiliated)
129	129	#set($isSchoolMember = true)
130		- #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode)
	208	+ #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode && !$viewerSecondaryGraduated)
131	131	#set($isSchoolMember = true)
132	132	#end
133	133	#end
...	...	@@ -304,7 +304,7 @@
304	304
305	305	## --- 編集ボタン（権限があるユーザーのみ表示） ---
306	306	#set($canEditSchool = false)
307		-#if(!$isGuest && ($isViewerAdmin || $isSchoolMember))
	385	+#if(!$isGuest && ($isViewerAdmin || $isSchoolMember || $isAlumniOfSchool))
308	308	#set($canEditSchool = true)
309	309	#end
310	310	#if($canEditSchool)
...	...	@@ -360,9 +360,9 @@
360	360
361	361	</div>
362	362
363		-## --- ② 生徒会基本情報（折りたたみカード） ---
	441	+## --- ② 生徒会情報（折りたたみカード） ---
364	364	<div class="school-info-card" id="card-seitokai-info">
365		- <h2 role="button" tabindex="0" aria-expanded="true" onclick="toggleInfoCard('card-seitokai-info')" onkeydown="if(event.key==='Enter'||event.key===' '){event.preventDefault();toggleInfoCard('card-seitokai-info')}"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/></svg> 生徒会基本情報</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2>
	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>
366	366	<div class="seitokai-info-body">
367	367
368	368	## --- 生徒会組織 ---
...	...	@@ -387,10 +387,132 @@
387	387	#end
388	388	#end
389	389
	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	+
390	390	## --- 日常の活動 ---
391	391	#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)
392	392	<div class="seitokai-subsection">
393		- <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z"/><polyline points="14 2 14 8 20 8"/><line x1="16" y1="13" x2="8" y2="13"/><line x1="16" y1="17" x2="8" y2="17"/></svg> 日常の活動</h3>
	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>
394	394	<div class="seitokai-subsection-content">
395	395	<p class="activity-hint">活動時間が多い3つ</p>
396	396	<div class="tag-container">
...	...	@@ -403,12 +403,104 @@
403	403	#end
404	404	</div>
405	405	</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
406	406	#end
407	407
	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	+
408	408	## --- 選挙 ---
409	409	#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)
410	410	<div class="seitokai-subsection">
411		- <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="3" width="18" height="18" rx="2"/><path d="M7 13l3 3 7-7"/></svg> 選挙</h3>
	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>
412	412	<div class="seitokai-subsection-content">
413	413	<div class="info-row">
414	414	<span class="info-label">役員選挙</span>
...	...	@@ -425,22 +425,74 @@
425	425	#end
426	426	</div>
427	427	</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
428	428	#end
429	429
430		- ## --- 定例活動 ---
431		- #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)
432	432	<div class="seitokai-subsection">
433		- <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="4" width="18" height="18" rx="2"/><line x1="16" y1="2" x2="16" y2="6"/><line x1="8" y1="2" x2="8" y2="6"/><line x1="3" y1="10" x2="21" y2="10"/></svg> 定例活動</h3>
	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>
434	434	<div class="seitokai-subsection-content">
435	435	<div class="info-row">
436		- <span class="info-label">役員定例会の頻度</span>
437		- <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>
438	438	</div>
439		- #if($regularActivitiesNote && $regularActivitiesNote.trim() != '')
440		- <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>
441	441	#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
442	442	</div>
443	443	</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
444	444	#end
445	445
446	446	## --- 予算 ---
...	...	@@ -505,68 +505,87 @@
505	505	#end
506	506	#end
507	507
508		- ## --- 校則・生徒会会則の見直し ---
509		- #if($ruleReviewStatus && $ruleReviewStatus != '')
510		- #set($canViewRuleReview = true)
511		- #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewRuleReview = false)
512		- #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false)
	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)
513	513	#end
514		- #if($canViewRuleReview)
	859	+ #if($canViewPB)
515	515	<div class="seitokai-subsection">
516		- <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M16 4h2a2 2 0 012 2v12a2 2 0 01-2 2h-2"/><path d="M8 4H6a2 2 0 00-2 2v12a2 2 0 002 2h2"/><line x1="12" y1="4" x2="12" y2="8"/><line x1="12" y1="16" x2="12" y2="20"/><line x1="8" y1="8" x2="16" y2="8"/><line x1="8" y1="16" x2="16" y2="16"/></svg> 校則・生徒会会則の見直し #if($visibilityRuleReview != 'public')<span class="visibility-badge visibility-${visibilityRuleReview}">#if($visibilityRuleReview == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
	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>
517	517	<div class="seitokai-subsection-content">
	863	+ #if($publicityMethod && !$publicityMethod.isEmpty())
518	518	<div class="info-row">
519		- <span class="info-label">見直しの有無（3年以内）</span>
520		- <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
521		- </div>
522		- #if($ruleReviewStatus != '実施なし')
523		- #if($ruleReviewContent && !$ruleReviewContent.isEmpty())
524		- <div class="info-row">
525		- <span class="info-label">見直しの内容</span>
	865	+ <span class="info-label">方法</span>
526	526	<span class="info-value">
527	527	<div class="selection-display">
528		- #foreach($rc in $ruleReviewContent)
529		- <span class="selection-item">$!escapetool.xml($rc.trim())</span>
	868	+ #foreach($pm in $publicityMethod)
	869	+ <span class="selection-item">$!escapetool.xml($pm.trim())</span>
530	530	#end
531	531	</div>
532	532	</span>
533	533	</div>
534	534	#end
535		- #if($ruleReviewProposer && !$ruleReviewProposer.isEmpty())
	875	+ #if($publicityFrequency && $publicityFrequency != '')
536	536	<div class="info-row">
537		- <span class="info-label">見直しの提案者</span>
538		- <span class="info-value">
539		- <div class="selection-display">
540		- #foreach($rp in $ruleReviewProposer)
541		- <span class="selection-item">$!escapetool.xml($rp.trim())</span>
542		- #end
543		- </div>
544		- </span>
	877	+ <span class="info-label">頻度</span>
	878	+ <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($publicityFrequency)</span></span>
545	545	</div>
546	546	#end
547		- #if($ruleReviewImplementer && !$ruleReviewImplementer.isEmpty())
	881	+ #if($publicityNote && $publicityNote != '')
548	548	<div class="info-row">
549		- <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>
550	550	<span class="info-value">
551	551	<div class="selection-display">
552		- #foreach($ri in $ruleReviewImplementer)
553		- <span class="selection-item">$!escapetool.xml($ri.trim())</span>
	922	+ #foreach($sp2 in $socialParticipation)
	923	+ <span class="selection-item">$!escapetool.xml($sp2.trim())</span>
554	554	#end
555	555	</div>
556	556	</span>
557	557	</div>
558	558	#end
559		- #end
560		- #if($ruleReviewSystem && $ruleReviewSystem != '')
561		- <div class="info-row">
562		- <span class="info-label">見直しの仕組み</span>
563		- <span class="info-value">$!escapetool.xml($!ruleReviewSystem)</span>
564		- </div>
565		- #end
566	566	</div>
567	567	</div>
568	568	#else
569		- <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 校則・生徒会会則の見直し情報は #if($visibilityRuleReview == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
	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>
570	570	#end
571	571	#end
572	572
...	...	@@ -641,13 +641,13 @@
641	641
642	642	<div class="activity-toolbar">
643	643	<div class="activity-fy-tabs">
644		- <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
	1007	+ <button class="activity-fy-tab" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
645	645	#foreach($fy in $fySet)
646	646	#if($fy != $currentFYStr)
647	647	<button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button>
648	648	#end
649	649	#end
650		- <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
	1013	+ <button class="activity-fy-tab active" onclick="switchActivityFY('all', this)">全期間</button>
651	651	</div>
652	652	<div class="activity-toolbar-right">
653	653	<button class="btn-view-toggle" id="btnViewToggle" onclick="toggleCompactView()" title="タイトルのみ表示">
...	...	@@ -686,22 +686,64 @@
686	686
687	687	{{/html}}
688	688
689		-## 特色ある活動を先頭に表示するため、並び替え用リストを作成
690		-#set($featuredActivities = [])
691		-#set($normalActivities = [])
692		-#if($activities && $activities.size() > 0)
693		- #foreach($act in $activities)
694		- #set($isFeatured = $!act.getValue('featured'))
695		- #if($isFeatured == '1')
696		- #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)
697	697	#else
698		- #set($discard = $normalActivities.add($foreach.index))
	1079	+ #set($discard = $fyNextRem.add($fy))
699	699	#end
700	700	#end
	1082	+ #set($fyRemaining = $fyNextRem)
701	701	#end
	1084	+## 年度未設定の活動は末尾に表示（fySetに'unknown'は入らないため無条件追加）
	1085	+#set($discard = $fyDesc.add('unknown'))
	1086	+## Step2: 年度降順で featured → normal の順にインデックスを収集
702	702	#set($orderedActivityIndices = [])
703		-#set($discard = $orderedActivityIndices.addAll($featuredActivities))
704		-#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
705	705
706	706	#if($activities && $activities.size() > 0)
707	707	#foreach($actIdx in $orderedActivityIndices)
...	...	@@ -966,6 +966,25 @@
966	966	#if($postVis != 'public')
967	967	<div class="visibility-badge visibility-${postVis} post-action-mt">#if($postVis == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</div>
968	968	#end
	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>
969	969	## 固定/編集/削除/通報/非表示ボタン（横並び）
970	970	#set($postAuthorRef = $!post.getValue('authorRef'))
971	971	#set($postObjNumED = $post.number)
...	...	@@ -1052,7 +1052,7 @@
1052	1052
1053	1053	#if($xcontext.user != "XWiki.XWikiGuest")
1054	1054	<div class="thread-add-post">
1055		- #if($isSchoolMember || $isViewerAdmin)
	1479	+ #if($isSchoolMember || $isAlumniOfSchool || $isViewerAdmin)
1056	1056	<a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
1057	1057	＋ 活動報告を追加
1058	1058	</a>
...	...	@@ -1086,10 +1086,68 @@
1086	1086	{{/html}}
1087	1087	#end
1088	1088
	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	+
1089	1089	## --- 年度タブ切り替え JavaScript ---
1090	1090	{{html clean="false"}}
1091	1091	<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	+})();
1092	1092	// コンパクト表示（タイトルのみ）トグル
	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	+
1093	1093	function toggleCompactView() {
1094	1094	var container = document.querySelector('.xwiki-content') || document.body;
1095	1095	var isCompact = container.classList.toggle('activity-compact-view');
...	...	@@ -1133,7 +1133,7 @@
1133	1133	}
1134	1134	// ページ読み込み時の初期化
1135	1135	document.addEventListener('DOMContentLoaded', function() {
1136		- // 年度タブを降順にソート（「全期間」タブは末尾に固定）
	1618	+ // 年度タブを降順にソート（「全期間」タブは先頭に固定）
1137	1137	var tabContainer = document.querySelector('.activity-fy-tabs');
1138	1138	if (tabContainer) {
1139	1139	var tabs = Array.from(tabContainer.querySelectorAll('.activity-fy-tab'));
...	...	@@ -1150,11 +1150,11 @@
1150	1150	var bYear = parseInt(b.textContent) || 0;
1151	1151	return bYear - aYear;
1152	1152	});
1153		- // DOM再配置
1154		- fyTabs.forEach(function(t) { tabContainer.appendChild(t); });
	1635	+ // DOM再配置（全期間を先頭、年度タブを降順で続ける）
1155	1155	if (allTab) { tabContainer.appendChild(allTab); }
	1637	+ fyTabs.forEach(function(t) { tabContainer.appendChild(t); });
1156	1156	}
1157		- // デフォルトで現在の年度を表示
	1639	+ // デフォルトで全期間を表示
1158	1158	var defaultTab = document.querySelector('.activity-fy-tab.active');
1159	1159	if (defaultTab) { defaultTab.click(); }
1160	1160	// 保存成功時のトースト通知
...	...	@@ -1207,7 +1207,15 @@
1207	1207	};
1208	1208	var toast = document.createElement('div');
1209	1209	toast.className = 'toast toast-' + type;
1210		- 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);
1211	1211	container.appendChild(toast);
1212	1212	setTimeout(function() { toast.remove(); }, 3200);
1213	1213	}
...	...	@@ -1246,6 +1246,7 @@
1246	1246	var html = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>';
1247	1247
1248	1248	// コメント以外は添付ファイル編集を表示
	1739	+ function escAttr(s) { return s.replace(/&/g,'&amp;').replace(/"/g,'&quot;').replace(/'/g,'&#39;').replace(/</g,'&lt;').replace(/>/g,'&gt;'); }
1249	1249	if (postType !== 'comment') {
1250	1250	// 既存画像
1251	1251	html += '<div class="edit-attachments">';
...	...	@@ -1255,10 +1255,10 @@
1255	1255	for (var i = 0; i < imgs.length; i++) {
1256	1256	var img = imgs[i].trim();
1257	1257	if (!img) continue;
1258		- html += '<div class="edit-attach-item" data-name="' + img.replace(/"/g,'&quot;') + '">' +
	1749	+ html += '<div class="edit-attach-item" data-name="' + escAttr(img) + '">' +
1259	1259	'<img src="/xwiki/bin/download/' + schoolPage.replace(/\./g,'/') + '/' + encodeURIComponent(img) + '" class="edit-attach-thumb" />' +
1260	1260	'<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1261		- '<input type="hidden" name="keepImages" value="' + img.replace(/"/g,'&quot;') + '" />' +
	1752	+ '<input type="hidden" name="keepImages" value="' + escAttr(img) + '" />' +
1262	1262	'</div>';
1263	1263	}
1264	1264	html += '</div>';
...	...	@@ -1272,10 +1272,10 @@
1272	1272	if (!f) continue;
1273	1273	var displayName = f;
1274	1274	if (/^file_\d{14}_\d+_/.test(f)) displayName = f.replace(/^file_\d{14}_\d+_/, '');
1275		- html += '<div class="edit-attach-item" data-name="' + f.replace(/"/g,'&quot;') + '">' +
1276		- '<span class="edit-attach-fname">' + displayName.replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</span>' +
	1766	+ html += '<div class="edit-attach-item" data-name="' + escAttr(f) + '">' +
	1767	+ '<span class="edit-attach-fname">' + escAttr(displayName) + '</span>' +
1277	1277	'<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1278		- '<input type="hidden" name="keepFiles" value="' + f.replace(/"/g,'&quot;') + '" />' +
	1769	+ '<input type="hidden" name="keepFiles" value="' + escAttr(f) + '" />' +
1279	1279	'</div>';
1280	1280	}
1281	1281	html += '</div>';