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

Summary

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

Details

Page properties

Content

...	...	@@ -127,8 +127,6 @@
127	127	<p>このページは管理者により非公開に設定されています。</p>
128	128	<a href="$xwiki.getURL('Schools.WebHome', 'view')" class="btn-back-list">学校一覧に戻る</a>
129	129	</div>
130		-{{/html}}
131		-{{/velocity}}
132	132	#stop
133	133	#end
134	134	#end
...	...	@@ -276,305 +276,275 @@
276	276	</div>
277	277	#end
278	278
279		-## --- ① 学校基本情報 + 連絡先（左右グリッド・折りたたみ対応） ---
280		-<div class="school-info-grid">
281		- <div class="school-info-card collapsed" id="card-basic-info">
282		- <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>
283		- <table class="wiki-table school-info-table">
284		- <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
285		- <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
286		- <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
287		- <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
288		- <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
289		- <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
290		- <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
291		- <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
292		- <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>
293		- </table>
294		- #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
295		- #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
296		- #if($infoEditDate && $infoEditDate != '')
297		- <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>
298		- #end
299		- </div>
300		-
301		- <div class="school-info-card collapsed" id="card-contact">
302		- <h2 role="button" tabindex="0" aria-expanded="false" onclick="toggleInfoCard('card-contact')" onkeydown="if(event.key==='Enter'||event.key===' '){event.preventDefault();toggleInfoCard('card-contact')}"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M22 16.92v3a2 2 0 01-2.18 2 19.79 19.79 0 01-8.63-3.07 19.5 19.5 0 01-6-6 19.79 19.79 0 01-3.07-8.67A2 2 0 014.11 2h3a2 2 0 012 1.72c.127.96.361 1.903.7 2.81a2 2 0 01-.45 2.11L8.09 9.91a16 16 0 006 6l1.27-1.27a2 2 0 012.11-.45c.907.339 1.85.573 2.81.7A2 2 0 0122 16.92z"/></svg> 連絡先・SNS</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2>
303		- <table class="wiki-table school-info-table">
304		- <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr>
305		- <tr><th>生徒会Web</th><td>#if($seitokaiWebsite && $seitokaiWebsite != '')<a href="$!escapetool.xml($seitokaiWebsite)" target="_blank" rel="noopener"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M2 12h20"/><path d="M12 2a15.3 15.3 0 014 10 15.3 15.3 0 01-4 10 15.3 15.3 0 01-4-10 15.3 15.3 0 014-10z"/></svg> $!escapetool.xml($seitokaiWebsite)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
306		- <tr><th>X (Twitter)</th><td>#if($seitokaiTwitter && $seitokaiTwitter != '')<a href="https://x.com/$!escapetool.url($seitokaiTwitter)" target="_blank" rel="noopener">𝕏 @$!escapetool.xml($seitokaiTwitter)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
307		- <tr><th>Instagram</th><td>#if($seitokaiInstagram && $seitokaiInstagram != '')<a href="https://instagram.com/$!escapetool.url($seitokaiInstagram)" target="_blank" rel="noopener"><svg class="ico" viewBox="0 0 24 24"><path d="M23 19a2 2 0 01-2 2H3a2 2 0 01-2-2V8a2 2 0 012-2h4l2-3h6l2 3h4a2 2 0 012 2z"/><circle cx="12" cy="13" r="4"/></svg> @$!escapetool.xml($seitokaiInstagram)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
308		- <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>
309		- <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
310		- </table>
311		- </div>
	277	+## --- ① 学校基本情報 ---
	278	+<div class="school-info-card collapsed" id="card-basic-info">
	279	+ <h2 role="button" tabindex="0" aria-expanded="false" onclick="toggleInfoCard('card-basic-info')" onkeydown="if(event.key==='Enter'||event.key===' '){event.preventDefault();toggleInfoCard('card-basic-info')}"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M4 19.5A2.5 2.5 0 016.5 17H20"/><path d="M6.5 2H20v20H6.5A2.5 2.5 0 014 19.5v-15A2.5 2.5 0 016.5 2z"/></svg> 学校基本情報</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2>
	280	+ <table class="wiki-table school-info-table">
	281	+ <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
	282	+ <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
	283	+ <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
	284	+ <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
	285	+ <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
	286	+ <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
	287	+ <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
	288	+ <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
	289	+ <tr><th>公式サイト</th><td>#if($website && $website != '')<a href="$!escapetool.xml($website)" target="_blank" rel="noopener">$!escapetool.xml($website)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
	290	+ </table>
	291	+ #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
	292	+ #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
	293	+ #if($infoEditDate && $infoEditDate != '')
	294	+ <div class="info-last-updated"><svg class="ico" viewBox="0 0 24 24"><path d="M11 4H4a2 2 0 00-2 2v14a2 2 0 002 2h14a2 2 0 002-2v-7"/><path d="M18.5 2.5a2.121 2.121 0 013 3L12 15l-4 1 1-4 9.5-9.5z"/></svg> 基本情報の最終更新: $!escapetool.xml($infoEditBy) — $!escapetool.xml($infoEditDate)</div>
	295	+ #end
