Skip to Content
Last modified by Super Admin on 2026/04/05 18:59
From version Icon 59.1 Icon
edited by Super Admin
on 2026/03/17 14:19
Change comment: There is no comment for this version
To version Icon 72.1 Icon
edited by Super Admin
on 2026/03/18 23:33
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'))
... ... @@ -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'))
104 + #set($viewerSecondarySchoolCode = $!viewerDoc.getValue('secondarySchoolCode'))
105 + #set($viewerUserRole = $!viewerDoc.getValue('userRole'))
98 98   #if($viewerAccountType == 'admin')
99 99   #set($isViewerAdmin = true)
100 100   #end
101 101  #end
102 102  
111 +## --- 関連校（中高一貫校）情報 ---
112 +#set($affiliatedSchoolCode = $!doc.getValue('affiliatedSchoolCode'))
113 +#set($affiliatedSchoolName = $!doc.getValue('affiliatedSchoolName'))
114 +#set($isAffiliated = false)
115 +#if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
116 + #if($viewerSchoolCode == $affiliatedSchoolCode)
117 + #set($isAffiliated = true)
118 + #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode)
119 + #set($isAffiliated = true)
120 + #end
121 +#end
122 +
123 +## --- 校内判定（卒業生を除外、secondarySchoolCodeも含む） ---
124 +#set($isSchoolMember = false)
125 +#if(!$isGuest && $viewerUserRole != 'graduate')
126 + #if($viewerSchoolCode == $schoolCode || $isAffiliated)
127 + #set($isSchoolMember = true)
128 + #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode)
129 + #set($isSchoolMember = true)
130 + #end
131 +#end
132 +## 卒業生の母校判定（投稿バッジ用）
133 +#set($isAlumniOfSchool = false)
134 +#if(!$isGuest && $viewerUserRole == 'graduate')
135 + #if($viewerSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $viewerSchoolCode == $affiliatedSchoolCode))
136 + #set($isAlumniOfSchool = true)
137 + #end
138 +#end
139 +
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))
173 +#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))
203 +#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))
305 +#if(!$isGuest && ($isViewerAdmin || $isSchoolMember))
269 269   #set($canEditSchool = true)
270 270  #end
271 271  #if($canEditSchool)
... ... @@ -274,6 +274,24 @@
274 274  </div>
275 275  #end
276 276  
314 +## --- 関連校（中高一貫校）バナー ---
315 +#if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
316 + #set($affiliatedPageRef = "Schools.${affiliatedSchoolCode}.WebHome")
317 + #set($affiliatedPageExists = $xwiki.exists($affiliatedPageRef))
318 +<div class="affiliated-school-banner">
319 + <svg class="ico" viewBox="0 0 24 24" stroke-width="1.5"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg>
320 + <div>
321 + <strong>中高一貫校</strong>：
322 + #if($affiliatedPageExists)
323 + <a href="$xwiki.getURL($affiliatedPageRef, 'view')">$!escapetool.xml($affiliatedSchoolName)</a>
324 + #else
325 + $!escapetool.xml($affiliatedSchoolName)
326 + #end
327 + と連携しています
328 + </div>
329 +</div>
330 +#end
331 +
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,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)
362 + #if($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewOrgChart = false)
363 + #elseif($visibilityOrgChart == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewOrgChart = false)
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)
442 + #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewBudget = false)
443 + #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false)
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)
498 + #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewRuleReview = false)
499 + #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false)
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)
561 + #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewChallenges = false)
562 + #elseif($visibilityChallenges == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewChallenges = false)
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>
632 + <div class="activity-toolbar-right">
633 + <button class="btn-view-toggle" id="btnViewToggle" onclick="toggleCompactView()" title="タイトルのみ表示">
634 + <svg class="ico-list" viewBox="0 0 24 24" stroke="currentColor" fill="none" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><line x1="8" y1="6" x2="21" y2="6"/><line x1="8" y1="12" x2="21" y2="12"/><line x1="8" y1="18" x2="21" y2="18"/><line x1="3" y1="6" x2="3.01" y2="6"/><line x1="3" y1="12" x2="3.01" y2="12"/><line x1="3" y1="18" x2="3.01" y2="18"/></svg>
635 + <svg class="ico-detail" viewBox="0 0 24 24" stroke="currentColor" fill="none" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="3" width="7" height="7"/><rect x="14" y="3" width="7" height="7"/><rect x="3" y="14" width="7" height="7"/><rect x="14" y="14" width="7" height="7"/></svg>
636 + <span class="toggle-label">一覧表示</span>
637 + </button>
638 + </div>
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>
644 + <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者 <span class="text-hint">— 運営スタッフ</span></span>
645 + <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み <span class="text-hint">— 本人確認済みのユーザー</span></span>
646 + <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介 <span class="text-hint">— 承認済みユーザーからの紹介</span></span>
647 + <span class="author-legend-item"><span class="bar bar-general"></span> 一般 <span class="text-hint">— 一般登録ユーザー</span></span>
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>
651 + <span class="author-legend-item"><span class="badge badge-school-internal-confirmed badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内（確認済）</span> <span class="text-hint">所属が確認されたこの学校のユーザー</span></span>
652 + <span class="author-legend-item"><span class="badge badge-school-internal badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内</span> <span class="text-hint">この学校に所属登録しているユーザー</span></span>
653 + <span class="author-legend-item"><span class="badge badge-alumni badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M22 10l-10-5L2 10l10 5 10-5z"/><path d="M6 12v5c0 1.66 2.69 3 6 3s6-1.34 6-3v-5"/></svg> 卒業生</span> <span class="text-hint">この学校の卒業生</span></span>
654 + <span class="author-legend-item"><span class="badge badge-school-external badge-sm"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M2 12h20"/><path d="M12 2a15.3 15.3 0 014 10 15.3 15.3 0 01-4 10 15.3 15.3 0 01-4-10 15.3 15.3 0 014-10z"/></svg> 他校</span> <span class="text-hint">別の学校に所属しているユーザー</span></span>
655 + <span class="author-legend-item text-hint">※一般アカウントは所属バッジが表示されません</span>
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>
660 + <span class="author-legend-item"><span class="badge badge-role-officer badge-sm"><svg class="ico" viewBox="0 0 24 24"><polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"/></svg> 役員</span> <span class="text-hint">生徒会役員</span></span>
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>
... ... @@ -665,6 +665,12 @@
665 665   <div class="activity-thread-title">
666 666   <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>
667 667   <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
731 + #set($actTagsList = $activity.getValue('tags'))
732 + #if($actTagsList && !$actTagsList.isEmpty())
733 + #foreach($tagItem in $actTagsList)
734 + #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end
735 + #end
736 + #end
668 668   </div>
669 669   <div class="thread-meta-row">
670 670   <span class="thread-post-count">${reportCount}件の報告 ・ ${commentCount}件のコメント</span>
... ... @@ -726,8 +726,8 @@
726 726   #set($postVis = $!post.getValue('visibility'))
727 727   #if(!$postVis || $postVis == '') #set($postVis = 'public') #end
728 728   #set($canViewPost = true)
729 - #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewPost = false)
730 - #elseif($postVis == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ($viewerSchoolCode != $schoolCode || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPost = false)
798 + #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewPost = false)
799 + #elseif($postVis == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPost = false)
731 731   #end
732 732   #if(!$canViewPost)
733 733   <div class="thread-post visibility-restricted-post">
... ... @@ -771,8 +771,11 @@
771 771   <span class="badge badge-general badge-sm">一般</span>
772 772   #end
773 773   ## 所属バッジ（投稿者の学校コードとページの学校コードを比較）
843 + #set($postIsSchoolMatch = ($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode)))
774 774   #if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general')
775 - #if($postSchoolCode == $schoolCode)
845 + #if($postUserRole == 'graduate' && $postIsSchoolMatch)
846 + <span class="badge badge-alumni badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M22 10l-10-5L2 10l10 5 10-5z"/><path d="M6 12v5c0 1.66 2.69 3 6 3s6-1.34 6-3v-5"/></svg> 卒業生</span>
847 + #elseif($postIsSchoolMatch && $postUserRole != 'graduate')
776 776   #if($postAccountType == 'verified' || $postAccountType == 'admin')
777 777   <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>
778 778   #else
... ... @@ -977,6 +977,35 @@
977 977  ## --- 年度タブ切り替え JavaScript ---
978 978  {{html clean="false"}}
979 979  <script>
1052 +// コンパクト表示（タイトルのみ）トグル
1053 +function toggleCompactView() {
1054 + var container = document.querySelector('.xwiki-content') || document.body;
1055 + var isCompact = container.classList.toggle('activity-compact-view');
1056 + var btn = document.getElementById('btnViewToggle');
1057 + if (btn) {
1058 + btn.querySelector('.toggle-label').textContent = isCompact ? '詳細表示' : '一覧表示';
1059 + btn.title = isCompact ? '詳細表示に戻す' : 'タイトルのみ表示';
1060 + }
1061 + // コンパクトモードでは各スレッドヘッダーをクリックで個別展開可能にする
1062 + document.querySelectorAll('.activity-thread').forEach(function(thread) {
1063 + if (isCompact) {
1064 + thread.classList.remove('compact-expanded');
1065 + }
1066 + });
1067 +}
1068 +
1069 +// コンパクトモードで個別スレッドを展開/折りたたみ
1070 +function toggleThreadExpand(e) {
1071 + var container = document.querySelector('.xwiki-content') || document.body;
1072 + if (!container.classList.contains('activity-compact-view')) return;
1073 + // リンクやボタンのクリックはスルー
1074 + if (e.target.closest('a, button, .btn-featured-toggle')) return;
1075 + var thread = e.target.closest('.activity-thread');
1076 + if (thread) {
1077 + thread.classList.toggle('compact-expanded');
1078 + }
1079 +}
1080 +
980 980  function switchActivityFY(fy, btn) {
981 981   // タブのアクティブ状態を切り替え
982 982   document.querySelectorAll('.activity-fy-tab').forEach(function(t) { t.classList.remove('active'); });
... ... @@ -992,6 +992,27 @@
992 992  }
993 993  // ページ読み込み時の初期化
994 994  document.addEventListener('DOMContentLoaded', function() {
1096 + // 年度タブを降順にソート（「全期間」タブは末尾に固定）
1097 + var tabContainer = document.querySelector('.activity-fy-tabs');
1098 + if (tabContainer) {
1099 + var tabs = Array.from(tabContainer.querySelectorAll('.activity-fy-tab'));
1100 + var allTab = null;
1101 + var fyTabs = [];
1102 + tabs.forEach(function(t) {
1103 + var onclickStr = t.getAttribute('onclick') || '';
1104 + if (onclickStr.indexOf("'all'") !== -1) { allTab = t; }
1105 + else { fyTabs.push(t); }
1106 + });
1107 + // 年度タブを数値の降順でソート
1108 + fyTabs.sort(function(a, b) {
1109 + var aYear = parseInt(a.textContent) || 0;
1110 + var bYear = parseInt(b.textContent) || 0;
1111 + return bYear - aYear;
1112 + });
1113 + // DOM再配置
1114 + fyTabs.forEach(function(t) { tabContainer.appendChild(t); });
1115 + if (allTab) { tabContainer.appendChild(allTab); }
1116 + }
995 995   // デフォルトで現在の年度を表示
996 996   var defaultTab = document.querySelector('.activity-fy-tab.active');
997 997   if (defaultTab) { defaultTab.click(); }
... ... @@ -1003,14 +1003,19 @@
1003 1003   window.history.replaceState({}, document.title, window.location.pathname);
1004 1004   }
1005 1005   }
1006 - // 長文投稿の折りたたみ初期化
1128 + // コンパクトモード: スレッドヘッダークリックで個別展開
1129 + document.querySelectorAll('.activity-thread-header').forEach(function(header) {
1130 + header.addEventListener('click', toggleThreadExpand);
1131 + });
1132 + // 長文投稿の折りたたみ初期化（max-height: 12em 超で省略）
1007 1007   document.querySelectorAll('.thread-post-body').forEach(function(body) {
1008 - // 先にtruncatedを仮適用してline-clampを有効にし、高さの差分で判定
1134 + // pre-wrapのまま高さを測定し、max-height(12em ≒ ~200px)を超える場合に折りたたむ
1009 1009   var fullH = body.scrollHeight;
1136 + // 12em を px に変換（font-size × line-height × 行数 の近似値ではなくCSSと同じ値を取得）
1010 1010   body.classList.add('truncated');
1011 - var clampedH = body.clientHeight;
1138 + var maxH = body.clientHeight; // max-height: 12em 適用後の高さ
1012 1012   body.classList.remove('truncated');
1013 - if (fullH > clampedH + 10) {
1140 + if (fullH > maxH + 30) {
1014 1014   body.classList.add('truncated');
1015 1015   var btn = document.createElement('button');
1016 1016   btn.className = 'btn-read-more';
... ... @@ -1084,7 +1084,7 @@
1084 1084   var csrfEl = document.querySelector('input[name="form_token"]');
1085 1085   var csrfToken = csrfEl ? csrfEl.value : '';
1086 1086   var xhr = new XMLHttpRequest();
1087 - xhr.open('POST', '/bin/SeitokaiCode/EditPost?outputSyntax=plain', true);
1214 + xhr.open('POST', '/bin/get/SeitokaiCode/EditPost?outputSyntax=plain', true);
1088 1088   xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1089 1089   var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken);
1090 1090   xhr.onload = function() {
... ... @@ -1106,7 +1106,7 @@
1106 1106  function confirmDeletePost(schoolPage, postObjNum, token) {
1107 1107   if (!confirm('この投稿を削除しますか？\\n削除後は「この投稿は削除されました」と表示されます。')) return;
1108 1108   var xhr = new XMLHttpRequest();
1109 - xhr.open('POST', '/bin/SeitokaiCode/DeletePost?outputSyntax=plain', true);
1236 + xhr.open('POST', '/bin/get/SeitokaiCode/DeletePost?outputSyntax=plain', true);
1110 1110   xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1111 1111   var deletePostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token);
1112 1112   xhr.onload = function() {