Changes for page 学校ページ テンプレート
Last modified by Super Admin on 2026/04/05 18:59
From version 
65.1 
65.1
edited by Super Admin
on 2026/03/18 08:56
on 2026/03/18 08:56
Change comment:
There is no comment for this version
To version 73.1
73.1
edited by Super Admin
on 2026/03/18 23:46
on 2026/03/18 23:46
Change comment:
There is no comment for this version
Summary
Details
-
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"> ... ... @@ -586,22 +586,23 @@ 586 586 <div class="author-legend-body"> 587 587 <div class="author-legend"> 588 588 <span class="author-legend-title">投稿者の信頼度:</span> 589 - <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者</span> 590 - <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み</span> 591 - <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介</span> 592 - <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> 593 593 </div> 594 594 <div class="author-legend"> 595 595 <span class="author-legend-title">所属:</span> 596 - <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> 597 - <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> 598 - <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> 599 - <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> 600 600 </div> 601 601 <div class="author-legend"> 602 602 <span class="author-legend-title">役割:</span> 603 603 <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> 604 - <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> 605 605 <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> 606 606 </div> 607 607 </div> ... ... @@ -739,8 +739,8 @@ 739 739 #set($postVis = $!post.getValue('visibility')) 740 740 #if(!$postVis || $postVis == '') #set($postVis = 'public') #end 741 741 #set($canViewPost = true) 742 - #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && $ viewerSchoolCode!= $schoolCode))) #set($canViewPost = false)743 - #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) 744 744 #end 745 745 #if(!$canViewPost) 746 746 <div class="thread-post visibility-restricted-post"> ... ... @@ -784,8 +784,11 @@ 784 784 <span class="badge badge-general badge-sm">一般</span> 785 785 #end 786 786 ## 所属バッジ（投稿者の学校コードとページの学校コードを比較） 853 + #set($postIsSchoolMatch = ($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode))) 787 787 #if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general') 788 - #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') 789 789 #if($postAccountType == 'verified' || $postAccountType == 'admin') 790 790 <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> 791 791 #else ... ... @@ -1034,6 +1034,27 @@ 1034 1034 } 1035 1035 // ページ読み込み時の初期化 1036 1036 document.addEventListener('DOMContentLoaded', function() { 1106 + // 年度タブを降順にソート（「全期間」タブは末尾に固定） 1107 + var tabContainer = document.querySelector('.activity-fy-tabs'); 1108 + if (tabContainer) { 1109 + var tabs = Array.from(tabContainer.querySelectorAll('.activity-fy-tab')); 1110 + var allTab = null; 1111 + var fyTabs = []; 1112 + tabs.forEach(function(t) { 1113 + var onclickStr = t.getAttribute('onclick') || ''; 1114 + if (onclickStr.indexOf("'all'") !== -1) { allTab = t; } 1115 + else { fyTabs.push(t); } 1116 + }); 1117 + // 年度タブを数値の降順でソート 1118 + fyTabs.sort(function(a, b) { 1119 + var aYear = parseInt(a.textContent) || 0; 1120 + var bYear = parseInt(b.textContent) || 0; 1121 + return bYear - aYear; 1122 + }); 1123 + // DOM再配置 1124 + fyTabs.forEach(function(t) { tabContainer.appendChild(t); }); 1125 + if (allTab) { tabContainer.appendChild(allTab); } 1126 + } 1037 1037 // デフォルトで現在の年度を表示 1038 1038 var defaultTab = document.querySelector('.activity-fy-tab.active'); 1039 1039 if (defaultTab) { defaultTab.click(); } ... ... @@ -1049,14 +1049,15 @@ 1049 1049 document.querySelectorAll('.activity-thread-header').forEach(function(header) { 1050 1050 header.addEventListener('click', toggleThreadExpand); 1051 1051 }); 1052 - // 長文投稿の折りたたみ初期化 1142 + // 長文投稿の折りたたみ初期化（max-height: 12em 超で省略） 1053 1053 document.querySelectorAll('.thread-post-body').forEach(function(body) { 1054 - // 先にtruncatedを仮適用してline-clampを有効にし、高さの差分で判定1144 + // pre-wrapのまま高さを測定し、max-height(12em ≒ ~200px)を超える場合に折りたたむ 1055 1055 var fullH = body.scrollHeight; 1146 + // 12em を px に変換（font-size × line-height × 行数 の近似値ではなくCSSと同じ値を取得） 1056 1056 body.classList.add('truncated'); 1057 - var clampedH = body.clientHeight;1148 + var maxH = body.clientHeight; // max-height: 12em 適用後の高さ 1058 1058 body.classList.remove('truncated'); 1059 - if (fullH > clampedH +10) {1150 + if (fullH > maxH + 30) { 1060 1060 body.classList.add('truncated'); 1061 1061 var btn = document.createElement('button'); 1062 1062 btn.className = 'btn-read-more';