312	312	</div>
313	313
314		-## --- 生徒会情報アコーディオン ---
315		-<div class="school-section-divider">
316		- <button class="shortcut-btn shortcut-btn-secondary" onclick="var sec=document.getElementById('seitokai-info-section');sec.classList.toggle('open');this.querySelector('.shortcut-arrow').textContent=sec.classList.contains('open')?'▲':'▼';">
317		- <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>
318		- 生徒会情報を見る <span class="shortcut-arrow">▼</span>
319		- </button>
320		-</div>
	298	+## --- ② 生徒会基本情報（折りたたみカード） ---
	299	+<div class="school-info-card" id="card-seitokai-info">
	300	+ <h2 role="button" tabindex="0" aria-expanded="true" onclick="toggleInfoCard('card-seitokai-info')" onkeydown="if(event.key==='Enter'||event.key===' '){event.preventDefault();toggleInfoCard('card-seitokai-info')}"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/></svg> 生徒会基本情報</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2>
	301	+ <div class="seitokai-info-body">
321	321
322		-<div id="seitokai-info-section" class="seitokai-info-accordion">
323		-
324		-## --- ② 組織図 ---
325		-#set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
326		-#if($hasOrgContent)
327		- ## 公開範囲チェック
328		- #set($canViewOrgChart = true)
329		- #if($visibilityOrgChart == 'members' && $isGuest) #set($canViewOrgChart = false)
330		- #elseif($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewOrgChart = false)
331		- #end
332		- #if($canViewOrgChart)
333		-<h2 class="section-title"><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/><line x1="9" y1="10" x2="9" y2="10.01"/><line x1="15" y1="10" x2="15" y2="10.01"/><line x1="9" y1="14" x2="9" y2="14.01"/><line x1="15" y1="14" x2="15" y2="14.01"/></svg> 組織図 #if($visibilityOrgChart != 'public')<span class="visibility-badge visibility-${visibilityOrgChart}">#if($visibilityOrgChart == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h2>
334		-<div class="school-section-card">
335		- <div class="card-inner">
336		- #if($orgChartImage && $orgChartImage != '')
337		- <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
	303	+ ## --- 組織図 ---
	304	+ #set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
	305	+ #if($hasOrgContent)
	306	+ #set($canViewOrgChart = true)
	307	+ #if($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewOrgChart = false)
	308	+ #elseif($visibilityOrgChart == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ($viewerSchoolCode != $schoolCode || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewOrgChart = false)
	309	+ #end
	310	+ #if($canViewOrgChart)
	311	+ <div class="seitokai-subsection">
	312	+ <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/><line x1="9" y1="10" x2="9" y2="10.01"/><line x1="15" y1="10" x2="15" y2="10.01"/><line x1="9" y1="14" x2="9" y2="14.01"/><line x1="15" y1="14" x2="15" y2="14.01"/></svg> 組織図 #if($visibilityOrgChart != 'public')<span class="visibility-badge visibility-${visibilityOrgChart}">#if($visibilityOrgChart == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
	313	+ <div class="seitokai-subsection-content">
	314	+ #if($orgChartImage && $orgChartImage != '')
	315	+ <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
	316	+ #end
	317	+ #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end
	318	+ </div>
	319	+ </div>
	320	+ #else
	321	+ <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 組織図は #if($visibilityOrgChart == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
	322	+ #end
338	338	#end
339		- #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end
340		- </div>
341		-</div>
342		- #else
343		-<div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 組織図は #if($visibilityOrgChart == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
344		- #end
345		-#end
346	346
347		-## --- ③④⑤ 日常の活動・選挙・定例活動 ---
348		-<div class="school-section-grid">
349		- #if($dailyActivities && !$dailyActivities.isEmpty())
350		- <div class="school-section-card">
351		- <h3><svg class="ico" viewBox="0 0 24 24"><path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z"/><polyline points="14 2 14 8 20 8"/><line x1="16" y1="13" x2="8" y2="13"/><line x1="16" y1="17" x2="8" y2="17"/></svg> 日常の活動</h3>
352		- <div class="card-inner">
353		- <p class="activity-hint">活動時間の多い順に上位3つ</p>
354		- <div class="tag-container">
355		- #set($daIdx = 1)
356		- #foreach($da in $dailyActivities)
357		- <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
358		- #set($daIdx = $daIdx + 1)
	325	+ ## --- 日常の活動 ---
	326	+ #if($dailyActivities && !$dailyActivities.isEmpty())
	327	+ <div class="seitokai-subsection">
	328	+ <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z"/><polyline points="14 2 14 8 20 8"/><line x1="16" y1="13" x2="8" y2="13"/><line x1="16" y1="17" x2="8" y2="17"/></svg> 日常の活動</h3>
	329	+ <div class="seitokai-subsection-content">
	330	+ <p class="activity-hint">活動時間の多い順に上位3つ</p>
	331	+ <div class="tag-container">
	332	+ #set($daIdx = 1)
	333	+ #foreach($da in $dailyActivities)
	334	+ <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
	335	+ #set($daIdx = $daIdx + 1)
	336	+ #end
	337	+ </div>
	338	+ #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
	339	+ <div class="free-note">$!escapetool.xml($dailyActivitiesNote)</div>
