Changes for page 学校ページ テンプレート
Last modified by Super Admin on 2026/04/05 18:59
From version 
113.1 
113.1
edited by Super Admin
on 2026/03/27 03:42
on 2026/03/27 03:42
Change comment:
There is no comment for this version
To 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
Summary
Details
-
Page properties
-
- Author
-
... ... @@ -1,1 +1,1 @@ 1 -XWiki. superadmin1 +XWiki.XWikiGuest - Content
-
... ... @@ -7,19 +7,6 @@ 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)" /> 23 23 ## メンテナンスバナー（{{include}}ではなくインラインで記述し、<p>タグ挿入を回避） 24 24 #set($bannerDoc = $xwiki.getDocument('SeitokaiAdmin.MaintenanceBanner')) 25 25 #set($bannerObj = $bannerDoc.getObject('SeitokaiCode.MaintenanceBannerClass')) ... ... @@ -465,123 +465,6 @@ 465 465 #end 466 466 #end 467 467 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 - 585 585 ## --- 日常の活動 --- 586 586 #if($dailyActivities && !$dailyActivities.isEmpty()) 587 587 #set($canViewDA = true) ... ... @@ -608,6 +608,36 @@ 608 608 #end 609 609 #end 610 610 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 + 611 611 ## --- 定例活動 --- 612 612 #if($meetingFrequency && $meetingFrequency != '') 613 613 #set($canViewMT = true) ... ... @@ -632,96 +632,68 @@ 632 632 #end 633 633 #end 634 634 635 - ## --- 生徒総会---636 - #set($has Assembly = ($assemblyFormat&& $assemblyFormat !='') ||($assemblyCount && $assemblyCount> 0) || ($assemblyAgenda&& !$assemblyAgenda.isEmpty()) || ($assemblyTopics&&!$assemblyTopics.isEmpty())|| ($assemblyNote && $assemblyNote != ''))637 - #if($has Assembly)638 - #set($canView AS= true)639 - #if($visibility Assembly== 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAS= false)640 - #elseif($visibility Assembly== 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAS= false)535 + ## --- 予算 --- 536 + #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != '')) 537 + #if($hasBudget) 538 + #set($canViewBudget = true) 539 + #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewBudget = false) 540 + #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false) 641 641 #end 642 - #if($canView AS)542 + #if($canViewBudget) 643 643 <div class="seitokai-subsection"> 644 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24">< pathd="M1721v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circlecx="9"cy="7"r="4"/><path d="M23 21v-2a440 00-3-3.87"/><pathd="M163.13a440 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>544 + <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> 645 645 <div class="seitokai-subsection-content"> 646 - #if($ assemblyFormat && $assemblyFormat!= '')546 + #if($budgetProcess && !$budgetProcess.isEmpty()) 647 647 <div class="info-row"> 648 - <span class="info-label">開催方式</span> 649 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($assemblyFormat)</span></span> 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> 650 650 </div> 651 651 #end 652 - #if($ assemblyCount && $assemblyCount>0)563 + #if($studentFee && $studentFee != '') 653 653 <div class="info-row"> 654 - <span class="info-label"> 開催回数（年）</span>655 - <span class="info-value">$!escapetool.xml($ assemblyCount)回</span>565 + <span class="info-label">生徒会費（年額）</span> 566 + <span class="info-value">$!escapetool.xml($!studentFee)</span> 656 656 </div> 657 657 #end 658 - #if($ assemblyAgenda &&!$assemblyAgenda.isEmpty())569 + #if($budgetScale && $budgetScale != '') 659 659 <div class="info-row"> 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> 571 + <span class="info-label">予算規模</span> 572 + <span class="info-value">$!escapetool.xml($!budgetScale)</span> 668 668 </div> 669 669 #end 670 - #if($ assemblyTopics&& !$assemblyTopics.isEmpty())575 + #if($budgetAllocation && !$budgetAllocation.isEmpty()) 671 671 <div class="info-row"> 672 - <span class="info-label"> 扱う内容</span>577 + <span class="info-label">主な予算配分</span> 673 673 <span class="info-value"> 674 674 <div class="selection-display"> 675 - #foreach($a tin $assemblyTopics)676 - <span class="selection-item">$!escapetool.xml($a t.trim())</span>580 + #foreach($ba in $budgetAllocation) 581 + <span class="selection-item">$!escapetool.xml($ba.trim())</span> 677 677 #end 678 678 </div> 679 679 </span> 680 680 </div> 681 681 #end 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> 587 + #if($budgetNote && $budgetNote.trim() != '') 588 + <div class="free-note">$!escapetool.xml($budgetNote)</div> 687 687 #end 688 688 </div> 689 689 </div> 690 690 #else 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>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> 692 692 #end 693 693 #end 694 694 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 - 725 725 ## --- 校則・生徒会会則の見直し --- 726 726 #if($ruleReviewStatus && $ruleReviewStatus != '') 727 727 #set($canViewRuleReview = true) ... ... @@ -787,65 +787,151 @@ 787 787 #end 788 788 #end 789 789 790 - ## --- 予算---791 - #set($has Budget = ($budgetProcess&& !$budgetProcess.isEmpty()) || ($studentFee&& $studentFee!= '') || ($budgetScale && $budgetScale != ''))792 - #if($has Budget)793 - #set($canView Budget= true)794 - #if($visibility Budget == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewBudget= false)795 - #elseif($visibility Budget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget= false)662 + ## --- 活動環境 --- 663 + #set($hasActivityEnv = ($activityPlace && !$activityPlace.isEmpty()) || ($activityRoomEquipment && $activityRoomEquipment != '') || ($activityRoomImage && $activityRoomImage != '') || ($ictTools && !$ictTools.isEmpty()) || ($ictUsage && !$ictUsage.isEmpty())) 664 + #if($hasActivityEnv) 665 + #set($canViewAE = true) 666 + #if($visibilityActivityEnv == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAE = false) 667 + #elseif($visibilityActivityEnv == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAE = false) 796 796 #end 797 - #if($canView Budget)669 + #if($canViewAE) 798 798 <div class="seitokai-subsection"> 799 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24">< linex1="12"y1="1"x2="12"y2="23"/><pathd="M17 5H9.5a3.53.500007h5a3.53.50 0107H6"/></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>671 + <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> 800 800 <div class="seitokai-subsection-content"> 801 - #if($ budgetProcess&& !$budgetProcess.isEmpty())673 + #if($activityPlace && !$activityPlace.isEmpty()) 802 802 <div class="info-row"> 803 - <span class="info-label"> 作成過程の生徒関与</span>675 + <span class="info-label">普段の活動場所</span> 804 804 <span class="info-value"> 805 805 <div class="selection-display"> 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 678 + #foreach($ap in $activityPlace) 679 + <span class="selection-item">$!escapetool.xml($ap.trim())</span> 813 813 #end 814 814 </div> 815 815 </span> 816 816 </div> 817 817 #end 818 - #if($ studentFee&& $studentFee!= '')685 + #if($activityRoomEquipment && $activityRoomEquipment != '') 819 819 <div class="info-row"> 820 - <span class="info-label">生徒会 費（年額）</span>821 - <span class="info-value">$!escapetool.xml($ !studentFee)</span>687 + <span class="info-label">生徒会室の設備</span> 688 + <span class="info-value free-text-value">$!escapetool.xml($activityRoomEquipment)</span> 822 822 </div> 823 823 #end 824 - #if($ budgetScale && $budgetScale != '')691 + #if($activityRoomImage && $activityRoomImage != '') 825 825 <div class="info-row"> 826 - <span class="info-label"> 予算規模</span>827 - <span class="info-value"> $!escapetool.xml($!budgetScale)</span>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> 828 828 </div> 829 829 #end 830 - #if($ budgetAllocation&& !$budgetAllocation.isEmpty())697 + #if($ictTools && !$ictTools.isEmpty()) 831 831 <div class="info-row"> 832 - <span class="info-label"> 主な予算配分</span>699 + <span class="info-label">利用しているICTツール</span> 833 833 <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"> 834 834 <div class="selection-display"> 835 - #foreach($ bain $budgetAllocation)836 - <span class="selection-item">$!escapetool.xml($ ba.trim())</span>736 + #foreach($iu in $ictUsage) 737 + <span class="selection-item">$!escapetool.xml($iu.trim())</span> 837 837 #end 838 838 </div> 839 839 </span> 840 840 </div> 841 841 #end 842 - #if($budgetNote && $budgetNote.trim() != '') 843 - <div class="free-note">$!escapetool.xml($budgetNote)</div> 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> 844 844 #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 845 845 </div> 846 846 </div> 847 847 #else 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>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> 849 849 #end 850 850 #end 851 851 ... ... @@ -933,6 +933,35 @@ 933 933 #end 934 934 #end 935 935 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 + 936 936 ## --- 生徒会の課題意識 --- 937 937 #if($challenges && $challenges != '') 938 938 #set($canViewChallenges = true) ... ... @@ -1004,13 +1004,13 @@ 1004 1004 1005 1005 <div class="activity-toolbar"> 1006 1006 <div class="activity-fy-tabs"> 1007 - <button class="activity-fy-tab" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button> 994 + <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button> 1008 1008 #foreach($fy in $fySet) 1009 1009 #if($fy != $currentFYStr) 1010 1010 <button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button> 1011 1011 #end 1012 1012 #end 1013 - <button class="activity-fy-tab active" onclick="switchActivityFY('all', this)">全期間</button>1000 + <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button> 1014 1014 </div> 1015 1015 <div class="activity-toolbar-right"> 1016 1016 <button class="btn-view-toggle" id="btnViewToggle" onclick="toggleCompactView()" title="タイトルのみ表示"> ... ... @@ -1329,25 +1329,6 @@ 1329 1329 #if($postVis != 'public') 1330 1330 <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> 1331 1331 #end 1332 - ## いいねボタン 1333 - #set($postLikeCount = $!post.getValue('likeCount')) 1334 - #if(!$postLikeCount || $postLikeCount == '') #set($postLikeCount = 0) #end 1335 - #set($postLikedBy = $!post.getValue('likedBy')) 1336 - #set($isLikedByMe = false) 1337 - #if($postLikedBy && $postLikedBy.contains($xcontext.user)) #set($isLikedByMe = true) #end 1338 - <div class="post-like-row post-action-mt"> 1339 - #if($xcontext.user != 'XWiki.XWikiGuest') 1340 - <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)"> 1341 - <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> 1342 - <span class="like-count">$postLikeCount</span> 1343 - </button> 1344 - #else 1345 - <span class="btn-like disabled"> 1346 - <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> 1347 - <span class="like-count">$postLikeCount</span> 1348 - </span> 1349 - #end 1350 - </div> 1351 1351 ## 固定/編集/削除/通報/非表示ボタン（横並び） 1352 1352 #set($postAuthorRef = $!post.getValue('authorRef')) 1353 1353 #set($postObjNumED = $post.number) ... ... @@ -1468,68 +1468,10 @@ 1468 1468 {{/html}} 1469 1469 #end 1470 1470 1471 -## --- OGP / SNSシェア対応 --- 1472 -#set($ogpTitle = "${schoolName} — 生徒会Wiki") 1473 -#set($ogpDesc = "${schoolName}の生徒会活動情報。") 1474 -#if($prefecture && $prefecture != '') #set($ogpDesc = "${ogpDesc}${prefecture}") #end 1475 -#if($city && $city != '') #set($ogpDesc = "${ogpDesc}${city}。") #end 1476 -#if($dailyActivities && $dailyActivities != '') #set($ogpDesc = "${ogpDesc} 主な活動: ${dailyActivities}") #end 1477 -#set($ogpUrl = "https://${request.serverName}${doc.getURL()}") 1478 - 1479 1479 ## --- 年度タブ切り替え JavaScript --- 1480 1480 {{html clean="false"}} 1481 1481 <script> 1482 -// OGPメタタグ挿入 1483 -(function() { 1484 - var ogp = { 1485 - 'og:title': '$escapetool.javascript($ogpTitle)', 1486 - 'og:description': '$escapetool.javascript($ogpDesc)', 1487 - 'og:type': 'article', 1488 - 'og:url': '$escapetool.javascript($ogpUrl)', 1489 - 'og:site_name': '生徒会Wiki', 1490 - 'twitter:card': 'summary' 1491 - }; 1492 - for (var p in ogp) { 1493 - var meta = document.createElement('meta'); 1494 - meta.setAttribute('property', p); 1495 - meta.setAttribute('content', ogp[p]); 1496 - document.head.appendChild(meta); 1497 - } 1498 - // twitter用 1499 - var tw = document.createElement('meta'); 1500 - tw.setAttribute('name', 'twitter:card'); 1501 - tw.setAttribute('content', 'summary'); 1502 - document.head.appendChild(tw); 1503 -})(); 1504 1504 // コンパクト表示（タイトルのみ）トグル 1505 -// いいねトグル 1506 -function toggleLike(btn) { 1507 - var page = btn.getAttribute('data-page'); 1508 - var obj = btn.getAttribute('data-obj'); 1509 - var csrf = btn.getAttribute('data-csrf'); 1510 - btn.disabled = true; 1511 - var fd = new FormData(); 1512 - fd.append('page', page); 1513 - fd.append('obj', obj); 1514 - fd.append('form_token', csrf); 1515 - fetch('/bin/SeitokaiCode/LikePost', { method: 'POST', body: fd }) 1516 - .then(function(r) { return r.json(); }) 1517 - .then(function(data) { 1518 - btn.querySelector('.like-count').textContent = data.count; 1519 - if (data.action === 'liked') { 1520 - btn.classList.add('liked'); 1521 - btn.querySelector('svg').setAttribute('fill', 'currentColor'); 1522 - btn.querySelector('svg').setAttribute('stroke', 'none'); 1523 - } else { 1524 - btn.classList.remove('liked'); 1525 - btn.querySelector('svg').removeAttribute('fill'); 1526 - btn.querySelector('svg').setAttribute('stroke', 'currentColor'); 1527 - } 1528 - }) 1529 - .catch(function() { alert('エラーが発生しました'); }) 1530 - .finally(function() { btn.disabled = false; }); 1531 -} 1532 - 1533 1533 function toggleCompactView() { 1534 1534 var container = document.querySelector('.xwiki-content') || document.body; 1535 1535 var isCompact = container.classList.toggle('activity-compact-view'); ... ... @@ -1594,7 +1594,7 @@ 1594 1594 fyTabs.forEach(function(t) { tabContainer.appendChild(t); }); 1595 1595 if (allTab) { tabContainer.appendChild(allTab); } 1596 1596 } 1597 - // デフォルトで 全期間を表示1507 + // デフォルトで現在の年度を表示 1598 1598 var defaultTab = document.querySelector('.activity-fy-tab.active'); 1599 1599 if (defaultTab) { defaultTab.click(); } 1600 1600 // 保存成功時のトースト通知 ... ... @@ -1647,15 +1647,7 @@ 1647 1647 }; 1648 1648 var toast = document.createElement('div'); 1649 1649 toast.className = 'toast toast-' + type; 1650 - var iconSvg = icons[type] || ''; 1651 - if (iconSvg) { 1652 - var iconSpan = document.createElement('span'); 1653 - iconSpan.innerHTML = iconSvg; 1654 - toast.appendChild(iconSpan); 1655 - } 1656 - var msgSpan = document.createElement('span'); 1657 - msgSpan.textContent = message; 1658 - toast.appendChild(msgSpan); 1560 + toast.innerHTML = (icons[type] || '') + '<span>' + message + '</span>'; 1659 1659 container.appendChild(toast); 1660 1660 setTimeout(function() { toast.remove(); }, 3200); 1661 1661 } ... ... @@ -1694,7 +1694,6 @@ 1694 1694 var html = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&').replace(/</g,'<').replace(/>/g,'>') + '</textarea>'; 1695 1695 1696 1696 // コメント以外は添付ファイル編集を表示 1697 - function escAttr(s) { return s.replace(/&/g,'&').replace(/"/g,'"').replace(/'/g,''').replace(/</g,'<').replace(/>/g,'>'); } 1698 1698 if (postType !== 'comment') { 1699 1699 // 既存画像 1700 1700 html += '<div class="edit-attachments">'; ... ... @@ -1704,10 +1704,10 @@ 1704 1704 for (var i = 0; i < imgs.length; i++) { 1705 1705 var img = imgs[i].trim(); 1706 1706 if (!img) continue; 1707 - html += '<div class="edit-attach-item" data-name="' + e scAttr(img) + '">' +1608 + html += '<div class="edit-attach-item" data-name="' + img.replace(/"/g,'"') + '">' + 1708 1708 '<img src="/xwiki/bin/download/' + schoolPage.replace(/\./g,'/') + '/' + encodeURIComponent(img) + '" class="edit-attach-thumb" />' + 1709 1709 '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' + 1710 - '<input type="hidden" name="keepImages" value="' + e scAttr(img) + '" />' +1611 + '<input type="hidden" name="keepImages" value="' + img.replace(/"/g,'"') + '" />' + 1711 1711 '</div>'; 1712 1712 } 1713 1713 html += '</div>'; ... ... @@ -1721,10 +1721,10 @@ 1721 1721 if (!f) continue; 1722 1722 var displayName = f; 1723 1723 if (/^file_\d{14}_\d+_/.test(f)) displayName = f.replace(/^file_\d{14}_\d+_/, ''); 1724 - html += '<div class="edit-attach-item" data-name="' + e scAttr(f) + '">' +1725 - '<span class="edit-attach-fname">' + escAttr(displayName) + '</span>' +1625 + html += '<div class="edit-attach-item" data-name="' + f.replace(/"/g,'"') + '">' + 1626 + '<span class="edit-attach-fname">' + displayName.replace(/</g,'<').replace(/>/g,'>') + '</span>' + 1726 1726 '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' + 1727 - '<input type="hidden" name="keepFiles" value="' + e scAttr(f) + '" />' +1628 + '<input type="hidden" name="keepFiles" value="' + f.replace(/"/g,'"') + '" />' + 1728 1728 '</div>'; 1729 1729 } 1730 1730 html += '</div>';