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

Summary

Details

Icon Page properties
Author
... ... @@ -1,1 +1,1 @@
1 -XWiki.superadmin
1 +XWiki.XWikiGuest
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,7 +34,6 @@
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 38  
39 39  ## --- 組織図 ---
40 40  #set($orgChart = $doc.getValue('orgChart'))
... ... @@ -102,42 +102,11 @@
102 102   #set($viewerDoc = $xwiki.getDocument($viewerUser))
103 103   #set($viewerAccountType = $!viewerDoc.getValue('accountType'))
104 104   #set($viewerSchoolCode = $!viewerDoc.getValue('schoolCode'))
105 - #set($viewerSecondarySchoolCode = $!viewerDoc.getValue('secondarySchoolCode'))
106 - #set($viewerUserRole = $!viewerDoc.getValue('userRole'))
107 107   #if($viewerAccountType == 'admin')
108 108   #set($isViewerAdmin = true)
109 109   #end
110 110  #end
111 111  
112 -## --- 関連校（中高一貫校）情報 ---
113 -#set($affiliatedSchoolCode = $!doc.getValue('affiliatedSchoolCode'))
114 -#set($affiliatedSchoolName = $!doc.getValue('affiliatedSchoolName'))
115 -#set($isAffiliated = false)
116 -#if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
117 - #if($viewerSchoolCode == $affiliatedSchoolCode)
118 - #set($isAffiliated = true)
119 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode)
120 - #set($isAffiliated = true)
121 - #end
122 -#end
123 -
124 -## --- 校内判定（卒業生を除外、secondarySchoolCodeも含む） ---
125 -#set($isSchoolMember = false)
126 -#if(!$isGuest && $viewerUserRole != 'graduate')
127 - #if($viewerSchoolCode == $schoolCode || $isAffiliated)
128 - #set($isSchoolMember = true)
129 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode)
130 - #set($isSchoolMember = true)
131 - #end
132 -#end
133 -## 卒業生の母校判定（投稿バッジ用）
134 -#set($isAlumniOfSchool = false)
135 -#if(!$isGuest && $viewerUserRole == 'graduate')
136 - #if($viewerSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $viewerSchoolCode == $affiliatedSchoolCode))
137 - #set($isAlumniOfSchool = true)
138 - #end
139 -#end
140 -
141 141  ## --- 学校ページ非表示チェック ---
142 142  #set($schoolHidden = $doc.getValue('hidden'))
143 143  #if($schoolHidden == 1)
... ... @@ -171,7 +171,7 @@
171 171  
172 172  ## --- 投稿固定/解除処理 ---
173 173  #set($pinAction = $!request.action)
174 -#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))
175 175   #set($pinPostObjStr = $!request.postObj)
176 176   #if(!$pinPostObjStr.matches('^\d+$'))
177 177   ## 不正な値 → 無視
... ... @@ -201,7 +201,7 @@
201 201  
202 202  ## --- 特色ある活動 選定/解除処理 ---
203 203  #set($featAction = $!request.action)
204 -#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))
205 205   #set($featActObjStr = $!request.actObj)
206 206   #if($featActObjStr.matches('^\d+$'))
207 207   #set($actObjNum = $mathtool.toInteger($featActObjStr))
... ... @@ -303,7 +303,7 @@
303 303  
304 304  ## --- 編集ボタン（権限があるユーザーのみ表示） ---
305 305  #set($canEditSchool = false)
306 -#if(!$isGuest && ($isViewerAdmin || $isSchoolMember))
268 +#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode))
307 307   #set($canEditSchool = true)
308 308  #end
309 309  #if($canEditSchool)
... ... @@ -312,47 +312,20 @@
312 312  </div>
313 313  #end
314 314  
315 -## --- 関連校（中高一貫校）バナー ---
316 -#if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
317 - #set($affiliatedPageRef = "Schools.${affiliatedSchoolCode}.WebHome")
318 - #set($affiliatedPageExists = $xwiki.exists($affiliatedPageRef))
319 -<div class="affiliated-school-banner">
320 - <svg class="ico" viewBox="0 0 24 24" stroke-width="1.5"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg>
321 - <div>
322 - <strong>中高一貫校</strong>：
323 - #if($affiliatedPageExists)
324 - <a href="$xwiki.getURL($affiliatedPageRef, 'view')">$!escapetool.xml($affiliatedSchoolName)</a>
325 - #else
326 - $!escapetool.xml($affiliatedSchoolName)
327 - #end
328 - と連携しています
329 - </div>
330 -</div>
331 -#end
332 -
333 333  ## --- ① 学校基本情報 ---
334 334  <div class="school-info-card collapsed" id="card-basic-info">
335 335   <h2 role="button" tabindex="0" aria-expanded="false" onclick="toggleInfoCard('card-basic-info')" onkeydown="if(event.key==='Enter'||event.key===' '){event.preventDefault();toggleInfoCard('card-basic-info')}"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M4 19.5A2.5 2.5 0 016.5 17H20"/><path d="M6.5 2H20v20H6.5A2.5 2.5 0 014 19.5v-15A2.5 2.5 0 016.5 2z"/></svg> 学校基本情報</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2>
336 - <div class="school-basic-info-layout">
337 - <div class="school-basic-info-table">
338 - <table class="wiki-table school-info-table">
339 - <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
340 - <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
341 - <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
342 - <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
343 - <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
344 - <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
345 - <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
346 - <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
347 - <tr><th>公式サイト</th><td>#if($website && $website != '')<a href="$!escapetool.xml($website)" target="_blank" rel="noopener">$!escapetool.xml($website)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
348 - </table>
349 - </div>
350 - #if($schoolPhoto && $schoolPhoto != '')
351 - <div class="school-photo-area">
352 - <img src="$doc.getAttachmentURL($schoolPhoto)" alt="$!escapetool.xml($schoolName)" class="school-photo" />
353 - </div>
354 - #end
355 - </div>
280 + <table class="wiki-table school-info-table">
281 + <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
282 + <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
283 + <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
284 + <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
285 + <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
286 + <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
287 + <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
288 + <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
289 + <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>
290 + </table>
356 356   #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
357 357   #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
358 358   #if($infoEditDate && $infoEditDate != '')
... ... @@ -369,8 +369,8 @@
369 369   #set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
370 370   #if($hasOrgContent)
371 371   #set($canViewOrgChart = true)
372 - #if($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewOrgChart = false)
373 - #elseif($visibilityOrgChart == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewOrgChart = false)
307 + #if($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewOrgChart = false)
308 + #elseif($visibilityOrgChart == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ($viewerSchoolCode != $schoolCode || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewOrgChart = false)
374 374   #end
375 375   #if($canViewOrgChart)
376 376   <div class="seitokai-subsection">
... ... @@ -449,8 +449,8 @@
449 449   #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
450 450   #if($hasBudget)
451 451   #set($canViewBudget = true)
452 - #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewBudget = false)
453 - #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false)
387 + #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewBudget = false)
388 + #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ($viewerSchoolCode != $schoolCode || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false)
454 454   #end
455 455   #if($canViewBudget)
456 456   <div class="seitokai-subsection">
... ... @@ -505,8 +505,8 @@
505 505   ## --- 校則の見直し ---
506 506   #if($ruleReviewStatus && $ruleReviewStatus != '')
507 507   #set($canViewRuleReview = true)
508 - #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewRuleReview = false)
509 - #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false)
443 + #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewRuleReview = false)
444 + #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ($viewerSchoolCode != $schoolCode || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false)
510 510   #end
511 511   #if($canViewRuleReview)
512 512   <div class="seitokai-subsection">
... ... @@ -568,8 +568,8 @@
568 568   ## --- 生徒会の課題意識 ---
569 569   #if($challenges && $challenges != '')
570 570   #set($canViewChallenges = true)
571 - #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewChallenges = false)
572 - #elseif($visibilityChallenges == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewChallenges = false)
506 + #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewChallenges = false)
507 + #elseif($visibilityChallenges == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ($viewerSchoolCode != $schoolCode || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewChallenges = false)
573 573   #end
574 574   #if($canViewChallenges)
575 575   <div class="seitokai-subsection">
... ... @@ -639,35 +639,27 @@
639 639   #end
640 640   <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
641 641   </div>
642 - <div class="activity-toolbar-right">
643 - <button class="btn-view-toggle" id="btnViewToggle" onclick="toggleCompactView()" title="タイトルのみ表示">
644 - <svg class="ico-list" viewBox="0 0 24 24" stroke="currentColor" fill="none" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><line x1="8" y1="6" x2="21" y2="6"/><line x1="8" y1="12" x2="21" y2="12"/><line x1="8" y1="18" x2="21" y2="18"/><line x1="3" y1="6" x2="3.01" y2="6"/><line x1="3" y1="12" x2="3.01" y2="12"/><line x1="3" y1="18" x2="3.01" y2="18"/></svg>
645 - <svg class="ico-detail" viewBox="0 0 24 24" stroke="currentColor" fill="none" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="3" width="7" height="7"/><rect x="14" y="3" width="7" height="7"/><rect x="3" y="14" width="7" height="7"/><rect x="14" y="14" width="7" height="7"/></svg>
646 - <span class="toggle-label">一覧表示</span>
647 - </button>
648 - </div>
649 649   <div class="author-legend-wrapper">
650 650   <button class="author-legend-toggle" onclick="this.classList.toggle('open');this.nextElementSibling.classList.toggle('open')"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M12 16v-4"/><path d="M12 8h.01"/></svg> バッジの見方 <span class="chevron">▼</span></button>
651 651   <div class="author-legend-body">
652 652   <div class="author-legend">
653 653   <span class="author-legend-title">投稿者の信頼度:</span>
654 - <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者 <span class="text-hint">— 運営スタッフ</span></span>
655 - <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み <span class="text-hint">— 本人確認済みのユーザー</span></span>
656 - <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介 <span class="text-hint">— 承認済みユーザーからの紹介</span></span>
657 - <span class="author-legend-item"><span class="bar bar-general"></span> 一般 <span class="text-hint">— 一般登録ユーザー</span></span>
582 + <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者</span>
583 + <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み</span>
584 + <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介</span>
585 + <span class="author-legend-item"><span class="bar bar-general"></span> 一般（未承認）</span>
658 658   </div>
659 659   <div class="author-legend">
660 660   <span class="author-legend-title">所属:</span>
661 - <span class="author-legend-item"><span class="badge badge-school-internal-confirmed badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内（確認済）</span> <span class="text-hint">所属が確認されたこの学校のユーザー</span></span>
662 - <span class="author-legend-item"><span class="badge badge-school-internal badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内</span> <span class="text-hint">この学校に所属登録しているユーザー</span></span>
663 - <span class="author-legend-item"><span class="badge badge-alumni badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M22 10l-10-5L2 10l10 5 10-5z"/><path d="M6 12v5c0 1.66 2.69 3 6 3s6-1.34 6-3v-5"/></svg> 卒業生</span> <span class="text-hint">この学校の卒業生</span></span>
664 - <span class="author-legend-item"><span class="badge badge-school-external badge-sm"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M2 12h20"/><path d="M12 2a15.3 15.3 0 014 10 15.3 15.3 0 01-4 10 15.3 15.3 0 01-4-10 15.3 15.3 0 014-10z"/></svg> 他校</span> <span class="text-hint">別の学校に所属しているユーザー</span></span>
665 - <span class="author-legend-item text-hint">※一般アカウントは所属バッジが表示されません</span>
589 + <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>
590 + <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>
591 + <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>
592 + <span class="author-legend-item text-hint">※一般アカウントは所属未確認のため非表示</span>
666 666   </div>
667 667   <div class="author-legend">
668 668   <span class="author-legend-title">役割:</span>
669 669   <span class="author-legend-item"><span class="badge badge-role-student badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M22 10v6M2 10l10-5 10 5-10 5z"/><path d="M6 12v5c0 2 4 3 6 3s6-1 6-3v-5"/></svg> 生徒</span></span>
670 - <span class="author-legend-item"><span class="badge badge-role-officer badge-sm"><svg class="ico" viewBox="0 0 24 24"><polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"/></svg> 役員</span> <span class="text-hint">生徒会役員</span></span>
597 + <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>
671 671   <span class="author-legend-item"><span class="badge badge-role-teacher badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M20 21v-2a4 4 0 00-4-4H8a4 4 0 00-4 4v2"/><circle cx="12" cy="7" r="4"/></svg> 教員</span></span>
672 672   </div>
673 673   </div>
... ... @@ -805,8 +805,8 @@
805 805   #set($postVis = $!post.getValue('visibility'))
806 806   #if(!$postVis || $postVis == '') #set($postVis = 'public') #end
807 807   #set($canViewPost = true)
808 - #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewPost = false)
809 - #elseif($postVis == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPost = false)
735 + #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewPost = false)
736 + #elseif($postVis == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ($viewerSchoolCode != $schoolCode || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPost = false)
810 810   #end
811 811   #if(!$canViewPost)
812 812   <div class="thread-post visibility-restricted-post">
... ... @@ -850,11 +850,8 @@
850 850   <span class="badge badge-general badge-sm">一般</span>
851 851   #end
852 852   ## 所属バッジ（投稿者の学校コードとページの学校コードを比較）
853 - #set($postIsSchoolMatch = ($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode)))
854 854   #if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general')
855 - #if($postUserRole == 'graduate' && $postIsSchoolMatch)
856 - <span class="badge badge-alumni badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M22 10l-10-5L2 10l10 5 10-5z"/><path d="M6 12v5c0 1.66 2.69 3 6 3s6-1.34 6-3v-5"/></svg> 卒業生</span>
857 - #elseif($postIsSchoolMatch && $postUserRole != 'graduate')
781 + #if($postSchoolCode == $schoolCode)
858 858   #if($postAccountType == 'verified' || $postAccountType == 'admin')
859 859   <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>
860 860   #else
... ... @@ -947,15 +947,10 @@
947 947   #if($postVis != 'public')
948 948   <div class="visibility-badge visibility-${postVis} post-action-mt">#if($postVis == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</div>
949 949   #end
950 - ## 固定/編集/削除ボタン（横並び）
951 - #set($postAuthorRef = $!post.getValue('authorRef'))
952 - #set($postObjNumED = $post.number)
953 - #set($showPinBtn = ($viewerAccountType == 'admin' || $viewerAccountType == 'verified'))
954 - #set($showEditDeleteBtn = ($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin'))
955 - #if($showPinBtn || $showEditDeleteBtn)
956 - <div class="post-edit-actions post-action-mt">
957 - #if($showPinBtn)
958 - #set($postObjNum = $post.number)
874 + ## 固定/解除ボタン（承認済み・管理者のみ）
875 + #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
876 + #set($postObjNum = $post.number)
877 + <div class="post-pin-action post-action-mt">
959 959   #if($isPinned == '1')
960 960   <a href="$doc.getURL('view', "action=unpin&postObj=${postObjNum}&form_token=${services.csrf.getToken()}")" class="btn-pin-toggle btn-unpin" title="固定を解除">
961 961   <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> 固定を解除
... ... @@ -965,8 +965,13 @@
965 965   <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> 固定する
966 966   </a>
967 967   #end
968 - #end
969 - #if($showEditDeleteBtn)
887 + </div>
888 + #end
889 + ## 編集・削除ボタン（投稿者本人 or 管理者）
890 + #set($postAuthorRef = $!post.getValue('authorRef'))
891 + #set($postObjNumED = $post.number)
892 + #if($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin')
893 + <div class="post-edit-actions post-action-mt">
970 970   #if($xcontext.user == $postAuthorRef)
971 971   <button type="button" class="btn-post-edit" onclick="openEditPost(this, '${doc.fullName}', $postObjNumED, '$!escapetool.javascript($!postContent)')" title="この投稿を編集">
972 972   <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> 編集
... ... @@ -975,7 +975,6 @@
975 975   <button type="button" class="btn-post-delete" onclick="confirmDeletePost('${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を削除">
976 976   <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> 削除
977 977   </button>
978 - #end
979 979   </div>
980 980   #end
981 981   </div>
... ... @@ -1060,35 +1060,6 @@
1060 1060  ## --- 年度タブ切り替え JavaScript ---
1061 1061  {{html clean="false"}}
1062 1062  <script>
1063 -// コンパクト表示（タイトルのみ）トグル
1064 -function toggleCompactView() {
1065 - var container = document.querySelector('.xwiki-content') || document.body;
1066 - var isCompact = container.classList.toggle('activity-compact-view');
1067 - var btn = document.getElementById('btnViewToggle');
1068 - if (btn) {
1069 - btn.querySelector('.toggle-label').textContent = isCompact ? '詳細表示' : '一覧表示';
1070 - btn.title = isCompact ? '詳細表示に戻す' : 'タイトルのみ表示';
1071 - }
1072 - // コンパクトモードでは各スレッドヘッダーをクリックで個別展開可能にする
1073 - document.querySelectorAll('.activity-thread').forEach(function(thread) {
1074 - if (isCompact) {
1075 - thread.classList.remove('compact-expanded');
1076 - }
1077 - });
1078 -}
1079 -
1080 -// コンパクトモードで個別スレッドを展開/折りたたみ
1081 -function toggleThreadExpand(e) {
1082 - var container = document.querySelector('.xwiki-content') || document.body;
1083 - if (!container.classList.contains('activity-compact-view')) return;
1084 - // リンクやボタンのクリックはスルー
1085 - if (e.target.closest('a, button, .btn-featured-toggle')) return;
1086 - var thread = e.target.closest('.activity-thread');
1087 - if (thread) {
1088 - thread.classList.toggle('compact-expanded');
1089 - }
1090 -}
1091 -
1092 1092  function switchActivityFY(fy, btn) {
1093 1093   // タブのアクティブ状態を切り替え
1094 1094   document.querySelectorAll('.activity-fy-tab').forEach(function(t) { t.classList.remove('active'); });
... ... @@ -1104,27 +1104,6 @@
1104 1104  }
1105 1105  // ページ読み込み時の初期化
1106 1106  document.addEventListener('DOMContentLoaded', function() {
1107 - // 年度タブを降順にソート（「全期間」タブは末尾に固定）
1108 - var tabContainer = document.querySelector('.activity-fy-tabs');
1109 - if (tabContainer) {
1110 - var tabs = Array.from(tabContainer.querySelectorAll('.activity-fy-tab'));
1111 - var allTab = null;
1112 - var fyTabs = [];
1113 - tabs.forEach(function(t) {
1114 - var onclickStr = t.getAttribute('onclick') || '';
1115 - if (onclickStr.indexOf("'all'") !== -1) { allTab = t; }
1116 - else { fyTabs.push(t); }
1117 - });
1118 - // 年度タブを数値の降順でソート
1119 - fyTabs.sort(function(a, b) {
1120 - var aYear = parseInt(a.textContent) || 0;
1121 - var bYear = parseInt(b.textContent) || 0;
1122 - return bYear - aYear;
1123 - });
1124 - // DOM再配置
1125 - fyTabs.forEach(function(t) { tabContainer.appendChild(t); });
1126 - if (allTab) { tabContainer.appendChild(allTab); }
1127 - }
1128 1128   // デフォルトで現在の年度を表示
1129 1129   var defaultTab = document.querySelector('.activity-fy-tab.active');
1130 1130   if (defaultTab) { defaultTab.click(); }
... ... @@ -1136,19 +1136,14 @@
1136 1136   window.history.replaceState({}, document.title, window.location.pathname);
1137 1137   }
1138 1138   }
1139 - // コンパクトモード: スレッドヘッダークリックで個別展開
1140 - document.querySelectorAll('.activity-thread-header').forEach(function(header) {
1141 - header.addEventListener('click', toggleThreadExpand);
1142 - });
1143 - // 長文投稿の折りたたみ初期化（max-height: 12em 超で省略）
1012 + // 長文投稿の折りたたみ初期化
1144 1144   document.querySelectorAll('.thread-post-body').forEach(function(body) {
1145 - // pre-wrapのまま高さを測定し、max-height(12em ≒ ~200px)を超える場合に折りたたむ
1014 + // 先にtruncatedを仮適用してline-clampを有効にし、高さの差分で判定
1146 1146   var fullH = body.scrollHeight;
1147 - // 12em を px に変換（font-size × line-height × 行数 の近似値ではなくCSSと同じ値を取得）
1148 1148   body.classList.add('truncated');
1149 - var maxH = body.clientHeight; // max-height: 12em 適用後の高さ
1017 + var clampedH = body.clientHeight;
1150 1150   body.classList.remove('truncated');
1151 - if (fullH > maxH + 30) {
1019 + if (fullH > clampedH + 10) {
1152 1152   body.classList.add('truncated');
1153 1153   var btn = document.createElement('button');
1154 1154   btn.className = 'btn-read-more';