359	359	#end
360	360	</div>
361		- #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
362		- <div class="free-note">$!escapetool.xml($dailyActivitiesNote)</div>
363		- #end
364	364	</div>
365		- </div>
366		- #end
	343	+ #end
367	367
368		- #if($electionExists && $electionExists != '')
369		- <div class="school-section-card">
370		- <h3><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="3" width="18" height="18" rx="2"/><path d="M7 13l3 3 7-7"/></svg> 選挙</h3>
371		- <div class="card-inner">
372		- <div class="info-row">
373		- <span class="info-label">役員選挙</span>
374		- <span class="info-value">$!escapetool.xml($!electionExists)</span>
	345	+ ## --- 選挙 ---
	346	+ #if($electionExists && $electionExists != '')
	347	+ <div class="seitokai-subsection">
	348	+ <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="3" width="18" height="18" rx="2"/><path d="M7 13l3 3 7-7"/></svg> 選挙</h3>
	349	+ <div class="seitokai-subsection-content">
	350	+ <div class="info-row">
	351	+ <span class="info-label">役員選挙</span>
	352	+ <span class="info-value">$!escapetool.xml($!electionExists)</span>
	353	+ </div>
	354	+ #if($electionType && $electionType != '')
	355	+ <div class="info-row">
	356	+ <span class="info-label">直近の選挙方式</span>
	357	+ <span class="info-value">$!escapetool.xml($!electionType)</span>
	358	+ </div>
	359	+ #end
	360	+ #if($electionNote && $electionNote.trim() != '')
	361	+ <div class="free-note">$!escapetool.xml($electionNote)</div>
	362	+ #end
375	375	</div>
376		- #if($electionType && $electionType != '')
377		- <div class="info-row">
378		- <span class="info-label">直近の選挙方式</span>
379		- <span class="info-value">$!escapetool.xml($!electionType)</span>
380		- </div>
381		- #end
382		- #if($electionNote && $electionNote.trim() != '')
383		- <div class="free-note">$!escapetool.xml($electionNote)</div>
384		- #end
385	385	</div>
386		- </div>
387		- #end
388		-</div>
	365	+ #end
389	389
390		-<div class="school-section-grid">
391		- #if($meetingFrequency && $meetingFrequency != '')
392		- <div class="school-section-card">
393		- <h3><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="4" width="18" height="18" rx="2"/><line x1="16" y1="2" x2="16" y2="6"/><line x1="8" y1="2" x2="8" y2="6"/><line x1="3" y1="10" x2="21" y2="10"/></svg> 定例活動</h3>
394		- <div class="card-inner">
395		- <div class="info-row">
396		- <span class="info-label">役員定例会の頻度</span>
397		- <span class="info-value">$!escapetool.xml($!meetingFrequency)</span>
	367	+ ## --- 定例活動 ---
	368	+ #if($meetingFrequency && $meetingFrequency != '')
	369	+ <div class="seitokai-subsection">
	370	+ <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="4" width="18" height="18" rx="2"/><line x1="16" y1="2" x2="16" y2="6"/><line x1="8" y1="2" x2="8" y2="6"/><line x1="3" y1="10" x2="21" y2="10"/></svg> 定例活動</h3>
	371	+ <div class="seitokai-subsection-content">
	372	+ <div class="info-row">
	373	+ <span class="info-label">役員定例会の頻度</span>
	374	+ <span class="info-value">$!escapetool.xml($!meetingFrequency)</span>
	375	+ </div>
	376	+ #if($regularActivitiesNote && $regularActivitiesNote.trim() != '')
	377	+ <div class="free-note">$!escapetool.xml($regularActivitiesNote)</div>
	378	+ #end
