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

Summary

Details

Icon Page properties
Content
... ... @@ -1,11 +1,5 @@
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
9 9  {{html clean="false"}}
10 10  ## メンテナンスバナー（{{include}}ではなくインラインで記述し、<p>タグ挿入を回避）
11 11  #set($bannerDoc = $xwiki.getDocument('SeitokaiAdmin.MaintenanceBanner'))
... ... @@ -34,10 +34,8 @@
34 34  #set($schoolLevel = $doc.getValue('schoolLevel'))
35 35  #set($schoolSystem = $doc.getValue('schoolSystem'))
36 36  #set($website = $doc.getValue('website'))
37 -#set($schoolPhoto = $doc.getValue('schoolPhoto'))
38 -#set($schoolDescription = $doc.getValue('schoolDescription'))
39 39  
40 -## --- 生徒会組織 ---
32 +## --- 組織図 ---
41 41  #set($orgChart = $doc.getValue('orgChart'))
42 42  #set($orgChartImage = $doc.getValue('orgChartImage'))
43 43  
... ... @@ -103,42 +103,11 @@
103 103   #set($viewerDoc = $xwiki.getDocument($viewerUser))
104 104   #set($viewerAccountType = $!viewerDoc.getValue('accountType'))
105 105   #set($viewerSchoolCode = $!viewerDoc.getValue('schoolCode'))
106 - #set($viewerSecondarySchoolCode = $!viewerDoc.getValue('secondarySchoolCode'))
107 - #set($viewerUserRole = $!viewerDoc.getValue('userRole'))
108 108   #if($viewerAccountType == 'admin')
109 109   #set($isViewerAdmin = true)
110 110   #end
111 111  #end
112 112  
113 -## --- 関連校（中高一貫校）情報 ---
114 -#set($affiliatedSchoolCode = $!doc.getValue('affiliatedSchoolCode'))
115 -#set($affiliatedSchoolName = $!doc.getValue('affiliatedSchoolName'))
116 -#set($isAffiliated = false)
117 -#if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
118 - #if($viewerSchoolCode == $affiliatedSchoolCode)
119 - #set($isAffiliated = true)
120 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode)
121 - #set($isAffiliated = true)
122 - #end
123 -#end
124 -
125 -## --- 校内判定（卒業生を除外、secondarySchoolCodeも含む） ---
126 -#set($isSchoolMember = false)
127 -#if(!$isGuest && $viewerUserRole != 'graduate')
128 - #if($viewerSchoolCode == $schoolCode || $isAffiliated)
129 - #set($isSchoolMember = true)
130 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode)
131 - #set($isSchoolMember = true)
132 - #end
133 -#end
134 -## 卒業生の母校判定（投稿バッジ用）
135 -#set($isAlumniOfSchool = false)
136 -#if(!$isGuest && $viewerUserRole == 'graduate')
137 - #if($viewerSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $viewerSchoolCode == $affiliatedSchoolCode))
138 - #set($isAlumniOfSchool = true)
139 - #end
140 -#end
141 -
142 142  ## --- 学校ページ非表示チェック ---
143 143  #set($schoolHidden = $doc.getValue('hidden'))
144 144  #if($schoolHidden == 1)
... ... @@ -172,7 +172,7 @@
172 172  
173 173  ## --- 投稿固定/解除処理 ---
174 174  #set($pinAction = $!request.action)
175 -#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $isSchoolMember)) && $services.csrf.isTokenValid($request.form_token))
136 +#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token))
176 176   #set($pinPostObjStr = $!request.postObj)
177 177   #if(!$pinPostObjStr.matches('^\d+$'))
178 178   ## 不正な値 → 無視
... ... @@ -202,7 +202,7 @@
202 202  
203 203  ## --- 特色ある活動 選定/解除処理 ---
204 204  #set($featAction = $!request.action)
205 -#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $isSchoolMember)) && $services.csrf.isTokenValid($request.form_token))
166 +#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token))
206 206   #set($featActObjStr = $!request.actObj)
207 207   #if($featActObjStr.matches('^\d+$'))
208 208   #set($actObjNum = $mathtool.toInteger($featActObjStr))
... ... @@ -304,7 +304,7 @@
304 304  
305 305  ## --- 編集ボタン（権限があるユーザーのみ表示） ---
306 306  #set($canEditSchool = false)
307 -#if(!$isGuest && ($isViewerAdmin || $isSchoolMember))
268 +#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode))
308 308   #set($canEditSchool = true)
309 309  #end
310 310  #if($canEditSchool)
... ... @@ -313,305 +313,305 @@
313 313  </div>
314 314  #end
315 315  
316 -## --- 関連校（中高一貫校）バナー ---
317 -#if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
318 - #set($affiliatedPageRef = "Schools.${affiliatedSchoolCode}.WebHome")
319 - #set($affiliatedPageExists = $xwiki.exists($affiliatedPageRef))
320 -<div class="affiliated-school-banner">
321 - <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>
322 - <div>
323 - <strong>中高一貫校</strong>：
324 - #if($affiliatedPageExists)
325 - <a href="$xwiki.getURL($affiliatedPageRef, 'view')">$!escapetool.xml($affiliatedSchoolName)</a>
326 - #else
327 - $!escapetool.xml($affiliatedSchoolName)
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>
328 328   #end
329 - と連携しています
330 330   </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>
331 331  </div>
332 -#end
333 333  
334 -## --- ① 学校基本情報 ---
335 -<div class="school-info-card collapsed" id="card-basic-info">
336 - <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>
337 - <div class="school-basic-info-layout">
338 - <div class="school-basic-info-table">
339 - <table class="wiki-table school-info-table">
340 - <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
341 - <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
342 - <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
343 - <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
344 - <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
345 - <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
346 - <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
347 - <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
348 - <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>
349 - </table>
350 - </div>
351 - #if($schoolPhoto && $schoolPhoto != '')
352 - <div class="school-photo-area">
353 - <img src="$doc.getAttachmentURL($schoolPhoto)" alt="$!escapetool.xml($schoolName)" class="school-photo" />
354 - </div>
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>
355 355   #end
337 + #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end
356 356   </div>
357 - #if($schoolDescription && $schoolDescription.trim() != '')
358 - <div class="free-note" style="margin-top:var(--sp-4);">$!escapetool.xml($schoolDescription)</div>
359 - #end
360 - #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
361 - #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
362 - #if($infoEditDate && $infoEditDate != '')
363 - <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>
364 - #end
365 365  </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 +#end
366 366  
367 -## --- ② 生徒会基本情報（折りたたみカード） ---
368 -<div class="school-info-card" id="card-seitokai-info">
369 - <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>
370 - <div class="seitokai-info-body">
371 -
372 - ## --- 生徒会組織 ---
373 - #set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
374 - #if($hasOrgContent)
375 - #set($canViewOrgChart = true)
376 - #if($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewOrgChart = false)
377 - #elseif($visibilityOrgChart == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewOrgChart = false)
378 - #end
379 - #if($canViewOrgChart)
380 - <div class="seitokai-subsection">
381 - <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>
382 - <div class="seitokai-subsection-content">
383 - #if($orgChartImage && $orgChartImage != '')
384 - <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
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)
385 385   #end
386 - #if($orgChart && $orgChart != '')<div class="free-note">$!escapetool.xml($orgChart)</div>#end
387 387   </div>
359 + #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
360 + <div class="free-note">$!escapetool.xml($dailyActivitiesNote)</div>
361 + #end
388 388   </div>
389 - #else
390 - <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>
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>
391 391   #end
392 - #end
380 + #if($electionNote && $electionNote.trim() != '')
381 + <div class="free-note">$!escapetool.xml($electionNote)</div>
382 + #end
383 + </div>
384 + </div>
385 + #end
386 +</div>
393 393  
394 - ## --- 日常の活動 ---
395 - #if($dailyActivities && !$dailyActivities.isEmpty())
396 - <div class="seitokai-subsection">
397 - <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>
398 - <div class="seitokai-subsection-content">
399 - <p class="activity-hint">活動時間の多い順に上位3つ</p>
400 - <div class="tag-container">
401 - #set($daIdx = 1)
402 - #foreach($da in $dailyActivities)
403 - <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
404 - #set($daIdx = $daIdx + 1)
405 - #end
406 - </div>
407 - #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
408 - <div class="free-note">$!escapetool.xml($dailyActivitiesNote)</div>
409 - #end
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>
410 410   </div>
397 + #if($regularActivitiesNote && $regularActivitiesNote.trim() != '')
398 + <div class="free-note">$!escapetool.xml($regularActivitiesNote)</div>
399 + #end
411 411   </div>
412 - #end
401 + </div>
402 + #end
413 413  
414 - ## --- 選挙 ---
415 - #if($electionExists && $electionExists != '')
416 - <div class="seitokai-subsection">
417 - <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>
418 - <div class="seitokai-subsection-content">
419 - <div class="info-row">
420 - <span class="info-label">役員選挙</span>
421 - <span class="info-value">$!escapetool.xml($!electionExists)</span>
422 - </div>
423 - #if($electionType && $electionType != '')
424 - <div class="info-row">
425 - <span class="info-label">直近の選挙方式</span>
426 - <span class="info-value">$!escapetool.xml($!electionType)</span>
427 - </div>
428 - #end
429 - #if($electionNote && $electionNote.trim() != '')
430 - <div class="free-note">$!escapetool.xml($electionNote)</div>
431 - #end
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>
432 432   </div>
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>
432 + </div>
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>
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
433 433   </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>
434 434   #end
460 + #end
461 +</div>
435 435  
436 - ## --- 定例活動 ---
437 - #if($meetingFrequency && $meetingFrequency != '')
438 - <div class="seitokai-subsection">
439 - <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>
440 - <div class="seitokai-subsection-content">
441 - <div class="info-row">
442 - <span class="info-label">役員定例会の頻度</span>
443 - <span class="info-value">$!escapetool.xml($!meetingFrequency)</span>
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>
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
444 444   </div>
445 - #if($regularActivitiesNote && $regularActivitiesNote.trim() != '')
446 - <div class="free-note">$!escapetool.xml($regularActivitiesNote)</div>
447 - #end
448 - </div>
487 + </span>
449 449   </div>
450 450   #end
451 -
452 - ## --- 予算 ---
453 - #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
454 - #if($hasBudget)
455 - #set($canViewBudget = true)
456 - #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewBudget = false)
457 - #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false)
458 - #end
459 - #if($canViewBudget)
460 - <div class="seitokai-subsection">
461 - <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>
462 - <div class="seitokai-subsection-content">
463 - #if($budgetProcess && !$budgetProcess.isEmpty())
464 - <div class="info-row">
465 - <span class="info-label">作成過程の生徒関与</span>
466 - <span class="info-value">
467 - <div class="selection-display">
468 - #foreach($bp in $budgetProcess)
469 - <span class="selection-item">$!escapetool.xml($bp.trim())</span>
470 - #end
471 - </div>
472 - </span>
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
473 473   </div>
474 - #end
475 - #if($studentFee && $studentFee != '')
476 - <div class="info-row">
477 - <span class="info-label">生徒会費（年額）</span>
478 - <span class="info-value">$!escapetool.xml($!studentFee)</span>
479 - </div>
480 - #end
481 - #if($budgetScale && $budgetScale != '')
482 - <div class="info-row">
483 - <span class="info-label">予算規模</span>
484 - <span class="info-value">$!escapetool.xml($!budgetScale)</span>
485 - </div>
486 - #end
487 - #if($budgetAllocation && !$budgetAllocation.isEmpty())
488 - <div class="info-row">
489 - <span class="info-label">主な予算配分</span>
490 - <span class="info-value">
491 - <div class="selection-display">
492 - #foreach($ba in $budgetAllocation)
493 - <span class="selection-item">$!escapetool.xml($ba.trim())</span>
494 - #end
495 - </div>
496 - </span>
497 - </div>
498 - #end
499 - #if($budgetNote && $budgetNote.trim() != '')
500 - <div class="free-note">$!escapetool.xml($budgetNote)</div>
501 - #end
502 - </div>
499 + </span>
503 503   </div>
504 - #else
505 - <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>
506 - #end
507 507   #end
508 -
509 - ## --- 校則の見直し ---
510 - #if($ruleReviewStatus && $ruleReviewStatus != '')
511 - #set($canViewRuleReview = true)
512 - #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewRuleReview = false)
513 - #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false)
514 - #end
515 - #if($canViewRuleReview)
516 - <div class="seitokai-subsection">
517 - <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>
518 - <div class="seitokai-subsection-content">
519 - <div class="info-row">
520 - <span class="info-label">見直しの有無（3年以内）</span>
521 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
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
522 522   </div>
523 - #if($ruleReviewContent && !$ruleReviewContent.isEmpty())
524 - <div class="info-row">
525 - <span class="info-label">見直しの内容</span>
526 - <span class="info-value">
527 - <div class="selection-display">
528 - #foreach($rc in $ruleReviewContent)
529 - <span class="selection-item">$!escapetool.xml($rc.trim())</span>
530 - #end
531 - </div>
532 - </span>
533 - </div>
534 - #end
535 - #if($ruleReviewProposer && !$ruleReviewProposer.isEmpty())
536 - <div class="info-row">
537 - <span class="info-label">見直しの提案者</span>
538 - <span class="info-value">
539 - <div class="selection-display">
540 - #foreach($rp in $ruleReviewProposer)
541 - <span class="selection-item">$!escapetool.xml($rp.trim())</span>
542 - #end
543 - </div>
544 - </span>
545 - </div>
546 - #end
547 - #if($ruleReviewImplementer && !$ruleReviewImplementer.isEmpty())
548 - <div class="info-row">
549 - <span class="info-label">見直しの実施者</span>
550 - <span class="info-value">
551 - <div class="selection-display">
552 - #foreach($ri in $ruleReviewImplementer)
553 - <span class="selection-item">$!escapetool.xml($ri.trim())</span>
554 - #end
555 - </div>
556 - </span>
557 - </div>
558 - #end
559 - #if($ruleReviewSystem && $ruleReviewSystem != '')
560 - <div class="info-row">
561 - <span class="info-label">見直しの仕組み</span>
562 - <span class="info-value">$!escapetool.xml($!ruleReviewSystem)</span>
563 - </div>
564 - #end
565 - </div>
511 + </span>
566 566   </div>
567 - #else
568 - <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>
569 - #end
570 570   #end
571 -
572 - ## --- 生徒会の課題意識 ---
573 - #if($challenges && $challenges != '')
574 - #set($canViewChallenges = true)
575 - #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewChallenges = false)
576 - #elseif($visibilityChallenges == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewChallenges = false)
577 - #end
578 - #if($canViewChallenges)
579 - <div class="seitokai-subsection">
580 - <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>
581 - <div class="seitokai-subsection-content">
582 - <div class="challenge-text">$!escapetool.xml($challenges)</div>
583 - </div>
514 + #if($ruleReviewSystem && $ruleReviewSystem != '')
515 + <div class="info-row">
516 + <span class="info-label">見直しの仕組み</span>
517 + <span class="info-value">$!escapetool.xml($!ruleReviewSystem)</span>
584 584   </div>
585 - #else
586 - <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>
587 - #end
588 588   #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
589 589  
590 - </div>## seitokai-info-body 終了
591 -</div>## card-seitokai-info 終了
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
592 592  
593 -## --- ③ SNS・連絡先 ---
594 -<div class="school-info-card collapsed" id="card-contact">
595 - <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>
596 - <table class="wiki-table school-info-table">
597 - <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr>
598 - <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>
599 - <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>
600 - <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>
601 - <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>
602 - <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
603 - </table>
604 -</div>
542 +</div>## seitokai-info-accordion 終了
605 605  
606 606  {{/html}}
607 607  
608 -----
609 -
610 610  ## --- ⑩ 活動報告一覧（スレッド型・年度タブ付き） ---
611 611  = 活動報告 =
612 612  
613 -## --- 年度タブ + 投稿者ステータス凡例 ---
549 +## --- 投稿者ステータス凡例（折りたたみ） ---
614 614  {{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>
615 615  
616 616  ## --- 年度タブ ---
617 617  ## 全活動から年度一覧を収集
... ... @@ -633,49 +633,14 @@
633 633  #end
634 634  ## ソート（降順にしたいが Velocity にはないので JS で制御）
635 635  
636 -<div class="activity-toolbar">
637 - <div class="activity-fy-tabs">
638 - <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
639 - #foreach($fy in $fySet)
640 - #if($fy != $currentFYStr)
641 - <button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button>
642 - #end
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>
643 643   #end
644 - <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
645 - </div>
646 - <div class="activity-toolbar-right">
647 - <button class="btn-view-toggle" id="btnViewToggle" onclick="toggleCompactView()" title="タイトルのみ表示">
648 - <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>
649 - <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>
650 - <span class="toggle-label">一覧表示</span>
651 - </button>
652 - </div>
653 - <div class="author-legend-wrapper">
654 - <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>
655 - <div class="author-legend-body">
656 - <div class="author-legend">
657 - <span class="author-legend-title">投稿者の信頼度:</span>
658 - <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者 <span class="text-hint">— 運営スタッフ</span></span>
659 - <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み <span class="text-hint">— 本人確認済みのユーザー</span></span>
660 - <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介 <span class="text-hint">— 承認済みユーザーからの紹介</span></span>
661 - <span class="author-legend-item"><span class="bar bar-general"></span> 一般 <span class="text-hint">— 一般登録ユーザー</span></span>
662 - </div>
663 - <div class="author-legend">
664 - <span class="author-legend-title">所属:</span>
665 - <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>
666 - <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>
667 - <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>
668 - <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>
669 - <span class="author-legend-item text-hint">※一般アカウントは所属バッジが表示されません</span>
670 - </div>
671 - <div class="author-legend">
672 - <span class="author-legend-title">役割:</span>
673 - <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>
674 - <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>
675 - <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>
676 - </div>
677 - </div>
678 - </div>
603 + #end
604 + <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
679 679  </div>
680 680  
681 681  {{/html}}
... ... @@ -740,18 +740,10 @@
740 740  <div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)">
741 741   <div class="activity-thread-header">
742 742   <div class="activity-thread-title">
743 - <h3 #if($actFeatured == '1')class="featured-title"#end>#if($actFeatured == '1')<svg class="ico ico-fixed-14 ico-star-offset" viewBox="0 0 24 24" fill="currentColor" stroke="none"><polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"/></svg> #end$!escapetool.xml($!actTitle)</h3>
744 - <div class="activity-meta-line">
745 - <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
746 - #set($actTagsList = $activity.getValue('tags'))
747 - #if($actTagsList && !$actTagsList.isEmpty())
748 - #foreach($tagItem in $actTagsList)
749 - #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end
750 - #end
751 - #end
752 - </div>
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 + <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
753 753   </div>
754 - <div class="thread-meta-right">
672 + <div class="thread-meta-row">
755 755   <span class="thread-post-count">${reportCount}件の報告 ・ ${commentCount}件のコメント</span>
756 756   #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred')
757 757   #if($actFeatured == '1')
... ... @@ -811,12 +811,12 @@
811 811   #set($postVis = $!post.getValue('visibility'))
812 812   #if(!$postVis || $postVis == '') #set($postVis = 'public') #end
813 813   #set($canViewPost = true)
814 - #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewPost = false)
815 - #elseif($postVis == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPost = false)
732 + #if($postVis == 'members' && $isGuest) #set($canViewPost = false)
733 + #elseif($postVis == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewPost = false)
816 816   #end
817 817   #if(!$canViewPost)
818 818   <div class="thread-post visibility-restricted-post">
819 - <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>
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>
820 820   </div>
821 821   #else
822 822   ## 投稿者のアカウント種別に基づいたCSSクラス
... ... @@ -856,11 +856,8 @@
856 856   <span class="badge badge-general badge-sm">一般</span>
857 857   #end
858 858   ## 所属バッジ（投稿者の学校コードとページの学校コードを比較）
859 - #set($postIsSchoolMatch = ($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode)))
860 860   #if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general')
861 - #if($postUserRole == 'graduate' && $postIsSchoolMatch)
862 - <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>
863 - #elseif($postIsSchoolMatch && $postUserRole != 'graduate')
778 + #if($postSchoolCode == $schoolCode)
864 864   #if($postAccountType == 'verified' || $postAccountType == 'admin')
865 865   <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>
866 866   #else
... ... @@ -887,13 +887,6 @@
887 887   #if($postEdited == 1 || $postEdited == '1')
888 888   <span class="post-edited-label">（編集済み）</span>
889 889   #end
890 - #set($postAuthorRefH = $!post.getValue('authorRef'))
891 - #set($postObjNumH = $post.number)
892 - #if(!$isGuest && $xcontext.user != $postAuthorRefH)
893 - <button type="button" class="btn-post-report btn-post-report-header" onclick="openReportDialog(this, '${doc.fullName}', $postObjNumH, '${services.csrf.getToken()}')" title="この投稿を通報">
894 - <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> 通報
895 - </button>
896 - #end
897 897   </div>
898 898   <div class="thread-post-body">
899 899   $!escapetool.xml($!postContent)
... ... @@ -958,18 +958,12 @@
958 958   #end
959 959   </div>
960 960   #if($postVis != 'public')
961 - <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>
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>
962 962   #end
963 - ## 固定/編集/削除/通報/非表示ボタン（横並び）
964 - #set($postAuthorRef = $!post.getValue('authorRef'))
965 - #set($postObjNumED = $post.number)
966 - #set($showPinBtn = ($viewerAccountType == 'admin' || $viewerAccountType == 'verified'))
967 - #set($showEditDeleteBtn = ($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin'))
968 - #set($showHideBtn = ($viewerAccountType == 'admin'))
969 - #if($showPinBtn || $showEditDeleteBtn || $showHideBtn)
970 - <div class="post-edit-actions post-action-mt">
971 - #if($showPinBtn)
972 - #set($postObjNum = $post.number)
871 + ## 固定/解除ボタン（承認済み・管理者のみ）
872 + #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
873 + #set($postObjNum = $post.number)
874 + <div class="post-pin-action post-action-mt">
973 973   #if($isPinned == '1')
974 974   <a href="$doc.getURL('view', "action=unpin&postObj=${postObjNum}&form_token=${services.csrf.getToken()}")" class="btn-pin-toggle btn-unpin" title="固定を解除">
975 975   <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> 固定を解除
... ... @@ -979,8 +979,13 @@
979 979   <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> 固定する
980 980   </a>
981 981   #end
982 - #end
983 - #if($showEditDeleteBtn)
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">
984 984   #if($xcontext.user == $postAuthorRef)
985 985   <button type="button" class="btn-post-edit" onclick="openEditPost(this, '${doc.fullName}', $postObjNumED, '$!escapetool.javascript($!postContent)')" title="この投稿を編集">
986 986   <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> 編集
... ... @@ -989,12 +989,6 @@
989 989   <button type="button" class="btn-post-delete" onclick="confirmDeletePost('${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を削除">
990 990   <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> 削除
991 991   </button>
992 - #end
993 - #if($showHideBtn)
994 - <button type="button" class="btn-post-hide" onclick="openHideDialog(this, '${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を非表示にする">
995 - <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> 非表示
996 - </button>
997 - #end
998 998   </div>
999 999   #end
1000 1000   </div>
... ... @@ -1044,11 +1044,9 @@
1044 1044  
1045 1045   #if($xcontext.user != "XWiki.XWikiGuest")
1046 1046   <div class="thread-add-post">
1047 - #if($isSchoolMember || $isViewerAdmin)
1048 1048   <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
1049 1049   ＋ 活動報告を追加
1050 1050   </a>
1051 - #end
1052 1052   <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
1053 1053   <svg class="ico" viewBox="0 0 24 24"><path d="M21 15a2 2 0 01-2 2H7l-4 4V5a2 2 0 012-2h14a2 2 0 012 2z"/></svg> コメントを書く
1054 1054   </a>
... ... @@ -1081,35 +1081,6 @@
1081 1081  ## --- 年度タブ切り替え JavaScript ---
1082 1082  {{html clean="false"}}
1083 1083  <script>
1084 -// コンパクト表示（タイトルのみ）トグル
1085 -function toggleCompactView() {
1086 - var container = document.querySelector('.xwiki-content') || document.body;
1087 - var isCompact = container.classList.toggle('activity-compact-view');
1088 - var btn = document.getElementById('btnViewToggle');
1089 - if (btn) {
1090 - btn.querySelector('.toggle-label').textContent = isCompact ? '詳細表示' : '一覧表示';
1091 - btn.title = isCompact ? '詳細表示に戻す' : 'タイトルのみ表示';
1092 - }
1093 - // コンパクトモードでは各スレッドヘッダーをクリックで個別展開可能にする
1094 - document.querySelectorAll('.activity-thread').forEach(function(thread) {
1095 - if (isCompact) {
1096 - thread.classList.remove('compact-expanded');
1097 - }
1098 - });
1099 -}
1100 -
1101 -// コンパクトモードで個別スレッドを展開/折りたたみ
1102 -function toggleThreadExpand(e) {
1103 - var container = document.querySelector('.xwiki-content') || document.body;
1104 - if (!container.classList.contains('activity-compact-view')) return;
1105 - // リンクやボタンのクリックはスルー
1106 - if (e.target.closest('a, button, .btn-featured-toggle')) return;
1107 - var thread = e.target.closest('.activity-thread');
1108 - if (thread) {
1109 - thread.classList.toggle('compact-expanded');
1110 - }
1111 -}
1112 -
1113 1113  function switchActivityFY(fy, btn) {
1114 1114   // タブのアクティブ状態を切り替え
1115 1115   document.querySelectorAll('.activity-fy-tab').forEach(function(t) { t.classList.remove('active'); });
... ... @@ -1125,27 +1125,6 @@
1125 1125  }
1126 1126  // ページ読み込み時の初期化
1127 1127  document.addEventListener('DOMContentLoaded', function() {
1128 - // 年度タブを降順にソート（「全期間」タブは末尾に固定）
1129 - var tabContainer = document.querySelector('.activity-fy-tabs');
1130 - if (tabContainer) {
1131 - var tabs = Array.from(tabContainer.querySelectorAll('.activity-fy-tab'));
1132 - var allTab = null;
1133 - var fyTabs = [];
1134 - tabs.forEach(function(t) {
1135 - var onclickStr = t.getAttribute('onclick') || '';
1136 - if (onclickStr.indexOf("'all'") !== -1) { allTab = t; }
1137 - else { fyTabs.push(t); }
1138 - });
1139 - // 年度タブを数値の降順でソート
1140 - fyTabs.sort(function(a, b) {
1141 - var aYear = parseInt(a.textContent) || 0;
1142 - var bYear = parseInt(b.textContent) || 0;
1143 - return bYear - aYear;
1144 - });
1145 - // DOM再配置
1146 - fyTabs.forEach(function(t) { tabContainer.appendChild(t); });
1147 - if (allTab) { tabContainer.appendChild(allTab); }
1148 - }
1149 1149   // デフォルトで現在の年度を表示
1150 1150   var defaultTab = document.querySelector('.activity-fy-tab.active');
1151 1151   if (defaultTab) { defaultTab.click(); }
... ... @@ -1157,30 +1157,6 @@
1157 1157   window.history.replaceState({}, document.title, window.location.pathname);
1158 1158   }
1159 1159   }
1160 - // コンパクトモード: スレッドヘッダークリックで個別展開
1161 - document.querySelectorAll('.activity-thread-header').forEach(function(header) {
1162 - header.addEventListener('click', toggleThreadExpand);
1163 - });
1164 - // 長文投稿の折りたたみ初期化（max-height: 12em 超で省略）
1165 - document.querySelectorAll('.thread-post-body').forEach(function(body) {
1166 - // pre-wrapのまま高さを測定し、max-height(12em ≒ ~200px)を超える場合に折りたたむ
1167 - var fullH = body.scrollHeight;
1168 - // 12em を px に変換（font-size × line-height × 行数 の近似値ではなくCSSと同じ値を取得）
1169 - body.classList.add('truncated');
1170 - var maxH = body.clientHeight; // max-height: 12em 適用後の高さ
1171 - body.classList.remove('truncated');
1172 - if (fullH > maxH + 30) {
1173 - body.classList.add('truncated');
1174 - var btn = document.createElement('button');
1175 - btn.className = 'btn-read-more';
1176 - btn.textContent = '広げて読む ▼';
1177 - btn.addEventListener('click', function() {
1178 - var isExpanded = body.classList.toggle('expanded');
1179 - btn.textContent = isExpanded ? '折りたたむ ▲' : '広げて読む ▼';
1180 - });
1181 - body.parentNode.insertBefore(btn, body.nextSibling);
1182 - }
1183 - });
1184 1184  });
1185 1185  
1186 1186  // トースト通知表示
... ... @@ -1243,7 +1243,7 @@
1243 1243   var csrfEl = document.querySelector('input[name="form_token"]');
1244 1244   var csrfToken = csrfEl ? csrfEl.value : '';
1245 1245   var xhr = new XMLHttpRequest();
1246 - xhr.open('POST', '/bin/get/SeitokaiCode/EditPost?outputSyntax=plain', true);
1071 + xhr.open('POST', '/bin/SeitokaiCode/EditPost?outputSyntax=plain', true);
1247 1247   xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1248 1248   var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken);
1249 1249   xhr.onload = function() {
... ... @@ -1265,7 +1265,7 @@
1265 1265  function confirmDeletePost(schoolPage, postObjNum, token) {
1266 1266   if (!confirm('この投稿を削除しますか？\\n削除後は「この投稿は削除されました」と表示されます。')) return;
1267 1267   var xhr = new XMLHttpRequest();
1268 - xhr.open('POST', '/bin/get/SeitokaiCode/DeletePost?outputSyntax=plain', true);
1093 + xhr.open('POST', '/bin/SeitokaiCode/DeletePost?outputSyntax=plain', true);
1269 1269   xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1270 1270   var deletePostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token);
1271 1271   xhr.onload = function() {
... ... @@ -1282,80 +1282,6 @@
1282 1282   xhr.onerror = function() { alert('通信エラーが発生しました'); };
1283 1283   xhr.send(deletePostData);
1284 1284  }
1285 -
1286 -/* --- 通報ダイアログ --- */
1287 -function openReportDialog(btn, targetPage, postObjNum, token) {
1288 - if (document.getElementById('report-dialog-overlay')) return;
1289 - var reasons = ['宣伝・スパム','不適切な内容','個人情報の露出','誹謗中傷','誤情報','その他'];
1290 - var overlay = document.createElement('div');
1291 - overlay.id = 'report-dialog-overlay';
1292 - 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;';
1293 - var dialog = document.createElement('div');
1294 - dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;max-height:80vh;overflow-y:auto;';
1295 - var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を通報</h3>';
1296 - html += '<p style="margin:0 0 12px;font-size:0.9em;color:#4b5563;">通報された投稿は管理者が確認するまで一時的に非表示になります。</p>';
1297 - html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">通報理由</label>';
1298 - html += '<select id="report-reason" style="width:100%;padding:8px;border:1px solid #d1d5db;border-radius:8px;margin-bottom:12px;font-size:0.9em;">';
1299 - for (var i=0; i<reasons.length; i++) html += '<option value="'+reasons[i]+'">'+reasons[i]+'</option>';
1300 - html += '</select>';
1301 - html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">補足コメント（任意）</label>';
1302 - 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>';
1303 - html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
1304 - html += '<button type="button" id="report-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
1305 - 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>';
1306 - html += '</div>';
1307 - dialog.innerHTML = html;
1308 - overlay.appendChild(dialog);
1309 - document.body.appendChild(overlay);
1310 - overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
1311 - document.getElementById('report-cancel-btn').addEventListener('click', function() { overlay.remove(); });
1312 - document.getElementById('report-submit-btn').addEventListener('click', function() {
1313 - var reason = document.getElementById('report-reason').value;
1314 - var detail = document.getElementById('report-detail').value;
1315 - var submitBtn = document.getElementById('report-submit-btn');
1316 - submitBtn.disabled = true; submitBtn.textContent = '送信中...';
1317 - var xhr = new XMLHttpRequest();
1318 - xhr.open('POST', '/bin/get/SeitokaiCode/ReportAction?outputSyntax=plain', true);
1319 - xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1320 - var data = 'targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&detail=' + encodeURIComponent(detail) + '&form_token=' + encodeURIComponent(token);
1321 - xhr.onload = function() {
1322 - overlay.remove();
1323 - showToast('通報を受け付けました', 'success');
1324 - setTimeout(function() { location.reload(); }, 1000);
1325 - };
1326 - xhr.onerror = function() { overlay.remove(); alert('通信エラーが発生しました'); };
1327 - xhr.send(data);
1328 - });
1329 -}
1330 -
1331 -/* --- 非表示ダイアログ（管理者用） --- */
1332 -function openHideDialog(btn, targetPage, postObjNum, token) {
1333 - if (document.getElementById('hide-dialog-overlay')) return;
1334 - var overlay = document.createElement('div');
1335 - overlay.id = 'hide-dialog-overlay';
1336 - 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;';
1337 - var dialog = document.createElement('div');
1338 - dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;';
1339 - var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を非表示にする</h3>';
1340 - html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">非表示の理由</label>';
1341 - 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="理由を入力" />';
1342 - html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
1343 - html += '<button type="button" id="hide-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
1344 - 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>';
1345 - 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>';
1346 - html += '</div>';
1347 - dialog.innerHTML = html;
1348 - overlay.appendChild(dialog);
1349 - document.body.appendChild(overlay);
1350 - overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
1351 - document.getElementById('hide-cancel-btn').addEventListener('click', function() { overlay.remove(); });
1352 - function doHide(action) {
1353 - var reason = document.getElementById('hide-reason').value || '管理者判断';
1354 - window.location.href = '/bin/view/SeitokaiCode/ModerationAction?action=' + action + '&targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&form_token=' + encodeURIComponent(token);
1355 - }
1356 - document.getElementById('hide-submit-btn').addEventListener('click', function() { doHide('hide'); });
1357 - document.getElementById('hide-warn-btn').addEventListener('click', function() { doHide('hide-warn'); });
1358 -}
1359 1359  </script>
1360 1360  {{/html}}
1361 1361  {{/velocity}}