Last modified by Super Admin on 2026/04/05 18:59

From version Icon 66.1 Icon
edited by Super Admin
on 2026/03/18 09:18
Change comment: There is no comment for this version
To version Icon 63.1 Icon
edited by XWikiGuest
on 2026/03/18 03:51
Change comment: There is no comment for this version

Summary

Details

Icon Page properties
Author
... ... @@ -1,1 +1,1 @@
1 -XWiki.superadmin
1 +XWiki.XWikiGuest
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">
... ... @@ -600,13 +600,6 @@
600 600   #end
601 601   <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
602 602   </div>
603 - <div class="activity-toolbar-right">
604 - <button class="btn-view-toggle" id="btnViewToggle" onclick="toggleCompactView()" title="タイトルのみ表示">
605 - <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>
606 - <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>
607 - <span class="toggle-label">一覧表示</span>
608 - </button>
609 - </div>
610 610   <div class="author-legend-wrapper">
611 611   <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>
612 612   <div class="author-legend-body">
... ... @@ -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)
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)
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))
781 + #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
... ... @@ -1016,35 +1016,6 @@
1016 1016  ## --- 年度タブ切り替え JavaScript ---
1017 1017  {{html clean="false"}}
1018 1018  <script>
1019 -// コンパクト表示(タイトルのみ)トグル
1020 -function toggleCompactView() {
1021 - var container = document.querySelector('.xwiki-content') || document.body;
1022 - var isCompact = container.classList.toggle('activity-compact-view');
1023 - var btn = document.getElementById('btnViewToggle');
1024 - if (btn) {
1025 - btn.querySelector('.toggle-label').textContent = isCompact ? '詳細表示' : '一覧表示';
1026 - btn.title = isCompact ? '詳細表示に戻す' : 'タイトルのみ表示';
1027 - }
1028 - // コンパクトモードでは各スレッドヘッダーをクリックで個別展開可能にする
1029 - document.querySelectorAll('.activity-thread').forEach(function(thread) {
1030 - if (isCompact) {
1031 - thread.classList.remove('compact-expanded');
1032 - }
1033 - });
1034 -}
1035 -
1036 -// コンパクトモードで個別スレッドを展開/折りたたみ
1037 -function toggleThreadExpand(e) {
1038 - var container = document.querySelector('.xwiki-content') || document.body;
1039 - if (!container.classList.contains('activity-compact-view')) return;
1040 - // リンクやボタンのクリックはスルー
1041 - if (e.target.closest('a, button, .btn-featured-toggle')) return;
1042 - var thread = e.target.closest('.activity-thread');
1043 - if (thread) {
1044 - thread.classList.toggle('compact-expanded');
1045 - }
1046 -}
1047 -
1048 1048  function switchActivityFY(fy, btn) {
1049 1049   // タブのアクティブ状態を切り替え
1050 1050   document.querySelectorAll('.activity-fy-tab').forEach(function(t) { t.classList.remove('active'); });
... ... @@ -1071,10 +1071,6 @@
1071 1071   window.history.replaceState({}, document.title, window.location.pathname);
1072 1072   }
1073 1073   }
1074 - // コンパクトモード: スレッドヘッダークリックで個別展開
1075 - document.querySelectorAll('.activity-thread-header').forEach(function(header) {
1076 - header.addEventListener('click', toggleThreadExpand);
1077 - });
1078 1078   // 長文投稿の折りたたみ初期化
1079 1079   document.querySelectorAll('.thread-post-body').forEach(function(body) {
1080 1080   // 先にtruncatedを仮適用してline-clampを有効にし、高さの差分で判定