398	398	</div>
399		- #if($regularActivitiesNote && $regularActivitiesNote.trim() != '')
400		- <div class="free-note">$!escapetool.xml($regularActivitiesNote)</div>
401		- #end
402	402	</div>
403		- </div>
404		- #end
405		-
406		- ## --- ⑦ 予算 ---
407		- #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
408		- #if($hasBudget)
409		- ## 公開範囲チェック
410		- #set($canViewBudget = true)
411		- #if($visibilityBudget == 'members' && $isGuest) #set($canViewBudget = false)
412		- #elseif($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewBudget = false)
413	413	#end
414		- #if($canViewBudget)
415		- <div class="school-section-card">
416		- <h3><svg class="ico" viewBox="0 0 24 24"><line x1="12" y1="1" x2="12" y2="23"/><path d="M17 5H9.5a3.5 3.5 0 000 7h5a3.5 3.5 0 010 7H6"/></svg> 予算 #if($visibilityBudget != 'public')<span class="visibility-badge visibility-${visibilityBudget}">#if($visibilityBudget == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
417		- <div class="card-inner">
418		- #if($budgetProcess && !$budgetProcess.isEmpty())
419		- <div class="info-row">
420		- <span class="info-label">作成過程の生徒関与</span>
421		- <span class="info-value">
422		- <div class="selection-display">
423		- #foreach($bp in $budgetProcess)
424		- <span class="selection-item">$!escapetool.xml($bp.trim())</span>
425		- #end
426		- </div>
427		- </span>
428		- </div>
	382	+
	383	+ ## --- 予算 ---
	384	+ #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
	385	+ #if($hasBudget)
	386	+ #set($canViewBudget = true)
	387	+ #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewBudget = false)
	388	+ #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ($viewerSchoolCode != $schoolCode || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false)
429	429	#end
430		- #if($studentFee && $studentFee != '')
431		- <div class="info-row">
432		- <span class="info-label">生徒会費（年額）</span>
433		- <span class="info-value">$!escapetool.xml($!studentFee)</span>
	390	+ #if($canViewBudget)
	391	+ <div class="seitokai-subsection">
	392	+ <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><line x1="12" y1="1" x2="12" y2="23"/><path d="M17 5H9.5a3.5 3.5 0 000 7h5a3.5 3.5 0 010 7H6"/></svg> 予算 #if($visibilityBudget != 'public')<span class="visibility-badge visibility-${visibilityBudget}">#if($visibilityBudget == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
	393	+ <div class="seitokai-subsection-content">
	394	+ #if($budgetProcess && !$budgetProcess.isEmpty())
	395	+ <div class="info-row">
	396	+ <span class="info-label">作成過程の生徒関与</span>
	397	+ <span class="info-value">
	398	+ <div class="selection-display">
	399	+ #foreach($bp in $budgetProcess)
	400	+ <span class="selection-item">$!escapetool.xml($bp.trim())</span>
	401	+ #end
	402	+ </div>
	403	+ </span>
	404	+ </div>
	405	+ #end
	406	+ #if($studentFee && $studentFee != '')
	407	+ <div class="info-row">
	408	+ <span class="info-label">生徒会費（年額）</span>
	409	+ <span class="info-value">$!escapetool.xml($!studentFee)</span>
	410	+ </div>
	411	+ #end
	412	+ #if($budgetScale && $budgetScale != '')
	413	+ <div class="info-row">
	414	+ <span class="info-label">予算規模</span>
	415	+ <span class="info-value">$!escapetool.xml($!budgetScale)</span>
	416	+ </div>
	417	+ #end
	418	+ #if($budgetAllocation && !$budgetAllocation.isEmpty())
	419	+ <div class="info-row">
	420	+ <span class="info-label">主な予算配分</span>
	421	+ <span class="info-value">
	422	+ <div class="selection-display">
	423	+ #foreach($ba in $budgetAllocation)
	424	+ <span class="selection-item">$!escapetool.xml($ba.trim())</span>
	425	+ #end
	426	+ </div>
	427	+ </span>
	428	+ </div>
	429	+ #end
	430	+ #if($budgetNote && $budgetNote.trim() != '')
	431	+ <div class="free-note">$!escapetool.xml($budgetNote)</div>
	432	+ #end
434	434	</div>
435		- #end
436		- #if($budgetScale && $budgetScale != '')
437		- <div class="info-row">
438		- <span class="info-label">予算規模</span>
439		- <span class="info-value">$!escapetool.xml($!budgetScale)</span>
440		- </div>
441		- #end
442		- #if($budgetAllocation && !$budgetAllocation.isEmpty())
443		- <div class="info-row">
444		- <span class="info-label">主な予算配分</span>
445		- <span class="info-value">
446		- <div class="selection-display">
447		- #foreach($ba in $budgetAllocation)
448		- <span class="selection-item">$!escapetool.xml($ba.trim())</span>
449		- #end
450		- </div>
451		- </span>
452		- </div>
453		- #end
454		- #if($budgetNote && $budgetNote.trim() != '')
455		- <div class="free-note">$!escapetool.xml($budgetNote)</div>
456		- #end
457	457	</div>
458		- </div>
459		- #else
460		- <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 予算情報は #if($visibilityBudget == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
	435	+ #else
	436	+ <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 予算情報は #if($visibilityBudget == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
	437	+ #end
