Skip to Content
Last modified by Super Admin on 2026/04/05 18:59
From version Icon 58.1 Icon
edited by Super Admin
on 2026/03/17 14:05
Change comment: There is no comment for this version
To version Icon 66.1 Icon
edited by Super Admin
on 2026/03/18 09:18
Change comment: There is no comment for this version

Summary

Details

Icon 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">
... ... @@ -574,6 +574,13 @@
574 574   #end
575 575   <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
576 576   </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>
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">
... ... @@ -665,6 +665,12 @@
665 665   <div class="activity-thread-title">
666 666   <h3 #if($actFeatured == '1')class="featured-title"#end>$!escapetool.xml($!actTitle) #if($actFeatured == '1')<svg class="ico ico-fixed-14 ico-star-offset" viewBox="0 0 24 24" fill="currentColor" stroke="none"><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>#end</h3>
667 667   <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
701 + #set($actTagsList = $activity.getValue('tags'))
702 + #if($actTagsList && !$actTagsList.isEmpty())
703 + #foreach($tagItem in $actTagsList)
704 + #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end
705 + #end
706 + #end
668 668   </div>
669 669   <div class="thread-meta-row">
670 670   <span class="thread-post-count">${reportCount}件の報告 ・ ${commentCount}件のコメント</span>
... ... @@ -726,8 +726,8 @@
726 726   #set($postVis = $!post.getValue('visibility'))
727 727   #if(!$postVis || $postVis == '') #set($postVis = 'public') #end
728 728   #set($canViewPost = true)
729 - #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewPost = false)
730 - #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)
731 731   #end
732 732   #if(!$canViewPost)
733 733   <div class="thread-post visibility-restricted-post">
... ... @@ -772,7 +772,7 @@
772 772   #end
773 773   ## 所属バッジ（投稿者の学校コードとページの学校コードを比較）
774 774   #if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general')
775 - #if($postSchoolCode == $schoolCode)
814 + #if($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode))
776 776   #if($postAccountType == 'verified' || $postAccountType == 'admin')
777 777   <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>
778 778   #else
... ... @@ -977,6 +977,35 @@
977 977  ## --- 年度タブ切り替え JavaScript ---
978 978  {{html clean="false"}}
979 979  <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 +
980 980  function switchActivityFY(fy, btn) {
981 981   // タブのアクティブ状態を切り替え
982 982   document.querySelectorAll('.activity-fy-tab').forEach(function(t) { t.classList.remove('active'); });
... ... @@ -1003,10 +1003,18 @@
1003 1003   window.history.replaceState({}, document.title, window.location.pathname);
1004 1004   }
1005 1005   }
1074 + // コンパクトモード: スレッドヘッダークリックで個別展開
1075 + document.querySelectorAll('.activity-thread-header').forEach(function(header) {
1076 + header.addEventListener('click', toggleThreadExpand);
1077 + });
1006 1006   // 長文投稿の折りたたみ初期化
1007 1007   document.querySelectorAll('.thread-post-body').forEach(function(body) {
1008 - // 画像・ファイル添付を除いたテキスト部分の高さを判定
1009 - if (body.scrollHeight > body.clientHeight + 10 || body.textContent.length > 300) {
1080 + // 先にtruncatedを仮適用してline-clampを有効にし、高さの差分で判定
1081 + var fullH = body.scrollHeight;
1082 + body.classList.add('truncated');
1083 + var clampedH = body.clientHeight;
1084 + body.classList.remove('truncated');
1085 + if (fullH > clampedH + 10) {
1010 1010   body.classList.add('truncated');
1011 1011   var btn = document.createElement('button');
1012 1012   btn.className = 'btn-read-more';
... ... @@ -1080,7 +1080,7 @@
1080 1080   var csrfEl = document.querySelector('input[name="form_token"]');
1081 1081   var csrfToken = csrfEl ? csrfEl.value : '';
1082 1082   var xhr = new XMLHttpRequest();
1083 - xhr.open('POST', '/bin/SeitokaiCode/EditPost?outputSyntax=plain', true);
1159 + xhr.open('POST', '/bin/get/SeitokaiCode/EditPost?outputSyntax=plain', true);
1084 1084   xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1085 1085   var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken);
1086 1086   xhr.onload = function() {
... ... @@ -1102,7 +1102,7 @@
1102 1102  function confirmDeletePost(schoolPage, postObjNum, token) {
1103 1103   if (!confirm('この投稿を削除しますか？\\n削除後は「この投稿は削除されました」と表示されます。')) return;
1104 1104   var xhr = new XMLHttpRequest();
1105 - xhr.open('POST', '/bin/SeitokaiCode/DeletePost?outputSyntax=plain', true);
1181 + xhr.open('POST', '/bin/get/SeitokaiCode/DeletePost?outputSyntax=plain', true);
1106 1106   xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1107 1107   var deletePostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token);
1108 1108   xhr.onload = function() {