Changes for page 学校ページ テンプレート
Last modified by Super Admin on 2026/04/05 18:59
From 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
To 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
Summary
Details
-
Page properties
-
- Content
-
... ... @@ -100,14 +100,6 @@ 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 - 111 111 ## --- 学校ページ非表示チェック --- 112 112 #set($schoolHidden = $doc.getValue('hidden')) 113 113 #if($schoolHidden == 1) ... ... @@ -141,7 +141,7 @@ 141 141 142 142 ## --- 投稿固定/解除処理 --- 143 143 #set($pinAction = $!request.action) 144 -#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && ($viewerSchoolCode == $schoolCode|| $isAffiliated)))&& $services.csrf.isTokenValid($request.form_token))136 +#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token)) 145 145 #set($pinPostObjStr = $!request.postObj) 146 146 #if(!$pinPostObjStr.matches('^\d+$')) 147 147 ## 不正な値 → 無視 ... ... @@ -273,7 +273,7 @@ 273 273 274 274 ## --- 編集ボタン（権限があるユーザーのみ表示） --- 275 275 #set($canEditSchool = false) 276 -#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode || $isAffiliated))268 +#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode)) 277 277 #set($canEditSchool = true) 278 278 #end 279 279 #if($canEditSchool) ... ... @@ -282,24 +282,6 @@ 282 282 </div> 283 283 #end 284 284 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 - 303 303 ## --- ① 学校基本情報 --- 304 304 <div class="school-info-card collapsed" id="card-basic-info"> 305 305 <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> ... ... @@ -330,8 +330,8 @@ 330 330 #set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != '')) 331 331 #if($hasOrgContent) 332 332 #set($canViewOrgChart = true) 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)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) 335 335 #end 336 336 #if($canViewOrgChart) 337 337 <div class="seitokai-subsection"> ... ... @@ -410,8 +410,8 @@ 410 410 #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != '')) 411 411 #if($hasBudget) 412 412 #set($canViewBudget = true) 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)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) 415 415 #end 416 416 #if($canViewBudget) 417 417 <div class="seitokai-subsection"> ... ... @@ -466,8 +466,8 @@ 466 466 ## --- 校則の見直し --- 467 467 #if($ruleReviewStatus && $ruleReviewStatus != '') 468 468 #set($canViewRuleReview = true) 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)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) 471 471 #end 472 472 #if($canViewRuleReview) 473 473 <div class="seitokai-subsection"> ... ... @@ -529,8 +529,8 @@ 529 529 ## --- 生徒会の課題意識 --- 530 530 #if($challenges && $challenges != '') 531 531 #set($canViewChallenges = true) 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)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) 534 534 #end 535 535 #if($canViewChallenges) 536 536 <div class="seitokai-subsection"> ... ... @@ -765,8 +765,8 @@ 765 765 #set($postVis = $!post.getValue('visibility')) 766 766 #if(!$postVis || $postVis == '') #set($postVis = 'public') #end 767 767 #set($canViewPost = true) 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)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) 770 770 #end 771 771 #if(!$canViewPost) 772 772 <div class="thread-post visibility-restricted-post"> ... ... @@ -811,7 +811,7 @@ 811 811 #end 812 812 ## 所属バッジ（投稿者の学校コードとページの学校コードを比較） 813 813 #if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general') 814 - #if($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode))788 + #if($postSchoolCode == $schoolCode) 815 815 #if($postAccountType == 'verified' || $postAccountType == 'admin') 816 816 <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> 817 817 #else ... ... @@ -1082,7 +1082,7 @@ 1082 1082 body.classList.add('truncated'); 1083 1083 var clampedH = body.clientHeight; 1084 1084 body.classList.remove('truncated'); 1085 - if (fullH > clampedH * 1.3+20) {1059 + if (fullH > clampedH + 10) { 1086 1086 body.classList.add('truncated'); 1087 1087 var btn = document.createElement('button'); 1088 1088 btn.className = 'btn-read-more';