461	461	#end
462		- #end
463		-</div>
464	464
465		-## --- ⑧ 校則の見直し ---
466		-#if($ruleReviewStatus && $ruleReviewStatus != '')
467		- ## 公開範囲チェック
468		- #set($canViewRuleReview = true)
469		- #if($visibilityRuleReview == 'members' && $isGuest) #set($canViewRuleReview = false)
470		- #elseif($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewRuleReview = false)
471		- #end
472		- #if($canViewRuleReview)
473		-<h2 class="section-title"><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M16 4h2a2 2 0 012 2v12a2 2 0 01-2 2h-2"/><path d="M8 4H6a2 2 0 00-2 2v12a2 2 0 002 2h2"/><line x1="12" y1="4" x2="12" y2="8"/><line x1="12" y1="16" x2="12" y2="20"/><line x1="8" y1="8" x2="16" y2="8"/><line x1="8" y1="16" x2="16" y2="16"/></svg> 校則の見直し #if($visibilityRuleReview != 'public')<span class="visibility-badge visibility-${visibilityRuleReview}">#if($visibilityRuleReview == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h2>
474		-<div class="school-section-card">
475		- <div class="card-inner">
476		- <div class="info-row">
477		- <span class="info-label">見直しの有無（3年以内）</span>
478		- <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
479		- </div>
480		- #if($ruleReviewContent && !$ruleReviewContent.isEmpty())
481		- <div class="info-row">
482		- <span class="info-label">見直しの内容</span>
483		- <span class="info-value">
484		- <div class="selection-display">
485		- #foreach($rc in $ruleReviewContent)
486		- <span class="selection-item">$!escapetool.xml($rc.trim())</span>
487		- #end
	440	+ ## --- 校則の見直し ---
	441	+ #if($ruleReviewStatus && $ruleReviewStatus != '')
	442	+ #set($canViewRuleReview = true)
	443	+ #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewRuleReview = false)
	444	+ #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ($viewerSchoolCode != $schoolCode || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false)
	445	+ #end
	446	+ #if($canViewRuleReview)
	447	+ <div class="seitokai-subsection">
	448	+ <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M16 4h2a2 2 0 012 2v12a2 2 0 01-2 2h-2"/><path d="M8 4H6a2 2 0 00-2 2v12a2 2 0 002 2h2"/><line x1="12" y1="4" x2="12" y2="8"/><line x1="12" y1="16" x2="12" y2="20"/><line x1="8" y1="8" x2="16" y2="8"/><line x1="8" y1="16" x2="16" y2="16"/></svg> 校則の見直し #if($visibilityRuleReview != 'public')<span class="visibility-badge visibility-${visibilityRuleReview}">#if($visibilityRuleReview == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
	449	+ <div class="seitokai-subsection-content">
	450	+ <div class="info-row">
	451	+ <span class="info-label">見直しの有無（3年以内）</span>
	452	+ <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
488	488	</div>
489		- </span>
490		- </div>
491		- #end
492		- #if($ruleReviewProposer && !$ruleReviewProposer.isEmpty())
493		- <div class="info-row">
494		- <span class="info-label">見直しの提案者</span>
495		- <span class="info-value">
496		- <div class="selection-display">
497		- #foreach($rp in $ruleReviewProposer)
498		- <span class="selection-item">$!escapetool.xml($rp.trim())</span>
499		- #end
	454	+ #if($ruleReviewContent && !$ruleReviewContent.isEmpty())
	455	+ <div class="info-row">
	456	+ <span class="info-label">見直しの内容</span>
	457	+ <span class="info-value">
	458	+ <div class="selection-display">
	459	+ #foreach($rc in $ruleReviewContent)
	460	+ <span class="selection-item">$!escapetool.xml($rc.trim())</span>
	461	+ #end
	462	+ </div>
	463	+ </span>
500	500	</div>
501		- </span>
502		- </div>
503		- #end
504		- #if($ruleReviewImplementer && !$ruleReviewImplementer.isEmpty())
505		- <div class="info-row">
506		- <span class="info-label">見直しの実施者</span>
507		- <span class="info-value">
508		- <div class="selection-display">
509		- #foreach($ri in $ruleReviewImplementer)
510		- <span class="selection-item">$!escapetool.xml($ri.trim())</span>
511		- #end
	465	+ #end
	466	+ #if($ruleReviewProposer && !$ruleReviewProposer.isEmpty())
	467	+ <div class="info-row">
	468	+ <span class="info-label">見直しの提案者</span>
	469	+ <span class="info-value">
	470	+ <div class="selection-display">
	471	+ #foreach($rp in $ruleReviewProposer)
	472	+ <span class="selection-item">$!escapetool.xml($rp.trim())</span>
	473	+ #end
	474	+ </div>
	475	+ </span>
512	512	</div>
513		- </span>
	477	+ #end
	478	+ #if($ruleReviewImplementer && !$ruleReviewImplementer.isEmpty())
	479	+ <div class="info-row">
	480	+ <span class="info-label">見直しの実施者</span>
	481	+ <span class="info-value">
	482	+ <div class="selection-display">
	483	+ #foreach($ri in $ruleReviewImplementer)
	484	+ <span class="selection-item">$!escapetool.xml($ri.trim())</span>
	485	+ #end
	486	+ </div>
	487	+ </span>
	488	+ </div>
	489	+ #end
	490	+ #if($ruleReviewSystem && $ruleReviewSystem != '')
	491	+ <div class="info-row">
	492	+ <span class="info-label">見直しの仕組み</span>
	493	+ <span class="info-value">$!escapetool.xml($!ruleReviewSystem)</span>
	494	+ </div>
	495	+ #end
	496	+ </div>
