Changes for page 学校ページ テンプレート
Last modified by Super Admin on 2026/04/05 18:59
From version 
104.1 
104.1
edited by XWikiGuest
on 2026/03/22 00:37
on 2026/03/22 00:37
Change comment:
There is no comment for this version
To version 118.1
118.1
edited by Super Admin
on 2026/04/01 17:36
on 2026/04/01 17:36
Change comment:
There is no comment for this version
Summary
Details
-
Page properties
-
- Author
-
... ... @@ -1,1 +1,1 @@ 1 -XWiki. XWikiGuest1 +XWiki.superadmin - 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')) ... ... @@ -374,7 +374,7 @@ 374 374 #end 375 375 #if($canEditSchool) 376 376 <div style="text-align:right; margin-bottom:12px;"> 377 - <a href="$doc.getURL('view', 'sheet=SeitokaiCode.SchoolEditForm')" class="btn-school-edit"><svg class="ico" viewBox="0 0 24 24"><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> 基本情報を編集</a>390 + <a href="$doc.getURL('view', 'sheet=SeitokaiCode.SchoolEditForm')" class="btn-school-edit"><svg class="ico" viewBox="0 0 24 24"><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> 情報を編集</a> 378 378 </div> 379 379 #end 380 380 ... ... @@ -452,6 +452,123 @@ 452 452 #end 453 453 #end 454 454 468 + ## --- 活動環境 --- 469 + #set($hasActivityEnv = ($activityPlace && !$activityPlace.isEmpty()) || ($activityRoomEquipment && $activityRoomEquipment != '') || ($activityRoomImage && $activityRoomImage != '') || ($ictTools && !$ictTools.isEmpty()) || ($ictUsage && !$ictUsage.isEmpty())) 470 + #if($hasActivityEnv) 471 + #set($canViewAE = true) 472 + #if($visibilityActivityEnv == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAE = false) 473 + #elseif($visibilityActivityEnv == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAE = false) 474 + #end 475 + #if($canViewAE) 476 + <div class="seitokai-subsection"> 477 + <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> 478 + <div class="seitokai-subsection-content"> 479 + #if($activityPlace && !$activityPlace.isEmpty()) 480 + <div class="info-row"> 481 + <span class="info-label">普段の活動場所</span> 482 + <span class="info-value"> 483 + <div class="selection-display"> 484 + #foreach($ap in $activityPlace) 485 + <span class="selection-item">$!escapetool.xml($ap.trim())</span> 486 + #end 487 + </div> 488 + </span> 489 + </div> 490 + #end 491 + #if($activityRoomEquipment && $activityRoomEquipment != '') 492 + <div class="info-row"> 493 + <span class="info-label">生徒会室の設備</span> 494 + <span class="info-value free-text-value">$!escapetool.xml($activityRoomEquipment)</span> 495 + </div> 496 + #end 497 + #if($activityRoomImage && $activityRoomImage != '') 498 + <div class="info-row"> 499 + <span class="info-label">活動場所の写真</span> 500 + <span class="info-value"><div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($activityRoomImage)" alt="活動場所の写真" class="org-chart-img" /></div></span> 501 + </div> 502 + #end 503 + #if($ictTools && !$ictTools.isEmpty()) 504 + <div class="info-row"> 505 + <span class="info-label">利用しているICTツール</span> 506 + <span class="info-value"> 507 + #set($ictCatDisplay = [ 508 + ["連絡ツール", ["メール","LINE","LINE WORKS","Discord","Slack","Microsoft Teams","Google Chat","InstagramのDM","XのDM","その他（連絡）"]], 509 + ["ドキュメント作成・共有", ["Googleドキュメント","Googleスプレッドシート","Googleスライド","Googleドライブ","Word","Excel","PowerPoint","OneDrive","SharePoint","Notion","Pages","Numbers","Keynote","Dropbox","Box","その他（ドキュメント）"]], 510 + ["タスク管理", ["Googleカレンダー","Google ToDoリスト","Trello","Asana","Excel等スプレッドシート","その他（タスク管理）"]], 511 + ["ビデオ会議ツール", ["Zoom","Google Meet","その他（ビデオ会議）"]], 512 + ["アンケート", ["Googleフォーム","Microsoft Forms","その他（アンケート）"]], 513 + ["デザイン・クリエイティブ", ["Canva","各種Adobe","CapCut","LumaFusion","AviUtl","ibisPaint","その他（デザイン）"]], 514 + ["その他", ["独自のWebシステム・自作アプリ"]] 515 + ]) 516 + #foreach($catD in $ictCatDisplay) 517 + #set($catHasItems = false) 518 + #foreach($t in $catD.get(1)) 519 + #if($ictTools.contains($t)) #set($catHasItems = true) #end 520 + #end 521 + #if($catHasItems) 522 + <div style="margin-bottom:6px"> 523 + <span style="font-size:0.8em;font-weight:600;color:var(--text-mid)">$catD.get(0):</span> 524 + <div class="selection-display" style="margin-top:2px"> 525 + #foreach($t in $catD.get(1)) 526 + #if($ictTools.contains($t)) 527 + <span class="selection-item">$!escapetool.xml($t)</span> 528 + #end 529 + #end 530 + </div> 531 + </div> 532 + #end 533 + #end 534 + </span> 535 + </div> 536 + #end 537 + #if($ictUsage && !$ictUsage.isEmpty()) 538 + <div class="info-row"> 539 + <span class="info-label">ICT活用している場面</span> 540 + <span class="info-value"> 541 + <div class="selection-display"> 542 + #foreach($iu in $ictUsage) 543 + <span class="selection-item">$!escapetool.xml($iu.trim())</span> 544 + #end 545 + </div> 546 + </span> 547 + </div> 548 + #end 549 + </div> 550 + </div> 551 + #else 552 + <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> 553 + #end 554 + #end 555 + 556 + ## --- 年間主要行事 --- 557 + #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]]) 558 + #set($hasAnyEvent = false) 559 + #foreach($m in $months) 560 + #if($m.get(1) && $m.get(1) != '') #set($hasAnyEvent = true) #end 561 + #end 562 + #if($hasAnyEvent) 563 + #set($canViewAN = true) 564 + #if($visibilityAnnualEvents == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAN = false) 565 + #elseif($visibilityAnnualEvents == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAN = false) 566 + #end 567 + #if($canViewAN) 568 + <div class="seitokai-subsection"> 569 + <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> 570 + <div class="seitokai-subsection-content"> 571 + <table class="wiki-table school-info-table" style="margin:0"> 572 + #foreach($m in $months) 573 + #if($m.get(1) && $m.get(1) != '') 574 + <tr><td style="width:60px;font-weight:600;white-space:nowrap">$m.get(0)</td><td>$!escapetool.xml($m.get(1))</td></tr> 575 + #end 576 + #end 577 + </table> 578 + </div> 579 + </div> 580 + #else 581 + <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> 582 + #end 583 + #end 584 + 455 455 ## --- 日常の活動 --- 456 456 #if($dailyActivities && !$dailyActivities.isEmpty()) 457 457 #set($canViewDA = true) ... ... @@ -478,36 +478,6 @@ 478 478 #end 479 479 #end 480 480 481 - ## --- 選挙 --- 482 - #if($electionExists && $electionExists != '') 483 - #set($canViewEL = true) 484 - #if($visibilityElection == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewEL = false) 485 - #elseif($visibilityElection == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewEL = false) 486 - #end 487 - #if($canViewEL) 488 - <div class="seitokai-subsection"> 489 - <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> 490 - <div class="seitokai-subsection-content"> 491 - <div class="info-row"> 492 - <span class="info-label">役員選挙</span> 493 - <span class="info-value">$!escapetool.xml($!electionExists)</span> 494 - </div> 495 - #if($electionType && $electionType != '') 496 - <div class="info-row"> 497 - <span class="info-label">直近の選挙方式</span> 498 - <span class="info-value">$!escapetool.xml($!electionType)</span> 499 - </div> 500 - #end 501 - #if($electionNote && $electionNote.trim() != '') 502 - <div class="free-note">$!escapetool.xml($electionNote)</div> 503 - #end 504 - </div> 505 - </div> 506 - #else 507 - <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> 508 - #end 509 - #end 510 - 511 511 ## --- 定例活動 --- 512 512 #if($meetingFrequency && $meetingFrequency != '') 513 513 #set($canViewMT = true) ... ... @@ -532,68 +532,96 @@ 532 532 #end 533 533 #end 534 534 535 - ## --- 予算---536 - #set($has Budget= ($budgetProcess &&!$budgetProcess.isEmpty()) || ($studentFee&& $studentFee != '') || ($budgetScale && $budgetScale != ''))537 - #if($has Budget)538 - #set($canView Budget= true)539 - #if($visibility Budget== 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewBudget= false)540 - #elseif($visibility Budget== 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget= false)635 + ## --- 生徒総会 --- 636 + #set($hasAssembly = ($assemblyFormat && $assemblyFormat != '') || ($assemblyCount && $assemblyCount > 0) || ($assemblyAgenda && !$assemblyAgenda.isEmpty()) || ($assemblyTopics && !$assemblyTopics.isEmpty()) || ($assemblyNote && $assemblyNote != '')) 637 + #if($hasAssembly) 638 + #set($canViewAS = true) 639 + #if($visibilityAssembly == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAS = false) 640 + #elseif($visibilityAssembly == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAS = false) 541 541 #end 542 - #if($canView Budget)642 + #if($canViewAS) 543 543 <div class="seitokai-subsection"> 544 - <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>644 + <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> 545 545 <div class="seitokai-subsection-content"> 546 - #if($ budgetProcess &&!$budgetProcess.isEmpty())646 + #if($assemblyFormat && $assemblyFormat != '') 547 547 <div class="info-row"> 548 - <span class="info-label">作成過程の生徒関与</span> 549 - <span class="info-value"> 550 - <div class="selection-display"> 551 - #set($allBpOpts = ["各部・委員会等への予算希望額調査","予算額調整（折衝等）","生徒会予算案の作成","生徒総会での議決","生徒関与なし","その他"]) 552 - #foreach($bpOpt in $allBpOpts) 553 - #if($budgetProcess.contains($bpOpt)) 554 - <span class="selection-item">$!escapetool.xml($bpOpt)</span> 555 - #else 556 - <span class="selection-item selection-item-off">$!escapetool.xml($bpOpt)</span> 557 - #end 558 - #end 559 - </div> 560 - </span> 648 + <span class="info-label">開催方式</span> 649 + <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($assemblyFormat)</span></span> 561 561 </div> 562 562 #end 563 - #if($s tudentFee&& $studentFee!='')652 + #if($assemblyCount && $assemblyCount > 0) 564 564 <div class="info-row"> 565 - <span class="info-label"> 生徒会費（年額）</span>566 - <span class="info-value">$!escapetool.xml($ !studentFee)</span>654 + <span class="info-label">開催回数（年）</span> 655 + <span class="info-value">$!escapetool.xml($assemblyCount)回</span> 567 567 </div> 568 568 #end 569 - #if($b udgetScale&& $budgetScale != '')658 + #if($assemblyAgenda && !$assemblyAgenda.isEmpty()) 570 570 <div class="info-row"> 571 - <span class="info-label">予算規模</span> 572 - <span class="info-value">$!escapetool.xml($!budgetScale)</span> 660 + <span class="info-label">議案の集め方</span> 661 + <span class="info-value"> 662 + <div class="selection-display"> 663 + #foreach($aa in $assemblyAgenda) 664 + <span class="selection-item">$!escapetool.xml($aa.trim())</span> 665 + #end 666 + </div> 667 + </span> 573 573 </div> 574 574 #end 575 - #if($ budgetAllocation&& !$budgetAllocation.isEmpty())670 + #if($assemblyTopics && !$assemblyTopics.isEmpty()) 576 576 <div class="info-row"> 577 - <span class="info-label"> 主な予算配分</span>672 + <span class="info-label">扱う内容</span> 578 578 <span class="info-value"> 579 579 <div class="selection-display"> 580 - #foreach($ ba in $budgetAllocation)581 - <span class="selection-item">$!escapetool.xml($ ba.trim())</span>675 + #foreach($at in $assemblyTopics) 676 + <span class="selection-item">$!escapetool.xml($at.trim())</span> 582 582 #end 583 583 </div> 584 584 </span> 585 585 </div> 586 586 #end 587 - #if($budgetNote && $budgetNote.trim() != '') 588 - <div class="free-note">$!escapetool.xml($budgetNote)</div> 682 + #if($assemblyNote && $assemblyNote != '') 683 + <div class="info-row"> 684 + <span class="info-label">自由記述</span> 685 + <span class="info-value free-text-value">$!escapetool.xml($assemblyNote)</span> 686 + </div> 589 589 #end 590 590 </div> 591 591 </div> 592 592 #else 593 - <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>691 + <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> 594 594 #end 595 595 #end 596 596 695 + ## --- 選挙 --- 696 + #if($electionExists && $electionExists != '') 697 + #set($canViewEL = true) 698 + #if($visibilityElection == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewEL = false) 699 + #elseif($visibilityElection == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewEL = false) 700 + #end 701 + #if($canViewEL) 702 + <div class="seitokai-subsection"> 703 + <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> 704 + <div class="seitokai-subsection-content"> 705 + <div class="info-row"> 706 + <span class="info-label">役員選挙</span> 707 + <span class="info-value">$!escapetool.xml($!electionExists)</span> 708 + </div> 709 + #if($electionType && $electionType != '') 710 + <div class="info-row"> 711 + <span class="info-label">直近の選挙方式</span> 712 + <span class="info-value">$!escapetool.xml($!electionType)</span> 713 + </div> 714 + #end 715 + #if($electionNote && $electionNote.trim() != '') 716 + <div class="free-note">$!escapetool.xml($electionNote)</div> 717 + #end 718 + </div> 719 + </div> 720 + #else 721 + <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> 722 + #end 723 + #end 724 + 597 597 ## --- 校則・生徒会会則の見直し --- 598 598 #if($ruleReviewStatus && $ruleReviewStatus != '') 599 599 #set($canViewRuleReview = true) ... ... @@ -659,151 +659,65 @@ 659 659 #end 660 660 #end 661 661 662 - ## --- 活動環境---663 - #set($has ActivityEnv= ($activityPlace && !$activityPlace.isEmpty()) || ($activityRoomEquipment && $activityRoomEquipment != '') || ($activityRoomImage && $activityRoomImage != '')|| ($ictTools && !$ictTools.isEmpty()) || ($ictUsage && !$ictUsage.isEmpty()))664 - #if($has ActivityEnv)665 - #set($canView AE= true)666 - #if($visibility ActivityEnv== 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAE= false)667 - #elseif($visibility ActivityEnv== 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAE= false)790 + ## --- 予算 --- 791 + #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != '')) 792 + #if($hasBudget) 793 + #set($canViewBudget = true) 794 + #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewBudget = false) 795 + #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false) 668 668 #end 669 - #if($canView AE)797 + #if($canViewBudget) 670 670 <div class="seitokai-subsection"> 671 - <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>799 + <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> 672 672 <div class="seitokai-subsection-content"> 673 - #if($ activityPlace && !$activityPlace.isEmpty())801 + #if($budgetProcess && !$budgetProcess.isEmpty()) 674 674 <div class="info-row"> 675 - <span class="info-label"> 普段の活動場所</span>803 + <span class="info-label">作成過程の生徒関与</span> 676 676 <span class="info-value"> 677 677 <div class="selection-display"> 678 - #foreach($ap in $activityPlace) 679 - <span class="selection-item">$!escapetool.xml($ap.trim())</span> 806 + #set($allBpOpts = ["各部・委員会等への予算希望額調査","予算額調整（折衝等）","生徒会予算案の作成","生徒総会での議決","生徒関与なし","その他"]) 807 + #foreach($bpOpt in $allBpOpts) 808 + #if($budgetProcess.contains($bpOpt)) 809 + <span class="selection-item">$!escapetool.xml($bpOpt)</span> 810 + #else 811 + <span class="selection-item selection-item-off">$!escapetool.xml($bpOpt)</span> 812 + #end 680 680 #end 681 681 </div> 682 682 </span> 683 683 </div> 684 684 #end 685 - #if($ activityRoomEquipment && $activityRoomEquipment != '')818 + #if($studentFee && $studentFee != '') 686 686 <div class="info-row"> 687 - <span class="info-label">生徒会 室の設備</span>688 - <span class="info-value free-text-value">$!escapetool.xml($activityRoomEquipment)</span>820 + <span class="info-label">生徒会費（年額）</span> 821 + <span class="info-value">$!escapetool.xml($!studentFee)</span> 689 689 </div> 690 690 #end 691 - #if($ activityRoomImage && $activityRoomImage != '')824 + #if($budgetScale && $budgetScale != '') 692 692 <div class="info-row"> 693 - <span class="info-label"> 活動場所の写真</span>694 - <span class="info-value"> <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($activityRoomImage)" alt="活動場所の写真" class="org-chart-img" /></div></span>826 + <span class="info-label">予算規模</span> 827 + <span class="info-value">$!escapetool.xml($!budgetScale)</span> 695 695 </div> 696 696 #end 697 - #if($ ictTools&& !$ictTools.isEmpty())830 + #if($budgetAllocation && !$budgetAllocation.isEmpty()) 698 698 <div class="info-row"> 699 - <span class="info-label"> 利用しているICTツール</span>832 + <span class="info-label">主な予算配分</span> 700 700 <span class="info-value"> 701 - #set($ictCatDisplay = [ 702 - ["連絡ツール", ["メール","LINE","LINE WORKS","Discord","Slack","Microsoft Teams","Google Chat","InstagramのDM","XのDM","その他（連絡）"]], 703 - ["ドキュメント作成・共有", ["Googleドキュメント","Googleスプレッドシート","Googleスライド","Googleドライブ","Word","Excel","PowerPoint","OneDrive","SharePoint","Notion","Pages","Numbers","Keynote","Dropbox","Box","その他（ドキュメント）"]], 704 - ["タスク管理", ["Googleカレンダー","Google ToDoリスト","Trello","Asana","Excel等スプレッドシート","その他（タスク管理）"]], 705 - ["ビデオ会議ツール", ["Zoom","Google Meet","その他（ビデオ会議）"]], 706 - ["アンケート", ["Googleフォーム","Microsoft Forms","その他（アンケート）"]], 707 - ["デザイン・クリエイティブ", ["Canva","各種Adobe","CapCut","LumaFusion","AviUtl","ibisPaint","その他（デザイン）"]], 708 - ["その他", ["独自のWebシステム・自作アプリ"]] 709 - ]) 710 - #foreach($catD in $ictCatDisplay) 711 - #set($catHasItems = false) 712 - #foreach($t in $catD.get(1)) 713 - #if($ictTools.contains($t)) #set($catHasItems = true) #end 714 - #end 715 - #if($catHasItems) 716 - <div style="margin-bottom:6px"> 717 - <span style="font-size:0.8em;font-weight:600;color:var(--text-mid)">$catD.get(0):</span> 718 - <div class="selection-display" style="margin-top:2px"> 719 - #foreach($t in $catD.get(1)) 720 - #if($ictTools.contains($t)) 721 - <span class="selection-item">$!escapetool.xml($t)</span> 722 - #end 723 - #end 724 - </div> 725 - </div> 726 - #end 727 - #end 728 - </span> 729 - </div> 730 - #end 731 - #if($ictUsage && !$ictUsage.isEmpty()) 732 - <div class="info-row"> 733 - <span class="info-label">ICT活用している場面</span> 734 - <span class="info-value"> 735 735 <div class="selection-display"> 736 - #foreach($ iuin $ictUsage)737 - <span class="selection-item">$!escapetool.xml($ iu.trim())</span>835 + #foreach($ba in $budgetAllocation) 836 + <span class="selection-item">$!escapetool.xml($ba.trim())</span> 738 738 #end 739 739 </div> 740 740 </span> 741 741 </div> 742 742 #end 743 - </div> 744 - </div> 745 - #else 746 - <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> 747 - #end 748 - #end 749 - 750 - ## --- 生徒総会 --- 751 - #set($hasAssembly = ($assemblyFormat && $assemblyFormat != '') || ($assemblyCount && $assemblyCount > 0) || ($assemblyAgenda && !$assemblyAgenda.isEmpty()) || ($assemblyTopics && !$assemblyTopics.isEmpty()) || ($assemblyNote && $assemblyNote != '')) 752 - #if($hasAssembly) 753 - #set($canViewAS = true) 754 - #if($visibilityAssembly == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAS = false) 755 - #elseif($visibilityAssembly == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAS = false) 756 - #end 757 - #if($canViewAS) 758 - <div class="seitokai-subsection"> 759 - <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> 760 - <div class="seitokai-subsection-content"> 761 - #if($assemblyFormat && $assemblyFormat != '') 762 - <div class="info-row"> 763 - <span class="info-label">開催方式</span> 764 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($assemblyFormat)</span></span> 765 - </div> 842 + #if($budgetNote && $budgetNote.trim() != '') 843 + <div class="free-note">$!escapetool.xml($budgetNote)</div> 766 766 #end 767 - #if($assemblyCount && $assemblyCount > 0) 768 - <div class="info-row"> 769 - <span class="info-label">開催回数（年）</span> 770 - <span class="info-value">$!escapetool.xml($assemblyCount)回</span> 771 - </div> 772 - #end 773 - #if($assemblyAgenda && !$assemblyAgenda.isEmpty()) 774 - <div class="info-row"> 775 - <span class="info-label">議案の集め方</span> 776 - <span class="info-value"> 777 - <div class="selection-display"> 778 - #foreach($aa in $assemblyAgenda) 779 - <span class="selection-item">$!escapetool.xml($aa.trim())</span> 780 - #end 781 - </div> 782 - </span> 783 - </div> 784 - #end 785 - #if($assemblyTopics && !$assemblyTopics.isEmpty()) 786 - <div class="info-row"> 787 - <span class="info-label">扱う内容</span> 788 - <span class="info-value"> 789 - <div class="selection-display"> 790 - #foreach($at in $assemblyTopics) 791 - <span class="selection-item">$!escapetool.xml($at.trim())</span> 792 - #end 793 - </div> 794 - </span> 795 - </div> 796 - #end 797 - #if($assemblyNote && $assemblyNote != '') 798 - <div class="info-row"> 799 - <span class="info-label">自由記述</span> 800 - <span class="info-value free-text-value">$!escapetool.xml($assemblyNote)</span> 801 - </div> 802 - #end 803 803 </div> 804 804 </div> 805 805 #else 806 - <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>848 + <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> 807 807 #end 808 808 #end 809 809 ... ... @@ -891,35 +891,6 @@ 891 891 #end 892 892 #end 893 893 894 - ## --- 年間主要行事 --- 895 - #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]]) 896 - #set($hasAnyEvent = false) 897 - #foreach($m in $months) 898 - #if($m.get(1) && $m.get(1) != '') #set($hasAnyEvent = true) #end 899 - #end 900 - #if($hasAnyEvent) 901 - #set($canViewAN = true) 902 - #if($visibilityAnnualEvents == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAN = false) 903 - #elseif($visibilityAnnualEvents == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAN = false) 904 - #end 905 - #if($canViewAN) 906 - <div class="seitokai-subsection"> 907 - <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> 908 - <div class="seitokai-subsection-content"> 909 - <table class="wiki-table school-info-table" style="margin:0"> 910 - #foreach($m in $months) 911 - #if($m.get(1) && $m.get(1) != '') 912 - <tr><td style="width:60px;font-weight:600;white-space:nowrap">$m.get(0)</td><td>$!escapetool.xml($m.get(1))</td></tr> 913 - #end 914 - #end 915 - </table> 916 - </div> 917 - </div> 918 - #else 919 - <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> 920 - #end 921 - #end 922 - 923 923 ## --- 生徒会の課題意識 --- 924 924 #if($challenges && $challenges != '') 925 925 #set($canViewChallenges = true) ... ... @@ -991,13 +991,13 @@ 991 991 992 992 <div class="activity-toolbar"> 993 993 <div class="activity-fy-tabs"> 994 - <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>1007 + <button class="activity-fy-tab" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button> 995 995 #foreach($fy in $fySet) 996 996 #if($fy != $currentFYStr) 997 997 <button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button> 998 998 #end 999 999 #end 1000 - <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button> 1013 + <button class="activity-fy-tab active" onclick="switchActivityFY('all', this)">全期間</button> 1001 1001 </div> 1002 1002 <div class="activity-toolbar-right"> 1003 1003 <button class="btn-view-toggle" id="btnViewToggle" onclick="toggleCompactView()" title="タイトルのみ表示"> ... ... @@ -1036,22 +1036,67 @@ 1036 1036 1037 1037 {{/html}} 1038 1038 1039 -## 特色ある活動を先頭に表示するため、並び替え用リストを作成 1040 -#set($featuredActivities = []) 1041 -#set($normalActivities = []) 1042 -#if($activities && $activities.size() > 0) 1043 - #foreach($act in $activities) 1044 - #set($isFeatured = $!act.getValue('featured')) 1045 - #if($isFeatured == '1') 1046 - #set($discard = $featuredActivities.add($foreach.index)) 1052 +## 活動を「年度降順 + 特色あり先頭」で並び替え 1053 +## Step1: fySet から年度を降順ソート（Velocity ネイティブ実装） 1054 +#set($fyNums = []) 1055 +#foreach($fy in $fySet) 1056 + #if($fy && $fy != '' && $fy != 'unknown') 1057 + #set($fyInt = $mathtool.toInteger($fy)) 1058 + #if($fyInt) 1059 + #set($discard = $fyNums.add($fyInt)) 1060 + #end 1061 + #end 1062 +#end 1063 +## 最大値を順番に取り出して降順リストを構築（最大20年度まで対応） 1064 +#set($fyDesc = []) 1065 +#set($fyRemaining = []) 1066 +#foreach($fy in $fyNums) 1067 + #set($discard = $fyRemaining.add($fy)) 1068 +#end 1069 +#foreach($dummy in [1..20]) 1070 + #if($fyRemaining.isEmpty())#break#end 1071 + #set($fyMax = $fyRemaining.get(0)) 1072 + #foreach($fy in $fyRemaining) 1073 + #if($fy > $fyMax)#set($fyMax = $fy)#end 1074 + #end 1075 + #set($discard = $fyDesc.add($fyMax)) 1076 + #set($fyNextRem = []) 1077 + #set($fyMaxRemoved = false) 1078 + #foreach($fy in $fyRemaining) 1079 + #if(!$fyMaxRemoved && $fy == $fyMax) 1080 + #set($fyMaxRemoved = true) 1047 1047 #else 1048 - #set($discard = $ normalActivities.add($foreach.index))1082 + #set($discard = $fyNextRem.add($fy)) 1049 1049 #end 1050 1050 #end 1085 + #set($fyRemaining = $fyNextRem) 1051 1051 #end 1087 +## 年度未設定の活動は末尾に表示（fySetに'unknown'は入らないため無条件追加） 1088 +#set($discard = $fyDesc.add('unknown')) 1089 +## Step2: 年度降順で featured → normal の順にインデックスを収集 1052 1052 #set($orderedActivityIndices = []) 1053 -#set($discard = $orderedActivityIndices.addAll($featuredActivities)) 1054 -#set($discard = $orderedActivityIndices.addAll($normalActivities)) 1091 +#foreach($curFY in $fyDesc) 1092 + ## 同年度の特色あり活動を先頭に 1093 + #set($actIdx2 = 0) 1094 + #foreach($act in $activities) 1095 + #set($aFY2 = $!act.getValue('fiscalYear')) 1096 + #if(!$aFY2 || $aFY2 == '') #set($aFY2 = 'unknown') #end 1097 + #if($aFY2 == $curFY && $act.getValue('featured') == '1') 1098 + #set($discard = $orderedActivityIndices.add($actIdx2)) 1099 + #end 1100 + #set($actIdx2 = $actIdx2 + 1) 1101 + #end 1102 + ## 同年度の通常活動 1103 + #set($actIdx2 = 0) 1104 + #foreach($act in $activities) 1105 + #set($aFY2 = $!act.getValue('fiscalYear')) 1106 + #if(!$aFY2 || $aFY2 == '') #set($aFY2 = 'unknown') #end 1107 + #if($aFY2 == $curFY && $act.getValue('featured') != '1') 1108 + #set($discard = $orderedActivityIndices.add($actIdx2)) 1109 + #end 1110 + #set($actIdx2 = $actIdx2 + 1) 1111 + #end 1112 +#end 1055 1055 1056 1056 #if($activities && $activities.size() > 0) 1057 1057 #foreach($actIdx in $orderedActivityIndices) ... ... @@ -1316,6 +1316,25 @@ 1316 1316 #if($postVis != 'public') 1317 1317 <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> 1318 1318 #end 1377 + ## いいねボタン 1378 + #set($postLikeCount = $!post.getValue('likeCount')) 1379 + #if(!$postLikeCount || $postLikeCount == '') #set($postLikeCount = 0) #end 1380 + #set($postLikedBy = $!post.getValue('likedBy')) 1381 + #set($isLikedByMe = false) 1382 + #if($postLikedBy && $postLikedBy.contains($xcontext.user)) #set($isLikedByMe = true) #end 1383 + <div class="post-like-row post-action-mt"> 1384 + #if($xcontext.user != 'XWiki.XWikiGuest') 1385 + <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)"> 1386 + <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> 1387 + <span class="like-count">$postLikeCount</span> 1388 + </button> 1389 + #else 1390 + <span class="btn-like disabled"> 1391 + <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> 1392 + <span class="like-count">$postLikeCount</span> 1393 + </span> 1394 + #end 1395 + </div> 1319 1319 ## 固定/編集/削除/通報/非表示ボタン（横並び） 1320 1320 #set($postAuthorRef = $!post.getValue('authorRef')) 1321 1321 #set($postObjNumED = $post.number) ... ... @@ -1436,10 +1436,68 @@ 1436 1436 {{/html}} 1437 1437 #end 1438 1438 1516 +## --- OGP / SNSシェア対応 --- 1517 +#set($ogpTitle = "${schoolName} — 生徒会Wiki") 1518 +#set($ogpDesc = "${schoolName}の生徒会活動情報。") 1519 +#if($prefecture && $prefecture != '') #set($ogpDesc = "${ogpDesc}${prefecture}") #end 1520 +#if($city && $city != '') #set($ogpDesc = "${ogpDesc}${city}。") #end 1521 +#if($dailyActivities && $dailyActivities != '') #set($ogpDesc = "${ogpDesc} 主な活動: ${dailyActivities}") #end 1522 +#set($ogpUrl = "https://${request.serverName}${doc.getURL()}") 1523 + 1439 1439 ## --- 年度タブ切り替え JavaScript --- 1440 1440 {{html clean="false"}} 1441 1441 <script> 1527 +// OGPメタタグ挿入 1528 +(function() { 1529 + var ogp = { 1530 + 'og:title': '$escapetool.javascript($ogpTitle)', 1531 + 'og:description': '$escapetool.javascript($ogpDesc)', 1532 + 'og:type': 'article', 1533 + 'og:url': '$escapetool.javascript($ogpUrl)', 1534 + 'og:site_name': '生徒会Wiki', 1535 + 'twitter:card': 'summary' 1536 + }; 1537 + for (var p in ogp) { 1538 + var meta = document.createElement('meta'); 1539 + meta.setAttribute('property', p); 1540 + meta.setAttribute('content', ogp[p]); 1541 + document.head.appendChild(meta); 1542 + } 1543 + // twitter用 1544 + var tw = document.createElement('meta'); 1545 + tw.setAttribute('name', 'twitter:card'); 1546 + tw.setAttribute('content', 'summary'); 1547 + document.head.appendChild(tw); 1548 +})(); 1442 1442 // コンパクト表示（タイトルのみ）トグル 1550 +// いいねトグル 1551 +function toggleLike(btn) { 1552 + var page = btn.getAttribute('data-page'); 1553 + var obj = btn.getAttribute('data-obj'); 1554 + var csrf = btn.getAttribute('data-csrf'); 1555 + btn.disabled = true; 1556 + var fd = new FormData(); 1557 + fd.append('page', page); 1558 + fd.append('obj', obj); 1559 + fd.append('form_token', csrf); 1560 + fetch('/bin/SeitokaiCode/LikePost', { method: 'POST', body: fd }) 1561 + .then(function(r) { return r.json(); }) 1562 + .then(function(data) { 1563 + btn.querySelector('.like-count').textContent = data.count; 1564 + if (data.action === 'liked') { 1565 + btn.classList.add('liked'); 1566 + btn.querySelector('svg').setAttribute('fill', 'currentColor'); 1567 + btn.querySelector('svg').setAttribute('stroke', 'none'); 1568 + } else { 1569 + btn.classList.remove('liked'); 1570 + btn.querySelector('svg').removeAttribute('fill'); 1571 + btn.querySelector('svg').setAttribute('stroke', 'currentColor'); 1572 + } 1573 + }) 1574 + .catch(function() { alert('エラーが発生しました'); }) 1575 + .finally(function() { btn.disabled = false; }); 1576 +} 1577 + 1443 1443 function toggleCompactView() { 1444 1444 var container = document.querySelector('.xwiki-content') || document.body; 1445 1445 var isCompact = container.classList.toggle('activity-compact-view'); ... ... @@ -1483,7 +1483,7 @@ 1483 1483 } 1484 1484 // ページ読み込み時の初期化 1485 1485 document.addEventListener('DOMContentLoaded', function() { 1486 - // 年度タブを降順にソート（「全期間」タブは 末尾に固定）1621 + // 年度タブを降順にソート（「全期間」タブは先頭に固定） 1487 1487 var tabContainer = document.querySelector('.activity-fy-tabs'); 1488 1488 if (tabContainer) { 1489 1489 var tabs = Array.from(tabContainer.querySelectorAll('.activity-fy-tab')); ... ... @@ -1500,11 +1500,11 @@ 1500 1500 var bYear = parseInt(b.textContent) || 0; 1501 1501 return bYear - aYear; 1502 1502 }); 1503 - // DOM再配置 1504 - fyTabs.forEach(function(t) { tabContainer.appendChild(t); }); 1638 + // DOM再配置（全期間を先頭、年度タブを降順で続ける） 1505 1505 if (allTab) { tabContainer.appendChild(allTab); } 1640 + fyTabs.forEach(function(t) { tabContainer.appendChild(t); }); 1506 1506 } 1507 - // デフォルトで 現在の年度を表示1642 + // デフォルトで全期間を表示 1508 1508 var defaultTab = document.querySelector('.activity-fy-tab.active'); 1509 1509 if (defaultTab) { defaultTab.click(); } 1510 1510 // 保存成功時のトースト通知 ... ... @@ -1557,7 +1557,15 @@ 1557 1557 }; 1558 1558 var toast = document.createElement('div'); 1559 1559 toast.className = 'toast toast-' + type; 1560 - toast.innerHTML = (icons[type] || '') + '<span>' + message + '</span>'; 1695 + var iconSvg = icons[type] || ''; 1696 + if (iconSvg) { 1697 + var iconSpan = document.createElement('span'); 1698 + iconSpan.innerHTML = iconSvg; 1699 + toast.appendChild(iconSpan); 1700 + } 1701 + var msgSpan = document.createElement('span'); 1702 + msgSpan.textContent = message; 1703 + toast.appendChild(msgSpan); 1561 1561 container.appendChild(toast); 1562 1562 setTimeout(function() { toast.remove(); }, 3200); 1563 1563 } ... ... @@ -1596,6 +1596,7 @@ 1596 1596 var html = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&').replace(/</g,'<').replace(/>/g,'>') + '</textarea>'; 1597 1597 1598 1598 // コメント以外は添付ファイル編集を表示 1742 + function escAttr(s) { return s.replace(/&/g,'&').replace(/"/g,'"').replace(/'/g,''').replace(/</g,'<').replace(/>/g,'>'); } 1599 1599 if (postType !== 'comment') { 1600 1600 // 既存画像 1601 1601 html += '<div class="edit-attachments">'; ... ... @@ -1605,10 +1605,10 @@ 1605 1605 for (var i = 0; i < imgs.length; i++) { 1606 1606 var img = imgs[i].trim(); 1607 1607 if (!img) continue; 1608 - html += '<div class="edit-attach-item" data-name="' + img.replace(/"/g,'"') + '">' +1752 + html += '<div class="edit-attach-item" data-name="' + escAttr(img) + '">' + 1609 1609 '<img src="/xwiki/bin/download/' + schoolPage.replace(/\./g,'/') + '/' + encodeURIComponent(img) + '" class="edit-attach-thumb" />' + 1610 1610 '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' + 1611 - '<input type="hidden" name="keepImages" value="' + img.replace(/"/g,'"') + '" />' +1755 + '<input type="hidden" name="keepImages" value="' + escAttr(img) + '" />' + 1612 1612 '</div>'; 1613 1613 } 1614 1614 html += '</div>'; ... ... @@ -1622,10 +1622,10 @@ 1622 1622 if (!f) continue; 1623 1623 var displayName = f; 1624 1624 if (/^file_\d{14}_\d+_/.test(f)) displayName = f.replace(/^file_\d{14}_\d+_/, ''); 1625 - html += '<div class="edit-attach-item" data-name="' + f.replace(/"/g,'"') + '">' +1626 - '<span class="edit-attach-fname">' + displayName .replace(/</g,'<').replace(/>/g,'>')+ '</span>' +1769 + html += '<div class="edit-attach-item" data-name="' + escAttr(f) + '">' + 1770 + '<span class="edit-attach-fname">' + escAttr(displayName) + '</span>' + 1627 1627 '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' + 1628 - '<input type="hidden" name="keepFiles" value="' + f.replace(/"/g,'"') + '" />' +1772 + '<input type="hidden" name="keepFiles" value="' + escAttr(f) + '" />' + 1629 1629 '</div>'; 1630 1630 } 1631 1631 html += '</div>';