Changes for page 学校ページ テンプレート
Last modified by Super Admin on 2026/04/05 18:59
From version 
62.1 
62.1
edited by Super Admin
on 2026/03/17 17:13
on 2026/03/17 17:13
Change comment:
There is no comment for this version
To 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
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')) ... ... @@ -100,6 +100,14 @@ 100 100 #end 101 101 #end 102 102 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 + 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)) 150 +#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)) 282 +#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 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 + 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) 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) 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) 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) 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) 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) 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) 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) 508 508 #end 509 509 #if($canViewChallenges) 510 510 <div class="seitokai-subsection"> ... ... @@ -574,27 +574,34 @@ 574 574 #end 575 575 <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button> 576 576 </div> 609 + <div class="activity-toolbar-right"> 610 + <button class="btn-view-toggle" id="btnViewToggle" onclick="toggleCompactView()" title="タイトルのみ表示"> 611 + <svg class="ico-list" viewBox="0 0 24 24" stroke="currentColor" fill="none" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><line x1="8" y1="6" x2="21" y2="6"/><line x1="8" y1="12" x2="21" y2="12"/><line x1="8" y1="18" x2="21" y2="18"/><line x1="3" y1="6" x2="3.01" y2="6"/><line x1="3" y1="12" x2="3.01" y2="12"/><line x1="3" y1="18" x2="3.01" y2="18"/></svg> 612 + <svg class="ico-detail" viewBox="0 0 24 24" stroke="currentColor" fill="none" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="3" width="7" height="7"/><rect x="14" y="3" width="7" height="7"/><rect x="3" y="14" width="7" height="7"/><rect x="14" y="14" width="7" height="7"/></svg> 613 + <span class="toggle-label">一覧表示</span> 614 + </button> 615 + </div> 577 577 <div class="author-legend-wrapper"> 578 578 <button class="author-legend-toggle" onclick="this.classList.toggle('open');this.nextElementSibling.classList.toggle('open')"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M12 16v-4"/><path d="M12 8h.01"/></svg> バッジの見方 <span class="chevron">▼</span></button> 579 579 <div class="author-legend-body"> 580 580 <div class="author-legend"> 581 581 <span class="author-legend-title">投稿者の信頼度:</span> 582 - <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者</span> 583 - <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み</span> 584 - <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介</span> 585 - <span class="author-legend-item"><span class="bar bar-general"></span> 一般 （未承認）</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> 586 586 </div> 587 587 <div class="author-legend"> 588 588 <span class="author-legend-title">所属:</span> 589 - <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>590 - <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>591 - <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>592 - <span class="author-legend-item text-hint">※一般アカウントは所属 未確認のため非表示</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> 593 593 </div> 594 594 <div class="author-legend"> 595 595 <span class="author-legend-title">役割:</span> 596 596 <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> 597 - <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> 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> 598 598 <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> 599 599 </div> 600 600 </div> ... ... @@ -732,8 +732,8 @@ 732 732 #set($postVis = $!post.getValue('visibility')) 733 733 #if(!$postVis || $postVis == '') #set($postVis = 'public') #end 734 734 #set($canViewPost = true) 735 - #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewPost = false) 736 - #elseif($postVis == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ($viewerSchoolCode != $schoolCode || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPost = false) 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) 737 737 #end 738 738 #if(!$canViewPost) 739 739 <div class="thread-post visibility-restricted-post"> ... ... @@ -778,7 +778,7 @@ 778 778 #end 779 779 ## 所属バッジ（投稿者の学校コードとページの学校コードを比較） 780 780 #if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general') 781 - #if($postSchoolCode == $schoolCode) 820 + #if($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode)) 782 782 #if($postAccountType == 'verified' || $postAccountType == 'admin') 783 783 <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> 784 784 #else ... ... @@ -983,6 +983,35 @@ 983 983 ## --- 年度タブ切り替え JavaScript --- 984 984 {{html clean="false"}} 985 985 <script> 1025 +// コンパクト表示（タイトルのみ）トグル 1026 +function toggleCompactView() { 1027 + var container = document.querySelector('.xwiki-content') || document.body; 1028 + var isCompact = container.classList.toggle('activity-compact-view'); 1029 + var btn = document.getElementById('btnViewToggle'); 1030 + if (btn) { 1031 + btn.querySelector('.toggle-label').textContent = isCompact ? '詳細表示' : '一覧表示'; 1032 + btn.title = isCompact ? '詳細表示に戻す' : 'タイトルのみ表示'; 1033 + } 1034 + // コンパクトモードでは各スレッドヘッダーをクリックで個別展開可能にする 1035 + document.querySelectorAll('.activity-thread').forEach(function(thread) { 1036 + if (isCompact) { 1037 + thread.classList.remove('compact-expanded'); 1038 + } 1039 + }); 1040 +} 1041 + 1042 +// コンパクトモードで個別スレッドを展開/折りたたみ 1043 +function toggleThreadExpand(e) { 1044 + var container = document.querySelector('.xwiki-content') || document.body; 1045 + if (!container.classList.contains('activity-compact-view')) return; 1046 + // リンクやボタンのクリックはスルー 1047 + if (e.target.closest('a, button, .btn-featured-toggle')) return; 1048 + var thread = e.target.closest('.activity-thread'); 1049 + if (thread) { 1050 + thread.classList.toggle('compact-expanded'); 1051 + } 1052 +} 1053 + 986 986 function switchActivityFY(fy, btn) { 987 987 // タブのアクティブ状態を切り替え 988 988 document.querySelectorAll('.activity-fy-tab').forEach(function(t) { t.classList.remove('active'); }); ... ... @@ -1009,14 +1009,19 @@ 1009 1009 window.history.replaceState({}, document.title, window.location.pathname); 1010 1010 } 1011 1011 } 1012 - // 長文投稿の折りたたみ初期化 1080 + // コンパクトモード: スレッドヘッダークリックで個別展開 1081 + document.querySelectorAll('.activity-thread-header').forEach(function(header) { 1082 + header.addEventListener('click', toggleThreadExpand); 1083 + }); 1084 + // 長文投稿の折りたたみ初期化（max-height: 12em 超で省略） 1013 1013 document.querySelectorAll('.thread-post-body').forEach(function(body) { 1014 - // 先にtruncatedを仮適用してline-clampを有効にし、高さの差分で判定1086 + // pre-wrapのまま高さを測定し、max-height(12em ≒ ~200px)を超える場合に折りたたむ 1015 1015 var fullH = body.scrollHeight; 1088 + // 12em を px に変換（font-size × line-height × 行数 の近似値ではなくCSSと同じ値を取得） 1016 1016 body.classList.add('truncated'); 1017 - var clampedH = body.clientHeight;1090 + var maxH = body.clientHeight; // max-height: 12em 適用後の高さ 1018 1018 body.classList.remove('truncated'); 1019 - if (fullH > clampedH +10) {1092 + if (fullH > maxH + 30) { 1020 1020 body.classList.add('truncated'); 1021 1021 var btn = document.createElement('button'); 1022 1022 btn.className = 'btn-read-more';