514	514	</div>
	498	+ #else
	499	+ <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 校則の見直し情報は #if($visibilityRuleReview == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
	500	+ #end
515	515	#end
516		- #if($ruleReviewSystem && $ruleReviewSystem != '')
517		- <div class="info-row">
518		- <span class="info-label">見直しの仕組み</span>
519		- <span class="info-value">$!escapetool.xml($!ruleReviewSystem)</span>
	502	+
	503	+ ## --- 生徒会の課題意識 ---
	504	+ #if($challenges && $challenges != '')
	505	+ #set($canViewChallenges = true)
	506	+ #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewChallenges = false)
	507	+ #elseif($visibilityChallenges == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ($viewerSchoolCode != $schoolCode || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewChallenges = false)
	508	+ #end
	509	+ #if($canViewChallenges)
	510	+ <div class="seitokai-subsection">
	511	+ <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M12 16v-4"/><path d="M12 8h.01"/></svg> 生徒会の課題意識 #if($visibilityChallenges != 'public')<span class="visibility-badge visibility-${visibilityChallenges}">#if($visibilityChallenges == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
	512	+ <div class="seitokai-subsection-content">
	513	+ <div class="challenge-text">$!escapetool.xml($challenges)</div>
	514	+ </div>
520	520	</div>
	516	+ #else
	517	+ <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 課題情報は #if($visibilityChallenges == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
	518	+ #end
521	521	#end
522		- </div>
523		-</div>
524		- #else
525		-<div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 校則の見直し情報は #if($visibilityRuleReview == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
526		- #end
527		-#end
528	528
529		-## --- ⑨ 課題 ---
530		-#if($challenges && $challenges != '')
531		- ## 公開範囲チェック
532		- #set($canViewChallenges = true)
533		- #if($visibilityChallenges == 'members' && $isGuest) #set($canViewChallenges = false)
534		- #elseif($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewChallenges = false)
535		- #end
536		- #if($canViewChallenges)
537		-<h2 class="section-title">生徒会の課題意識 #if($visibilityChallenges != 'public')<span class="visibility-badge visibility-${visibilityChallenges}">#if($visibilityChallenges == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h2>
538		-<div class="challenge-text">$!escapetool.xml($challenges)</div>
539		- #else
540		-<div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 課題情報は #if($visibilityChallenges == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
541		- #end
542		-#end
	521	+ </div>## seitokai-info-body 終了
	522	+</div>## card-seitokai-info 終了
543	543
544		-</div>## seitokai-info-accordion 終了
	524	+## --- ③ SNS・連絡先 ---
	525	+<div class="school-info-card collapsed" id="card-contact">
	526	+ <h2 role="button" tabindex="0" aria-expanded="false" onclick="toggleInfoCard('card-contact')" onkeydown="if(event.key==='Enter'||event.key===' '){event.preventDefault();toggleInfoCard('card-contact')}"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M22 16.92v3a2 2 0 01-2.18 2 19.79 19.79 0 01-8.63-3.07 19.5 19.5 0 01-6-6 19.79 19.79 0 01-3.07-8.67A2 2 0 014.11 2h3a2 2 0 012 1.72c.127.96.361 1.903.7 2.81a2 2 0 01-.45 2.11L8.09 9.91a16 16 0 006 6l1.27-1.27a2 2 0 012.11-.45c.907.339 1.85.573 2.81.7A2 2 0 0122 16.92z"/></svg> SNS・連絡先</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2>
	527	+ <table class="wiki-table school-info-table">
	528	+ <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr>
	529	+ <tr><th>生徒会Web</th><td>#if($seitokaiWebsite && $seitokaiWebsite != '')<a href="$!escapetool.xml($seitokaiWebsite)" target="_blank" rel="noopener"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M2 12h20"/><path d="M12 2a15.3 15.3 0 014 10 15.3 15.3 0 01-4 10 15.3 15.3 0 01-4-10 15.3 15.3 0 014-10z"/></svg> $!escapetool.xml($seitokaiWebsite)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
	530	+ <tr><th>X (Twitter)</th><td>#if($seitokaiTwitter && $seitokaiTwitter != '')<a href="https://x.com/$!escapetool.url($seitokaiTwitter)" target="_blank" rel="noopener">𝕏 @$!escapetool.xml($seitokaiTwitter)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
	531	+ <tr><th>Instagram</th><td>#if($seitokaiInstagram && $seitokaiInstagram != '')<a href="https://instagram.com/$!escapetool.url($seitokaiInstagram)" target="_blank" rel="noopener"><svg class="ico" viewBox="0 0 24 24"><path d="M23 19a2 2 0 01-2 2H3a2 2 0 01-2-2V8a2 2 0 012-2h4l2-3h6l2 3h4a2 2 0 012 2z"/><circle cx="12" cy="13" r="4"/></svg> @$!escapetool.xml($seitokaiInstagram)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
	532	+ <tr><th>YouTube</th><td>#if($seitokaiYoutube && $seitokaiYoutube != '')<a href="$!escapetool.xml($seitokaiYoutube)" target="_blank" rel="noopener"><svg class="ico" viewBox="0 0 24 24"><polygon points="5 3 19 12 5 21 5 3"/></svg> YouTubeチャンネル</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
	533	+ <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
	534	+ </table>
	535	+</div>
