Skip to Content
Last modified by Super Admin on 2026/04/05 18:59
From version Icon 67.1 Icon
edited by Super Admin
on 2026/03/18 11:26
Change comment: There is no comment for this version
To version Icon 55.1 Icon
edited by Super Admin
on 2026/03/15 01:20
Change comment: There is no comment for this version

Summary

Details

Icon 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,12 +330,12 @@
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 == 'members' && $isGuest) #set($canViewOrgChart = false)
308 + #elseif($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewOrgChart = false)
335 335   #end
336 336   #if($canViewOrgChart)
337 337   <div class="seitokai-subsection">
338 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/><line x1="9" y1="10" x2="9" y2="10.01"/><line x1="15" y1="10" x2="15" y2="10.01"/><line x1="9" y1="14" x2="9" y2="14.01"/><line x1="15" y1="14" x2="15" y2="14.01"/></svg> 組織図 #if($visibilityOrgChart != 'public')<span class="visibility-badge visibility-${visibilityOrgChart}">#if($visibilityOrgChart == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認者限定#else<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> 校内限定#end</span>#end</h3>
312 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/><line x1="9" y1="10" x2="9" y2="10.01"/><line x1="15" y1="10" x2="15" y2="10.01"/><line x1="9" y1="14" x2="9" y2="14.01"/><line x1="15" y1="14" x2="15" y2="14.01"/></svg> 組織図 #if($visibilityOrgChart != 'public')<span class="visibility-badge visibility-${visibilityOrgChart}">#if($visibilityOrgChart == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<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> 校内限定#end</span>#end</h3>
339 339   <div class="seitokai-subsection-content">
340 340   #if($orgChartImage && $orgChartImage != '')
341 341   <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
... ... @@ -344,7 +344,7 @@
344 344   </div>
345 345   </div>
346 346   #else
347 - <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 組織図は #if($visibilityOrgChart == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
321 + <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 組織図は #if($visibilityOrgChart == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
348 348   #end
349 349   #end
350 350  
... ... @@ -410,12 +410,12 @@
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 == 'members' && $isGuest) #set($canViewBudget = false)
388 + #elseif($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewBudget = false)
415 415   #end
416 416   #if($canViewBudget)
417 417   <div class="seitokai-subsection">
418 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><line x1="12" y1="1" x2="12" y2="23"/><path d="M17 5H9.5a3.5 3.5 0 000 7h5a3.5 3.5 0 010 7H6"/></svg> 予算 #if($visibilityBudget != 'public')<span class="visibility-badge visibility-${visibilityBudget}">#if($visibilityBudget == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認者限定#else<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> 校内限定#end</span>#end</h3>
392 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><line x1="12" y1="1" x2="12" y2="23"/><path d="M17 5H9.5a3.5 3.5 0 000 7h5a3.5 3.5 0 010 7H6"/></svg> 予算 #if($visibilityBudget != 'public')<span class="visibility-badge visibility-${visibilityBudget}">#if($visibilityBudget == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<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> 校内限定#end</span>#end</h3>
419 419   <div class="seitokai-subsection-content">
420 420   #if($budgetProcess && !$budgetProcess.isEmpty())
421 421   <div class="info-row">
... ... @@ -459,7 +459,7 @@
459 459   </div>
460 460   </div>
461 461   #else
462 - <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 予算情報は #if($visibilityBudget == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
436 + <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 予算情報は #if($visibilityBudget == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
463 463   #end
464 464   #end
465 465  
... ... @@ -466,12 +466,12 @@
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 == 'members' && $isGuest) #set($canViewRuleReview = false)
444 + #elseif($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewRuleReview = false)
471 471   #end
472 472   #if($canViewRuleReview)
473 473   <div class="seitokai-subsection">
474 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M16 4h2a2 2 0 012 2v12a2 2 0 01-2 2h-2"/><path d="M8 4H6a2 2 0 00-2 2v12a2 2 0 002 2h2"/><line x1="12" y1="4" x2="12" y2="8"/><line x1="12" y1="16" x2="12" y2="20"/><line x1="8" y1="8" x2="16" y2="8"/><line x1="8" y1="16" x2="16" y2="16"/></svg> 校則の見直し #if($visibilityRuleReview != 'public')<span class="visibility-badge visibility-${visibilityRuleReview}">#if($visibilityRuleReview == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認者限定#else<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> 校内限定#end</span>#end</h3>
448 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M16 4h2a2 2 0 012 2v12a2 2 0 01-2 2h-2"/><path d="M8 4H6a2 2 0 00-2 2v12a2 2 0 002 2h2"/><line x1="12" y1="4" x2="12" y2="8"/><line x1="12" y1="16" x2="12" y2="20"/><line x1="8" y1="8" x2="16" y2="8"/><line x1="8" y1="16" x2="16" y2="16"/></svg> 校則の見直し #if($visibilityRuleReview != 'public')<span class="visibility-badge visibility-${visibilityRuleReview}">#if($visibilityRuleReview == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<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> 校内限定#end</span>#end</h3>
475 475   <div class="seitokai-subsection-content">
476 476   <div class="info-row">
477 477   <span class="info-label">見直しの有無（3年以内）</span>
... ... @@ -522,7 +522,7 @@
522 522   </div>
523 523   </div>
524 524   #else
525 - <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 校則の見直し情報は #if($visibilityRuleReview == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
499 + <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 校則の見直し情報は #if($visibilityRuleReview == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
526 526   #end
527 527   #end
528 528  
... ... @@ -529,18 +529,18 @@
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 == 'members' && $isGuest) #set($canViewChallenges = false)
507 + #elseif($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewChallenges = false)
534 534   #end
535 535   #if($canViewChallenges)
536 536   <div class="seitokai-subsection">
537 - <h3 class="seitokai-subsection-title"><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> 生徒会の課題意識 #if($visibilityChallenges != 'public')<span class="visibility-badge visibility-${visibilityChallenges}">#if($visibilityChallenges == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認者限定#else<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> 校内限定#end</span>#end</h3>
511 + <h3 class="seitokai-subsection-title"><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> 生徒会の課題意識 #if($visibilityChallenges != 'public')<span class="visibility-badge visibility-${visibilityChallenges}">#if($visibilityChallenges == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<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> 校内限定#end</span>#end</h3>
538 538   <div class="seitokai-subsection-content">
539 539   <div class="challenge-text">$!escapetool.xml($challenges)</div>
540 540   </div>
541 541   </div>
542 542   #else
543 - <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 課題情報は #if($visibilityChallenges == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
517 + <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 課題情報は #if($visibilityChallenges == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
544 544   #end
545 545   #end
546 546  
... ... @@ -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">
... ... @@ -698,12 +698,6 @@
698 698   <div class="activity-thread-title">
699 699   <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>
700 700   <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
707 707   </div>
708 708   <div class="thread-meta-row">
709 709   <span class="thread-post-count">${reportCount}件の報告 ・ ${commentCount}件のコメント</span>
... ... @@ -765,12 +765,12 @@
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)
729 + #if($postVis == 'members' && $isGuest) #set($canViewPost = false)
730 + #elseif($postVis == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewPost = false)
770 770   #end
771 771   #if(!$canViewPost)
772 772   <div class="thread-post visibility-restricted-post">
773 - <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> この投稿は #if($postVis == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
734 + <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> この投稿は #if($postVis == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
774 774   </div>
775 775   #else
776 776   ## 投稿者のアカウント種別に基づいたCSSクラス
... ... @@ -811,7 +811,7 @@
811 811   #end
812 812   ## 所属バッジ（投稿者の学校コードとページの学校コードを比較）
813 813   #if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general')
814 - #if($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode))
775 + #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
... ... @@ -902,7 +902,7 @@
902 902   #end
903 903   </div>
904 904   #if($postVis != 'public')
905 - <div class="visibility-badge visibility-${postVis} post-action-mt">#if($postVis == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認者限定#else<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> 校内限定#end</div>
866 + <div class="visibility-badge visibility-${postVis} post-action-mt">#if($postVis == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<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> 校内限定#end</div>
906 906   #end
907 907   ## 固定/解除ボタン（承認済み・管理者のみ）
908 908   #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
... ... @@ -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,29 +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 - // 長文投稿の折りたたみ初期化
1079 - document.querySelectorAll('.thread-post-body').forEach(function(body) {
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 * 1.3 + 20) {
1086 - body.classList.add('truncated');
1087 - var btn = document.createElement('button');
1088 - btn.className = 'btn-read-more';
1089 - btn.textContent = '広げて読む ▼';
1090 - btn.addEventListener('click', function() {
1091 - var isExpanded = body.classList.toggle('expanded');
1092 - btn.textContent = isExpanded ? '折りたたむ ▲' : '広げて読む ▼';
1093 - });
1094 - body.parentNode.insertBefore(btn, body.nextSibling);
1095 - }
1096 - });
1097 1097  });
1098 1098  
1099 1099  // トースト通知表示
... ... @@ -1156,7 +1156,7 @@
1156 1156   var csrfEl = document.querySelector('input[name="form_token"]');
1157 1157   var csrfToken = csrfEl ? csrfEl.value : '';
1158 1158   var xhr = new XMLHttpRequest();
1159 - xhr.open('POST', '/bin/get/SeitokaiCode/EditPost?outputSyntax=plain', true);
1068 + xhr.open('POST', '/bin/SeitokaiCode/EditPost?outputSyntax=plain', true);
1160 1160   xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1161 1161   var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken);
1162 1162   xhr.onload = function() {
... ... @@ -1178,7 +1178,7 @@
1178 1178  function confirmDeletePost(schoolPage, postObjNum, token) {
1179 1179   if (!confirm('この投稿を削除しますか？\\n削除後は「この投稿は削除されました」と表示されます。')) return;
1180 1180   var xhr = new XMLHttpRequest();
1181 - xhr.open('POST', '/bin/get/SeitokaiCode/DeletePost?outputSyntax=plain', true);
1090 + xhr.open('POST', '/bin/SeitokaiCode/DeletePost?outputSyntax=plain', true);
1182 1182   xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1183 1183   var deletePostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token);
1184 1184   xhr.onload = function() {