Changes for page 学校ページ テンプレート
Last modified by Super Admin on 2026/04/05 18:59
From version 
70.1 
70.1
edited by Super Admin
on 2026/03/18 18:54
on 2026/03/18 18:54
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
-
... ... @@ -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')) ... ... @@ -106,14 +106,6 @@ 106 106 #end 107 107 #end 108 108 109 -## --- 関連校（中高一貫校）情報 --- 110 -#set($affiliatedSchoolCode = $!doc.getValue('affiliatedSchoolCode')) 111 -#set($affiliatedSchoolName = $!doc.getValue('affiliatedSchoolName')) 112 -#set($isAffiliated = false) 113 -#if($affiliatedSchoolCode && $affiliatedSchoolCode != '' && $viewerSchoolCode == $affiliatedSchoolCode) 114 - #set($isAffiliated = true) 115 -#end 116 - 117 117 ## --- 学校ページ非表示チェック --- 118 118 #set($schoolHidden = $doc.getValue('hidden')) 119 119 #if($schoolHidden == 1) ... ... @@ -147,7 +147,7 @@ 147 147 148 148 ## --- 投稿固定/解除処理 --- 149 149 #set($pinAction = $!request.action) 150 -#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)) 151 151 #set($pinPostObjStr = $!request.postObj) 152 152 #if(!$pinPostObjStr.matches('^\d+$')) 153 153 ## 不正な値 → 無視 ... ... @@ -279,7 +279,7 @@ 279 279 280 280 ## --- 編集ボタン（権限があるユーザーのみ表示） --- 281 281 #set($canEditSchool = false) 282 -#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode || $isAffiliated))268 +#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode)) 283 283 #set($canEditSchool = true) 284 284 #end 285 285 #if($canEditSchool) ... ... @@ -288,24 +288,6 @@ 288 288 </div> 289 289 #end 290 290 291 -## --- 関連校（中高一貫校）バナー --- 292 -#if($affiliatedSchoolCode && $affiliatedSchoolCode != '') 293 - #set($affiliatedPageRef = "Schools.${affiliatedSchoolCode}.WebHome") 294 - #set($affiliatedPageExists = $xwiki.exists($affiliatedPageRef)) 295 -<div class="affiliated-school-banner"> 296 - <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> 297 - <div> 298 - <strong>中高一貫校</strong>： 299 - #if($affiliatedPageExists) 300 - <a href="$xwiki.getURL($affiliatedPageRef, 'view')">$!escapetool.xml($affiliatedSchoolName)</a> 301 - #else 302 - $!escapetool.xml($affiliatedSchoolName) 303 - #end 304 - と連携しています 305 - </div> 306 -</div> 307 -#end 308 - 309 309 ## --- ① 学校基本情報 --- 310 310 <div class="school-info-card collapsed" id="card-basic-info"> 311 311 <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> ... ... @@ -336,8 +336,8 @@ 336 336 #set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != '')) 337 337 #if($hasOrgContent) 338 338 #set($canViewOrgChart = true) 339 - #if($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewOrgChart = false)340 - #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) 341 341 #end 342 342 #if($canViewOrgChart) 343 343 <div class="seitokai-subsection"> ... ... @@ -416,8 +416,8 @@ 416 416 #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != '')) 417 417 #if($hasBudget) 418 418 #set($canViewBudget = true) 419 - #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewBudget = false)420 - #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) 421 421 #end 422 422 #if($canViewBudget) 423 423 <div class="seitokai-subsection"> ... ... @@ -472,8 +472,8 @@ 472 472 ## --- 校則の見直し --- 473 473 #if($ruleReviewStatus && $ruleReviewStatus != '') 474 474 #set($canViewRuleReview = true) 475 - #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewRuleReview = false)476 - #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) 477 477 #end 478 478 #if($canViewRuleReview) 479 479 <div class="seitokai-subsection"> ... ... @@ -535,8 +535,8 @@ 535 535 ## --- 生徒会の課題意識 --- 536 536 #if($challenges && $challenges != '') 537 537 #set($canViewChallenges = true) 538 - #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewChallenges = false)539 - #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) 540 540 #end 541 541 #if($canViewChallenges) 542 542 <div class="seitokai-subsection"> ... ... @@ -618,22 +618,22 @@ 618 618 <div class="author-legend-body"> 619 619 <div class="author-legend"> 620 620 <span class="author-legend-title">投稿者の信頼度:</span> 621 - <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者 span class="text-hint">— 運営スタッフ</span></span>622 - <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み span class="text-hint">— 本人確認済みのユーザー</span></span>623 - <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介 span class="text-hint">— 承認済みユーザーからの紹介</span></span>624 - <span class="author-legend-item"><span class="bar bar-general"></span> 一般 span class="text-hint">— 一般登録ユーザー</span></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> 625 625 </div> 626 626 <div class="author-legend"> 627 627 <span class="author-legend-title">所属:</span> 628 - <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>629 - <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>630 - <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>631 - <span class="author-legend-item text-hint">※一般アカウントは所属 バッジが表示されません</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> 632 632 </div> 633 633 <div class="author-legend"> 634 634 <span class="author-legend-title">役割:</span> 635 635 <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> 636 - <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>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> 637 637 <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> 638 638 </div> 639 639 </div> ... ... @@ -771,8 +771,8 @@ 771 771 #set($postVis = $!post.getValue('visibility')) 772 772 #if(!$postVis || $postVis == '') #set($postVis = 'public') #end 773 773 #set($canViewPost = true) 774 - #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewPost = false)775 - #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) 776 776 #end 777 777 #if(!$canViewPost) 778 778 <div class="thread-post visibility-restricted-post"> ... ... @@ -817,7 +817,7 @@ 817 817 #end 818 818 ## 所属バッジ（投稿者の学校コードとページの学校コードを比較） 819 819 #if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general') 820 - #if($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode))788 + #if($postSchoolCode == $schoolCode) 821 821 #if($postAccountType == 'verified' || $postAccountType == 'admin') 822 822 <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> 823 823 #else ... ... @@ -1081,15 +1081,14 @@ 1081 1081 document.querySelectorAll('.activity-thread-header').forEach(function(header) { 1082 1082 header.addEventListener('click', toggleThreadExpand); 1083 1083 }); 1084 - // 長文投稿の折りたたみ初期化 （max-height: 12em 超で省略）1052 + // 長文投稿の折りたたみ初期化 1085 1085 document.querySelectorAll('.thread-post-body').forEach(function(body) { 1086 - // pre-wrapのまま高さを測定し、max-height(12em≒ ~200px)を超える場合に折りたたむ1054 + // 先にtruncatedを仮適用してline-clampを有効にし、高さの差分で判定 1087 1087 var fullH = body.scrollHeight; 1088 - // 12em を px に変換（font-size × line-height × 行数 の近似値ではなくCSSと同じ値を取得） 1089 1089 body.classList.add('truncated'); 1090 - var maxH = body.clientHeight;// max-height: 12em 適用後の高さ1057 + var clampedH = body.clientHeight; 1091 1091 body.classList.remove('truncated'); 1092 - if (fullH > maxH +30) {1059 + if (fullH > clampedH + 10) { 1093 1093 body.classList.add('truncated'); 1094 1094 var btn = document.createElement('button'); 1095 1095 btn.className = 'btn-read-more';