Skip to Content
Last modified by Super Admin on 2026/04/05 18:59
From version Icon 48.1 Icon
edited by Super Admin
on 2026/03/13 21:13
Change comment: There is no comment for this version
To version Icon 75.1 Icon
edited by Super Admin
on 2026/03/19 13:01
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)
... ... @@ -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
... ... @@ -135,7 +135,7 @@
135 135  
136 136  ## --- 投稿固定/解除処理 ---
137 137  #set($pinAction = $!request.action)
138 -#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))
139 139   #set($pinPostObjStr = $!request.postObj)
140 140   #if(!$pinPostObjStr.matches('^\d+$'))
141 141   ## 不正な値 → 無視
... ... @@ -165,7 +165,7 @@
165 165  
166 166  ## --- 特色ある活動 選定/解除処理 ---
167 167  #set($featAction = $!request.action)
168 -#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))
169 169   #set($featActObjStr = $!request.actObj)
170 170   #if($featActObjStr.matches('^\d+$'))
171 171   #set($actObjNum = $mathtool.toInteger($featActObjStr))
... ... @@ -267,7 +267,7 @@
267 267  
268 268  ## --- 編集ボタン（権限があるユーザーのみ表示） ---
269 269  #set($canEditSchool = false)
270 -#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode))
306 +#if(!$isGuest && ($isViewerAdmin || $isSchoolMember))
271 271   #set($canEditSchool = true)
272 272  #end
273 273  #if($canEditSchool)
... ... @@ -276,305 +276,302 @@
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>
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)
298 298   #end
328 + と連携しています
299 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>
312 312  </div>
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>
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>
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 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)
359 - #end
360 - </div>
361 - #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
362 - <div class="free-note">$!escapetool.xml($dailyActivitiesNote)</div>
363 - #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>
364 364   </div>
365 - </div>
366 - #end
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>
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
350 + #if($schoolPhoto && $schoolPhoto != '')
351 + <div class="school-photo-area">
352 + <img src="$doc.getAttachmentURL($schoolPhoto)" alt="$!escapetool.xml($schoolName)" class="school-photo" />
385 385   </div>
354 + #end
386 386   </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>
387 387   #end
388 388  </div>
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>
398 - </div>
399 - #if($regularActivitiesNote && $regularActivitiesNote.trim() != '')
400 - <div class="free-note">$!escapetool.xml($regularActivitiesNote)</div>
401 - #end
402 - </div>
403 - </div>
404 - #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">
405 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 - #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>
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)
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>
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
434 434   </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>
435 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>
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
440 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>
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>
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>
479 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
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>
488 488   </div>
489 - </span>
441 + #if($regularActivitiesNote && $regularActivitiesNote.trim() != '')
442 + <div class="free-note">$!escapetool.xml($regularActivitiesNote)</div>
443 + #end
444 + </div>
490 490   </div>
491 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
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>
500 500   </div>
501 - </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>
502 502   </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
503 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
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>
512 512   </div>
513 - </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>
514 514   </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
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>
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>
520 520   </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
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
586 + </div>## seitokai-info-body 終了
587 +</div>## card-seitokai-info 終了
543 543  
544 -</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>
545 545  
546 546  {{/html}}
547 547  
604 +----
605 +
548 548  ## --- ⑩ 活動報告一覧（スレッド型・年度タブ付き） ---
549 549  = 活動報告 =
550 550  
551 -## --- 投稿者ステータス凡例（折りたたみ） ---
609 +## --- 年度タブ + 投稿者ステータス凡例 ---
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,49 @@
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>
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
604 604   #end
605 - #end
606 - <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>
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>
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
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)
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)
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>
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>
740 740   </div>
741 741   #else
742 742   ## 投稿者のアカウント種別に基づいたCSSクラス
... ... @@ -776,8 +776,11 @@
776 776   <span class="badge badge-general badge-sm">一般</span>
777 777   #end
778 778   ## 所属バッジ（投稿者の学校コードとページの学校コードを比較）
853 + #set($postIsSchoolMatch = ($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode)))
779 779   #if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general')
780 - #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')
781 781   #if($postAccountType == 'verified' || $postAccountType == 'admin')
782 782   <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>
783 783   #else
... ... @@ -868,12 +868,19 @@
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>
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>
872 872   #end
873 - ## 固定/解除ボタン（承認済み・管理者のみ）
874 - #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
875 - #set($postObjNum = $post.number)
876 - <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 + #set($showReportBtn = (!$isGuest && $xcontext.user != $postAuthorRef))
956 + #set($showHideBtn = ($viewerAccountType == 'admin'))
957 + #if($showPinBtn || $showEditDeleteBtn || $showReportBtn || $showHideBtn)
958 + <div class="post-edit-actions post-action-mt">
959 + #if($showPinBtn)
960 + #set($postObjNum = $post.number)
877 877   #if($isPinned == '1')
878 878   <a href="$doc.getURL('view', "action=unpin&postObj=${postObjNum}&form_token=${services.csrf.getToken()}")" class="btn-pin-toggle btn-unpin" title="固定を解除">
879 879   <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> 固定を解除
... ... @@ -883,13 +883,8 @@
883 883   <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> 固定する
884 884   </a>
885 885   #end
886 - </div>
887 - #end
888 - ## 編集・削除ボタン（投稿者本人 or 管理者）
889 - #set($postAuthorRef = $!post.getValue('authorRef'))
890 - #set($postObjNumED = $post.number)
891 - #if($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin')
892 - <div class="post-edit-actions post-action-mt">
970 + #end
971 + #if($showEditDeleteBtn)
893 893   #if($xcontext.user == $postAuthorRef)
894 894   <button type="button" class="btn-post-edit" onclick="openEditPost(this, '${doc.fullName}', $postObjNumED, '$!escapetool.javascript($!postContent)')" title="この投稿を編集">
895 895   <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> 編集
... ... @@ -898,6 +898,17 @@
898 898   <button type="button" class="btn-post-delete" onclick="confirmDeletePost('${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を削除">
899 899   <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> 削除
900 900   </button>
980 + #end
981 + #if($showReportBtn)
982 + <button type="button" class="btn-post-report" onclick="openReportDialog(this, '${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を通報">
983 + <svg class="ico ico-fixed-14" viewBox="0 0 24 24"><path d="M4 15s1-1 4-1 5 2 8 2 4-1 4-1V3s-1 1-4 1-5-2-8-2-4 1-4 1z"/><line x1="4" y1="22" x2="4" y2="15"/></svg> 通報
984 + </button>
985 + #end
986 + #if($showHideBtn)
987 + <button type="button" class="btn-post-hide" onclick="openHideDialog(this, '${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を非表示にする">
988 + <svg class="ico ico-fixed-14" viewBox="0 0 24 24"><path d="M17.94 17.94A10.07 10.07 0 0112 20c-7 0-11-8-11-8a18.45 18.45 0 015.06-5.94M9.9 4.24A9.12 9.12 0 0112 4c7 0 11 8 11 8a18.5 18.5 0 01-2.16 3.19m-6.72-1.07a3 3 0 11-4.24-4.24"/><line x1="1" y1="1" x2="23" y2="23"/></svg> 非表示
989 + </button>
990 + #end
901 901   </div>
902 902   #end
903 903   </div>
... ... @@ -982,6 +982,35 @@
982 982  ## --- 年度タブ切り替え JavaScript ---
983 983  {{html clean="false"}}
984 984  <script>
1075 +// コンパクト表示（タイトルのみ）トグル
1076 +function toggleCompactView() {
1077 + var container = document.querySelector('.xwiki-content') || document.body;
1078 + var isCompact = container.classList.toggle('activity-compact-view');
1079 + var btn = document.getElementById('btnViewToggle');
1080 + if (btn) {
1081 + btn.querySelector('.toggle-label').textContent = isCompact ? '詳細表示' : '一覧表示';
1082 + btn.title = isCompact ? '詳細表示に戻す' : 'タイトルのみ表示';
1083 + }
1084 + // コンパクトモードでは各スレッドヘッダーをクリックで個別展開可能にする
1085 + document.querySelectorAll('.activity-thread').forEach(function(thread) {
1086 + if (isCompact) {
1087 + thread.classList.remove('compact-expanded');
1088 + }
1089 + });
1090 +}
1091 +
1092 +// コンパクトモードで個別スレッドを展開/折りたたみ
1093 +function toggleThreadExpand(e) {
1094 + var container = document.querySelector('.xwiki-content') || document.body;
1095 + if (!container.classList.contains('activity-compact-view')) return;
1096 + // リンクやボタンのクリックはスルー
1097 + if (e.target.closest('a, button, .btn-featured-toggle')) return;
1098 + var thread = e.target.closest('.activity-thread');
1099 + if (thread) {
1100 + thread.classList.toggle('compact-expanded');
1101 + }
1102 +}
1103 +
985 985  function switchActivityFY(fy, btn) {
986 986   // タブのアクティブ状態を切り替え
987 987   document.querySelectorAll('.activity-fy-tab').forEach(function(t) { t.classList.remove('active'); });
... ... @@ -997,6 +997,27 @@
997 997  }
998 998  // ページ読み込み時の初期化
999 999  document.addEventListener('DOMContentLoaded', function() {
1119 + // 年度タブを降順にソート（「全期間」タブは末尾に固定）
1120 + var tabContainer = document.querySelector('.activity-fy-tabs');
1121 + if (tabContainer) {
1122 + var tabs = Array.from(tabContainer.querySelectorAll('.activity-fy-tab'));
1123 + var allTab = null;
1124 + var fyTabs = [];
1125 + tabs.forEach(function(t) {
1126 + var onclickStr = t.getAttribute('onclick') || '';
1127 + if (onclickStr.indexOf("'all'") !== -1) { allTab = t; }
1128 + else { fyTabs.push(t); }
1129 + });
1130 + // 年度タブを数値の降順でソート
1131 + fyTabs.sort(function(a, b) {
1132 + var aYear = parseInt(a.textContent) || 0;
1133 + var bYear = parseInt(b.textContent) || 0;
1134 + return bYear - aYear;
1135 + });
1136 + // DOM再配置
1137 + fyTabs.forEach(function(t) { tabContainer.appendChild(t); });
1138 + if (allTab) { tabContainer.appendChild(allTab); }
1139 + }
1000 1000   // デフォルトで現在の年度を表示
1001 1001   var defaultTab = document.querySelector('.activity-fy-tab.active');
1002 1002   if (defaultTab) { defaultTab.click(); }
... ... @@ -1008,6 +1008,30 @@
1008 1008   window.history.replaceState({}, document.title, window.location.pathname);
1009 1009   }
1010 1010   }
1151 + // コンパクトモード: スレッドヘッダークリックで個別展開
1152 + document.querySelectorAll('.activity-thread-header').forEach(function(header) {
1153 + header.addEventListener('click', toggleThreadExpand);
1154 + });
1155 + // 長文投稿の折りたたみ初期化（max-height: 12em 超で省略）
1156 + document.querySelectorAll('.thread-post-body').forEach(function(body) {
1157 + // pre-wrapのまま高さを測定し、max-height(12em ≒ ~200px)を超える場合に折りたたむ
1158 + var fullH = body.scrollHeight;
1159 + // 12em を px に変換（font-size × line-height × 行数 の近似値ではなくCSSと同じ値を取得）
1160 + body.classList.add('truncated');
1161 + var maxH = body.clientHeight; // max-height: 12em 適用後の高さ
1162 + body.classList.remove('truncated');
1163 + if (fullH > maxH + 30) {
1164 + body.classList.add('truncated');
1165 + var btn = document.createElement('button');
1166 + btn.className = 'btn-read-more';
1167 + btn.textContent = '広げて読む ▼';
1168 + btn.addEventListener('click', function() {
1169 + var isExpanded = body.classList.toggle('expanded');
1170 + btn.textContent = isExpanded ? '折りたたむ ▲' : '広げて読む ▼';
1171 + });
1172 + body.parentNode.insertBefore(btn, body.nextSibling);
1173 + }
1174 + });
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);
1237 + 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);
1259 + 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() {
... ... @@ -1109,6 +1109,80 @@
1109 1109   xhr.onerror = function() { alert('通信エラーが発生しました'); };
1110 1110   xhr.send(deletePostData);
1111 1111  }
1276 +
1277 +/* --- 通報ダイアログ --- */
1278 +function openReportDialog(btn, targetPage, postObjNum, token) {
1279 + if (document.getElementById('report-dialog-overlay')) return;
1280 + var reasons = ['宣伝・スパム','不適切な内容','個人情報の露出','誹謗中傷','誤情報','その他'];
1281 + var overlay = document.createElement('div');
1282 + overlay.id = 'report-dialog-overlay';
1283 + overlay.style.cssText = 'position:fixed;inset:0;background:rgba(0,0,0,0.5);z-index:9999;display:flex;align-items:center;justify-content:center;';
1284 + var dialog = document.createElement('div');
1285 + dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;max-height:80vh;overflow-y:auto;';
1286 + var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を通報</h3>';
1287 + html += '<p style="margin:0 0 12px;font-size:0.9em;color:#4b5563;">通報された投稿は管理者が確認するまで一時的に非表示になります。</p>';
1288 + html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">通報理由</label>';
1289 + html += '<select id="report-reason" style="width:100%;padding:8px;border:1px solid #d1d5db;border-radius:8px;margin-bottom:12px;font-size:0.9em;">';
1290 + for (var i=0; i<reasons.length; i++) html += '<option value="'+reasons[i]+'">'+reasons[i]+'</option>';
1291 + html += '</select>';
1292 + html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">補足コメント（任意）</label>';
1293 + html += '<textarea id="report-detail" rows="3" maxlength="500" style="width:100%;padding:8px;border:1px solid #d1d5db;border-radius:8px;resize:vertical;font-size:0.9em;box-sizing:border-box;" placeholder="具体的な内容があればご記入ください"></textarea>';
1294 + html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
1295 + html += '<button type="button" id="report-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
1296 + html += '<button type="button" id="report-submit-btn" style="padding:8px 16px;border:none;border-radius:8px;background:#dc2626;color:#fff;cursor:pointer;font-weight:600;">通報する</button>';
1297 + html += '</div>';
1298 + dialog.innerHTML = html;
1299 + overlay.appendChild(dialog);
1300 + document.body.appendChild(overlay);
1301 + overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
1302 + document.getElementById('report-cancel-btn').addEventListener('click', function() { overlay.remove(); });
1303 + document.getElementById('report-submit-btn').addEventListener('click', function() {
1304 + var reason = document.getElementById('report-reason').value;
1305 + var detail = document.getElementById('report-detail').value;
1306 + var submitBtn = document.getElementById('report-submit-btn');
1307 + submitBtn.disabled = true; submitBtn.textContent = '送信中...';
1308 + var xhr = new XMLHttpRequest();
1309 + xhr.open('POST', '/bin/get/SeitokaiCode/ReportAction?outputSyntax=plain', true);
1310 + xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1311 + var data = 'targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&detail=' + encodeURIComponent(detail) + '&form_token=' + encodeURIComponent(token);
1312 + xhr.onload = function() {
1313 + overlay.remove();
1314 + showToast('通報を受け付けました', 'success');
1315 + setTimeout(function() { location.reload(); }, 1000);
1316 + };
1317 + xhr.onerror = function() { overlay.remove(); alert('通信エラーが発生しました'); };
1318 + xhr.send(data);
1319 + });
1320 +}
1321 +
1322 +/* --- 非表示ダイアログ（管理者用） --- */
1323 +function openHideDialog(btn, targetPage, postObjNum, token) {
1324 + if (document.getElementById('hide-dialog-overlay')) return;
1325 + var overlay = document.createElement('div');
1326 + overlay.id = 'hide-dialog-overlay';
1327 + overlay.style.cssText = 'position:fixed;inset:0;background:rgba(0,0,0,0.5);z-index:9999;display:flex;align-items:center;justify-content:center;';
1328 + var dialog = document.createElement('div');
1329 + dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;';
1330 + var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を非表示にする</h3>';
1331 + html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">非表示の理由</label>';
1332 + html += '<input type="text" id="hide-reason" style="width:100%;padding:8px;border:1px solid #d1d5db;border-radius:8px;margin-bottom:12px;font-size:0.9em;box-sizing:border-box;" placeholder="理由を入力" />';
1333 + html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
1334 + html += '<button type="button" id="hide-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
1335 + html += '<button type="button" id="hide-submit-btn" style="padding:8px 16px;border:none;border-radius:8px;background:#d97706;color:#fff;cursor:pointer;font-weight:600;">非表示にする</button>';
1336 + html += '<button type="button" id="hide-warn-btn" style="padding:8px 16px;border:none;border-radius:8px;background:#dc2626;color:#fff;cursor:pointer;font-weight:600;">非表示+警告</button>';
1337 + html += '</div>';
1338 + dialog.innerHTML = html;
1339 + overlay.appendChild(dialog);
1340 + document.body.appendChild(overlay);
1341 + overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
1342 + document.getElementById('hide-cancel-btn').addEventListener('click', function() { overlay.remove(); });
1343 + function doHide(action) {
1344 + var reason = document.getElementById('hide-reason').value || '管理者判断';
1345 + window.location.href = '/bin/view/SeitokaiCode/ModerationAction?action=' + action + '&targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&form_token=' + encodeURIComponent(token);
1346 + }
1347 + document.getElementById('hide-submit-btn').addEventListener('click', function() { doHide('hide'); });
1348 + document.getElementById('hide-warn-btn').addEventListener('click', function() { doHide('hide-warn'); });
1349 +}
1112 1112  </script>
1113 1113  {{/html}}
1114 1114  {{/velocity}}