Skip to Content
Last modified by Super Admin on 2026/04/05 18:59
From version Icon 49.1 Icon
edited by Super Admin
on 2026/03/13 21:55
Change comment: There is no comment for this version
To version Icon 74.1 Icon
edited by Super Admin
on 2026/03/19 12:32
Change comment: There is no comment for this version

Summary

Details

Icon Page properties
Content
... ... @@ -1,5 +1,11 @@
1 1  {{velocity}}
2 2  ## ===== 学校ページ テンプレート =====
3 +## ゲストが ?sheet= 付きURL（編集フォーム等）に直接アクセスした場合、ログインページへリダイレクト
4 +#if($xcontext.user == 'XWiki.XWikiGuest' && $request.sheet && $request.sheet != '')
5 + #set($currentUrl = $doc.getURL('view', "sheet=${request.sheet}"))
6 + $response.sendRedirect("/bin/login/XWiki/XWikiLogin?srid=$escapetool.url($currentUrl)")
7 + #stop
8 +#end
3 3  {{html clean="false"}}
4 4  ## メンテナンスバナー（{{include}}ではなくインラインで記述し、<p>タグ挿入を回避）
5 5  #set($bannerDoc = $xwiki.getDocument('SeitokaiAdmin.MaintenanceBanner'))
... ... @@ -28,6 +28,7 @@
28 28  #set($schoolLevel = $doc.getValue('schoolLevel'))
29 29  #set($schoolSystem = $doc.getValue('schoolSystem'))
30 30  #set($website = $doc.getValue('website'))
37 +#set($schoolPhoto = $doc.getValue('schoolPhoto'))
31 31  
32 32  ## --- 組織図 ---
33 33  #set($orgChart = $doc.getValue('orgChart'))
... ... @@ -95,11 +95,42 @@
95 95   #set($viewerDoc = $xwiki.getDocument($viewerUser))
96 96   #set($viewerAccountType = $!viewerDoc.getValue('accountType'))
97 97   #set($viewerSchoolCode = $!viewerDoc.getValue('schoolCode'))
105 + #set($viewerSecondarySchoolCode = $!viewerDoc.getValue('secondarySchoolCode'))
106 + #set($viewerUserRole = $!viewerDoc.getValue('userRole'))
98 98   #if($viewerAccountType == 'admin')
99 99   #set($isViewerAdmin = true)
100 100   #end
101 101  #end
102 102  
112 +## --- 関連校（中高一貫校）情報 ---
113 +#set($affiliatedSchoolCode = $!doc.getValue('affiliatedSchoolCode'))
114 +#set($affiliatedSchoolName = $!doc.getValue('affiliatedSchoolName'))
115 +#set($isAffiliated = false)
116 +#if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
117 + #if($viewerSchoolCode == $affiliatedSchoolCode)
118 + #set($isAffiliated = true)
119 + #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode)
120 + #set($isAffiliated = true)
121 + #end
122 +#end
123 +
124 +## --- 校内判定（卒業生を除外、secondarySchoolCodeも含む） ---
125 +#set($isSchoolMember = false)
126 +#if(!$isGuest && $viewerUserRole != 'graduate')
127 + #if($viewerSchoolCode == $schoolCode || $isAffiliated)
128 + #set($isSchoolMember = true)
129 + #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode)
130 + #set($isSchoolMember = true)
131 + #end
132 +#end
133 +## 卒業生の母校判定（投稿バッジ用）
134 +#set($isAlumniOfSchool = false)
135 +#if(!$isGuest && $viewerUserRole == 'graduate')
136 + #if($viewerSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $viewerSchoolCode == $affiliatedSchoolCode))
137 + #set($isAlumniOfSchool = true)
138 + #end
139 +#end
140 +
103 103  ## --- 学校ページ非表示チェック ---
104 104  #set($schoolHidden = $doc.getValue('hidden'))
105 105  #if($schoolHidden == 1)
... ... @@ -133,7 +133,7 @@
133 133  
134 134  ## --- 投稿固定/解除処理 ---
135 135  #set($pinAction = $!request.action)
136 -#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token))
174 +#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $isSchoolMember)) && $services.csrf.isTokenValid($request.form_token))
137 137   #set($pinPostObjStr = $!request.postObj)
138 138   #if(!$pinPostObjStr.matches('^\d+$'))
139 139   ## 不正な値 → 無視
... ... @@ -163,7 +163,7 @@
163 163  
164 164  ## --- 特色ある活動 選定/解除処理 ---
165 165  #set($featAction = $!request.action)
166 -#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token))
204 +#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $isSchoolMember)) && $services.csrf.isTokenValid($request.form_token))
167 167   #set($featActObjStr = $!request.actObj)
168 168   #if($featActObjStr.matches('^\d+$'))
169 169   #set($actObjNum = $mathtool.toInteger($featActObjStr))
... ... @@ -265,7 +265,7 @@
265 265  
266 266  ## --- 編集ボタン（権限があるユーザーのみ表示） ---
267 267  #set($canEditSchool = false)
268 -#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode))
306 +#if(!$isGuest && ($isViewerAdmin || $isSchoolMember))
269 269   #set($canEditSchool = true)
270 270  #end
271 271  #if($canEditSchool)
... ... @@ -274,305 +274,302 @@
274 274  </div>
275 275  #end
276 276  
277 -## --- ① 学校基本情報 + 連絡先（左右グリッド・折りたたみ対応） ---
278 -<div class="school-info-grid">
279 - <div class="school-info-card collapsed" id="card-basic-info">
280 - <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>
281 - <table class="wiki-table school-info-table">
282 - <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
283 - <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
284 - <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
285 - <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
286 - <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
287 - <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
288 - <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
289 - <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
290 - <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>
291 - </table>
292 - #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
293 - #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
294 - #if($infoEditDate && $infoEditDate != '')
295 - <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>
315 +## --- 関連校（中高一貫校）バナー ---
316 +#if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
317 + #set($affiliatedPageRef = "Schools.${affiliatedSchoolCode}.WebHome")
318 + #set($affiliatedPageExists = $xwiki.exists($affiliatedPageRef))
319 +<div class="affiliated-school-banner">
320 + <svg class="ico" viewBox="0 0 24 24" stroke-width="1.5"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg>
321 + <div>
322 + <strong>中高一貫校</strong>：
323 + #if($affiliatedPageExists)
324 + <a href="$xwiki.getURL($affiliatedPageRef, 'view')">$!escapetool.xml($affiliatedSchoolName)</a>
325 + #else
326 + $!escapetool.xml($affiliatedSchoolName)
296 296   #end
328 + と連携しています
297 297   </div>
298 -
299 - <div class="school-info-card collapsed" id="card-contact">
300 - <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>
301 - <table class="wiki-table school-info-table">
302 - <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr>
303 - <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>
304 - <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>
305 - <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>
306 - <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>
307 - <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
308 - </table>
309 - </div>
310 310  </div>
311 -
312 -## --- 生徒会情報アコーディオン ---
313 -<div class="school-section-divider">
314 - <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')?'▲':'▼';">
315 - <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>
316 - 生徒会情報を見る <span class="shortcut-arrow">▼</span>
317 - </button>
318 -</div>
319 -
320 -<div id="seitokai-info-section" class="seitokai-info-accordion">
321 -
322 -## --- ② 組織図 ---
323 -#set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
324 -#if($hasOrgContent)
325 - ## 公開範囲チェック
326 - #set($canViewOrgChart = true)
327 - #if($visibilityOrgChart == 'members' && $isGuest) #set($canViewOrgChart = false)
328 - #elseif($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewOrgChart = false)
329 - #end
330 - #if($canViewOrgChart)
331 -<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>
332 -<div class="school-section-card">
333 - <div class="card-inner">
334 - #if($orgChartImage && $orgChartImage != '')
335 - <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
336 - #end
337 - #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end
338 - </div>
339 -</div>
340 - #else
341 -<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>
342 - #end
343 343  #end
344 344  
345 -## --- ③④⑤ 日常の活動・選挙・定例活動 ---
346 -<div class="school-section-grid">
347 - #if($dailyActivities && !$dailyActivities.isEmpty())
348 - <div class="school-section-card">
349 - <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>
350 - <div class="card-inner">
351 - <p class="activity-hint">活動時間の多い順に上位3つ</p>
352 - <div class="tag-container">
353 - #set($daIdx = 1)
354 - #foreach($da in $dailyActivities)
355 - <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
356 - #set($daIdx = $daIdx + 1)
357 - #end
358 - </div>
359 - #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
360 - <div class="free-note">$!escapetool.xml($dailyActivitiesNote)</div>
361 - #end
333 +## --- ① 学校基本情報 ---
334 +<div class="school-info-card collapsed" id="card-basic-info">
335 + <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>
336 + <div class="school-basic-info-layout">
337 + <div class="school-basic-info-table">
338 + <table class="wiki-table school-info-table">
339 + <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
340 + <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
341 + <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
342 + <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
343 + <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
344 + <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
345 + <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
346 + <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
347 + <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>
348 + </table>
362 362   </div>
363 - </div>
364 - #end
365 -
366 - #if($electionExists && $electionExists != '')
367 - <div class="school-section-card">
368 - <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>
369 - <div class="card-inner">
370 - <div class="info-row">
371 - <span class="info-label">役員選挙</span>
372 - <span class="info-value">$!escapetool.xml($!electionExists)</span>
373 - </div>
374 - #if($electionType && $electionType != '')
375 - <div class="info-row">
376 - <span class="info-label">直近の選挙方式</span>
377 - <span class="info-value">$!escapetool.xml($!electionType)</span>
378 - </div>
379 - #end
380 - #if($electionNote && $electionNote.trim() != '')
381 - <div class="free-note">$!escapetool.xml($electionNote)</div>
382 - #end
350 + #if($schoolPhoto && $schoolPhoto != '')
351 + <div class="school-photo-area">
352 + <img src="$doc.getAttachmentURL($schoolPhoto)" alt="$!escapetool.xml($schoolName)" class="school-photo" />
383 383   </div>
354 + #end
384 384   </div>
356 + #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
357 + #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
358 + #if($infoEditDate && $infoEditDate != '')
359 + <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>
385 385   #end
386 386  </div>
387 387  
388 -<div class="school-section-grid">
389 - #if($meetingFrequency && $meetingFrequency != '')
390 - <div class="school-section-card">
391 - <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>
392 - <div class="card-inner">
393 - <div class="info-row">
394 - <span class="info-label">役員定例会の頻度</span>
395 - <span class="info-value">$!escapetool.xml($!meetingFrequency)</span>
396 - </div>
397 - #if($regularActivitiesNote && $regularActivitiesNote.trim() != '')
398 - <div class="free-note">$!escapetool.xml($regularActivitiesNote)</div>
399 - #end
400 - </div>
401 - </div>
402 - #end
363 +## --- ② 生徒会基本情報（折りたたみカード） ---
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>
366 + <div class="seitokai-info-body">
403 403  
404 - ## --- ⑦ 予算 ---
405 - #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
406 - #if($hasBudget)
407 - ## 公開範囲チェック
408 - #set($canViewBudget = true)
409 - #if($visibilityBudget == 'members' && $isGuest) #set($canViewBudget = false)
410 - #elseif($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewBudget = false)
411 - #end
412 - #if($canViewBudget)
413 - <div class="school-section-card">
414 - <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>
415 - <div class="card-inner">
416 - #if($budgetProcess && !$budgetProcess.isEmpty())
417 - <div class="info-row">
418 - <span class="info-label">作成過程の生徒関与</span>
419 - <span class="info-value">
420 - <div class="selection-display">
421 - #foreach($bp in $budgetProcess)
422 - <span class="selection-item">$!escapetool.xml($bp.trim())</span>
423 - #end
424 - </div>
425 - </span>
426 - </div>
368 + ## --- 組織図 ---
369 + #set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
370 + #if($hasOrgContent)
371 + #set($canViewOrgChart = true)
372 + #if($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewOrgChart = false)
373 + #elseif($visibilityOrgChart == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewOrgChart = false)
427 427   #end
428 - #if($studentFee && $studentFee != '')
429 - <div class="info-row">
430 - <span class="info-label">生徒会費（年額）</span>
431 - <span class="info-value">$!escapetool.xml($!studentFee)</span>
375 + #if($canViewOrgChart)
376 + <div class="seitokai-subsection">
377 + <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>
378 + <div class="seitokai-subsection-content">
379 + #if($orgChartImage && $orgChartImage != '')
380 + <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
381 + #end
382 + #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end
432 432   </div>
384 + </div>
385 + #else
386 + <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>
433 433   #end
434 - #if($budgetScale && $budgetScale != '')
435 - <div class="info-row">
436 - <span class="info-label">予算規模</span>
437 - <span class="info-value">$!escapetool.xml($!budgetScale)</span>
388 + #end
389 +
390 + ## --- 日常の活動 ---
391 + #if($dailyActivities && !$dailyActivities.isEmpty())
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>
394 + <div class="seitokai-subsection-content">
395 + <p class="activity-hint">活動時間の多い順に上位3つ</p>
396 + <div class="tag-container">
397 + #set($daIdx = 1)
398 + #foreach($da in $dailyActivities)
399 + <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
400 + #set($daIdx = $daIdx + 1)
401 + #end
402 + </div>
403 + #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
404 + <div class="free-note">$!escapetool.xml($dailyActivitiesNote)</div>
405 + #end
438 438   </div>
439 - #end
440 - #if($budgetAllocation && !$budgetAllocation.isEmpty())
441 - <div class="info-row">
442 - <span class="info-label">主な予算配分</span>
443 - <span class="info-value">
444 - <div class="selection-display">
445 - #foreach($ba in $budgetAllocation)
446 - <span class="selection-item">$!escapetool.xml($ba.trim())</span>
447 - #end
448 - </div>
449 - </span>
450 - </div>
451 - #end
452 - #if($budgetNote && $budgetNote.trim() != '')
453 - <div class="free-note">$!escapetool.xml($budgetNote)</div>
454 - #end
455 455   </div>
456 - </div>
457 - #else
458 - <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>
459 459   #end
460 - #end
461 -</div>
462 462  
463 -## --- ⑧ 校則の見直し ---
464 -#if($ruleReviewStatus && $ruleReviewStatus != '')
465 - ## 公開範囲チェック
466 - #set($canViewRuleReview = true)
467 - #if($visibilityRuleReview == 'members' && $isGuest) #set($canViewRuleReview = false)
468 - #elseif($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewRuleReview = false)
469 - #end
470 - #if($canViewRuleReview)
471 -<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>
472 -<div class="school-section-card">
473 - <div class="card-inner">
474 - <div class="info-row">
475 - <span class="info-label">見直しの有無（3年以内）</span>
476 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
410 + ## --- 選挙 ---
411 + #if($electionExists && $electionExists != '')
412 + <div class="seitokai-subsection">
413 + <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>
414 + <div class="seitokai-subsection-content">
415 + <div class="info-row">
416 + <span class="info-label">役員選挙</span>
417 + <span class="info-value">$!escapetool.xml($!electionExists)</span>
418 + </div>
419 + #if($electionType && $electionType != '')
420 + <div class="info-row">
421 + <span class="info-label">直近の選挙方式</span>
422 + <span class="info-value">$!escapetool.xml($!electionType)</span>
423 + </div>
424 + #end
425 + #if($electionNote && $electionNote.trim() != '')
426 + <div class="free-note">$!escapetool.xml($electionNote)</div>
427 + #end
428 + </div>
477 477   </div>
478 - #if($ruleReviewContent && !$ruleReviewContent.isEmpty())
479 - <div class="info-row">
480 - <span class="info-label">見直しの内容</span>
481 - <span class="info-value">
482 - <div class="selection-display">
483 - #foreach($rc in $ruleReviewContent)
484 - <span class="selection-item">$!escapetool.xml($rc.trim())</span>
485 - #end
430 + #end
431 +
432 + ## --- 定例活動 ---
433 + #if($meetingFrequency && $meetingFrequency != '')
434 + <div class="seitokai-subsection">
435 + <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>
436 + <div class="seitokai-subsection-content">
437 + <div class="info-row">
438 + <span class="info-label">役員定例会の頻度</span>
439 + <span class="info-value">$!escapetool.xml($!meetingFrequency)</span>
486 486   </div>
487 - </span>
441 + #if($regularActivitiesNote && $regularActivitiesNote.trim() != '')
442 + <div class="free-note">$!escapetool.xml($regularActivitiesNote)</div>
443 + #end
444 + </div>
488 488   </div>
489 489   #end
490 - #if($ruleReviewProposer && !$ruleReviewProposer.isEmpty())
491 - <div class="info-row">
492 - <span class="info-label">見直しの提案者</span>
493 - <span class="info-value">
494 - <div class="selection-display">
495 - #foreach($rp in $ruleReviewProposer)
496 - <span class="selection-item">$!escapetool.xml($rp.trim())</span>
497 - #end
447 +
448 + ## --- 予算 ---
449 + #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
450 + #if($hasBudget)
451 + #set($canViewBudget = true)
452 + #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewBudget = false)
453 + #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false)
454 + #end
455 + #if($canViewBudget)
456 + <div class="seitokai-subsection">
457 + <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>
458 + <div class="seitokai-subsection-content">
459 + #if($budgetProcess && !$budgetProcess.isEmpty())
460 + <div class="info-row">
461 + <span class="info-label">作成過程の生徒関与</span>
462 + <span class="info-value">
463 + <div class="selection-display">
464 + #foreach($bp in $budgetProcess)
465 + <span class="selection-item">$!escapetool.xml($bp.trim())</span>
466 + #end
467 + </div>
468 + </span>
498 498   </div>
499 - </span>
470 + #end
471 + #if($studentFee && $studentFee != '')
472 + <div class="info-row">
473 + <span class="info-label">生徒会費（年額）</span>
474 + <span class="info-value">$!escapetool.xml($!studentFee)</span>
475 + </div>
476 + #end
477 + #if($budgetScale && $budgetScale != '')
478 + <div class="info-row">
479 + <span class="info-label">予算規模</span>
480 + <span class="info-value">$!escapetool.xml($!budgetScale)</span>
481 + </div>
482 + #end
483 + #if($budgetAllocation && !$budgetAllocation.isEmpty())
484 + <div class="info-row">
485 + <span class="info-label">主な予算配分</span>
486 + <span class="info-value">
487 + <div class="selection-display">
488 + #foreach($ba in $budgetAllocation)
489 + <span class="selection-item">$!escapetool.xml($ba.trim())</span>
490 + #end
491 + </div>
492 + </span>
493 + </div>
494 + #end
495 + #if($budgetNote && $budgetNote.trim() != '')
496 + <div class="free-note">$!escapetool.xml($budgetNote)</div>
497 + #end
498 + </div>
500 500   </div>
500 + #else
501 + <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>
502 + #end
501 501   #end
502 - #if($ruleReviewImplementer && !$ruleReviewImplementer.isEmpty())
503 - <div class="info-row">
504 - <span class="info-label">見直しの実施者</span>
505 - <span class="info-value">
506 - <div class="selection-display">
507 - #foreach($ri in $ruleReviewImplementer)
508 - <span class="selection-item">$!escapetool.xml($ri.trim())</span>
509 - #end
504 +
505 + ## --- 校則の見直し ---
506 + #if($ruleReviewStatus && $ruleReviewStatus != '')
507 + #set($canViewRuleReview = true)
508 + #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewRuleReview = false)
509 + #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false)
510 + #end
511 + #if($canViewRuleReview)
512 + <div class="seitokai-subsection">
513 + <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>
514 + <div class="seitokai-subsection-content">
515 + <div class="info-row">
516 + <span class="info-label">見直しの有無（3年以内）</span>
517 + <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
510 510   </div>
511 - </span>
519 + #if($ruleReviewContent && !$ruleReviewContent.isEmpty())
520 + <div class="info-row">
521 + <span class="info-label">見直しの内容</span>
522 + <span class="info-value">
523 + <div class="selection-display">
524 + #foreach($rc in $ruleReviewContent)
525 + <span class="selection-item">$!escapetool.xml($rc.trim())</span>
526 + #end
527 + </div>
528 + </span>
529 + </div>
530 + #end
531 + #if($ruleReviewProposer && !$ruleReviewProposer.isEmpty())
532 + <div class="info-row">
533 + <span class="info-label">見直しの提案者</span>
534 + <span class="info-value">
535 + <div class="selection-display">
536 + #foreach($rp in $ruleReviewProposer)
537 + <span class="selection-item">$!escapetool.xml($rp.trim())</span>
538 + #end
539 + </div>
540 + </span>
541 + </div>
542 + #end
543 + #if($ruleReviewImplementer && !$ruleReviewImplementer.isEmpty())
544 + <div class="info-row">
545 + <span class="info-label">見直しの実施者</span>
546 + <span class="info-value">
547 + <div class="selection-display">
548 + #foreach($ri in $ruleReviewImplementer)
549 + <span class="selection-item">$!escapetool.xml($ri.trim())</span>
550 + #end
551 + </div>
552 + </span>
553 + </div>
554 + #end
555 + #if($ruleReviewSystem && $ruleReviewSystem != '')
556 + <div class="info-row">
557 + <span class="info-label">見直しの仕組み</span>
558 + <span class="info-value">$!escapetool.xml($!ruleReviewSystem)</span>
559 + </div>
560 + #end
561 + </div>
512 512   </div>
563 + #else
564 + <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 校則の見直し情報は #if($visibilityRuleReview == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
565 + #end
513 513   #end
514 - #if($ruleReviewSystem && $ruleReviewSystem != '')
515 - <div class="info-row">
516 - <span class="info-label">見直しの仕組み</span>
517 - <span class="info-value">$!escapetool.xml($!ruleReviewSystem)</span>
567 +
568 + ## --- 生徒会の課題意識 ---
569 + #if($challenges && $challenges != '')
570 + #set($canViewChallenges = true)
571 + #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewChallenges = false)
572 + #elseif($visibilityChallenges == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewChallenges = false)
573 + #end
574 + #if($canViewChallenges)
575 + <div class="seitokai-subsection">
576 + <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>
577 + <div class="seitokai-subsection-content">
578 + <div class="challenge-text">$!escapetool.xml($challenges)</div>
579 + </div>
518 518   </div>
581 + #else
582 + <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>
583 + #end
519 519   #end
520 - </div>
521 -</div>
522 - #else
523 -<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>
524 - #end
525 -#end
526 526  
527 -## --- ⑨ 課題 ---
528 -#if($challenges && $challenges != '')
529 - ## 公開範囲チェック
530 - #set($canViewChallenges = true)
531 - #if($visibilityChallenges == 'members' && $isGuest) #set($canViewChallenges = false)
532 - #elseif($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewChallenges = false)
533 - #end
534 - #if($canViewChallenges)
535 -<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>
536 -<div class="challenge-text">$!escapetool.xml($challenges)</div>
537 - #else
538 -<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>
539 - #end
540 -#end
586 + </div>## seitokai-info-body 終了
587 +</div>## card-seitokai-info 終了
541 541  
542 -</div>## seitokai-info-accordion 終了
589 +## --- ③ SNS・連絡先 ---
590 +<div class="school-info-card collapsed" id="card-contact">
591 + <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>
592 + <table class="wiki-table school-info-table">
593 + <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr>
594 + <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>
595 + <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>
596 + <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>
597 + <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>
598 + <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
599 + </table>
600 +</div>
543 543  
544 544  {{/html}}
545 545  
604 +----
605 +
546 546  ## --- ⑩ 活動報告一覧（スレッド型・年度タブ付き） ---
547 547  = 活動報告 =
548 548  
549 -## --- 投稿者ステータス凡例（折りたたみ） ---
609 +## --- 年度タブ + 投稿者ステータス凡例 ---
550 550  {{html clean="false"}}
551 -<div class="author-legend-wrapper">
552 - <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>
553 - <div class="author-legend-body">
554 - <div class="author-legend">
555 - <span class="author-legend-title">投稿者の信頼度:</span>
556 - <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者</span>
557 - <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み</span>
558 - <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介</span>
559 - <span class="author-legend-item"><span class="bar bar-general"></span> 一般（未承認）</span>
560 - </div>
561 - <div class="author-legend">
562 - <span class="author-legend-title">所属:</span>
563 - <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>
564 - <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>
565 - <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>
566 - <span class="author-legend-item text-hint">※一般アカウントは所属未確認のため非表示</span>
567 - </div>
568 - <div class="author-legend">
569 - <span class="author-legend-title">役割:</span>
570 - <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>
571 - <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>
572 - <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>
573 - </div>
574 - </div>
575 -</div>
576 576  
577 577  ## --- 年度タブ ---
578 578  ## 全活動から年度一覧を収集
... ... @@ -594,14 +594,49 @@
594 594  #end
595 595  ## ソート（降順にしたいが Velocity にはないので JS で制御）
596 596  
597 -<div class="activity-fy-tabs">
598 - <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
599 - #foreach($fy in $fySet)
600 - #if($fy != $currentFYStr)
601 - <button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button>
632 +<div class="activity-toolbar">
633 + <div class="activity-fy-tabs">
634 + <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
635 + #foreach($fy in $fySet)
636 + #if($fy != $currentFYStr)
637 + <button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button>
638 + #end
602 602   #end
603 - #end
604 - <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
640 + <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
641 + </div>
642 + <div class="activity-toolbar-right">
643 + <button class="btn-view-toggle" id="btnViewToggle" onclick="toggleCompactView()" title="タイトルのみ表示">
644 + <svg class="ico-list" viewBox="0 0 24 24" stroke="currentColor" fill="none" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><line x1="8" y1="6" x2="21" y2="6"/><line x1="8" y1="12" x2="21" y2="12"/><line x1="8" y1="18" x2="21" y2="18"/><line x1="3" y1="6" x2="3.01" y2="6"/><line x1="3" y1="12" x2="3.01" y2="12"/><line x1="3" y1="18" x2="3.01" y2="18"/></svg>
645 + <svg class="ico-detail" viewBox="0 0 24 24" stroke="currentColor" fill="none" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="3" width="7" height="7"/><rect x="14" y="3" width="7" height="7"/><rect x="3" y="14" width="7" height="7"/><rect x="14" y="14" width="7" height="7"/></svg>
646 + <span class="toggle-label">一覧表示</span>
647 + </button>
648 + </div>
649 + <div class="author-legend-wrapper">
650 + <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>
651 + <div class="author-legend-body">
652 + <div class="author-legend">
653 + <span class="author-legend-title">投稿者の信頼度:</span>
654 + <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者 <span class="text-hint">— 運営スタッフ</span></span>
655 + <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み <span class="text-hint">— 本人確認済みのユーザー</span></span>
656 + <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介 <span class="text-hint">— 承認済みユーザーからの紹介</span></span>
657 + <span class="author-legend-item"><span class="bar bar-general"></span> 一般 <span class="text-hint">— 一般登録ユーザー</span></span>
658 + </div>
659 + <div class="author-legend">
660 + <span class="author-legend-title">所属:</span>
661 + <span class="author-legend-item"><span class="badge badge-school-internal-confirmed badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内（確認済）</span> <span class="text-hint">所属が確認されたこの学校のユーザー</span></span>
662 + <span class="author-legend-item"><span class="badge badge-school-internal badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内</span> <span class="text-hint">この学校に所属登録しているユーザー</span></span>
663 + <span class="author-legend-item"><span class="badge badge-alumni badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M22 10l-10-5L2 10l10 5 10-5z"/><path d="M6 12v5c0 1.66 2.69 3 6 3s6-1.34 6-3v-5"/></svg> 卒業生</span> <span class="text-hint">この学校の卒業生</span></span>
664 + <span class="author-legend-item"><span class="badge badge-school-external badge-sm"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M2 12h20"/><path d="M12 2a15.3 15.3 0 014 10 15.3 15.3 0 01-4 10 15.3 15.3 0 01-4-10 15.3 15.3 0 014-10z"/></svg> 他校</span> <span class="text-hint">別の学校に所属しているユーザー</span></span>
665 + <span class="author-legend-item text-hint">※一般アカウントは所属バッジが表示されません</span>
666 + </div>
667 + <div class="author-legend">
668 + <span class="author-legend-title">役割:</span>
669 + <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>
670 + <span class="author-legend-item"><span class="badge badge-role-officer badge-sm"><svg class="ico" viewBox="0 0 24 24"><polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"/></svg> 役員</span> <span class="text-hint">生徒会役員</span></span>
671 + <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>
672 + </div>
673 + </div>
674 + </div>
605 605  </div>
606 606  
607 607  {{/html}}
... ... @@ -668,6 +668,12 @@
668 668   <div class="activity-thread-title">
669 669   <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>
670 670   <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
741 + #set($actTagsList = $activity.getValue('tags'))
742 + #if($actTagsList && !$actTagsList.isEmpty())
743 + #foreach($tagItem in $actTagsList)
744 + #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end
745 + #end
746 + #end
671 671   </div>
672 672   <div class="thread-meta-row">
673 673   <span class="thread-post-count">${reportCount}件の報告 ・ ${commentCount}件のコメント</span>
... ... @@ -729,12 +729,12 @@
729 729   #set($postVis = $!post.getValue('visibility'))
730 730   #if(!$postVis || $postVis == '') #set($postVis = 'public') #end
731 731   #set($canViewPost = true)
732 - #if($postVis == 'members' && $isGuest) #set($canViewPost = false)
733 - #elseif($postVis == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewPost = false)
808 + #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewPost = false)
809 + #elseif($postVis == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPost = false)
734 734   #end
735 735   #if(!$canViewPost)
736 736   <div class="thread-post visibility-restricted-post">
737 - <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>
813 + <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>
738 738   </div>
739 739   #else
740 740   ## 投稿者のアカウント種別に基づいたCSSクラス
... ... @@ -774,8 +774,11 @@
774 774   <span class="badge badge-general badge-sm">一般</span>
775 775   #end
776 776   ## 所属バッジ（投稿者の学校コードとページの学校コードを比較）
853 + #set($postIsSchoolMatch = ($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode)))
777 777   #if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general')
778 - #if($postSchoolCode == $schoolCode)
855 + #if($postUserRole == 'graduate' && $postIsSchoolMatch)
856 + <span class="badge badge-alumni badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M22 10l-10-5L2 10l10 5 10-5z"/><path d="M6 12v5c0 1.66 2.69 3 6 3s6-1.34 6-3v-5"/></svg> 卒業生</span>
857 + #elseif($postIsSchoolMatch && $postUserRole != 'graduate')
779 779   #if($postAccountType == 'verified' || $postAccountType == 'admin')
780 780   <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>
781 781   #else
... ... @@ -866,12 +866,17 @@
866 866   #end
867 867   </div>
868 868   #if($postVis != 'public')
869 - <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>
948 + <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>
870 870   #end
871 - ## 固定/解除ボタン（承認済み・管理者のみ）
872 - #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
873 - #set($postObjNum = $post.number)
874 - <div class="post-pin-action post-action-mt">
950 + ## 固定/編集/削除ボタン（横並び）
951 + #set($postAuthorRef = $!post.getValue('authorRef'))
952 + #set($postObjNumED = $post.number)
953 + #set($showPinBtn = ($viewerAccountType == 'admin' || $viewerAccountType == 'verified'))
954 + #set($showEditDeleteBtn = ($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin'))
955 + #if($showPinBtn || $showEditDeleteBtn)
956 + <div class="post-edit-actions post-action-mt">
957 + #if($showPinBtn)
958 + #set($postObjNum = $post.number)
875 875   #if($isPinned == '1')
876 876   <a href="$doc.getURL('view', "action=unpin&postObj=${postObjNum}&form_token=${services.csrf.getToken()}")" class="btn-pin-toggle btn-unpin" title="固定を解除">
877 877   <svg class="ico ico-fixed-14" viewBox="0 0 24 24" fill="currentColor" stroke="none"><path d="M16 2l-4 4-2-1-5 5 3 3-6 6h4l4-4 3 3 5-5-1-2 4-4-5-5z"/></svg> 固定を解除
... ... @@ -881,13 +881,8 @@
881 881   <svg class="ico ico-fixed-14" viewBox="0 0 24 24"><path d="M16 2l-4 4-2-1-5 5 3 3-6 6h4l4-4 3 3 5-5-1-2 4-4-5-5z"/></svg> 固定する
882 882   </a>
883 883   #end
884 - </div>
885 - #end
886 - ## 編集・削除ボタン（投稿者本人 or 管理者）
887 - #set($postAuthorRef = $!post.getValue('authorRef'))
888 - #set($postObjNumED = $post.number)
889 - #if($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin')
890 - <div class="post-edit-actions post-action-mt">
968 + #end
969 + #if($showEditDeleteBtn)
891 891   #if($xcontext.user == $postAuthorRef)
892 892   <button type="button" class="btn-post-edit" onclick="openEditPost(this, '${doc.fullName}', $postObjNumED, '$!escapetool.javascript($!postContent)')" title="この投稿を編集">
893 893   <svg class="ico ico-fixed-14" viewBox="0 0 24 24"><path d="M11 4H4a2 2 0 00-2 2v14a2 2 0 002 2h14a2 2 0 002-2v-7"/><path d="M18.5 2.5a2.121 2.121 0 013 3L12 15l-4 1 1-4 9.5-9.5z"/></svg> 編集
... ... @@ -896,6 +896,7 @@
896 896   <button type="button" class="btn-post-delete" onclick="confirmDeletePost('${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を削除">
897 897   <svg class="ico ico-fixed-14" viewBox="0 0 24 24"><polyline points="3 6 5 6 21 6"/><path d="M19 6v14a2 2 0 01-2 2H7a2 2 0 01-2-2V6m3 0V4a2 2 0 012-2h4a2 2 0 012 2v2"/></svg> 削除
898 898   </button>
978 + #end
899 899   </div>
900 900   #end
901 901   </div>
... ... @@ -980,6 +980,35 @@
980 980  ## --- 年度タブ切り替え JavaScript ---
981 981  {{html clean="false"}}
982 982  <script>
1063 +// コンパクト表示（タイトルのみ）トグル
1064 +function toggleCompactView() {
1065 + var container = document.querySelector('.xwiki-content') || document.body;
1066 + var isCompact = container.classList.toggle('activity-compact-view');
1067 + var btn = document.getElementById('btnViewToggle');
1068 + if (btn) {
1069 + btn.querySelector('.toggle-label').textContent = isCompact ? '詳細表示' : '一覧表示';
1070 + btn.title = isCompact ? '詳細表示に戻す' : 'タイトルのみ表示';
1071 + }
1072 + // コンパクトモードでは各スレッドヘッダーをクリックで個別展開可能にする
1073 + document.querySelectorAll('.activity-thread').forEach(function(thread) {
1074 + if (isCompact) {
1075 + thread.classList.remove('compact-expanded');
1076 + }
1077 + });
1078 +}
1079 +
1080 +// コンパクトモードで個別スレッドを展開/折りたたみ
1081 +function toggleThreadExpand(e) {
1082 + var container = document.querySelector('.xwiki-content') || document.body;
1083 + if (!container.classList.contains('activity-compact-view')) return;
1084 + // リンクやボタンのクリックはスルー
1085 + if (e.target.closest('a, button, .btn-featured-toggle')) return;
1086 + var thread = e.target.closest('.activity-thread');
1087 + if (thread) {
1088 + thread.classList.toggle('compact-expanded');
1089 + }
1090 +}
1091 +
983 983  function switchActivityFY(fy, btn) {
984 984   // タブのアクティブ状態を切り替え
985 985   document.querySelectorAll('.activity-fy-tab').forEach(function(t) { t.classList.remove('active'); });
... ... @@ -995,6 +995,27 @@
995 995  }
996 996  // ページ読み込み時の初期化
997 997  document.addEventListener('DOMContentLoaded', function() {
1107 + // 年度タブを降順にソート（「全期間」タブは末尾に固定）
1108 + var tabContainer = document.querySelector('.activity-fy-tabs');
1109 + if (tabContainer) {
1110 + var tabs = Array.from(tabContainer.querySelectorAll('.activity-fy-tab'));
1111 + var allTab = null;
1112 + var fyTabs = [];
1113 + tabs.forEach(function(t) {
1114 + var onclickStr = t.getAttribute('onclick') || '';
1115 + if (onclickStr.indexOf("'all'") !== -1) { allTab = t; }
1116 + else { fyTabs.push(t); }
1117 + });
1118 + // 年度タブを数値の降順でソート
1119 + fyTabs.sort(function(a, b) {
1120 + var aYear = parseInt(a.textContent) || 0;
1121 + var bYear = parseInt(b.textContent) || 0;
1122 + return bYear - aYear;
1123 + });
1124 + // DOM再配置
1125 + fyTabs.forEach(function(t) { tabContainer.appendChild(t); });
1126 + if (allTab) { tabContainer.appendChild(allTab); }
1127 + }
998 998   // デフォルトで現在の年度を表示
999 999   var defaultTab = document.querySelector('.activity-fy-tab.active');
1000 1000   if (defaultTab) { defaultTab.click(); }
... ... @@ -1006,6 +1006,30 @@
1006 1006   window.history.replaceState({}, document.title, window.location.pathname);
1007 1007   }
1008 1008   }
1139 + // コンパクトモード: スレッドヘッダークリックで個別展開
1140 + document.querySelectorAll('.activity-thread-header').forEach(function(header) {
1141 + header.addEventListener('click', toggleThreadExpand);
1142 + });
1143 + // 長文投稿の折りたたみ初期化（max-height: 12em 超で省略）
1144 + document.querySelectorAll('.thread-post-body').forEach(function(body) {
1145 + // pre-wrapのまま高さを測定し、max-height(12em ≒ ~200px)を超える場合に折りたたむ
1146 + var fullH = body.scrollHeight;
1147 + // 12em を px に変換（font-size × line-height × 行数 の近似値ではなくCSSと同じ値を取得）
1148 + body.classList.add('truncated');
1149 + var maxH = body.clientHeight; // max-height: 12em 適用後の高さ
1150 + body.classList.remove('truncated');
1151 + if (fullH > maxH + 30) {
1152 + body.classList.add('truncated');
1153 + var btn = document.createElement('button');
1154 + btn.className = 'btn-read-more';
1155 + btn.textContent = '広げて読む ▼';
1156 + btn.addEventListener('click', function() {
1157 + var isExpanded = body.classList.toggle('expanded');
1158 + btn.textContent = isExpanded ? '折りたたむ ▲' : '広げて読む ▼';
1159 + });
1160 + body.parentNode.insertBefore(btn, body.nextSibling);
1161 + }
1162 + });
1009 1009  });
1010 1010  
1011 1011  // トースト通知表示
... ... @@ -1068,7 +1068,7 @@
1068 1068   var csrfEl = document.querySelector('input[name="form_token"]');
1069 1069   var csrfToken = csrfEl ? csrfEl.value : '';
1070 1070   var xhr = new XMLHttpRequest();
1071 - xhr.open('POST', '/bin/SeitokaiCode/EditPost?outputSyntax=plain', true);
1225 + xhr.open('POST', '/bin/get/SeitokaiCode/EditPost?outputSyntax=plain', true);
1072 1072   xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1073 1073   var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken);
1074 1074   xhr.onload = function() {
... ... @@ -1090,7 +1090,7 @@
1090 1090  function confirmDeletePost(schoolPage, postObjNum, token) {
1091 1091   if (!confirm('この投稿を削除しますか？\\n削除後は「この投稿は削除されました」と表示されます。')) return;
1092 1092   var xhr = new XMLHttpRequest();
1093 - xhr.open('POST', '/bin/SeitokaiCode/DeletePost?outputSyntax=plain', true);
1247 + xhr.open('POST', '/bin/get/SeitokaiCode/DeletePost?outputSyntax=plain', true);
1094 1094   xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1095 1095   var deletePostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token);
1096 1096   xhr.onload = function() {