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 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
-
... ... @@ -100,6 +100,14 @@ 100 100 #end 101 101 #end 102 102 103 +## --- 関連校（中高一貫校）情報 --- 104 +#set($affiliatedSchoolCode = $!doc.getValue('affiliatedSchoolCode')) 105 +#set($affiliatedSchoolName = $!doc.getValue('affiliatedSchoolName')) 106 +#set($isAffiliated = false) 107 +#if($affiliatedSchoolCode && $affiliatedSchoolCode != '' && $viewerSchoolCode == $affiliatedSchoolCode) 108 + #set($isAffiliated = true) 109 +#end 110 + 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)) 144 +#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && ($viewerSchoolCode == $schoolCode || $isAffiliated))) && $services.csrf.isTokenValid($request.form_token)) 137 137 #set($pinPostObjStr = $!request.postObj) 138 138 #if(!$pinPostObjStr.matches('^\d+$')) 139 139 ## 不正な値 → 無視 ... ... @@ -265,7 +265,7 @@ 265 265 266 266 ## --- 編集ボタン（権限があるユーザーのみ表示） --- 267 267 #set($canEditSchool = false) 268 -#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode)) 276 +#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode || $isAffiliated)) 269 269 #set($canEditSchool = true) 270 270 #end 271 271 #if($canEditSchool) ... ... @@ -274,6 +274,24 @@ 274 274 </div> 275 275 #end 276 276 285 +## --- 関連校（中高一貫校）バナー --- 286 +#if($affiliatedSchoolCode && $affiliatedSchoolCode != '') 287 + #set($affiliatedPageRef = "Schools.${affiliatedSchoolCode}.WebHome") 288 + #set($affiliatedPageExists = $xwiki.exists($affiliatedPageRef)) 289 +<div class="affiliated-school-banner"> 290 + <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> 291 + <div> 292 + <strong>中高一貫校</strong>： 293 + #if($affiliatedPageExists) 294 + <a href="$xwiki.getURL($affiliatedPageRef, 'view')">$!escapetool.xml($affiliatedSchoolName)</a> 295 + #else 296 + $!escapetool.xml($affiliatedSchoolName) 297 + #end 298 + と連携しています 299 + </div> 300 +</div> 301 +#end 302 + 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) 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) 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) 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) 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) 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) 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) 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) 508 508 #end 509 509 #if($canViewChallenges) 510 510 <div class="seitokai-subsection"> ... ... @@ -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) 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) 744 744 #end 745 745 #if(!$canViewPost) 746 746 <div class="thread-post visibility-restricted-post"> ... ... @@ -785,7 +785,7 @@ 785 785 #end 786 786 ## 所属バッジ（投稿者の学校コードとページの学校コードを比較） 787 787 #if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general') 788 - #if($postSchoolCode == $schoolCode) 814 + #if($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode)) 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 ... ... @@ -1056,7 +1056,7 @@ 1056 1056 body.classList.add('truncated'); 1057 1057 var clampedH = body.clientHeight; 1058 1058 body.classList.remove('truncated'); 1059 - if (fullH > clampedH +10) {1085 + if (fullH > clampedH * 1.3 + 20) { 1060 1060 body.classList.add('truncated'); 1061 1061 var btn = document.createElement('button'); 1062 1062 btn.className = 'btn-read-more';