Skip to Content
Last modified by Super Admin on 2026/04/05 18:59
From version Icon 62.1 Icon
edited by Super Admin
on 2026/03/17 17:13
Change comment: There is no comment for this version
To version Icon 76.1 Icon
edited by Super Admin
on 2026/03/19 13:11
Change comment: There is no comment for this version

Summary

Details

Icon Page properties
Content
... ... @@ -1,5 +1,11 @@
1 1  {{velocity}}
2 2  ## ===== 学校ページ テンプレート =====
3 +## ゲストが ?sheet= 付きURL（編集フォーム等）に直接アクセスした場合、ログインページへリダイレクト
4 +#if($xcontext.user == 'XWiki.XWikiGuest' && $request.sheet && $request.sheet != '')
5 + #set($currentUrl = $doc.getURL('view', "sheet=${request.sheet}"))
6 + $response.sendRedirect("/bin/login/XWiki/XWikiLogin?srid=$escapetool.url($currentUrl)")
7 + #stop
8 +#end
3 3  {{html clean="false"}}
4 4  ## メンテナンスバナー（{{include}}ではなくインラインで記述し、<p>タグ挿入を回避）
5 5  #set($bannerDoc = $xwiki.getDocument('SeitokaiAdmin.MaintenanceBanner'))
... ... @@ -28,6 +28,7 @@
28 28  #set($schoolLevel = $doc.getValue('schoolLevel'))
29 29  #set($schoolSystem = $doc.getValue('schoolSystem'))
30 30  #set($website = $doc.getValue('website'))
37 +#set($schoolPhoto = $doc.getValue('schoolPhoto'))
31 31  
32 32  ## --- 組織図 ---
33 33  #set($orgChart = $doc.getValue('orgChart'))
... ... @@ -95,11 +95,42 @@
95 95   #set($viewerDoc = $xwiki.getDocument($viewerUser))
96 96   #set($viewerAccountType = $!viewerDoc.getValue('accountType'))
97 97   #set($viewerSchoolCode = $!viewerDoc.getValue('schoolCode'))
105 + #set($viewerSecondarySchoolCode = $!viewerDoc.getValue('secondarySchoolCode'))
106 + #set($viewerUserRole = $!viewerDoc.getValue('userRole'))
98 98   #if($viewerAccountType == 'admin')
99 99   #set($isViewerAdmin = true)
100 100   #end
101 101  #end
102 102  
112 +## --- 関連校（中高一貫校）情報 ---
113 +#set($affiliatedSchoolCode = $!doc.getValue('affiliatedSchoolCode'))
114 +#set($affiliatedSchoolName = $!doc.getValue('affiliatedSchoolName'))
115 +#set($isAffiliated = false)
116 +#if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
117 + #if($viewerSchoolCode == $affiliatedSchoolCode)
118 + #set($isAffiliated = true)
119 + #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode)
120 + #set($isAffiliated = true)
121 + #end
122 +#end
123 +
124 +## --- 校内判定（卒業生を除外、secondarySchoolCodeも含む） ---
125 +#set($isSchoolMember = false)
126 +#if(!$isGuest && $viewerUserRole != 'graduate')
127 + #if($viewerSchoolCode == $schoolCode || $isAffiliated)
128 + #set($isSchoolMember = true)
129 + #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode)
130 + #set($isSchoolMember = true)
131 + #end
132 +#end
133 +## 卒業生の母校判定（投稿バッジ用）
134 +#set($isAlumniOfSchool = false)
135 +#if(!$isGuest && $viewerUserRole == 'graduate')
136 + #if($viewerSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $viewerSchoolCode == $affiliatedSchoolCode))
137 + #set($isAlumniOfSchool = true)
138 + #end
139 +#end
140 +
103 103  ## --- 学校ページ非表示チェック ---
104 104  #set($schoolHidden = $doc.getValue('hidden'))
105 105  #if($schoolHidden == 1)
... ... @@ -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))
174 +#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $isSchoolMember)) && $services.csrf.isTokenValid($request.form_token))
137 137   #set($pinPostObjStr = $!request.postObj)
138 138   #if(!$pinPostObjStr.matches('^\d+$'))
139 139   ## 不正な値 → 無視
... ... @@ -163,7 +163,7 @@
163 163  
164 164  ## --- 特色ある活動 選定/解除処理 ---
165 165  #set($featAction = $!request.action)
166 -#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token))
204 +#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $isSchoolMember)) && $services.csrf.isTokenValid($request.form_token))
167 167   #set($featActObjStr = $!request.actObj)
168 168   #if($featActObjStr.matches('^\d+$'))
169 169   #set($actObjNum = $mathtool.toInteger($featActObjStr))
... ... @@ -265,7 +265,7 @@
265 265  
266 266  ## --- 編集ボタン（権限があるユーザーのみ表示） ---
267 267  #set($canEditSchool = false)
268 -#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode))
306 +#if(!$isGuest && ($isViewerAdmin || $isSchoolMember))
269 269   #set($canEditSchool = true)
270 270  #end
271 271  #if($canEditSchool)
... ... @@ -274,20 +274,47 @@
274 274  </div>
275 275  #end
276 276  
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 +
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>
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>
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>
291 291   #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
292 292   #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
293 293   #if($infoEditDate && $infoEditDate != '')
... ... @@ -304,8 +304,8 @@
304 304   #set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
305 305   #if($hasOrgContent)
306 306   #set($canViewOrgChart = true)
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)
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)
309 309   #end
310 310   #if($canViewOrgChart)
311 311   <div class="seitokai-subsection">
... ... @@ -384,8 +384,8 @@
384 384   #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
385 385   #if($hasBudget)
386 386   #set($canViewBudget = true)
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)
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)
389 389   #end
390 390   #if($canViewBudget)
391 391   <div class="seitokai-subsection">
... ... @@ -440,8 +440,8 @@
440 440   ## --- 校則の見直し ---
441 441   #if($ruleReviewStatus && $ruleReviewStatus != '')
442 442   #set($canViewRuleReview = true)
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)
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)
445 445   #end
446 446   #if($canViewRuleReview)
447 447   <div class="seitokai-subsection">
... ... @@ -503,8 +503,8 @@
503 503   ## --- 生徒会の課題意識 ---
504 504   #if($challenges && $challenges != '')
505 505   #set($canViewChallenges = true)
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)
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)
508 508   #end
509 509   #if($canViewChallenges)
510 510   <div class="seitokai-subsection">
... ... @@ -574,27 +574,35 @@
574 574   #end
575 575   <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
576 576   </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>
577 577   <div class="author-legend-wrapper">
578 578   <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>
579 579   <div class="author-legend-body">
580 580   <div class="author-legend">
581 581   <span class="author-legend-title">投稿者の信頼度:</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>
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>
586 586   </div>
587 587   <div class="author-legend">
588 588   <span class="author-legend-title">所属:</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>
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>
593 593   </div>
594 594   <div class="author-legend">
595 595   <span class="author-legend-title">役割:</span>
596 596   <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>
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>
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>
598 598   <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>
599 599   </div>
600 600   </div>
... ... @@ -732,8 +732,8 @@
732 732   #set($postVis = $!post.getValue('visibility'))
733 733   #if(!$postVis || $postVis == '') #set($postVis = 'public') #end
734 734   #set($canViewPost = true)
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)
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)
737 737   #end
738 738   #if(!$canViewPost)
739 739   <div class="thread-post visibility-restricted-post">
... ... @@ -777,8 +777,11 @@
777 777   <span class="badge badge-general badge-sm">一般</span>
778 778   #end
779 779   ## 所属バッジ（投稿者の学校コードとページの学校コードを比較）
853 + #set($postIsSchoolMatch = ($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode)))
780 780   #if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general')
781 - #if($postSchoolCode == $schoolCode)
855 + #if($postUserRole == 'graduate' && $postIsSchoolMatch)
856 + <span class="badge badge-alumni badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M22 10l-10-5L2 10l10 5 10-5z"/><path d="M6 12v5c0 1.66 2.69 3 6 3s6-1.34 6-3v-5"/></svg> 卒業生</span>
857 + #elseif($postIsSchoolMatch && $postUserRole != 'graduate')
782 782   #if($postAccountType == 'verified' || $postAccountType == 'admin')
783 783   <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>
784 784   #else
... ... @@ -805,6 +805,13 @@
805 805   #if($postEdited == 1 || $postEdited == '1')
806 806   <span class="post-edited-label">（編集済み）</span>
807 807   #end
884 + #set($postAuthorRefH = $!post.getValue('authorRef'))
885 + #set($postObjNumH = $post.number)
886 + #if(!$isGuest && $xcontext.user != $postAuthorRefH)
887 + <button type="button" class="btn-post-report btn-post-report-header" onclick="openReportDialog(this, '${doc.fullName}', $postObjNumH, '${services.csrf.getToken()}')" title="この投稿を通報">
888 + <svg class="ico ico-fixed-14" viewBox="0 0 24 24"><path d="M4 15s1-1 4-1 5 2 8 2 4-1 4-1V3s-1 1-4 1-5-2-8-2-4 1-4 1z"/><line x1="4" y1="22" x2="4" y2="15"/></svg> 通報
889 + </button>
890 + #end
808 808   </div>
809 809   <div class="thread-post-body">
810 810   $!escapetool.xml($!postContent)
... ... @@ -871,10 +871,16 @@
871 871   #if($postVis != 'public')
872 872   <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>
873 873   #end
874 - ## 固定/解除ボタン（承認済み・管理者のみ）
875 - #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
876 - #set($postObjNum = $post.number)
877 - <div class="post-pin-action post-action-mt">
957 + ## 固定/編集/削除/通報/非表示ボタン（横並び）
958 + #set($postAuthorRef = $!post.getValue('authorRef'))
959 + #set($postObjNumED = $post.number)
960 + #set($showPinBtn = ($viewerAccountType == 'admin' || $viewerAccountType == 'verified'))
961 + #set($showEditDeleteBtn = ($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin'))
962 + #set($showHideBtn = ($viewerAccountType == 'admin'))
963 + #if($showPinBtn || $showEditDeleteBtn || $showHideBtn)
964 + <div class="post-edit-actions post-action-mt">
965 + #if($showPinBtn)
966 + #set($postObjNum = $post.number)
878 878   #if($isPinned == '1')
879 879   <a href="$doc.getURL('view', "action=unpin&postObj=${postObjNum}&form_token=${services.csrf.getToken()}")" class="btn-pin-toggle btn-unpin" title="固定を解除">
880 880   <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> 固定を解除
... ... @@ -884,13 +884,8 @@
884 884   <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> 固定する
885 885   </a>
886 886   #end
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">
976 + #end
977 + #if($showEditDeleteBtn)
894 894   #if($xcontext.user == $postAuthorRef)
895 895   <button type="button" class="btn-post-edit" onclick="openEditPost(this, '${doc.fullName}', $postObjNumED, '$!escapetool.javascript($!postContent)')" title="この投稿を編集">
896 896   <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> 編集
... ... @@ -899,6 +899,12 @@
899 899   <button type="button" class="btn-post-delete" onclick="confirmDeletePost('${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を削除">
900 900   <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> 削除
901 901   </button>
986 + #end
987 + #if($showHideBtn)
988 + <button type="button" class="btn-post-hide" onclick="openHideDialog(this, '${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を非表示にする">
989 + <svg class="ico ico-fixed-14" viewBox="0 0 24 24"><path d="M17.94 17.94A10.07 10.07 0 0112 20c-7 0-11-8-11-8a18.45 18.45 0 015.06-5.94M9.9 4.24A9.12 9.12 0 0112 4c7 0 11 8 11 8a18.5 18.5 0 01-2.16 3.19m-6.72-1.07a3 3 0 11-4.24-4.24"/><line x1="1" y1="1" x2="23" y2="23"/></svg> 非表示
990 + </button>
991 + #end
902 902   </div>
903 903   #end
904 904   </div>
... ... @@ -983,6 +983,35 @@
983 983  ## --- 年度タブ切り替え JavaScript ---
984 984  {{html clean="false"}}
985 985  <script>
1076 +// コンパクト表示（タイトルのみ）トグル
1077 +function toggleCompactView() {
1078 + var container = document.querySelector('.xwiki-content') || document.body;
1079 + var isCompact = container.classList.toggle('activity-compact-view');
1080 + var btn = document.getElementById('btnViewToggle');
1081 + if (btn) {
1082 + btn.querySelector('.toggle-label').textContent = isCompact ? '詳細表示' : '一覧表示';
1083 + btn.title = isCompact ? '詳細表示に戻す' : 'タイトルのみ表示';
1084 + }
1085 + // コンパクトモードでは各スレッドヘッダーをクリックで個別展開可能にする
1086 + document.querySelectorAll('.activity-thread').forEach(function(thread) {
1087 + if (isCompact) {
1088 + thread.classList.remove('compact-expanded');
1089 + }
1090 + });
1091 +}
1092 +
1093 +// コンパクトモードで個別スレッドを展開/折りたたみ
1094 +function toggleThreadExpand(e) {
1095 + var container = document.querySelector('.xwiki-content') || document.body;
1096 + if (!container.classList.contains('activity-compact-view')) return;
1097 + // リンクやボタンのクリックはスルー
1098 + if (e.target.closest('a, button, .btn-featured-toggle')) return;
1099 + var thread = e.target.closest('.activity-thread');
1100 + if (thread) {
1101 + thread.classList.toggle('compact-expanded');
1102 + }
1103 +}
1104 +
986 986  function switchActivityFY(fy, btn) {
987 987   // タブのアクティブ状態を切り替え
988 988   document.querySelectorAll('.activity-fy-tab').forEach(function(t) { t.classList.remove('active'); });
... ... @@ -998,6 +998,27 @@
998 998  }
999 999  // ページ読み込み時の初期化
1000 1000  document.addEventListener('DOMContentLoaded', function() {
1120 + // 年度タブを降順にソート（「全期間」タブは末尾に固定）
1121 + var tabContainer = document.querySelector('.activity-fy-tabs');
1122 + if (tabContainer) {
1123 + var tabs = Array.from(tabContainer.querySelectorAll('.activity-fy-tab'));
1124 + var allTab = null;
1125 + var fyTabs = [];
1126 + tabs.forEach(function(t) {
1127 + var onclickStr = t.getAttribute('onclick') || '';
1128 + if (onclickStr.indexOf("'all'") !== -1) { allTab = t; }
1129 + else { fyTabs.push(t); }
1130 + });
1131 + // 年度タブを数値の降順でソート
1132 + fyTabs.sort(function(a, b) {
1133 + var aYear = parseInt(a.textContent) || 0;
1134 + var bYear = parseInt(b.textContent) || 0;
1135 + return bYear - aYear;
1136 + });
1137 + // DOM再配置
1138 + fyTabs.forEach(function(t) { tabContainer.appendChild(t); });
1139 + if (allTab) { tabContainer.appendChild(allTab); }
1140 + }
1001 1001   // デフォルトで現在の年度を表示
1002 1002   var defaultTab = document.querySelector('.activity-fy-tab.active');
1003 1003   if (defaultTab) { defaultTab.click(); }
... ... @@ -1009,14 +1009,19 @@
1009 1009   window.history.replaceState({}, document.title, window.location.pathname);
1010 1010   }
1011 1011   }
1012 - // 長文投稿の折りたたみ初期化
1152 + // コンパクトモード: スレッドヘッダークリックで個別展開
1153 + document.querySelectorAll('.activity-thread-header').forEach(function(header) {
1154 + header.addEventListener('click', toggleThreadExpand);
1155 + });
1156 + // 長文投稿の折りたたみ初期化（max-height: 12em 超で省略）
1013 1013   document.querySelectorAll('.thread-post-body').forEach(function(body) {
1014 - // 先にtruncatedを仮適用してline-clampを有効にし、高さの差分で判定
1158 + // pre-wrapのまま高さを測定し、max-height(12em ≒ ~200px)を超える場合に折りたたむ
1015 1015   var fullH = body.scrollHeight;
1160 + // 12em を px に変換（font-size × line-height × 行数 の近似値ではなくCSSと同じ値を取得）
1016 1016   body.classList.add('truncated');
1017 - var clampedH = body.clientHeight;
1162 + var maxH = body.clientHeight; // max-height: 12em 適用後の高さ
1018 1018   body.classList.remove('truncated');
1019 - if (fullH > clampedH + 10) {
1164 + if (fullH > maxH + 30) {
1020 1020   body.classList.add('truncated');
1021 1021   var btn = document.createElement('button');
1022 1022   btn.className = 'btn-read-more';
... ... @@ -1129,6 +1129,80 @@
1129 1129   xhr.onerror = function() { alert('通信エラーが発生しました'); };
1130 1130   xhr.send(deletePostData);
1131 1131  }
1277 +
1278 +/* --- 通報ダイアログ --- */
1279 +function openReportDialog(btn, targetPage, postObjNum, token) {
1280 + if (document.getElementById('report-dialog-overlay')) return;
1281 + var reasons = ['宣伝・スパム','不適切な内容','個人情報の露出','誹謗中傷','誤情報','その他'];
1282 + var overlay = document.createElement('div');
1283 + overlay.id = 'report-dialog-overlay';
1284 + overlay.style.cssText = 'position:fixed;inset:0;background:rgba(0,0,0,0.5);z-index:9999;display:flex;align-items:center;justify-content:center;';
1285 + var dialog = document.createElement('div');
1286 + dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;max-height:80vh;overflow-y:auto;';
1287 + var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を通報</h3>';
1288 + html += '<p style="margin:0 0 12px;font-size:0.9em;color:#4b5563;">通報された投稿は管理者が確認するまで一時的に非表示になります。</p>';
1289 + html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">通報理由</label>';
1290 + html += '<select id="report-reason" style="width:100%;padding:8px;border:1px solid #d1d5db;border-radius:8px;margin-bottom:12px;font-size:0.9em;">';
1291 + for (var i=0; i<reasons.length; i++) html += '<option value="'+reasons[i]+'">'+reasons[i]+'</option>';
1292 + html += '</select>';
1293 + html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">補足コメント（任意）</label>';
1294 + html += '<textarea id="report-detail" rows="3" maxlength="500" style="width:100%;padding:8px;border:1px solid #d1d5db;border-radius:8px;resize:vertical;font-size:0.9em;box-sizing:border-box;" placeholder="具体的な内容があればご記入ください"></textarea>';
1295 + html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
1296 + html += '<button type="button" id="report-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
1297 + html += '<button type="button" id="report-submit-btn" style="padding:8px 16px;border:none;border-radius:8px;background:#dc2626;color:#fff;cursor:pointer;font-weight:600;">通報する</button>';
1298 + html += '</div>';
1299 + dialog.innerHTML = html;
1300 + overlay.appendChild(dialog);
1301 + document.body.appendChild(overlay);
1302 + overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
1303 + document.getElementById('report-cancel-btn').addEventListener('click', function() { overlay.remove(); });
1304 + document.getElementById('report-submit-btn').addEventListener('click', function() {
1305 + var reason = document.getElementById('report-reason').value;
1306 + var detail = document.getElementById('report-detail').value;
1307 + var submitBtn = document.getElementById('report-submit-btn');
1308 + submitBtn.disabled = true; submitBtn.textContent = '送信中...';
1309 + var xhr = new XMLHttpRequest();
1310 + xhr.open('POST', '/bin/get/SeitokaiCode/ReportAction?outputSyntax=plain', true);
1311 + xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1312 + var data = 'targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&detail=' + encodeURIComponent(detail) + '&form_token=' + encodeURIComponent(token);
1313 + xhr.onload = function() {
1314 + overlay.remove();
1315 + showToast('通報を受け付けました', 'success');
1316 + setTimeout(function() { location.reload(); }, 1000);
1317 + };
1318 + xhr.onerror = function() { overlay.remove(); alert('通信エラーが発生しました'); };
1319 + xhr.send(data);
1320 + });
1321 +}
1322 +
1323 +/* --- 非表示ダイアログ（管理者用） --- */
1324 +function openHideDialog(btn, targetPage, postObjNum, token) {
1325 + if (document.getElementById('hide-dialog-overlay')) return;
1326 + var overlay = document.createElement('div');
1327 + overlay.id = 'hide-dialog-overlay';
1328 + overlay.style.cssText = 'position:fixed;inset:0;background:rgba(0,0,0,0.5);z-index:9999;display:flex;align-items:center;justify-content:center;';
1329 + var dialog = document.createElement('div');
1330 + dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;';
1331 + var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を非表示にする</h3>';
1332 + html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">非表示の理由</label>';
1333 + html += '<input type="text" id="hide-reason" style="width:100%;padding:8px;border:1px solid #d1d5db;border-radius:8px;margin-bottom:12px;font-size:0.9em;box-sizing:border-box;" placeholder="理由を入力" />';
1334 + html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
1335 + html += '<button type="button" id="hide-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
1336 + html += '<button type="button" id="hide-submit-btn" style="padding:8px 16px;border:none;border-radius:8px;background:#d97706;color:#fff;cursor:pointer;font-weight:600;">非表示にする</button>';
1337 + html += '<button type="button" id="hide-warn-btn" style="padding:8px 16px;border:none;border-radius:8px;background:#dc2626;color:#fff;cursor:pointer;font-weight:600;">非表示+警告</button>';
1338 + html += '</div>';
1339 + dialog.innerHTML = html;
1340 + overlay.appendChild(dialog);
1341 + document.body.appendChild(overlay);
1342 + overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
1343 + document.getElementById('hide-cancel-btn').addEventListener('click', function() { overlay.remove(); });
1344 + function doHide(action) {
1345 + var reason = document.getElementById('hide-reason').value || '管理者判断';
1346 + window.location.href = '/bin/view/SeitokaiCode/ModerationAction?action=' + action + '&targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&form_token=' + encodeURIComponent(token);
1347 + }
1348 + document.getElementById('hide-submit-btn').addEventListener('click', function() { doHide('hide'); });
1349 + document.getElementById('hide-warn-btn').addEventListener('click', function() { doHide('hide-warn'); });
1350 +}
1132 1132  </script>
1133 1133  {{/html}}
1134 1134  {{/velocity}}