Skip to Content
Last modified by Super Admin on 2026/04/05 18:59
From version Icon 54.1 Icon
edited by Super Admin
on 2026/03/15 00:11
Change comment: There is no comment for this version
To version Icon 71.1 Icon
edited by Super Admin
on 2026/03/18 20:48
Change comment: There is no comment for this version

Summary

Details

Icon Page properties
Content
... ... @@ -1,5 +1,11 @@
1 1  {{velocity}}
2 2  ## ===== 学校ページ テンプレート =====
3 +## ゲストが ?sheet= 付きURL（編集フォーム等）に直接アクセスした場合、ログインページへリダイレクト
4 +#if($xcontext.user == 'XWiki.XWikiGuest' && $request.sheet && $request.sheet != '')
5 + #set($currentUrl = $doc.getURL('view', "sheet=${request.sheet}"))
6 + $response.sendRedirect("/bin/login/XWiki/XWikiLogin?srid=$escapetool.url($currentUrl)")
7 + #stop
8 +#end
3 3  {{html clean="false"}}
4 4  ## メンテナンスバナー（{{include}}ではなくインラインで記述し、<p>タグ挿入を回避）
5 5  #set($bannerDoc = $xwiki.getDocument('SeitokaiAdmin.MaintenanceBanner'))
... ... @@ -100,6 +100,14 @@
100 100   #end
101 101  #end
102 102  
109 +## --- 関連校（中高一貫校）情報 ---
110 +#set($affiliatedSchoolCode = $!doc.getValue('affiliatedSchoolCode'))
111 +#set($affiliatedSchoolName = $!doc.getValue('affiliatedSchoolName'))
112 +#set($isAffiliated = false)
113 +#if($affiliatedSchoolCode && $affiliatedSchoolCode != '' && $viewerSchoolCode == $affiliatedSchoolCode)
114 + #set($isAffiliated = true)
115 +#end
116 +
103 103  ## --- 学校ページ非表示チェック ---
104 104  #set($schoolHidden = $doc.getValue('hidden'))
105 105  #if($schoolHidden == 1)
... ... @@ -133,7 +133,7 @@
133 133  
134 134  ## --- 投稿固定/解除処理 ---
135 135  #set($pinAction = $!request.action)
136 -#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token))
150 +#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && ($viewerSchoolCode == $schoolCode || $isAffiliated))) && $services.csrf.isTokenValid($request.form_token))
137 137   #set($pinPostObjStr = $!request.postObj)
138 138   #if(!$pinPostObjStr.matches('^\d+$'))
139 139   ## 不正な値 → 無視
... ... @@ -265,7 +265,7 @@
265 265  
266 266  ## --- 編集ボタン（権限があるユーザーのみ表示） ---
267 267  #set($canEditSchool = false)
268 -#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode))
282 +#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode || $isAffiliated))
269 269   #set($canEditSchool = true)
270 270  #end
271 271  #if($canEditSchool)
... ... @@ -274,6 +274,24 @@
274 274  </div>
275 275  #end
276 276  
291 +## --- 関連校（中高一貫校）バナー ---
292 +#if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
293 + #set($affiliatedPageRef = "Schools.${affiliatedSchoolCode}.WebHome")
294 + #set($affiliatedPageExists = $xwiki.exists($affiliatedPageRef))
295 +<div class="affiliated-school-banner">
296 + <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>
297 + <div>
298 + <strong>中高一貫校</strong>：
299 + #if($affiliatedPageExists)
300 + <a href="$xwiki.getURL($affiliatedPageRef, 'view')">$!escapetool.xml($affiliatedSchoolName)</a>
301 + #else
302 + $!escapetool.xml($affiliatedSchoolName)
303 + #end
304 + と連携しています
305 + </div>
306 +</div>
307 +#end
308 +
277 277  ## --- ① 学校基本情報 ---
278 278  <div class="school-info-card collapsed" id="card-basic-info">
279 279   <h2 role="button" tabindex="0" aria-expanded="false" onclick="toggleInfoCard('card-basic-info')" onkeydown="if(event.key==='Enter'||event.key===' '){event.preventDefault();toggleInfoCard('card-basic-info')}"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M4 19.5A2.5 2.5 0 016.5 17H20"/><path d="M6.5 2H20v20H6.5A2.5 2.5 0 014 19.5v-15A2.5 2.5 0 016.5 2z"/></svg> 学校基本情報</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2>
... ... @@ -304,12 +304,12 @@
304 304   #set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
305 305   #if($hasOrgContent)
306 306   #set($canViewOrgChart = true)
307 - #if($visibilityOrgChart == 'members' && $isGuest) #set($canViewOrgChart = false)
308 - #elseif($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewOrgChart = false)
339 + #if($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewOrgChart = false)
340 + #elseif($visibilityOrgChart == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewOrgChart = false)
309 309   #end
310 310   #if($canViewOrgChart)
311 311   <div class="seitokai-subsection">
312 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/><line x1="9" y1="10" x2="9" y2="10.01"/><line x1="15" y1="10" x2="15" y2="10.01"/><line x1="9" y1="14" x2="9" y2="14.01"/><line x1="15" y1="14" x2="15" y2="14.01"/></svg> 組織図 #if($visibilityOrgChart != 'public')<span class="visibility-badge visibility-${visibilityOrgChart}">#if($visibilityOrgChart == '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>
344 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/><line x1="9" y1="10" x2="9" y2="10.01"/><line x1="15" y1="10" x2="15" y2="10.01"/><line x1="9" y1="14" x2="9" y2="14.01"/><line x1="15" y1="14" x2="15" y2="14.01"/></svg> 組織図 #if($visibilityOrgChart != 'public')<span class="visibility-badge visibility-${visibilityOrgChart}">#if($visibilityOrgChart == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
313 313   <div class="seitokai-subsection-content">
314 314   #if($orgChartImage && $orgChartImage != '')
315 315   <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
... ... @@ -318,7 +318,7 @@
318 318   </div>
319 319   </div>
320 320   #else
321 - <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 組織図は #if($visibilityOrgChart == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
353 + <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 組織図は #if($visibilityOrgChart == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
322 322   #end
323 323   #end
324 324  
... ... @@ -384,12 +384,12 @@
384 384   #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
385 385   #if($hasBudget)
386 386   #set($canViewBudget = true)
387 - #if($visibilityBudget == 'members' && $isGuest) #set($canViewBudget = false)
388 - #elseif($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewBudget = false)
419 + #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewBudget = false)
420 + #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false)
389 389   #end
390 390   #if($canViewBudget)
391 391   <div class="seitokai-subsection">
392 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><line x1="12" y1="1" x2="12" y2="23"/><path d="M17 5H9.5a3.5 3.5 0 000 7h5a3.5 3.5 0 010 7H6"/></svg> 予算 #if($visibilityBudget != 'public')<span class="visibility-badge visibility-${visibilityBudget}">#if($visibilityBudget == '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>
424 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><line x1="12" y1="1" x2="12" y2="23"/><path d="M17 5H9.5a3.5 3.5 0 000 7h5a3.5 3.5 0 010 7H6"/></svg> 予算 #if($visibilityBudget != 'public')<span class="visibility-badge visibility-${visibilityBudget}">#if($visibilityBudget == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
393 393   <div class="seitokai-subsection-content">
394 394   #if($budgetProcess && !$budgetProcess.isEmpty())
395 395   <div class="info-row">
... ... @@ -433,7 +433,7 @@
433 433   </div>
434 434   </div>
435 435   #else
436 - <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 予算情報は #if($visibilityBudget == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
468 + <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 予算情報は #if($visibilityBudget == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
437 437   #end
438 438   #end
439 439  
... ... @@ -440,12 +440,12 @@
440 440   ## --- 校則の見直し ---
441 441   #if($ruleReviewStatus && $ruleReviewStatus != '')
442 442   #set($canViewRuleReview = true)
443 - #if($visibilityRuleReview == 'members' && $isGuest) #set($canViewRuleReview = false)
444 - #elseif($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewRuleReview = false)
475 + #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewRuleReview = false)
476 + #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false)
445 445   #end
446 446   #if($canViewRuleReview)
447 447   <div class="seitokai-subsection">
448 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M16 4h2a2 2 0 012 2v12a2 2 0 01-2 2h-2"/><path d="M8 4H6a2 2 0 00-2 2v12a2 2 0 002 2h2"/><line x1="12" y1="4" x2="12" y2="8"/><line x1="12" y1="16" x2="12" y2="20"/><line x1="8" y1="8" x2="16" y2="8"/><line x1="8" y1="16" x2="16" y2="16"/></svg> 校則の見直し #if($visibilityRuleReview != 'public')<span class="visibility-badge visibility-${visibilityRuleReview}">#if($visibilityRuleReview == '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>
480 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M16 4h2a2 2 0 012 2v12a2 2 0 01-2 2h-2"/><path d="M8 4H6a2 2 0 00-2 2v12a2 2 0 002 2h2"/><line x1="12" y1="4" x2="12" y2="8"/><line x1="12" y1="16" x2="12" y2="20"/><line x1="8" y1="8" x2="16" y2="8"/><line x1="8" y1="16" x2="16" y2="16"/></svg> 校則の見直し #if($visibilityRuleReview != 'public')<span class="visibility-badge visibility-${visibilityRuleReview}">#if($visibilityRuleReview == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
449 449   <div class="seitokai-subsection-content">
450 450   <div class="info-row">
451 451   <span class="info-label">見直しの有無（3年以内）</span>
... ... @@ -496,7 +496,7 @@
496 496   </div>
497 497   </div>
498 498   #else
499 - <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 校則の見直し情報は #if($visibilityRuleReview == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
531 + <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 校則の見直し情報は #if($visibilityRuleReview == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
500 500   #end
501 501   #end
502 502  
... ... @@ -503,18 +503,18 @@
503 503   ## --- 生徒会の課題意識 ---
504 504   #if($challenges && $challenges != '')
505 505   #set($canViewChallenges = true)
506 - #if($visibilityChallenges == 'members' && $isGuest) #set($canViewChallenges = false)
507 - #elseif($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewChallenges = false)
538 + #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewChallenges = false)
539 + #elseif($visibilityChallenges == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewChallenges = false)
508 508   #end
509 509   #if($canViewChallenges)
510 510   <div class="seitokai-subsection">
511 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M12 16v-4"/><path d="M12 8h.01"/></svg> 生徒会の課題意識 #if($visibilityChallenges != 'public')<span class="visibility-badge visibility-${visibilityChallenges}">#if($visibilityChallenges == '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>
543 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M12 16v-4"/><path d="M12 8h.01"/></svg> 生徒会の課題意識 #if($visibilityChallenges != 'public')<span class="visibility-badge visibility-${visibilityChallenges}">#if($visibilityChallenges == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
512 512   <div class="seitokai-subsection-content">
513 513   <div class="challenge-text">$!escapetool.xml($challenges)</div>
514 514   </div>
515 515   </div>
516 516   #else
517 - <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 課題情報は #if($visibilityChallenges == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
549 + <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 課題情報は #if($visibilityChallenges == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
518 518   #end
519 519   #end
520 520  
... ... @@ -541,33 +541,8 @@
541 541  ## --- ⑩ 活動報告一覧（スレッド型・年度タブ付き） ---
542 542  = 活動報告 =
543 543  
544 -## --- 投稿者ステータス凡例（折りたたみ） ---
576 +## --- 年度タブ + 投稿者ステータス凡例 ---
545 545  {{html clean="false"}}
546 -<div class="author-legend-wrapper">
547 - <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>
548 - <div class="author-legend-body">
549 - <div class="author-legend">
550 - <span class="author-legend-title">投稿者の信頼度:</span>
551 - <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者</span>
552 - <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み</span>
553 - <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介</span>
554 - <span class="author-legend-item"><span class="bar bar-general"></span> 一般（未承認）</span>
555 - </div>
556 - <div class="author-legend">
557 - <span class="author-legend-title">所属:</span>
558 - <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>
559 - <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>
560 - <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>
561 - <span class="author-legend-item text-hint">※一般アカウントは所属未確認のため非表示</span>
562 - </div>
563 - <div class="author-legend">
564 - <span class="author-legend-title">役割:</span>
565 - <span class="author-legend-item"><span class="badge badge-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>
566 - <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>
567 - <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>
568 - </div>
569 - </div>
570 -</div>
571 571  
572 572  ## --- 年度タブ ---
573 573  ## 全活動から年度一覧を収集
... ... @@ -589,14 +589,48 @@
589 589  #end
590 590  ## ソート（降順にしたいが Velocity にはないので JS で制御）
591 591  
592 -<div class="activity-fy-tabs">
593 - <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
594 - #foreach($fy in $fySet)
595 - #if($fy != $currentFYStr)
596 - <button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button>
599 +<div class="activity-toolbar">
600 + <div class="activity-fy-tabs">
601 + <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
602 + #foreach($fy in $fySet)
603 + #if($fy != $currentFYStr)
604 + <button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button>
605 + #end
597 597   #end
598 - #end
599 - <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
607 + <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
608 + </div>
609 + <div class="activity-toolbar-right">
610 + <button class="btn-view-toggle" id="btnViewToggle" onclick="toggleCompactView()" title="タイトルのみ表示">
611 + <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>
612 + <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>
613 + <span class="toggle-label">一覧表示</span>
614 + </button>
615 + </div>
616 + <div class="author-legend-wrapper">
617 + <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>
618 + <div class="author-legend-body">
619 + <div class="author-legend">
620 + <span class="author-legend-title">投稿者の信頼度:</span>
621 + <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者 <span class="text-hint">— 運営スタッフ</span></span>
622 + <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み <span class="text-hint">— 本人確認済みのユーザー</span></span>
623 + <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介 <span class="text-hint">— 承認済みユーザーからの紹介</span></span>
624 + <span class="author-legend-item"><span class="bar bar-general"></span> 一般 <span class="text-hint">— 一般登録ユーザー</span></span>
625 + </div>
626 + <div class="author-legend">
627 + <span class="author-legend-title">所属:</span>
628 + <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>
629 + <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>
630 + <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>
631 + <span class="author-legend-item text-hint">※一般アカウントは所属バッジが表示されません</span>
632 + </div>
633 + <div class="author-legend">
634 + <span class="author-legend-title">役割:</span>
635 + <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>
636 + <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>
637 + <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>
638 + </div>
639 + </div>
640 + </div>
600 600  </div>
601 601  
602 602  {{/html}}
... ... @@ -663,6 +663,12 @@
663 663   <div class="activity-thread-title">
664 664   <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>
665 665   <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
707 + #set($actTagsList = $activity.getValue('tags'))
708 + #if($actTagsList && !$actTagsList.isEmpty())
709 + #foreach($tagItem in $actTagsList)
710 + #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end
711 + #end
712 + #end
666 666   </div>
667 667   <div class="thread-meta-row">
668 668   <span class="thread-post-count">${reportCount}件の報告 ・ ${commentCount}件のコメント</span>
... ... @@ -724,12 +724,12 @@
724 724   #set($postVis = $!post.getValue('visibility'))
725 725   #if(!$postVis || $postVis == '') #set($postVis = 'public') #end
726 726   #set($canViewPost = true)
727 - #if($postVis == 'members' && $isGuest) #set($canViewPost = false)
728 - #elseif($postVis == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewPost = false)
774 + #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewPost = false)
775 + #elseif($postVis == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPost = false)
729 729   #end
730 730   #if(!$canViewPost)
731 731   <div class="thread-post visibility-restricted-post">
732 - <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>
779 + <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>
733 733   </div>
734 734   #else
735 735   ## 投稿者のアカウント種別に基づいたCSSクラス
... ... @@ -770,7 +770,7 @@
770 770   #end
771 771   ## 所属バッジ（投稿者の学校コードとページの学校コードを比較）
772 772   #if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general')
773 - #if($postSchoolCode == $schoolCode)
820 + #if($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode))
774 774   #if($postAccountType == 'verified' || $postAccountType == 'admin')
775 775   <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>
776 776   #else
... ... @@ -861,7 +861,7 @@
861 861   #end
862 862   </div>
863 863   #if($postVis != 'public')
864 - <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>
911 + <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>
865 865   #end
866 866   ## 固定/解除ボタン（承認済み・管理者のみ）
867 867   #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
... ... @@ -975,6 +975,35 @@
975 975  ## --- 年度タブ切り替え JavaScript ---
976 976  {{html clean="false"}}
977 977  <script>
1025 +// コンパクト表示（タイトルのみ）トグル
1026 +function toggleCompactView() {
1027 + var container = document.querySelector('.xwiki-content') || document.body;
1028 + var isCompact = container.classList.toggle('activity-compact-view');
1029 + var btn = document.getElementById('btnViewToggle');
1030 + if (btn) {
1031 + btn.querySelector('.toggle-label').textContent = isCompact ? '詳細表示' : '一覧表示';
1032 + btn.title = isCompact ? '詳細表示に戻す' : 'タイトルのみ表示';
1033 + }
1034 + // コンパクトモードでは各スレッドヘッダーをクリックで個別展開可能にする
1035 + document.querySelectorAll('.activity-thread').forEach(function(thread) {
1036 + if (isCompact) {
1037 + thread.classList.remove('compact-expanded');
1038 + }
1039 + });
1040 +}
1041 +
1042 +// コンパクトモードで個別スレッドを展開/折りたたみ
1043 +function toggleThreadExpand(e) {
1044 + var container = document.querySelector('.xwiki-content') || document.body;
1045 + if (!container.classList.contains('activity-compact-view')) return;
1046 + // リンクやボタンのクリックはスルー
1047 + if (e.target.closest('a, button, .btn-featured-toggle')) return;
1048 + var thread = e.target.closest('.activity-thread');
1049 + if (thread) {
1050 + thread.classList.toggle('compact-expanded');
1051 + }
1052 +}
1053 +
978 978  function switchActivityFY(fy, btn) {
979 979   // タブのアクティブ状態を切り替え
980 980   document.querySelectorAll('.activity-fy-tab').forEach(function(t) { t.classList.remove('active'); });
... ... @@ -990,6 +990,27 @@
990 990  }
991 991  // ページ読み込み時の初期化
992 992  document.addEventListener('DOMContentLoaded', function() {
1069 + // 年度タブを降順にソート（「全期間」タブは末尾に固定）
1070 + var tabContainer = document.querySelector('.activity-fy-tabs');
1071 + if (tabContainer) {
1072 + var tabs = Array.from(tabContainer.querySelectorAll('.activity-fy-tab'));
1073 + var allTab = null;
1074 + var fyTabs = [];
1075 + tabs.forEach(function(t) {
1076 + var onclickStr = t.getAttribute('onclick') || '';
1077 + if (onclickStr.indexOf("'all'") !== -1) { allTab = t; }
1078 + else { fyTabs.push(t); }
1079 + });
1080 + // 年度タブを数値の降順でソート
1081 + fyTabs.sort(function(a, b) {
1082 + var aYear = parseInt(a.textContent) || 0;
1083 + var bYear = parseInt(b.textContent) || 0;
1084 + return bYear - aYear;
1085 + });
1086 + // DOM再配置
1087 + fyTabs.forEach(function(t) { tabContainer.appendChild(t); });
1088 + if (allTab) { tabContainer.appendChild(allTab); }
1089 + }
993 993   // デフォルトで現在の年度を表示
994 994   var defaultTab = document.querySelector('.activity-fy-tab.active');
995 995   if (defaultTab) { defaultTab.click(); }
... ... @@ -1001,6 +1001,30 @@
1001 1001   window.history.replaceState({}, document.title, window.location.pathname);
1002 1002   }
1003 1003   }
1101 + // コンパクトモード: スレッドヘッダークリックで個別展開
1102 + document.querySelectorAll('.activity-thread-header').forEach(function(header) {
1103 + header.addEventListener('click', toggleThreadExpand);
1104 + });
1105 + // 長文投稿の折りたたみ初期化（max-height: 12em 超で省略）
1106 + document.querySelectorAll('.thread-post-body').forEach(function(body) {
1107 + // pre-wrapのまま高さを測定し、max-height(12em ≒ ~200px)を超える場合に折りたたむ
1108 + var fullH = body.scrollHeight;
1109 + // 12em を px に変換（font-size × line-height × 行数 の近似値ではなくCSSと同じ値を取得）
1110 + body.classList.add('truncated');
1111 + var maxH = body.clientHeight; // max-height: 12em 適用後の高さ
1112 + body.classList.remove('truncated');
1113 + if (fullH > maxH + 30) {
1114 + body.classList.add('truncated');
1115 + var btn = document.createElement('button');
1116 + btn.className = 'btn-read-more';
1117 + btn.textContent = '広げて読む ▼';
1118 + btn.addEventListener('click', function() {
1119 + var isExpanded = body.classList.toggle('expanded');
1120 + btn.textContent = isExpanded ? '折りたたむ ▲' : '広げて読む ▼';
1121 + });
1122 + body.parentNode.insertBefore(btn, body.nextSibling);
1123 + }
1124 + });
1004 1004  });
1005 1005  
1006 1006  // トースト通知表示
... ... @@ -1063,7 +1063,7 @@
1063 1063   var csrfEl = document.querySelector('input[name="form_token"]');
1064 1064   var csrfToken = csrfEl ? csrfEl.value : '';
1065 1065   var xhr = new XMLHttpRequest();
1066 - xhr.open('POST', '/bin/SeitokaiCode/EditPost?outputSyntax=plain', true);
1187 + xhr.open('POST', '/bin/get/SeitokaiCode/EditPost?outputSyntax=plain', true);
1067 1067   xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1068 1068   var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken);
1069 1069   xhr.onload = function() {
... ... @@ -1085,7 +1085,7 @@
1085 1085  function confirmDeletePost(schoolPage, postObjNum, token) {
1086 1086   if (!confirm('この投稿を削除しますか？\\n削除後は「この投稿は削除されました」と表示されます。')) return;
1087 1087   var xhr = new XMLHttpRequest();
1088 - xhr.open('POST', '/bin/SeitokaiCode/DeletePost?outputSyntax=plain', true);
1209 + xhr.open('POST', '/bin/get/SeitokaiCode/DeletePost?outputSyntax=plain', true);
1089 1089   xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1090 1090   var deletePostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token);
1091 1091   xhr.onload = function() {