Skip to Content
Last modified by Super Admin on 2026/04/05 18:59
From version Icon 72.1 Icon
edited by Super Admin
on 2026/03/18 23:33
Change comment: There is no comment for this version
To version Icon 50.1 Icon
edited by Super Admin
on 2026/03/14 15:31
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'))
... ... @@ -101,42 +101,11 @@
101 101   #set($viewerDoc = $xwiki.getDocument($viewerUser))
102 102   #set($viewerAccountType = $!viewerDoc.getValue('accountType'))
103 103   #set($viewerSchoolCode = $!viewerDoc.getValue('schoolCode'))
104 - #set($viewerSecondarySchoolCode = $!viewerDoc.getValue('secondarySchoolCode'))
105 - #set($viewerUserRole = $!viewerDoc.getValue('userRole'))
106 106   #if($viewerAccountType == 'admin')
107 107   #set($isViewerAdmin = true)
108 108   #end
109 109  #end
110 110  
111 -## --- 関連校（中高一貫校）情報 ---
112 -#set($affiliatedSchoolCode = $!doc.getValue('affiliatedSchoolCode'))
113 -#set($affiliatedSchoolName = $!doc.getValue('affiliatedSchoolName'))
114 -#set($isAffiliated = false)
115 -#if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
116 - #if($viewerSchoolCode == $affiliatedSchoolCode)
117 - #set($isAffiliated = true)
118 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode)
119 - #set($isAffiliated = true)
120 - #end
121 -#end
122 -
123 -## --- 校内判定（卒業生を除外、secondarySchoolCodeも含む） ---
124 -#set($isSchoolMember = false)
125 -#if(!$isGuest && $viewerUserRole != 'graduate')
126 - #if($viewerSchoolCode == $schoolCode || $isAffiliated)
127 - #set($isSchoolMember = true)
128 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode)
129 - #set($isSchoolMember = true)
130 - #end
131 -#end
132 -## 卒業生の母校判定（投稿バッジ用）
133 -#set($isAlumniOfSchool = false)
134 -#if(!$isGuest && $viewerUserRole == 'graduate')
135 - #if($viewerSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $viewerSchoolCode == $affiliatedSchoolCode))
136 - #set($isAlumniOfSchool = true)
137 - #end
138 -#end
139 -
140 140  ## --- 学校ページ非表示チェック ---
141 141  #set($schoolHidden = $doc.getValue('hidden'))
142 142  #if($schoolHidden == 1)
... ... @@ -170,7 +170,7 @@
170 170  
171 171  ## --- 投稿固定/解除処理 ---
172 172  #set($pinAction = $!request.action)
173 -#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))
174 174   #set($pinPostObjStr = $!request.postObj)
175 175   #if(!$pinPostObjStr.matches('^\d+$'))
176 176   ## 不正な値 → 無視
... ... @@ -200,7 +200,7 @@
200 200  
201 201  ## --- 特色ある活動 選定/解除処理 ---
202 202  #set($featAction = $!request.action)
203 -#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))
204 204   #set($featActObjStr = $!request.actObj)
205 205   #if($featActObjStr.matches('^\d+$'))
206 206   #set($actObjNum = $mathtool.toInteger($featActObjStr))
... ... @@ -302,7 +302,7 @@
302 302  
303 303  ## --- 編集ボタン（権限があるユーザーのみ表示） ---
304 304  #set($canEditSchool = false)
305 -#if(!$isGuest && ($isViewerAdmin || $isSchoolMember))
268 +#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode))
306 306   #set($canEditSchool = true)
307 307  #end
308 308  #if($canEditSchool)
... ... @@ -311,24 +311,6 @@
311 311  </div>
312 312  #end
313 313  
314 -## --- 関連校（中高一貫校）バナー ---
315 -#if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
316 - #set($affiliatedPageRef = "Schools.${affiliatedSchoolCode}.WebHome")
317 - #set($affiliatedPageExists = $xwiki.exists($affiliatedPageRef))
318 -<div class="affiliated-school-banner">
319 - <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>
320 - <div>
321 - <strong>中高一貫校</strong>：
322 - #if($affiliatedPageExists)
323 - <a href="$xwiki.getURL($affiliatedPageRef, 'view')">$!escapetool.xml($affiliatedSchoolName)</a>
324 - #else
325 - $!escapetool.xml($affiliatedSchoolName)
326 - #end
327 - と連携しています
328 - </div>
329 -</div>
330 -#end
331 -
332 332  ## --- ① 学校基本情報 ---
333 333  <div class="school-info-card collapsed" id="card-basic-info">
334 334   <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>
... ... @@ -350,9 +350,22 @@
350 350   #end
351 351  </div>
352 352  
353 -## --- ② 生徒会基本情報（折りたたみカード） ---
354 -<div class="school-info-card" id="card-seitokai-info">
355 - <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>
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> 連絡先</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2>
301 + <table class="wiki-table school-info-table">
302 + <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr>
303 + <tr><th>生徒会Web</th><td>#if($seitokaiWebsite && $seitokaiWebsite != '')<a href="$!escapetool.xml($seitokaiWebsite)" target="_blank" rel="noopener"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M2 12h20"/><path d="M12 2a15.3 15.3 0 014 10 15.3 15.3 0 01-4 10 15.3 15.3 0 01-4-10 15.3 15.3 0 014-10z"/></svg> $!escapetool.xml($seitokaiWebsite)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
304 + <tr><th>X (Twitter)</th><td>#if($seitokaiTwitter && $seitokaiTwitter != '')<a href="https://x.com/$!escapetool.url($seitokaiTwitter)" target="_blank" rel="noopener">𝕏 @$!escapetool.xml($seitokaiTwitter)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
305 + <tr><th>Instagram</th><td>#if($seitokaiInstagram && $seitokaiInstagram != '')<a href="https://instagram.com/$!escapetool.url($seitokaiInstagram)" target="_blank" rel="noopener"><svg class="ico" viewBox="0 0 24 24"><path d="M23 19a2 2 0 01-2 2H3a2 2 0 01-2-2V8a2 2 0 012-2h4l2-3h6l2 3h4a2 2 0 012 2z"/><circle cx="12" cy="13" r="4"/></svg> @$!escapetool.xml($seitokaiInstagram)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
306 + <tr><th>YouTube</th><td>#if($seitokaiYoutube && $seitokaiYoutube != '')<a href="$!escapetool.xml($seitokaiYoutube)" target="_blank" rel="noopener"><svg class="ico" viewBox="0 0 24 24"><polygon points="5 3 19 12 5 21 5 3"/></svg> YouTubeチャンネル</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
307 + <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
308 + </table>
309 +</div>
310 +
311 +## --- ③ 生徒会基本情報（折りたたみカード） ---
312 +<div class="school-info-card collapsed" id="card-seitokai-info">
313 + <h2 role="button" tabindex="0" aria-expanded="false" 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>
356 356   <div class="seitokai-info-body">
357 357  
358 358   ## --- 組織図 ---
... ... @@ -359,12 +359,12 @@
359 359   #set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
360 360   #if($hasOrgContent)
361 361   #set($canViewOrgChart = true)
362 - #if($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewOrgChart = false)
363 - #elseif($visibilityOrgChart == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewOrgChart = false)
320 + #if($visibilityOrgChart == 'members' && $isGuest) #set($canViewOrgChart = false)
321 + #elseif($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewOrgChart = false)
364 364   #end
365 365   #if($canViewOrgChart)
366 366   <div class="seitokai-subsection">
367 - <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>
325 + <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 == '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>
368 368   <div class="seitokai-subsection-content">
369 369   #if($orgChartImage && $orgChartImage != '')
370 370   <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
... ... @@ -373,7 +373,7 @@
373 373   </div>
374 374   </div>
375 375   #else
376 - <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>
334 + <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>
377 377   #end
378 378   #end
379 379  
... ... @@ -439,12 +439,12 @@
439 439   #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
440 440   #if($hasBudget)
441 441   #set($canViewBudget = true)
442 - #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewBudget = false)
443 - #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false)
400 + #if($visibilityBudget == 'members' && $isGuest) #set($canViewBudget = false)
401 + #elseif($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewBudget = false)
444 444   #end
445 445   #if($canViewBudget)
446 446   <div class="seitokai-subsection">
447 - <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>
405 + <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 == '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>
448 448   <div class="seitokai-subsection-content">
449 449   #if($budgetProcess && !$budgetProcess.isEmpty())
450 450   <div class="info-row">
... ... @@ -488,7 +488,7 @@
488 488   </div>
489 489   </div>
490 490   #else
491 - <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>
449 + <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>
492 492   #end
493 493   #end
494 494  
... ... @@ -495,12 +495,12 @@
495 495   ## --- 校則の見直し ---
496 496   #if($ruleReviewStatus && $ruleReviewStatus != '')
497 497   #set($canViewRuleReview = true)
498 - #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewRuleReview = false)
499 - #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false)
456 + #if($visibilityRuleReview == 'members' && $isGuest) #set($canViewRuleReview = false)
457 + #elseif($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewRuleReview = false)
500 500   #end
501 501   #if($canViewRuleReview)
502 502   <div class="seitokai-subsection">
503 - <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>
461 + <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 == '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>
504 504   <div class="seitokai-subsection-content">
505 505   <div class="info-row">
506 506   <span class="info-label">見直しの有無（3年以内）</span>
... ... @@ -551,7 +551,7 @@
551 551   </div>
552 552   </div>
553 553   #else
554 - <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>
512 + <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>
555 555   #end
556 556   #end
557 557  
... ... @@ -558,18 +558,18 @@
558 558   ## --- 生徒会の課題意識 ---
559 559   #if($challenges && $challenges != '')
560 560   #set($canViewChallenges = true)
561 - #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewChallenges = false)
562 - #elseif($visibilityChallenges == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewChallenges = false)
519 + #if($visibilityChallenges == 'members' && $isGuest) #set($canViewChallenges = false)
520 + #elseif($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewChallenges = false)
563 563   #end
564 564   #if($canViewChallenges)
565 565   <div class="seitokai-subsection">
566 - <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>
524 + <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 == '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>
567 567   <div class="seitokai-subsection-content">
568 568   <div class="challenge-text">$!escapetool.xml($challenges)</div>
569 569   </div>
570 570   </div>
571 571   #else
572 - <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>
530 + <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>
573 573   #end
574 574   #end
575 575  
... ... @@ -576,28 +576,38 @@
576 576   </div>## seitokai-info-body 終了
577 577  </div>## card-seitokai-info 終了
578 578  
579 -## --- ③ SNS・連絡先 ---
580 -<div class="school-info-card collapsed" id="card-contact">
581 - <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>
582 - <table class="wiki-table school-info-table">
583 - <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr>
584 - <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>
585 - <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>
586 - <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>
587 - <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>
588 - <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
589 - </table>
590 -</div>
591 -
592 592  {{/html}}
593 593  
594 -----
595 -
596 596  ## --- ⑩ 活動報告一覧（スレッド型・年度タブ付き） ---
597 597  = 活動報告 =
598 598  
599 -## --- 年度タブ + 投稿者ステータス凡例 ---
542 +## --- 投稿者ステータス凡例（折りたたみ） ---
600 600  {{html clean="false"}}
544 +<div class="author-legend-wrapper">
545 + <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>
546 + <div class="author-legend-body">
547 + <div class="author-legend">
548 + <span class="author-legend-title">投稿者の信頼度:</span>
549 + <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者</span>
550 + <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み</span>
551 + <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介</span>
552 + <span class="author-legend-item"><span class="bar bar-general"></span> 一般（未承認）</span>
553 + </div>
554 + <div class="author-legend">
555 + <span class="author-legend-title">所属:</span>
556 + <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>
557 + <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>
558 + <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>
559 + <span class="author-legend-item text-hint">※一般アカウントは所属未確認のため非表示</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-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>
564 + <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>
565 + <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>
566 + </div>
567 + </div>
568 +</div>
601 601  
602 602  ## --- 年度タブ ---
603 603  ## 全活動から年度一覧を収集
... ... @@ -619,49 +619,14 @@
619 619  #end
620 620  ## ソート（降順にしたいが Velocity にはないので JS で制御）
621 621  
622 -<div class="activity-toolbar">
623 - <div class="activity-fy-tabs">
624 - <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
625 - #foreach($fy in $fySet)
626 - #if($fy != $currentFYStr)
627 - <button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button>
628 - #end
590 +<div class="activity-fy-tabs">
591 + <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
592 + #foreach($fy in $fySet)
593 + #if($fy != $currentFYStr)
594 + <button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button>
629 629   #end
630 - <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
631 - </div>
632 - <div class="activity-toolbar-right">
633 - <button class="btn-view-toggle" id="btnViewToggle" onclick="toggleCompactView()" title="タイトルのみ表示">
634 - <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>
635 - <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>
636 - <span class="toggle-label">一覧表示</span>
637 - </button>
638 - </div>
639 - <div class="author-legend-wrapper">
640 - <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>
641 - <div class="author-legend-body">
642 - <div class="author-legend">
643 - <span class="author-legend-title">投稿者の信頼度:</span>
644 - <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者 <span class="text-hint">— 運営スタッフ</span></span>
645 - <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み <span class="text-hint">— 本人確認済みのユーザー</span></span>
646 - <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介 <span class="text-hint">— 承認済みユーザーからの紹介</span></span>
647 - <span class="author-legend-item"><span class="bar bar-general"></span> 一般 <span class="text-hint">— 一般登録ユーザー</span></span>
648 - </div>
649 - <div class="author-legend">
650 - <span class="author-legend-title">所属:</span>
651 - <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>
652 - <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>
653 - <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>
654 - <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>
655 - <span class="author-legend-item text-hint">※一般アカウントは所属バッジが表示されません</span>
656 - </div>
657 - <div class="author-legend">
658 - <span class="author-legend-title">役割:</span>
659 - <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>
660 - <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>
661 - <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>
662 - </div>
663 - </div>
664 - </div>
596 + #end
597 + <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
665 665  </div>
666 666  
667 667  {{/html}}
... ... @@ -728,12 +728,6 @@
728 728   <div class="activity-thread-title">
729 729   <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>
730 730   <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
731 - #set($actTagsList = $activity.getValue('tags'))
732 - #if($actTagsList && !$actTagsList.isEmpty())
733 - #foreach($tagItem in $actTagsList)
734 - #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end
735 - #end
736 - #end
737 737   </div>
738 738   <div class="thread-meta-row">
739 739   <span class="thread-post-count">${reportCount}件の報告 ・ ${commentCount}件のコメント</span>
... ... @@ -795,12 +795,12 @@
795 795   #set($postVis = $!post.getValue('visibility'))
796 796   #if(!$postVis || $postVis == '') #set($postVis = 'public') #end
797 797   #set($canViewPost = true)
798 - #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewPost = false)
799 - #elseif($postVis == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPost = false)
725 + #if($postVis == 'members' && $isGuest) #set($canViewPost = false)
726 + #elseif($postVis == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewPost = false)
800 800   #end
801 801   #if(!$canViewPost)
802 802   <div class="thread-post visibility-restricted-post">
803 - <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>
730 + <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>
804 804   </div>
805 805   #else
806 806   ## 投稿者のアカウント種別に基づいたCSSクラス
... ... @@ -840,11 +840,8 @@
840 840   <span class="badge badge-general badge-sm">一般</span>
841 841   #end
842 842   ## 所属バッジ（投稿者の学校コードとページの学校コードを比較）
843 - #set($postIsSchoolMatch = ($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode)))
844 844   #if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general')
845 - #if($postUserRole == 'graduate' && $postIsSchoolMatch)
846 - <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>
847 - #elseif($postIsSchoolMatch && $postUserRole != 'graduate')
771 + #if($postSchoolCode == $schoolCode)
848 848   #if($postAccountType == 'verified' || $postAccountType == 'admin')
849 849   <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>
850 850   #else
... ... @@ -935,7 +935,7 @@
935 935   #end
936 936   </div>
937 937   #if($postVis != 'public')
938 - <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>
862 + <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>
939 939   #end
940 940   ## 固定/解除ボタン（承認済み・管理者のみ）
941 941   #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
... ... @@ -1049,35 +1049,6 @@
1049 1049  ## --- 年度タブ切り替え JavaScript ---
1050 1050  {{html clean="false"}}
1051 1051  <script>
1052 -// コンパクト表示（タイトルのみ）トグル
1053 -function toggleCompactView() {
1054 - var container = document.querySelector('.xwiki-content') || document.body;
1055 - var isCompact = container.classList.toggle('activity-compact-view');
1056 - var btn = document.getElementById('btnViewToggle');
1057 - if (btn) {
1058 - btn.querySelector('.toggle-label').textContent = isCompact ? '詳細表示' : '一覧表示';
1059 - btn.title = isCompact ? '詳細表示に戻す' : 'タイトルのみ表示';
1060 - }
1061 - // コンパクトモードでは各スレッドヘッダーをクリックで個別展開可能にする
1062 - document.querySelectorAll('.activity-thread').forEach(function(thread) {
1063 - if (isCompact) {
1064 - thread.classList.remove('compact-expanded');
1065 - }
1066 - });
1067 -}
1068 -
1069 -// コンパクトモードで個別スレッドを展開/折りたたみ
1070 -function toggleThreadExpand(e) {
1071 - var container = document.querySelector('.xwiki-content') || document.body;
1072 - if (!container.classList.contains('activity-compact-view')) return;
1073 - // リンクやボタンのクリックはスルー
1074 - if (e.target.closest('a, button, .btn-featured-toggle')) return;
1075 - var thread = e.target.closest('.activity-thread');
1076 - if (thread) {
1077 - thread.classList.toggle('compact-expanded');
1078 - }
1079 -}
1080 -
1081 1081  function switchActivityFY(fy, btn) {
1082 1082   // タブのアクティブ状態を切り替え
1083 1083   document.querySelectorAll('.activity-fy-tab').forEach(function(t) { t.classList.remove('active'); });
... ... @@ -1093,27 +1093,6 @@
1093 1093  }
1094 1094  // ページ読み込み時の初期化
1095 1095  document.addEventListener('DOMContentLoaded', function() {
1096 - // 年度タブを降順にソート（「全期間」タブは末尾に固定）
1097 - var tabContainer = document.querySelector('.activity-fy-tabs');
1098 - if (tabContainer) {
1099 - var tabs = Array.from(tabContainer.querySelectorAll('.activity-fy-tab'));
1100 - var allTab = null;
1101 - var fyTabs = [];
1102 - tabs.forEach(function(t) {
1103 - var onclickStr = t.getAttribute('onclick') || '';
1104 - if (onclickStr.indexOf("'all'") !== -1) { allTab = t; }
1105 - else { fyTabs.push(t); }
1106 - });
1107 - // 年度タブを数値の降順でソート
1108 - fyTabs.sort(function(a, b) {
1109 - var aYear = parseInt(a.textContent) || 0;
1110 - var bYear = parseInt(b.textContent) || 0;
1111 - return bYear - aYear;
1112 - });
1113 - // DOM再配置
1114 - fyTabs.forEach(function(t) { tabContainer.appendChild(t); });
1115 - if (allTab) { tabContainer.appendChild(allTab); }
1116 - }
1117 1117   // デフォルトで現在の年度を表示
1118 1118   var defaultTab = document.querySelector('.activity-fy-tab.active');
1119 1119   if (defaultTab) { defaultTab.click(); }
... ... @@ -1125,30 +1125,6 @@
1125 1125   window.history.replaceState({}, document.title, window.location.pathname);
1126 1126   }
1127 1127   }
1128 - // コンパクトモード: スレッドヘッダークリックで個別展開
1129 - document.querySelectorAll('.activity-thread-header').forEach(function(header) {
1130 - header.addEventListener('click', toggleThreadExpand);
1131 - });
1132 - // 長文投稿の折りたたみ初期化（max-height: 12em 超で省略）
1133 - document.querySelectorAll('.thread-post-body').forEach(function(body) {
1134 - // pre-wrapのまま高さを測定し、max-height(12em ≒ ~200px)を超える場合に折りたたむ
1135 - var fullH = body.scrollHeight;
1136 - // 12em を px に変換（font-size × line-height × 行数 の近似値ではなくCSSと同じ値を取得）
1137 - body.classList.add('truncated');
1138 - var maxH = body.clientHeight; // max-height: 12em 適用後の高さ
1139 - body.classList.remove('truncated');
1140 - if (fullH > maxH + 30) {
1141 - body.classList.add('truncated');
1142 - var btn = document.createElement('button');
1143 - btn.className = 'btn-read-more';
1144 - btn.textContent = '広げて読む ▼';
1145 - btn.addEventListener('click', function() {
1146 - var isExpanded = body.classList.toggle('expanded');
1147 - btn.textContent = isExpanded ? '折りたたむ ▲' : '広げて読む ▼';
1148 - });
1149 - body.parentNode.insertBefore(btn, body.nextSibling);
1150 - }
1151 - });
1152 1152  });
1153 1153  
1154 1154  // トースト通知表示
... ... @@ -1211,7 +1211,7 @@
1211 1211   var csrfEl = document.querySelector('input[name="form_token"]');
1212 1212   var csrfToken = csrfEl ? csrfEl.value : '';
1213 1213   var xhr = new XMLHttpRequest();
1214 - xhr.open('POST', '/bin/get/SeitokaiCode/EditPost?outputSyntax=plain', true);
1064 + xhr.open('POST', '/bin/SeitokaiCode/EditPost?outputSyntax=plain', true);
1215 1215   xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1216 1216   var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken);
1217 1217   xhr.onload = function() {
... ... @@ -1233,7 +1233,7 @@
1233 1233  function confirmDeletePost(schoolPage, postObjNum, token) {
1234 1234   if (!confirm('この投稿を削除しますか？\\n削除後は「この投稿は削除されました」と表示されます。')) return;
1235 1235   var xhr = new XMLHttpRequest();
1236 - xhr.open('POST', '/bin/get/SeitokaiCode/DeletePost?outputSyntax=plain', true);
1086 + xhr.open('POST', '/bin/SeitokaiCode/DeletePost?outputSyntax=plain', true);
1237 1237   xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1238 1238   var deletePostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token);
1239 1239   xhr.onload = function() {