545	545
546	546	{{/html}}
547	547
	539	+----
	540	+
548	548	## --- ⑩ 活動報告一覧（スレッド型・年度タブ付き） ---
549	549	= 活動報告 =
550	550
551		-## --- 投稿者ステータス凡例（折りたたみ） ---
	544	+## --- 年度タブ + 投稿者ステータス凡例 ---
552	552	{{html clean="false"}}
553		-<div class="author-legend-wrapper">
554		- <button class="author-legend-toggle" onclick="this.classList.toggle('open');this.nextElementSibling.classList.toggle('open')"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M12 16v-4"/><path d="M12 8h.01"/></svg> バッジの見方 <span class="chevron">▼</span></button>
555		- <div class="author-legend-body">
556		- <div class="author-legend">
557		- <span class="author-legend-title">投稿者の信頼度:</span>
558		- <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者</span>
559		- <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み</span>
560		- <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介</span>
561		- <span class="author-legend-item"><span class="bar bar-general"></span> 一般（未承認）</span>
562		- </div>
563		- <div class="author-legend">
564		- <span class="author-legend-title">所属:</span>
565		- <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>
566		- <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>
567		- <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>
568		- <span class="author-legend-item text-hint">※一般アカウントは所属未確認のため非表示</span>
569		- </div>
570		- <div class="author-legend">
571		- <span class="author-legend-title">役割:</span>
572		- <span class="author-legend-item"><span class="badge badge-role-student badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M22 10v6M2 10l10-5 10 5-10 5z"/><path d="M6 12v5c0 2 4 3 6 3s6-1 6-3v-5"/></svg> 生徒</span></span>
573		- <span class="author-legend-item"><span class="badge badge-role-officer badge-sm"><svg class="ico" viewBox="0 0 24 24"><polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"/></svg> 役員</span></span>
574		- <span class="author-legend-item"><span class="badge badge-role-teacher badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M20 21v-2a4 4 0 00-4-4H8a4 4 0 00-4 4v2"/><circle cx="12" cy="7" r="4"/></svg> 教員</span></span>
575		- </div>
576		- </div>
577		-</div>
578	578
579	579	## --- 年度タブ ---
580	580	## 全活動から年度一覧を収集
...	...	@@ -596,14 +596,41 @@
596	596	#end
597	597	## ソート（降順にしたいが Velocity にはないので JS で制御）
598	598
599		-<div class="activity-fy-tabs">
600		- <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
601		- #foreach($fy in $fySet)
602		- #if($fy != $currentFYStr)
603		- <button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button>
	567	+<div class="activity-toolbar">
	568	+ <div class="activity-fy-tabs">
	569	+ <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
	570	+ #foreach($fy in $fySet)
	571	+ #if($fy != $currentFYStr)
	572	+ <button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button>
	573	+ #end
604	604	#end
605		- #end
606		- <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
	575	+ <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
	576	+ </div>
	577	+ <div class="author-legend-wrapper">
	578	+ <button class="author-legend-toggle" onclick="this.classList.toggle('open');this.nextElementSibling.classList.toggle('open')"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M12 16v-4"/><path d="M12 8h.01"/></svg> バッジの見方 <span class="chevron">▼</span></button>
	579	+ <div class="author-legend-body">
	580	+ <div class="author-legend">
	581	+ <span class="author-legend-title">投稿者の信頼度:</span>
	582	+ <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者</span>
	583	+ <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み</span>
	584	+ <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介</span>
	585	+ <span class="author-legend-item"><span class="bar bar-general"></span> 一般（未承認）</span>
	586	+ </div>
	587	+ <div class="author-legend">
	588	+ <span class="author-legend-title">所属:</span>
	589	+ <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>
	590	+ <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>
	591	+ <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>
	592	+ <span class="author-legend-item text-hint">※一般アカウントは所属未確認のため非表示</span>
	593	+ </div>
	594	+ <div class="author-legend">
	595	+ <span class="author-legend-title">役割:</span>
	596	+ <span class="author-legend-item"><span class="badge badge-role-student badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M22 10v6M2 10l10-5 10 5-10 5z"/><path d="M6 12v5c0 2 4 3 6 3s6-1 6-3v-5"/></svg> 生徒</span></span>
	597	+ <span class="author-legend-item"><span class="badge badge-role-officer badge-sm"><svg class="ico" viewBox="0 0 24 24"><polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"/></svg> 役員</span></span>
	598	+ <span class="author-legend-item"><span class="badge badge-role-teacher badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M20 21v-2a4 4 0 00-4-4H8a4 4 0 00-4 4v2"/><circle cx="12" cy="7" r="4"/></svg> 教員</span></span>
	599	+ </div>
	600	+ </div>
	601	+ </div>
