Changes for page 学校ページ テンプレート
Last modified by Super Admin on 2026/04/05 18:59
From version 
54.1 
54.1
edited by Super Admin
on 2026/03/15 00:11
on 2026/03/15 00:11
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
-
... ... @@ -304,12 +304,12 @@ 304 304 #set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != '')) 305 305 #if($hasOrgContent) 306 306 #set($canViewOrgChart = true) 307 - #if($visibilityOrgChart == ' members' && $isGuest) #set($canViewOrgChart = false)308 - #elseif($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #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) 309 309 #end 310 310 #if($canViewOrgChart) 311 311 <div class="seitokai-subsection"> 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="M1721v-2a44000-4-4H5a4 4 0 00-44v2"/><circlecx="9"cy="7"r="4"/><path d="M23 21v-2a4 4000-3-3.87"/><pathd="M16 3.13a4 40010 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>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 == '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> 313 313 <div class="seitokai-subsection-content"> 314 314 #if($orgChartImage && $orgChartImage != '') 315 315 <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div> ... ... @@ -318,7 +318,7 @@ 318 318 </div> 319 319 </div> 320 320 #else 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>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 == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div> 322 322 #end 323 323 #end 324 324 ... ... @@ -384,12 +384,12 @@ 384 384 #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != '')) 385 385 #if($hasBudget) 386 386 #set($canViewBudget = true) 387 - #if($visibilityBudget == ' members' && $isGuest) #set($canViewBudget = false)388 - #elseif($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #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) 389 389 #end 390 390 #if($canViewBudget) 391 391 <div class="seitokai-subsection"> 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="M1721v-2a44000-4-4H5a4 4 0 00-44v2"/><circlecx="9"cy="7"r="4"/><path d="M23 21v-2a4 4000-3-3.87"/><pathd="M16 3.13a4 40010 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>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 == '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> 393 393 <div class="seitokai-subsection-content"> 394 394 #if($budgetProcess && !$budgetProcess.isEmpty()) 395 395 <div class="info-row"> ... ... @@ -433,7 +433,7 @@ 433 433 </div> 434 434 </div> 435 435 #else 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>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 == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div> 437 437 #end 438 438 #end 439 439 ... ... @@ -440,12 +440,12 @@ 440 440 ## --- 校則の見直し --- 441 441 #if($ruleReviewStatus && $ruleReviewStatus != '') 442 442 #set($canViewRuleReview = true) 443 - #if($visibilityRuleReview == ' members' && $isGuest) #set($canViewRuleReview = false)444 - #elseif($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #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) 445 445 #end 446 446 #if($canViewRuleReview) 447 447 <div class="seitokai-subsection"> 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="M1721v-2a44000-4-4H5a4 4 0 00-44v2"/><circlecx="9"cy="7"r="4"/><path d="M23 21v-2a4 4000-3-3.87"/><pathd="M16 3.13a4 40010 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>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 == '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> 449 449 <div class="seitokai-subsection-content"> 450 450 <div class="info-row"> 451 451 <span class="info-label">見直しの有無（3年以内）</span> ... ... @@ -496,7 +496,7 @@ 496 496 </div> 497 497 </div> 498 498 #else 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>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 == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div> 500 500 #end 501 501 #end 502 502 ... ... @@ -503,18 +503,18 @@ 503 503 ## --- 生徒会の課題意識 --- 504 504 #if($challenges && $challenges != '') 505 505 #set($canViewChallenges = true) 506 - #if($visibilityChallenges == ' members' && $isGuest) #set($canViewChallenges = false)507 - #elseif($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #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) 508 508 #end 509 509 #if($canViewChallenges) 510 510 <div class="seitokai-subsection"> 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="M1721v-2a44000-4-4H5a4 4 0 00-44v2"/><circlecx="9"cy="7"r="4"/><path d="M23 21v-2a4 4000-3-3.87"/><pathd="M16 3.13a4 40010 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>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 == '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> 512 512 <div class="seitokai-subsection-content"> 513 513 <div class="challenge-text">$!escapetool.xml($challenges)</div> 514 514 </div> 515 515 </div> 516 516 #else 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>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 == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div> 518 518 #end 519 519 #end 520 520 ... ... @@ -541,33 +541,8 @@ 541 541 ## --- ⑩ 活動報告一覧（スレッド型・年度タブ付き） --- 542 542 = 活動報告 = 543 543 544 -## --- 投稿者ステータス凡例 （折りたたみ）---544 +## --- 年度タブ + 投稿者ステータス凡例 --- 545 545 {{html clean="false"}} 546 -<div class="author-legend-wrapper"> 547 - <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> 548 - <div class="author-legend-body"> 549 - <div class="author-legend"> 550 - <span class="author-legend-title">投稿者の信頼度:</span> 551 - <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者</span> 552 - <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み</span> 553 - <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介</span> 554 - <span class="author-legend-item"><span class="bar bar-general"></span> 一般（未承認）</span> 555 - </div> 556 - <div class="author-legend"> 557 - <span class="author-legend-title">所属:</span> 558 - <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> 559 - <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> 560 - <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> 561 - <span class="author-legend-item text-hint">※一般アカウントは所属未確認のため非表示</span> 562 - </div> 563 - <div class="author-legend"> 564 - <span class="author-legend-title">役割:</span> 565 - <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> 566 - <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> 567 - <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> 568 - </div> 569 - </div> 570 -</div> 571 571 572 572 ## --- 年度タブ --- 573 573 ## 全活動から年度一覧を収集 ... ... @@ -589,14 +589,48 @@ 589 589 #end 590 590 ## ソート（降順にしたいが Velocity にはないので JS で制御） 591 591 592 -<div class="activity-fy-tabs"> 593 - <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button> 594 - #foreach($fy in $fySet) 595 - #if($fy != $currentFYStr) 596 - <button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button> 567 +<div class="activity-toolbar"> 568 + <div class="activity-fy-tabs"> 569 + <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button> 570 + #foreach($fy in $fySet) 571 + #if($fy != $currentFYStr) 572 + <button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button> 573 + #end 597 597 #end 598 - #end 599 - <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button> 575 + <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button> 576 + </div> 577 + <div class="activity-toolbar-right"> 578 + <button class="btn-view-toggle" id="btnViewToggle" onclick="toggleCompactView()" title="タイトルのみ表示"> 579 + <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> 580 + <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> 581 + <span class="toggle-label">一覧表示</span> 582 + </button> 583 + </div> 584 + <div class="author-legend-wrapper"> 585 + <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> 586 + <div class="author-legend-body"> 587 + <div class="author-legend"> 588 + <span class="author-legend-title">投稿者の信頼度:</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> 593 + </div> 594 + <div class="author-legend"> 595 + <span class="author-legend-title">所属:</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> 600 + </div> 601 + <div class="author-legend"> 602 + <span class="author-legend-title">役割:</span> 603 + <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> 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> 605 + <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> 606 + </div> 607 + </div> 608 + </div> 600 600 </div> 601 601 602 602 {{/html}} ... ... @@ -663,6 +663,12 @@ 663 663 <div class="activity-thread-title"> 664 664 <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> 665 665 <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span> 675 + #set($actTagsList = $activity.getValue('tags')) 676 + #if($actTagsList && !$actTagsList.isEmpty()) 677 + #foreach($tagItem in $actTagsList) 678 + #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end 679 + #end 680 + #end 666 666 </div> 667 667 <div class="thread-meta-row"> 668 668 <span class="thread-post-count">${reportCount}件の報告 ・ ${commentCount}件のコメント</span> ... ... @@ -724,12 +724,12 @@ 724 724 #set($postVis = $!post.getValue('visibility')) 725 725 #if(!$postVis || $postVis == '') #set($postVis = 'public') #end 726 726 #set($canViewPost = true) 727 - #if($postVis == ' members' && $isGuest) #set($canViewPost = false)728 - #elseif($postVis == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #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) 729 729 #end 730 730 #if(!$canViewPost) 731 731 <div class="thread-post visibility-restricted-post"> 732 - <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>747 + <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> 733 733 </div> 734 734 #else 735 735 ## 投稿者のアカウント種別に基づいたCSSクラス ... ... @@ -861,7 +861,7 @@ 861 861 #end 862 862 </div> 863 863 #if($postVis != 'public') 864 - <div class="visibility-badge visibility-${postVis} post-action-mt">#if($postVis == ' members')<svg class="ico" viewBox="0 0 24 24"><path d="M1721v-2a44000-4-4H5a4 4 0 00-44v2"/><circlecx="9"cy="7"r="4"/><path d="M23 21v-2a4 4000-3-3.87"/><pathd="M16 3.13a4 40010 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>879 + <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> 865 865 #end 866 866 ## 固定/解除ボタン（承認済み・管理者のみ） 867 867 #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified') ... ... @@ -975,6 +975,35 @@ 975 975 ## --- 年度タブ切り替え JavaScript --- 976 976 {{html clean="false"}} 977 977 <script> 993 +// コンパクト表示（タイトルのみ）トグル 994 +function toggleCompactView() { 995 + var container = document.querySelector('.xwiki-content') || document.body; 996 + var isCompact = container.classList.toggle('activity-compact-view'); 997 + var btn = document.getElementById('btnViewToggle'); 998 + if (btn) { 999 + btn.querySelector('.toggle-label').textContent = isCompact ? '詳細表示' : '一覧表示'; 1000 + btn.title = isCompact ? '詳細表示に戻す' : 'タイトルのみ表示'; 1001 + } 1002 + // コンパクトモードでは各スレッドヘッダーをクリックで個別展開可能にする 1003 + document.querySelectorAll('.activity-thread').forEach(function(thread) { 1004 + if (isCompact) { 1005 + thread.classList.remove('compact-expanded'); 1006 + } 1007 + }); 1008 +} 1009 + 1010 +// コンパクトモードで個別スレッドを展開/折りたたみ 1011 +function toggleThreadExpand(e) { 1012 + var container = document.querySelector('.xwiki-content') || document.body; 1013 + if (!container.classList.contains('activity-compact-view')) return; 1014 + // リンクやボタンのクリックはスルー 1015 + if (e.target.closest('a, button, .btn-featured-toggle')) return; 1016 + var thread = e.target.closest('.activity-thread'); 1017 + if (thread) { 1018 + thread.classList.toggle('compact-expanded'); 1019 + } 1020 +} 1021 + 978 978 function switchActivityFY(fy, btn) { 979 979 // タブのアクティブ状態を切り替え 980 980 document.querySelectorAll('.activity-fy-tab').forEach(function(t) { t.classList.remove('active'); }); ... ... @@ -1001,6 +1001,29 @@ 1001 1001 window.history.replaceState({}, document.title, window.location.pathname); 1002 1002 } 1003 1003 } 1048 + // コンパクトモード: スレッドヘッダークリックで個別展開 1049 + document.querySelectorAll('.activity-thread-header').forEach(function(header) { 1050 + header.addEventListener('click', toggleThreadExpand); 1051 + }); 1052 + // 長文投稿の折りたたみ初期化 1053 + document.querySelectorAll('.thread-post-body').forEach(function(body) { 1054 + // 先にtruncatedを仮適用してline-clampを有効にし、高さの差分で判定 1055 + var fullH = body.scrollHeight; 1056 + body.classList.add('truncated'); 1057 + var clampedH = body.clientHeight; 1058 + body.classList.remove('truncated'); 1059 + if (fullH > clampedH + 10) { 1060 + body.classList.add('truncated'); 1061 + var btn = document.createElement('button'); 1062 + btn.className = 'btn-read-more'; 1063 + btn.textContent = '広げて読む ▼'; 1064 + btn.addEventListener('click', function() { 1065 + var isExpanded = body.classList.toggle('expanded'); 1066 + btn.textContent = isExpanded ? '折りたたむ ▲' : '広げて読む ▼'; 1067 + }); 1068 + body.parentNode.insertBefore(btn, body.nextSibling); 1069 + } 1070 + }); 1004 1004 }); 1005 1005 1006 1006 // トースト通知表示 ... ... @@ -1063,7 +1063,7 @@ 1063 1063 var csrfEl = document.querySelector('input[name="form_token"]'); 1064 1064 var csrfToken = csrfEl ? csrfEl.value : ''; 1065 1065 var xhr = new XMLHttpRequest(); 1066 - xhr.open('POST', '/bin/SeitokaiCode/EditPost?outputSyntax=plain', true); 1133 + xhr.open('POST', '/bin/get/SeitokaiCode/EditPost?outputSyntax=plain', true); 1067 1067 xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'); 1068 1068 var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken); 1069 1069 xhr.onload = function() { ... ... @@ -1085,7 +1085,7 @@ 1085 1085 function confirmDeletePost(schoolPage, postObjNum, token) { 1086 1086 if (!confirm('この投稿を削除しますか？\\n削除後は「この投稿は削除されました」と表示されます。')) return; 1087 1087 var xhr = new XMLHttpRequest(); 1088 - xhr.open('POST', '/bin/SeitokaiCode/DeletePost?outputSyntax=plain', true); 1155 + xhr.open('POST', '/bin/get/SeitokaiCode/DeletePost?outputSyntax=plain', true); 1089 1089 xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'); 1090 1090 var deletePostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token); 1091 1091 xhr.onload = function() {