Changes for page 学校ページ テンプレート
Last modified by Super Admin on 2026/04/05 18:59
From version 
72.1 
72.1
edited by Super Admin
on 2026/03/18 23:33
on 2026/03/18 23:33
Change comment:
There is no comment for this version
To version 67.1
67.1
edited by Super Admin
on 2026/03/18 11:26
on 2026/03/18 11:26
Change comment:
There is no comment for this version
Summary
Details
-
Page properties
-
- 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')) ... ... @@ -101,8 +101,6 @@ 101 101 #set($viewerDoc = $xwiki.getDocument($viewerUser)) 102 102 #set($viewerAccountType = $!viewerDoc.getValue('accountType')) 103 103 #set($viewerSchoolCode = $!viewerDoc.getValue('schoolCode')) 104 - #set($viewerSecondarySchoolCode = $!viewerDoc.getValue('secondarySchoolCode')) 105 - #set($viewerUserRole = $!viewerDoc.getValue('userRole')) 106 106 #if($viewerAccountType == 'admin') 107 107 #set($isViewerAdmin = true) 108 108 #end ... ... @@ -112,31 +112,10 @@ 112 112 #set($affiliatedSchoolCode = $!doc.getValue('affiliatedSchoolCode')) 113 113 #set($affiliatedSchoolName = $!doc.getValue('affiliatedSchoolName')) 114 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 107 +#if($affiliatedSchoolCode && $affiliatedSchoolCode != '' && $viewerSchoolCode == $affiliatedSchoolCode) 108 + #set($isAffiliated = true) 121 121 #end 122 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 - 140 140 ## --- 学校ページ非表示チェック --- 141 141 #set($schoolHidden = $doc.getValue('hidden')) 142 142 #if($schoolHidden == 1) ... ... @@ -170,7 +170,7 @@ 170 170 171 171 ## --- 投稿固定/解除処理 --- 172 172 #set($pinAction = $!request.action) 173 -#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $i sSchoolMember)) && $services.csrf.isTokenValid($request.form_token))144 +#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && ($viewerSchoolCode == $schoolCode || $isAffiliated))) && $services.csrf.isTokenValid($request.form_token)) 174 174 #set($pinPostObjStr = $!request.postObj) 175 175 #if(!$pinPostObjStr.matches('^\d+$')) 176 176 ## 不正な値 → 無視 ... ... @@ -200,7 +200,7 @@ 200 200 201 201 ## --- 特色ある活動 選定/解除処理 --- 202 202 #set($featAction = $!request.action) 203 -#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $i sSchoolMember)) && $services.csrf.isTokenValid($request.form_token))174 +#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token)) 204 204 #set($featActObjStr = $!request.actObj) 205 205 #if($featActObjStr.matches('^\d+$')) 206 206 #set($actObjNum = $mathtool.toInteger($featActObjStr)) ... ... @@ -302,7 +302,7 @@ 302 302 303 303 ## --- 編集ボタン（権限があるユーザーのみ表示） --- 304 304 #set($canEditSchool = false) 305 -#if(!$isGuest && ($isViewerAdmin || $i sSchoolMember))276 +#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode || $isAffiliated)) 306 306 #set($canEditSchool = true) 307 307 #end 308 308 #if($canEditSchool) ... ... @@ -359,8 +359,8 @@ 359 359 #set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != '')) 360 360 #if($hasOrgContent) 361 361 #set($canViewOrgChart = true) 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)333 + #if($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewOrgChart = false) 334 + #elseif($visibilityOrgChart == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewOrgChart = false) 364 364 #end 365 365 #if($canViewOrgChart) 366 366 <div class="seitokai-subsection"> ... ... @@ -439,8 +439,8 @@ 439 439 #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != '')) 440 440 #if($hasBudget) 441 441 #set($canViewBudget = true) 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)413 + #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewBudget = false) 414 + #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false) 444 444 #end 445 445 #if($canViewBudget) 446 446 <div class="seitokai-subsection"> ... ... @@ -495,8 +495,8 @@ 495 495 ## --- 校則の見直し --- 496 496 #if($ruleReviewStatus && $ruleReviewStatus != '') 497 497 #set($canViewRuleReview = true) 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)469 + #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewRuleReview = false) 470 + #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false) 500 500 #end 501 501 #if($canViewRuleReview) 502 502 <div class="seitokai-subsection"> ... ... @@ -558,8 +558,8 @@ 558 558 ## --- 生徒会の課題意識 --- 559 559 #if($challenges && $challenges != '') 560 560 #set($canViewChallenges = true) 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)532 + #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewChallenges = false) 533 + #elseif($visibilityChallenges == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewChallenges = false) 563 563 #end 564 564 #if($canViewChallenges) 565 565 <div class="seitokai-subsection"> ... ... @@ -641,23 +641,22 @@ 641 641 <div class="author-legend-body"> 642 642 <div class="author-legend"> 643 643 <span class="author-legend-title">投稿者の信頼度:</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>615 + <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者</span> 616 + <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み</span> 617 + <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介</span> 618 + <span class="author-legend-item"><span class="bar bar-general"></span> 一般（未承認）</span> 648 648 </div> 649 649 <div class="author-legend"> 650 650 <span class="author-legend-title">所属:</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> 622 + <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> 623 + <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> 624 + <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> 625 + <span class="author-legend-item text-hint">※一般アカウントは所属未確認のため非表示</span> 656 656 </div> 657 657 <div class="author-legend"> 658 658 <span class="author-legend-title">役割:</span> 659 659 <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> 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>630 + <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> 661 661 <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> 662 662 </div> 663 663 </div> ... ... @@ -795,8 +795,8 @@ 795 795 #set($postVis = $!post.getValue('visibility')) 796 796 #if(!$postVis || $postVis == '') #set($postVis = 'public') #end 797 797 #set($canViewPost = true) 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)768 + #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewPost = false) 769 + #elseif($postVis == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPost = false) 800 800 #end 801 801 #if(!$canViewPost) 802 802 <div class="thread-post visibility-restricted-post"> ... ... @@ -840,11 +840,8 @@ 840 840 <span class="badge badge-general badge-sm">一般</span> 841 841 #end 842 842 ## 所属バッジ（投稿者の学校コードとページの学校コードを比較） 843 - #set($postIsSchoolMatch = ($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode))) 844 844 #if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general') 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') 814 + #if($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode)) 848 848 #if($postAccountType == 'verified' || $postAccountType == 'admin') 849 849 <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> 850 850 #else ... ... @@ -1093,27 +1093,6 @@ 1093 1093 } 1094 1094 // ページ読み込み時の初期化 1095 1095 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 - } 1117 1117 // デフォルトで現在の年度を表示 1118 1118 var defaultTab = document.querySelector('.activity-fy-tab.active'); 1119 1119 if (defaultTab) { defaultTab.click(); } ... ... @@ -1129,15 +1129,14 @@ 1129 1129 document.querySelectorAll('.activity-thread-header').forEach(function(header) { 1130 1130 header.addEventListener('click', toggleThreadExpand); 1131 1131 }); 1132 - // 長文投稿の折りたたみ初期化 （max-height: 12em 超で省略）1078 + // 長文投稿の折りたたみ初期化 1133 1133 document.querySelectorAll('.thread-post-body').forEach(function(body) { 1134 - // pre-wrapのまま高さを測定し、max-height(12em≒ ~200px)を超える場合に折りたたむ1080 + // 先にtruncatedを仮適用してline-clampを有効にし、高さの差分で判定 1135 1135 var fullH = body.scrollHeight; 1136 - // 12em を px に変換（font-size × line-height × 行数 の近似値ではなくCSSと同じ値を取得） 1137 1137 body.classList.add('truncated'); 1138 - var maxH = body.clientHeight;// max-height: 12em 適用後の高さ1083 + var clampedH = body.clientHeight; 1139 1139 body.classList.remove('truncated'); 1140 - if (fullH > maxH+30) {1085 + if (fullH > clampedH * 1.3 + 20) { 1141 1141 body.classList.add('truncated'); 1142 1142 var btn = document.createElement('button'); 1143 1143 btn.className = 'btn-read-more';