Changes for page 学校ページ テンプレート
Last modified by Super Admin on 2026/04/05 18:59
From version 
98.1 
98.1
edited by Super Admin
on 2026/03/20 18:16
on 2026/03/20 18:16
Change comment:
There is no comment for this version
To version 111.1
111.1
edited by Super Admin
on 2026/03/24 21:32
on 2026/03/24 21:32
Change comment:
There is no comment for this version
Summary
Details
-
Page properties
-
- Content
-
... ... @@ -7,6 +7,19 @@ 7 7 #stop 8 8 #end 9 9 {{html clean="false"}} 10 +## --- OGP メタタグ（SNSシェア対応） --- 11 +#set($ogTitle = "$!{schoolName} — 生徒会Wiki") 12 +#set($ogDesc = "$!{schoolName}の生徒会活動情報。全国の高校の生徒会活動事例を集積・共有するプラットフォーム。") 13 +#set($ogUrl = "https://${request.serverName}${doc.getURL('view')}") 14 +<meta property="og:type" content="article" /> 15 +<meta property="og:title" content="$escapetool.xml($ogTitle)" /> 16 +<meta property="og:description" content="$escapetool.xml($ogDesc)" /> 17 +<meta property="og:url" content="$escapetool.xml($ogUrl)" /> 18 +<meta property="og:site_name" content="生徒会Wiki" /> 19 +<meta property="og:locale" content="ja_JP" /> 20 +<meta name="twitter:card" content="summary" /> 21 +<meta name="twitter:title" content="$escapetool.xml($ogTitle)" /> 22 +<meta name="twitter:description" content="$escapetool.xml($ogDesc)" /> 10 10 ## メンテナンスバナー（{{include}}ではなくインラインで記述し、<p>タグ挿入を回避） 11 11 #set($bannerDoc = $xwiki.getDocument('SeitokaiAdmin.MaintenanceBanner')) 12 12 #set($bannerObj = $bannerDoc.getObject('SeitokaiCode.MaintenanceBannerClass')) ... ... @@ -145,6 +145,7 @@ 145 145 #set($isGuest = $viewerUser == 'XWiki.XWikiGuest') 146 146 #set($isViewerAdmin = false) 147 147 #set($viewerSchoolCode = '') 161 +#set($viewerSecondaryGraduated = false) 148 148 #if(!$isGuest) 149 149 #set($viewerDoc = $xwiki.getDocument($viewerUser)) 150 150 #set($viewerAccountType = $!viewerDoc.getValue('accountType')) ... ... @@ -154,6 +154,24 @@ 154 154 #if($viewerAccountType == 'admin') 155 155 #set($isViewerAdmin = true) 156 156 #end 171 + ## 第2所属校の在学年数超過チェック 172 + #set($viewerSecEnrollYear = $!viewerDoc.getValue('secondaryEnrollmentYear')) 173 + #if($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecEnrollYear && $viewerSecEnrollYear != '') 174 + #set($vNow = $datetool.date) 175 + #set($vCurYear = $mathtool.toInteger($datetool.format('yyyy', $vNow))) 176 + #set($vCurMonth = $mathtool.toInteger($datetool.format('MM', $vNow))) 177 + #if($vCurMonth >= 4)#set($vSchoolYear = $vCurYear)#else#set($vSchoolYear = $mathtool.sub($vCurYear, 1))#end 178 + #set($vSecEnroll = $mathtool.toInteger($viewerSecEnrollYear)) 179 + #set($vSecMax = 3) 180 + #if($viewerSecondarySchoolCode.length() >= 2) 181 + #set($vSecType = $viewerSecondarySchoolCode.substring(0, 2)) 182 + #if($vSecType == 'C2')#set($vSecMax = 9)#elseif($vSecType == 'D2')#set($vSecMax = 6)#end 183 + #end 184 + #set($vSecGrade = $mathtool.add($mathtool.sub($vSchoolYear, $vSecEnroll), 1)) 185 + #if($vSecGrade > $vSecMax) 186 + #set($viewerSecondaryGraduated = true) 187 + #end 188 + #end 157 157 #end 158 158 159 159 ## --- 関連校（中高一貫校）情報 --- ... ... @@ -163,7 +163,7 @@ 163 163 #if($affiliatedSchoolCode && $affiliatedSchoolCode != '') 164 164 #if($viewerSchoolCode == $affiliatedSchoolCode) 165 165 #set($isAffiliated = true) 166 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode) 198 + #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode && !$viewerSecondaryGraduated) 167 167 #set($isAffiliated = true) 168 168 #end 169 169 #end ... ... @@ -173,7 +173,7 @@ 173 173 #if(!$isGuest && $viewerUserRole != 'graduate') 174 174 #if($viewerSchoolCode == $schoolCode || $isAffiliated) 175 175 #set($isSchoolMember = true) 176 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode) 208 + #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode && !$viewerSecondaryGraduated) 177 177 #set($isSchoolMember = true) 178 178 #end 179 179 #end ... ... @@ -377,6 +377,106 @@ 377 377 </div> 378 378 #end 379 379 412 +## --- 入力進捗ガイド（自校ユーザー向け） --- 413 +#if(!$isGuest && $canEdit) 414 + #set($stepItems = []) 415 + #set($completedCount = 0) 416 + #set($totalSteps = 8) 417 + ## 1. 基本情報（生徒数） 418 + #if($studentCount && $studentCount != '' && $studentCount != '0') 419 + #set($discard = $stepItems.add({'name': '基本情報（生徒数・学級数）', 'done': true})) 420 + #set($completedCount = $completedCount + 1) 421 + #else 422 + #set($discard = $stepItems.add({'name': '基本情報（生徒数・学級数）', 'done': false})) 423 + #end 424 + ## 2. 生徒会組織 425 + #if($orgChart && $orgChart != '') 426 + #set($discard = $stepItems.add({'name': '生徒会組織', 'done': true})) 427 + #set($completedCount = $completedCount + 1) 428 + #else 429 + #set($discard = $stepItems.add({'name': '生徒会組織', 'done': false})) 430 + #end 431 + ## 3. 日常の活動 432 + #if($dailyActivities && $dailyActivities != '') 433 + #set($discard = $stepItems.add({'name': '日常の活動', 'done': true})) 434 + #set($completedCount = $completedCount + 1) 435 + #else 436 + #set($discard = $stepItems.add({'name': '日常の活動', 'done': false})) 437 + #end 438 + ## 4. 生徒総会 439 + #if($assemblyFormat && $assemblyFormat != '') 440 + #set($discard = $stepItems.add({'name': '生徒総会', 'done': true})) 441 + #set($completedCount = $completedCount + 1) 442 + #else 443 + #set($discard = $stepItems.add({'name': '生徒総会', 'done': false})) 444 + #end 445 + ## 5. 選挙 446 + #if($electionExists && $electionExists != '') 447 + #set($discard = $stepItems.add({'name': '選挙', 'done': true})) 448 + #set($completedCount = $completedCount + 1) 449 + #else 450 + #set($discard = $stepItems.add({'name': '選挙', 'done': false})) 451 + #end 452 + ## 6. 校則の見直し 453 + #if($ruleReviewStatus && $ruleReviewStatus != '') 454 + #set($discard = $stepItems.add({'name': '校則・生徒会会則の見直し', 'done': true})) 455 + #set($completedCount = $completedCount + 1) 456 + #else 457 + #set($discard = $stepItems.add({'name': '校則・生徒会会則の見直し', 'done': false})) 458 + #end 459 + ## 7. 予算 460 + #set($budgetFilled = false) 461 + #if(($budgetScale && $budgetScale != '') || ($studentFee && $studentFee != '')) #set($budgetFilled = true) #end 462 + #if($budgetFilled) 463 + #set($discard = $stepItems.add({'name': '予算', 'done': true})) 464 + #set($completedCount = $completedCount + 1) 465 + #else 466 + #set($discard = $stepItems.add({'name': '予算', 'done': false})) 467 + #end 468 + ## 8. 活動報告 469 + #set($activityCount = $doc.getObjects('SeitokaiCode.ActivityClass').size()) 470 + #if($activityCount > 0) 471 + #set($discard = $stepItems.add({'name': '活動報告', 'done': true})) 472 + #set($completedCount = $completedCount + 1) 473 + #else 474 + #set($discard = $stepItems.add({'name': '活動報告（まだ投稿がありません）', 'done': false})) 475 + #end 476 + ## 全完了なら非表示 477 + #if($completedCount < $totalSteps) 478 + #set($progressPct = $mathtool.mul($mathtool.div($completedCount, $totalSteps), 100)) 479 + #set($progressPctInt = $mathtool.toInteger($progressPct)) 480 + #set($firstMissing = false) 481 +<div class="progress-guide" style="margin-bottom:var(--sp-4);"> 482 + <div class="progress-guide-header"> 483 + <span class="progress-guide-title"><svg class="ico" viewBox="0 0 24 24" style="width:1.1em;height:1.1em;vertical-align:-2px;"><circle cx="12" cy="12" r="10"/><polyline points="12 6 12 12 16 14"/></svg> 学校情報の入力状況</span> 484 + <span class="progress-guide-count">${completedCount} / ${totalSteps} 完了</span> 485 + </div> 486 + <div class="progress-bar-track"> 487 + <div class="progress-bar-fill" style="width:${progressPctInt}%"></div> 488 + </div> 489 + <ul class="progress-step-list"> 490 + #foreach($step in $stepItems) 491 + #if($step.done) 492 + <li class="progress-step done"><svg class="ico" viewBox="0 0 24 24" style="width:0.9em;height:0.9em;"><path d="M20 6L9 17l-5-5"/></svg> $step.name</li> 493 + #else 494 + #if(!$firstMissing) 495 + <li class="progress-step next"><svg class="ico" viewBox="0 0 24 24" style="width:0.9em;height:0.9em;"><circle cx="12" cy="12" r="10"/></svg> $step.name <span class="progress-next-label">← 次はここ！</span></li> 496 + #set($firstMissing = true) 497 + #else 498 + <li class="progress-step pending"><svg class="ico" viewBox="0 0 24 24" style="width:0.9em;height:0.9em;"><rect x="3" y="3" width="18" height="18" rx="2"/></svg> $step.name</li> 499 + #end 500 + #end 501 + #end 502 + </ul> 503 + <div style="margin-top:var(--sp-3);"> 504 + <a href="$doc.getURL('view', 'sheet=SeitokaiCode.SchoolEditForm')" class="btn-primary-sm"> 505 + <svg class="ico" viewBox="0 0 24 24" style="width:0.9em;height:0.9em;"><path d="M11 4H4a2 2 0 00-2 2v14a2 2 0 002 2h14a2 2 0 002-2v-7"/><path d="M18.5 2.5a2.121 2.121 0 013 3L12 15l-4 1 1-4 9.5-9.5z"/></svg> 編集画面を開く 506 + </a> 507 + </div> 508 +</div> 509 + #end 510 +#end 511 + 380 380 ## --- ① 学校基本情報 --- 381 381 <div class="school-info-card collapsed" id="card-basic-info"> 382 382 <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> ... ... @@ -433,6 +433,123 @@ 433 433 #end 434 434 #end 435 435 568 + ## --- 活動環境 --- 569 + #set($hasActivityEnv = ($activityPlace && !$activityPlace.isEmpty()) || ($activityRoomEquipment && $activityRoomEquipment != '') || ($activityRoomImage && $activityRoomImage != '') || ($ictTools && !$ictTools.isEmpty()) || ($ictUsage && !$ictUsage.isEmpty())) 570 + #if($hasActivityEnv) 571 + #set($canViewAE = true) 572 + #if($visibilityActivityEnv == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAE = false) 573 + #elseif($visibilityActivityEnv == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAE = false) 574 + #end 575 + #if($canViewAE) 576 + <div class="seitokai-subsection"> 577 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M3 9l9-7 9 7v11a2 2 0 01-2 2H5a2 2 0 01-2-2z"/><polyline points="9 22 9 12 15 12 15 22"/></svg> 生徒会の活動環境 #if($visibilityActivityEnv != '' && $visibilityActivityEnv != 'public')<span class="visibility-badge visibility-${visibilityActivityEnv}">#if($visibilityActivityEnv == '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> 578 + <div class="seitokai-subsection-content"> 579 + #if($activityPlace && !$activityPlace.isEmpty()) 580 + <div class="info-row"> 581 + <span class="info-label">普段の活動場所</span> 582 + <span class="info-value"> 583 + <div class="selection-display"> 584 + #foreach($ap in $activityPlace) 585 + <span class="selection-item">$!escapetool.xml($ap.trim())</span> 586 + #end 587 + </div> 588 + </span> 589 + </div> 590 + #end 591 + #if($activityRoomEquipment && $activityRoomEquipment != '') 592 + <div class="info-row"> 593 + <span class="info-label">生徒会室の設備</span> 594 + <span class="info-value free-text-value">$!escapetool.xml($activityRoomEquipment)</span> 595 + </div> 596 + #end 597 + #if($activityRoomImage && $activityRoomImage != '') 598 + <div class="info-row"> 599 + <span class="info-label">活動場所の写真</span> 600 + <span class="info-value"><div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($activityRoomImage)" alt="活動場所の写真" class="org-chart-img" /></div></span> 601 + </div> 602 + #end 603 + #if($ictTools && !$ictTools.isEmpty()) 604 + <div class="info-row"> 605 + <span class="info-label">利用しているICTツール</span> 606 + <span class="info-value"> 607 + #set($ictCatDisplay = [ 608 + ["連絡ツール", ["メール","LINE","LINE WORKS","Discord","Slack","Microsoft Teams","Google Chat","InstagramのDM","XのDM","その他（連絡）"]], 609 + ["ドキュメント作成・共有", ["Googleドキュメント","Googleスプレッドシート","Googleスライド","Googleドライブ","Word","Excel","PowerPoint","OneDrive","SharePoint","Notion","Pages","Numbers","Keynote","Dropbox","Box","その他（ドキュメント）"]], 610 + ["タスク管理", ["Googleカレンダー","Google ToDoリスト","Trello","Asana","Excel等スプレッドシート","その他（タスク管理）"]], 611 + ["ビデオ会議ツール", ["Zoom","Google Meet","その他（ビデオ会議）"]], 612 + ["アンケート", ["Googleフォーム","Microsoft Forms","その他（アンケート）"]], 613 + ["デザイン・クリエイティブ", ["Canva","各種Adobe","CapCut","LumaFusion","AviUtl","ibisPaint","その他（デザイン）"]], 614 + ["その他", ["独自のWebシステム・自作アプリ"]] 615 + ]) 616 + #foreach($catD in $ictCatDisplay) 617 + #set($catHasItems = false) 618 + #foreach($t in $catD.get(1)) 619 + #if($ictTools.contains($t)) #set($catHasItems = true) #end 620 + #end 621 + #if($catHasItems) 622 + <div style="margin-bottom:6px"> 623 + <span style="font-size:0.8em;font-weight:600;color:var(--text-mid)">$catD.get(0):</span> 624 + <div class="selection-display" style="margin-top:2px"> 625 + #foreach($t in $catD.get(1)) 626 + #if($ictTools.contains($t)) 627 + <span class="selection-item">$!escapetool.xml($t)</span> 628 + #end 629 + #end 630 + </div> 631 + </div> 632 + #end 633 + #end 634 + </span> 635 + </div> 636 + #end 637 + #if($ictUsage && !$ictUsage.isEmpty()) 638 + <div class="info-row"> 639 + <span class="info-label">ICT活用している場面</span> 640 + <span class="info-value"> 641 + <div class="selection-display"> 642 + #foreach($iu in $ictUsage) 643 + <span class="selection-item">$!escapetool.xml($iu.trim())</span> 644 + #end 645 + </div> 646 + </span> 647 + </div> 648 + #end 649 + </div> 650 + </div> 651 + #else 652 + <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($visibilityActivityEnv == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div> 653 + #end 654 + #end 655 + 656 + ## --- 年間主要行事 --- 657 + #set($months = [["4月", $eventApril], ["5月", $eventMay], ["6月", $eventJune], ["7月", $eventJuly], ["8月", $eventAugust], ["9月", $eventSeptember], ["10月", $eventOctober], ["11月", $eventNovember], ["12月", $eventDecember], ["1月", $eventJanuary], ["2月", $eventFebruary], ["3月", $eventMarch]]) 658 + #set($hasAnyEvent = false) 659 + #foreach($m in $months) 660 + #if($m.get(1) && $m.get(1) != '') #set($hasAnyEvent = true) #end 661 + #end 662 + #if($hasAnyEvent) 663 + #set($canViewAN = true) 664 + #if($visibilityAnnualEvents == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAN = false) 665 + #elseif($visibilityAnnualEvents == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAN = false) 666 + #end 667 + #if($canViewAN) 668 + <div class="seitokai-subsection"> 669 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="4" width="18" height="18" rx="2" ry="2"/><line x1="16" y1="2" x2="16" y2="6"/><line x1="8" y1="2" x2="8" y2="6"/><line x1="3" y1="10" x2="21" y2="10"/></svg> 年間主要行事 #if($visibilityAnnualEvents != '' && $visibilityAnnualEvents != 'public')<span class="visibility-badge visibility-${visibilityAnnualEvents}">#if($visibilityAnnualEvents == '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> 670 + <div class="seitokai-subsection-content"> 671 + <table class="wiki-table school-info-table" style="margin:0"> 672 + #foreach($m in $months) 673 + #if($m.get(1) && $m.get(1) != '') 674 + <tr><td style="width:60px;font-weight:600;white-space:nowrap">$m.get(0)</td><td>$!escapetool.xml($m.get(1))</td></tr> 675 + #end 676 + #end 677 + </table> 678 + </div> 679 + </div> 680 + #else 681 + <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($visibilityAnnualEvents == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div> 682 + #end 683 + #end 684 + 436 436 ## --- 日常の活動 --- 437 437 #if($dailyActivities && !$dailyActivities.isEmpty()) 438 438 #set($canViewDA = true) ... ... @@ -459,36 +459,6 @@ 459 459 #end 460 460 #end 461 461 462 - ## --- 選挙 --- 463 - #if($electionExists && $electionExists != '') 464 - #set($canViewEL = true) 465 - #if($visibilityElection == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewEL = false) 466 - #elseif($visibilityElection == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewEL = false) 467 - #end 468 - #if($canViewEL) 469 - <div class="seitokai-subsection"> 470 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="3" width="18" height="18" rx="2"/><path d="M7 13l3 3 7-7"/></svg> 選挙 #if($visibilityElection != '' && $visibilityElection != 'public')<span class="visibility-badge visibility-${visibilityElection}">#if($visibilityElection == '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> 471 - <div class="seitokai-subsection-content"> 472 - <div class="info-row"> 473 - <span class="info-label">役員選挙</span> 474 - <span class="info-value">$!escapetool.xml($!electionExists)</span> 475 - </div> 476 - #if($electionType && $electionType != '') 477 - <div class="info-row"> 478 - <span class="info-label">直近の選挙方式</span> 479 - <span class="info-value">$!escapetool.xml($!electionType)</span> 480 - </div> 481 - #end 482 - #if($electionNote && $electionNote.trim() != '') 483 - <div class="free-note">$!escapetool.xml($electionNote)</div> 484 - #end 485 - </div> 486 - </div> 487 - #else 488 - <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($visibilityElection == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div> 489 - #end 490 - #end 491 - 492 492 ## --- 定例活動 --- 493 493 #if($meetingFrequency && $meetingFrequency != '') 494 494 #set($canViewMT = true) ... ... @@ -513,68 +513,96 @@ 513 513 #end 514 514 #end 515 515 516 - ## --- 予算---517 - #set($has Budget= ($budgetProcess &&!$budgetProcess.isEmpty()) || ($studentFee&& $studentFee != '') || ($budgetScale && $budgetScale != ''))518 - #if($has Budget)519 - #set($canView Budget= true)520 - #if($visibility Budget== 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewBudget= false)521 - #elseif($visibility Budget== 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget= false)735 + ## --- 生徒総会 --- 736 + #set($hasAssembly = ($assemblyFormat && $assemblyFormat != '') || ($assemblyCount && $assemblyCount > 0) || ($assemblyAgenda && !$assemblyAgenda.isEmpty()) || ($assemblyTopics && !$assemblyTopics.isEmpty()) || ($assemblyNote && $assemblyNote != '')) 737 + #if($hasAssembly) 738 + #set($canViewAS = true) 739 + #if($visibilityAssembly == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAS = false) 740 + #elseif($visibilityAssembly == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAS = false) 522 522 #end 523 - #if($canView Budget)742 + #if($canViewAS) 524 524 <div class="seitokai-subsection"> 525 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24">< linex1="12"y1="1"x2="12"y2="23"/><path d="M175H9.5a3.53.50 000 7h5a3.53.50 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>744 + <h3 class="seitokai-subsection-title"><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> 生徒総会 #if($visibilityAssembly != '' && $visibilityAssembly != 'public')<span class="visibility-badge visibility-${visibilityAssembly}">#if($visibilityAssembly == '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> 526 526 <div class="seitokai-subsection-content"> 527 - #if($ budgetProcess &&!$budgetProcess.isEmpty())746 + #if($assemblyFormat && $assemblyFormat != '') 528 528 <div class="info-row"> 529 - <span class="info-label">作成過程の生徒関与</span> 530 - <span class="info-value"> 531 - <div class="selection-display"> 532 - #set($allBpOpts = ["各部・委員会等への予算希望額調査","予算額調整（折衝等）","生徒会予算案の作成","生徒総会での議決","生徒関与なし","その他"]) 533 - #foreach($bpOpt in $allBpOpts) 534 - #if($budgetProcess.contains($bpOpt)) 535 - <span class="selection-item">$!escapetool.xml($bpOpt)</span> 536 - #else 537 - <span class="selection-item selection-item-off">$!escapetool.xml($bpOpt)</span> 538 - #end 539 - #end 540 - </div> 541 - </span> 748 + <span class="info-label">開催方式</span> 749 + <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($assemblyFormat)</span></span> 542 542 </div> 543 543 #end 544 - #if($s tudentFee&& $studentFee!='')752 + #if($assemblyCount && $assemblyCount > 0) 545 545 <div class="info-row"> 546 - <span class="info-label"> 生徒会費（年額）</span>547 - <span class="info-value">$!escapetool.xml($ !studentFee)</span>754 + <span class="info-label">開催回数（年）</span> 755 + <span class="info-value">$!escapetool.xml($assemblyCount)回</span> 548 548 </div> 549 549 #end 550 - #if($b udgetScale&& $budgetScale != '')758 + #if($assemblyAgenda && !$assemblyAgenda.isEmpty()) 551 551 <div class="info-row"> 552 - <span class="info-label">予算規模</span> 553 - <span class="info-value">$!escapetool.xml($!budgetScale)</span> 760 + <span class="info-label">議案の集め方</span> 761 + <span class="info-value"> 762 + <div class="selection-display"> 763 + #foreach($aa in $assemblyAgenda) 764 + <span class="selection-item">$!escapetool.xml($aa.trim())</span> 765 + #end 766 + </div> 767 + </span> 554 554 </div> 555 555 #end 556 - #if($ budgetAllocation&& !$budgetAllocation.isEmpty())770 + #if($assemblyTopics && !$assemblyTopics.isEmpty()) 557 557 <div class="info-row"> 558 - <span class="info-label"> 主な予算配分</span>772 + <span class="info-label">扱う内容</span> 559 559 <span class="info-value"> 560 560 <div class="selection-display"> 561 - #foreach($ ba in $budgetAllocation)562 - <span class="selection-item">$!escapetool.xml($ ba.trim())</span>775 + #foreach($at in $assemblyTopics) 776 + <span class="selection-item">$!escapetool.xml($at.trim())</span> 563 563 #end 564 564 </div> 565 565 </span> 566 566 </div> 567 567 #end 568 - #if($budgetNote && $budgetNote.trim() != '') 569 - <div class="free-note">$!escapetool.xml($budgetNote)</div> 782 + #if($assemblyNote && $assemblyNote != '') 783 + <div class="info-row"> 784 + <span class="info-label">自由記述</span> 785 + <span class="info-value free-text-value">$!escapetool.xml($assemblyNote)</span> 786 + </div> 570 570 #end 571 571 </div> 572 572 </div> 573 573 #else 574 - <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>791 + <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($visibilityAssembly == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div> 575 575 #end 576 576 #end 577 577 795 + ## --- 選挙 --- 796 + #if($electionExists && $electionExists != '') 797 + #set($canViewEL = true) 798 + #if($visibilityElection == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewEL = false) 799 + #elseif($visibilityElection == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewEL = false) 800 + #end 801 + #if($canViewEL) 802 + <div class="seitokai-subsection"> 803 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="3" width="18" height="18" rx="2"/><path d="M7 13l3 3 7-7"/></svg> 選挙 #if($visibilityElection != '' && $visibilityElection != 'public')<span class="visibility-badge visibility-${visibilityElection}">#if($visibilityElection == '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> 804 + <div class="seitokai-subsection-content"> 805 + <div class="info-row"> 806 + <span class="info-label">役員選挙</span> 807 + <span class="info-value">$!escapetool.xml($!electionExists)</span> 808 + </div> 809 + #if($electionType && $electionType != '') 810 + <div class="info-row"> 811 + <span class="info-label">直近の選挙方式</span> 812 + <span class="info-value">$!escapetool.xml($!electionType)</span> 813 + </div> 814 + #end 815 + #if($electionNote && $electionNote.trim() != '') 816 + <div class="free-note">$!escapetool.xml($electionNote)</div> 817 + #end 818 + </div> 819 + </div> 820 + #else 821 + <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($visibilityElection == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div> 822 + #end 823 + #end 824 + 578 578 ## --- 校則・生徒会会則の見直し --- 579 579 #if($ruleReviewStatus && $ruleReviewStatus != '') 580 580 #set($canViewRuleReview = true) ... ... @@ -640,151 +640,65 @@ 640 640 #end 641 641 #end 642 642 643 - ## --- 活動環境---644 - #set($has ActivityEnv= ($activityPlace && !$activityPlace.isEmpty()) || ($activityRoomEquipment && $activityRoomEquipment != '') || ($activityRoomImage && $activityRoomImage != '')|| ($ictTools && !$ictTools.isEmpty()) || ($ictUsage && !$ictUsage.isEmpty()))645 - #if($has ActivityEnv)646 - #set($canView AE= true)647 - #if($visibility ActivityEnv== 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAE= false)648 - #elseif($visibility ActivityEnv== 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAE= false)890 + ## --- 予算 --- 891 + #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != '')) 892 + #if($hasBudget) 893 + #set($canViewBudget = true) 894 + #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewBudget = false) 895 + #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false) 649 649 #end 650 - #if($canView AE)897 + #if($canViewBudget) 651 651 <div class="seitokai-subsection"> 652 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24">< pathd="M39l9-7 9 7v11a220 01-2 2H5a22 0 01-2-2z"/><polyline points="92291215121522"/></svg>生徒会の活動環境#if($visibilityActivityEnv!= '' && $visibilityActivityEnv != 'public')<span class="visibility-badge visibility-${visibilityActivityEnv}">#if($visibilityActivityEnv== '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>899 + <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> 653 653 <div class="seitokai-subsection-content"> 654 - #if($ activityPlace && !$activityPlace.isEmpty())901 + #if($budgetProcess && !$budgetProcess.isEmpty()) 655 655 <div class="info-row"> 656 - <span class="info-label"> 普段の活動場所</span>903 + <span class="info-label">作成過程の生徒関与</span> 657 657 <span class="info-value"> 658 658 <div class="selection-display"> 659 - #foreach($ap in $activityPlace) 660 - <span class="selection-item">$!escapetool.xml($ap.trim())</span> 906 + #set($allBpOpts = ["各部・委員会等への予算希望額調査","予算額調整（折衝等）","生徒会予算案の作成","生徒総会での議決","生徒関与なし","その他"]) 907 + #foreach($bpOpt in $allBpOpts) 908 + #if($budgetProcess.contains($bpOpt)) 909 + <span class="selection-item">$!escapetool.xml($bpOpt)</span> 910 + #else 911 + <span class="selection-item selection-item-off">$!escapetool.xml($bpOpt)</span> 912 + #end 661 661 #end 662 662 </div> 663 663 </span> 664 664 </div> 665 665 #end 666 - #if($ activityRoomEquipment && $activityRoomEquipment != '')918 + #if($studentFee && $studentFee != '') 667 667 <div class="info-row"> 668 - <span class="info-label">生徒会 室の設備</span>669 - <span class="info-value free-text-value">$!escapetool.xml($activityRoomEquipment)</span>920 + <span class="info-label">生徒会費（年額）</span> 921 + <span class="info-value">$!escapetool.xml($!studentFee)</span> 670 670 </div> 671 671 #end 672 - #if($ activityRoomImage && $activityRoomImage != '')924 + #if($budgetScale && $budgetScale != '') 673 673 <div class="info-row"> 674 - <span class="info-label"> 活動場所の写真</span>675 - <span class="info-value"> <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($activityRoomImage)" alt="活動場所の写真" class="org-chart-img" /></div></span>926 + <span class="info-label">予算規模</span> 927 + <span class="info-value">$!escapetool.xml($!budgetScale)</span> 676 676 </div> 677 677 #end 678 - #if($ ictTools&& !$ictTools.isEmpty())930 + #if($budgetAllocation && !$budgetAllocation.isEmpty()) 679 679 <div class="info-row"> 680 - <span class="info-label"> 利用しているICTツール</span>932 + <span class="info-label">主な予算配分</span> 681 681 <span class="info-value"> 682 - #set($ictCatDisplay = [ 683 - ["連絡ツール", ["メール","LINE","LINE WORKS","Discord","Slack","Microsoft Teams","Google Chat","InstagramのDM","XのDM","その他（連絡）"]], 684 - ["ドキュメント作成・共有", ["Googleドキュメント","Googleスプレッドシート","Googleスライド","Googleドライブ","Word","Excel","PowerPoint","OneDrive","SharePoint","Notion","Pages","Numbers","Keynote","Dropbox","Box","その他（ドキュメント）"]], 685 - ["タスク管理", ["Googleカレンダー","Google ToDoリスト","Trello","Asana","Excel等スプレッドシート","その他（タスク管理）"]], 686 - ["ビデオ会議ツール", ["Zoom","Google Meet","その他（ビデオ会議）"]], 687 - ["アンケート", ["Googleフォーム","Microsoft Forms","その他（アンケート）"]], 688 - ["デザイン・クリエイティブ", ["Canva","各種Adobe","CapCut","LumaFusion","AviUtl","ibisPaint","その他（デザイン）"]], 689 - ["その他", ["独自のWebシステム・自作アプリ"]] 690 - ]) 691 - #foreach($catD in $ictCatDisplay) 692 - #set($catHasItems = false) 693 - #foreach($t in $catD.get(1)) 694 - #if($ictTools.contains($t)) #set($catHasItems = true) #end 695 - #end 696 - #if($catHasItems) 697 - <div style="margin-bottom:6px"> 698 - <span style="font-size:0.8em;font-weight:600;color:var(--text-mid)">$catD.get(0):</span> 699 - <div class="selection-display" style="margin-top:2px"> 700 - #foreach($t in $catD.get(1)) 701 - #if($ictTools.contains($t)) 702 - <span class="selection-item">$!escapetool.xml($t)</span> 703 - #end 704 - #end 705 - </div> 706 - </div> 707 - #end 708 - #end 709 - </span> 710 - </div> 711 - #end 712 - #if($ictUsage && !$ictUsage.isEmpty()) 713 - <div class="info-row"> 714 - <span class="info-label">ICT活用している場面</span> 715 - <span class="info-value"> 716 716 <div class="selection-display"> 717 - #foreach($ iuin $ictUsage)718 - <span class="selection-item">$!escapetool.xml($ iu.trim())</span>935 + #foreach($ba in $budgetAllocation) 936 + <span class="selection-item">$!escapetool.xml($ba.trim())</span> 719 719 #end 720 720 </div> 721 721 </span> 722 722 </div> 723 723 #end 724 - </div> 725 - </div> 726 - #else 727 - <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($visibilityActivityEnv == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div> 728 - #end 729 - #end 730 - 731 - ## --- 生徒総会 --- 732 - #set($hasAssembly = ($assemblyFormat && $assemblyFormat != '') || ($assemblyCount && $assemblyCount > 0) || ($assemblyAgenda && !$assemblyAgenda.isEmpty()) || ($assemblyTopics && !$assemblyTopics.isEmpty()) || ($assemblyNote && $assemblyNote != '')) 733 - #if($hasAssembly) 734 - #set($canViewAS = true) 735 - #if($visibilityAssembly == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAS = false) 736 - #elseif($visibilityAssembly == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAS = false) 737 - #end 738 - #if($canViewAS) 739 - <div class="seitokai-subsection"> 740 - <h3 class="seitokai-subsection-title"><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> 生徒総会 #if($visibilityAssembly != '' && $visibilityAssembly != 'public')<span class="visibility-badge visibility-${visibilityAssembly}">#if($visibilityAssembly == '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> 741 - <div class="seitokai-subsection-content"> 742 - #if($assemblyFormat && $assemblyFormat != '') 743 - <div class="info-row"> 744 - <span class="info-label">開催方式</span> 745 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($assemblyFormat)</span></span> 746 - </div> 942 + #if($budgetNote && $budgetNote.trim() != '') 943 + <div class="free-note">$!escapetool.xml($budgetNote)</div> 747 747 #end 748 - #if($assemblyCount && $assemblyCount > 0) 749 - <div class="info-row"> 750 - <span class="info-label">開催回数（年）</span> 751 - <span class="info-value">$!escapetool.xml($assemblyCount)回</span> 752 - </div> 753 - #end 754 - #if($assemblyAgenda && !$assemblyAgenda.isEmpty()) 755 - <div class="info-row"> 756 - <span class="info-label">議案の集め方</span> 757 - <span class="info-value"> 758 - <div class="selection-display"> 759 - #foreach($aa in $assemblyAgenda) 760 - <span class="selection-item">$!escapetool.xml($aa.trim())</span> 761 - #end 762 - </div> 763 - </span> 764 - </div> 765 - #end 766 - #if($assemblyTopics && !$assemblyTopics.isEmpty()) 767 - <div class="info-row"> 768 - <span class="info-label">扱う内容</span> 769 - <span class="info-value"> 770 - <div class="selection-display"> 771 - #foreach($at in $assemblyTopics) 772 - <span class="selection-item">$!escapetool.xml($at.trim())</span> 773 - #end 774 - </div> 775 - </span> 776 - </div> 777 - #end 778 - #if($assemblyNote && $assemblyNote != '') 779 - <div class="info-row"> 780 - <span class="info-label">自由記述</span> 781 - <span class="info-value free-text-value">$!escapetool.xml($assemblyNote)</span> 782 - </div> 783 - #end 784 784 </div> 785 785 </div> 786 786 #else 787 - <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($visibilityAssembly== 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>948 + <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> 788 788 #end 789 789 #end 790 790 ... ... @@ -872,35 +872,6 @@ 872 872 #end 873 873 #end 874 874 875 - ## --- 年間主要行事 --- 876 - #set($months = [["4月", $eventApril], ["5月", $eventMay], ["6月", $eventJune], ["7月", $eventJuly], ["8月", $eventAugust], ["9月", $eventSeptember], ["10月", $eventOctober], ["11月", $eventNovember], ["12月", $eventDecember], ["1月", $eventJanuary], ["2月", $eventFebruary], ["3月", $eventMarch]]) 877 - #set($hasAnyEvent = false) 878 - #foreach($m in $months) 879 - #if($m.get(1) && $m.get(1) != '') #set($hasAnyEvent = true) #end 880 - #end 881 - #if($hasAnyEvent) 882 - #set($canViewAN = true) 883 - #if($visibilityAnnualEvents == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAN = false) 884 - #elseif($visibilityAnnualEvents == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAN = false) 885 - #end 886 - #if($canViewAN) 887 - <div class="seitokai-subsection"> 888 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="4" width="18" height="18" rx="2" ry="2"/><line x1="16" y1="2" x2="16" y2="6"/><line x1="8" y1="2" x2="8" y2="6"/><line x1="3" y1="10" x2="21" y2="10"/></svg> 年間主要行事 #if($visibilityAnnualEvents != '' && $visibilityAnnualEvents != 'public')<span class="visibility-badge visibility-${visibilityAnnualEvents}">#if($visibilityAnnualEvents == '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> 889 - <div class="seitokai-subsection-content"> 890 - <table class="wiki-table school-info-table" style="margin:0"> 891 - #foreach($m in $months) 892 - #if($m.get(1) && $m.get(1) != '') 893 - <tr><td style="width:60px;font-weight:600;white-space:nowrap">$m.get(0)</td><td>$!escapetool.xml($m.get(1))</td></tr> 894 - #end 895 - #end 896 - </table> 897 - </div> 898 - </div> 899 - #else 900 - <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($visibilityAnnualEvents == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div> 901 - #end 902 - #end 903 - 904 904 ## --- 生徒会の課題意識 --- 905 905 #if($challenges && $challenges != '') 906 906 #set($canViewChallenges = true) ... ... @@ -1297,6 +1297,25 @@ 1297 1297 #if($postVis != 'public') 1298 1298 <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> 1299 1299 #end 1432 + ## いいねボタン 1433 + #set($postLikeCount = $!post.getValue('likeCount')) 1434 + #if(!$postLikeCount || $postLikeCount == '') #set($postLikeCount = 0) #end 1435 + #set($postLikedBy = $!post.getValue('likedBy')) 1436 + #set($isLikedByMe = false) 1437 + #if($postLikedBy && $postLikedBy.contains($xcontext.user)) #set($isLikedByMe = true) #end 1438 + <div class="post-like-row post-action-mt"> 1439 + #if($xcontext.user != 'XWiki.XWikiGuest') 1440 + <button type="button" class="btn-like #if($isLikedByMe)liked#end" data-page="$escapetool.xml($doc.fullName)" data-obj="$post.number" data-csrf="$services.csrf.getToken()" onclick="toggleLike(this)"> 1441 + <svg class="ico ico-fixed-14" viewBox="0 0 24 24" #if($isLikedByMe)fill="currentColor" stroke="none"#end><path d="M20.84 4.61a5.5 5.5 0 00-7.78 0L12 5.67l-1.06-1.06a5.5 5.5 0 00-7.78 7.78l1.06 1.06L12 21.23l7.78-7.78 1.06-1.06a5.5 5.5 0 000-7.78z"/></svg> 1442 + <span class="like-count">$postLikeCount</span> 1443 + </button> 1444 + #else 1445 + <span class="btn-like disabled"> 1446 + <svg class="ico ico-fixed-14" viewBox="0 0 24 24"><path d="M20.84 4.61a5.5 5.5 0 00-7.78 0L12 5.67l-1.06-1.06a5.5 5.5 0 00-7.78 7.78l1.06 1.06L12 21.23l7.78-7.78 1.06-1.06a5.5 5.5 0 000-7.78z"/></svg> 1447 + <span class="like-count">$postLikeCount</span> 1448 + </span> 1449 + #end 1450 + </div> 1300 1300 ## 固定/編集/削除/通報/非表示ボタン（横並び） 1301 1301 #set($postAuthorRef = $!post.getValue('authorRef')) 1302 1302 #set($postObjNumED = $post.number) ... ... @@ -1417,10 +1417,68 @@ 1417 1417 {{/html}} 1418 1418 #end 1419 1419 1571 +## --- OGP / SNSシェア対応 --- 1572 +#set($ogpTitle = "${schoolName} — 生徒会Wiki") 1573 +#set($ogpDesc = "${schoolName}の生徒会活動情報。") 1574 +#if($prefecture && $prefecture != '') #set($ogpDesc = "${ogpDesc}${prefecture}") #end 1575 +#if($city && $city != '') #set($ogpDesc = "${ogpDesc}${city}。") #end 1576 +#if($dailyActivities && $dailyActivities != '') #set($ogpDesc = "${ogpDesc} 主な活動: ${dailyActivities}") #end 1577 +#set($ogpUrl = "https://${request.serverName}${doc.getURL()}") 1578 + 1420 1420 ## --- 年度タブ切り替え JavaScript --- 1421 1421 {{html clean="false"}} 1422 1422 <script> 1582 +// OGPメタタグ挿入 1583 +(function() { 1584 + var ogp = { 1585 + 'og:title': '$escapetool.javascript($ogpTitle)', 1586 + 'og:description': '$escapetool.javascript($ogpDesc)', 1587 + 'og:type': 'article', 1588 + 'og:url': '$escapetool.javascript($ogpUrl)', 1589 + 'og:site_name': '生徒会Wiki', 1590 + 'twitter:card': 'summary' 1591 + }; 1592 + for (var p in ogp) { 1593 + var meta = document.createElement('meta'); 1594 + meta.setAttribute('property', p); 1595 + meta.setAttribute('content', ogp[p]); 1596 + document.head.appendChild(meta); 1597 + } 1598 + // twitter用 1599 + var tw = document.createElement('meta'); 1600 + tw.setAttribute('name', 'twitter:card'); 1601 + tw.setAttribute('content', 'summary'); 1602 + document.head.appendChild(tw); 1603 +})(); 1423 1423 // コンパクト表示（タイトルのみ）トグル 1605 +// いいねトグル 1606 +function toggleLike(btn) { 1607 + var page = btn.getAttribute('data-page'); 1608 + var obj = btn.getAttribute('data-obj'); 1609 + var csrf = btn.getAttribute('data-csrf'); 1610 + btn.disabled = true; 1611 + var fd = new FormData(); 1612 + fd.append('page', page); 1613 + fd.append('obj', obj); 1614 + fd.append('form_token', csrf); 1615 + fetch('/bin/SeitokaiCode/LikePost', { method: 'POST', body: fd }) 1616 + .then(function(r) { return r.json(); }) 1617 + .then(function(data) { 1618 + btn.querySelector('.like-count').textContent = data.count; 1619 + if (data.action === 'liked') { 1620 + btn.classList.add('liked'); 1621 + btn.querySelector('svg').setAttribute('fill', 'currentColor'); 1622 + btn.querySelector('svg').setAttribute('stroke', 'none'); 1623 + } else { 1624 + btn.classList.remove('liked'); 1625 + btn.querySelector('svg').removeAttribute('fill'); 1626 + btn.querySelector('svg').setAttribute('stroke', 'currentColor'); 1627 + } 1628 + }) 1629 + .catch(function() { alert('エラーが発生しました'); }) 1630 + .finally(function() { btn.disabled = false; }); 1631 +} 1632 + 1424 1424 function toggleCompactView() { 1425 1425 var container = document.querySelector('.xwiki-content') || document.body; 1426 1426 var isCompact = container.classList.toggle('activity-compact-view'); ... ... @@ -1538,7 +1538,15 @@ 1538 1538 }; 1539 1539 var toast = document.createElement('div'); 1540 1540 toast.className = 'toast toast-' + type; 1541 - toast.innerHTML = (icons[type] || '') + '<span>' + message + '</span>'; 1750 + var iconSvg = icons[type] || ''; 1751 + if (iconSvg) { 1752 + var iconSpan = document.createElement('span'); 1753 + iconSpan.innerHTML = iconSvg; 1754 + toast.appendChild(iconSpan); 1755 + } 1756 + var msgSpan = document.createElement('span'); 1757 + msgSpan.textContent = message; 1758 + toast.appendChild(msgSpan); 1542 1542 container.appendChild(toast); 1543 1543 setTimeout(function() { toast.remove(); }, 3200); 1544 1544 } ... ... @@ -1577,6 +1577,7 @@ 1577 1577 var html = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&').replace(/</g,'<').replace(/>/g,'>') + '</textarea>'; 1578 1578 1579 1579 // コメント以外は添付ファイル編集を表示 1797 + function escAttr(s) { return s.replace(/&/g,'&').replace(/"/g,'"').replace(/'/g,''').replace(/</g,'<').replace(/>/g,'>'); } 1580 1580 if (postType !== 'comment') { 1581 1581 // 既存画像 1582 1582 html += '<div class="edit-attachments">'; ... ... @@ -1586,10 +1586,10 @@ 1586 1586 for (var i = 0; i < imgs.length; i++) { 1587 1587 var img = imgs[i].trim(); 1588 1588 if (!img) continue; 1589 - html += '<div class="edit-attach-item" data-name="' + img.replace(/"/g,'"') + '">' +1807 + html += '<div class="edit-attach-item" data-name="' + escAttr(img) + '">' + 1590 1590 '<img src="/xwiki/bin/download/' + schoolPage.replace(/\./g,'/') + '/' + encodeURIComponent(img) + '" class="edit-attach-thumb" />' + 1591 1591 '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' + 1592 - '<input type="hidden" name="keepImages" value="' + img.replace(/"/g,'"') + '" />' +1810 + '<input type="hidden" name="keepImages" value="' + escAttr(img) + '" />' + 1593 1593 '</div>'; 1594 1594 } 1595 1595 html += '</div>'; ... ... @@ -1603,10 +1603,10 @@ 1603 1603 if (!f) continue; 1604 1604 var displayName = f; 1605 1605 if (/^file_\d{14}_\d+_/.test(f)) displayName = f.replace(/^file_\d{14}_\d+_/, ''); 1606 - html += '<div class="edit-attach-item" data-name="' + f.replace(/"/g,'"') + '">' +1607 - '<span class="edit-attach-fname">' + displayName .replace(/</g,'<').replace(/>/g,'>')+ '</span>' +1824 + html += '<div class="edit-attach-item" data-name="' + escAttr(f) + '">' + 1825 + '<span class="edit-attach-fname">' + escAttr(displayName) + '</span>' + 1608 1608 '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' + 1609 - '<input type="hidden" name="keepFiles" value="' + f.replace(/"/g,'"') + '" />' +1827 + '<input type="hidden" name="keepFiles" value="' + escAttr(f) + '" />' + 1610 1610 '</div>'; 1611 1611 } 1612 1612 html += '</div>';