607	607	</div>
608	608
609	609	{{/html}}
...	...	@@ -670,6 +670,12 @@
670	670	<div class="activity-thread-title">
671	671	<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>
672	672	<span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
	668	+ #set($actTagsList = $activity.getValue('tags'))
	669	+ #if($actTagsList && !$actTagsList.isEmpty())
	670	+ #foreach($tagItem in $actTagsList)
	671	+ #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end
	672	+ #end
	673	+ #end
673	673	</div>
674	674	<div class="thread-meta-row">
675	675	<span class="thread-post-count">${reportCount}件の報告 ・ ${commentCount}件のコメント</span>
...	...	@@ -731,12 +731,12 @@
731	731	#set($postVis = $!post.getValue('visibility'))
732	732	#if(!$postVis || $postVis == '') #set($postVis = 'public') #end
733	733	#set($canViewPost = true)
734		- #if($postVis == 'members' && $isGuest) #set($canViewPost = false)
735		- #elseif($postVis == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewPost = false)
	735	+ #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewPost = false)
	736	+ #elseif($postVis == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ($viewerSchoolCode != $schoolCode || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPost = false)
736	736	#end
737	737	#if(!$canViewPost)
738	738	<div class="thread-post visibility-restricted-post">
739		- <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> この投稿は #if($postVis == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
	740	+ <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> この投稿は #if($postVis == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
740	740	</div>
741	741	#else
742	742	## 投稿者のアカウント種別に基づいたCSSクラス
...	...	@@ -868,7 +868,7 @@
868	868	#end
869	869	</div>
870	870	#if($postVis != 'public')
871		- <div class="visibility-badge visibility-${postVis} post-action-mt">#if($postVis == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</div>
	872	+ <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>
872	872	#end
873	873	## 固定/解除ボタン（承認済み・管理者のみ）
874	874	#if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
...	...	@@ -1008,6 +1008,25 @@
1008	1008	window.history.replaceState({}, document.title, window.location.pathname);
1009	1009	}
1010	1010	}
	1012	+ // 長文投稿の折りたたみ初期化
	1013	+ document.querySelectorAll('.thread-post-body').forEach(function(body) {
	1014	+ // 先にtruncatedを仮適用してline-clampを有効にし、高さの差分で判定
	1015	+ var fullH = body.scrollHeight;
	1016	+ body.classList.add('truncated');
	1017	+ var clampedH = body.clientHeight;
	1018	+ body.classList.remove('truncated');
	1019	+ if (fullH > clampedH + 10) {
	1020	+ body.classList.add('truncated');
	1021	+ var btn = document.createElement('button');
	1022	+ btn.className = 'btn-read-more';
	1023	+ btn.textContent = '広げて読む ▼';
	1024	+ btn.addEventListener('click', function() {
	1025	+ var isExpanded = body.classList.toggle('expanded');
	1026	+ btn.textContent = isExpanded ? '折りたたむ ▲' : '広げて読む ▼';
	1027	+ });
	1028	+ body.parentNode.insertBefore(btn, body.nextSibling);
	1029	+ }
	1030	+ });
1011	1011	});
1012	1012
1013	1013	// トースト通知表示
...	...	@@ -1070,7 +1070,7 @@
1070	1070	var csrfEl = document.querySelector('input[name="form_token"]');
1071	1071	var csrfToken = csrfEl ? csrfEl.value : '';
1072	1072	var xhr = new XMLHttpRequest();
1073		- xhr.open('POST', '/bin/SeitokaiCode/EditPost?outputSyntax=plain', true);
	1093	+ xhr.open('POST', '/bin/get/SeitokaiCode/EditPost?outputSyntax=plain', true);
1074	1074	xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1075	1075	var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken);
1076	1076	xhr.onload = function() {
...	...	@@ -1092,7 +1092,7 @@
1092	1092	function confirmDeletePost(schoolPage, postObjNum, token) {
1093	1093	if (!confirm('この投稿を削除しますか？\\n削除後は「この投稿は削除されました」と表示されます。')) return;
1094	1094	var xhr = new XMLHttpRequest();
1095		- xhr.open('POST', '/bin/SeitokaiCode/DeletePost?outputSyntax=plain', true);
	1115	+ xhr.open('POST', '/bin/get/SeitokaiCode/DeletePost?outputSyntax=plain', true);
1096	1096	xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1097	1097	var deletePostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token);
1098	1098	xhr.onload = function() {