Changes for page 学校ページ テンプレート
Last modified by Super Admin on 2026/04/05 18:59
From version 
112.1 
112.1
edited by Super Admin
on 2026/03/25 01:50
on 2026/03/25 01:50
Change comment:
There is no comment for this version
To version 94.1
94.1
edited by Super Admin
on 2026/03/20 17:50
on 2026/03/20 17:50
Change comment:
There is no comment for this version
Summary
Details
-
Page properties
-
- 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')) ... ... @@ -81,7 +81,6 @@ 81 81 #set($activityPlace = $doc.getValue('activityPlace')) 82 82 #set($activityRoomEquipment = $doc.getValue('activityRoomEquipment')) 83 83 #set($activityRoomImage = $doc.getValue('activityRoomImage')) 84 -#set($ictTools = $doc.getValue('ictTools')) 85 85 #set($ictUsage = $doc.getValue('ictUsage')) 86 86 87 87 ## --- 生徒総会 --- ... ... @@ -139,14 +139,6 @@ 139 139 #set($visibilityBudget = $!doc.getValue('visibilityBudget')) 140 140 #set($visibilityRuleReview = $!doc.getValue('visibilityRuleReview')) 141 141 #set($visibilityChallenges = $!doc.getValue('visibilityChallenges')) 142 -#set($visibilityDailyActivities = $!doc.getValue('visibilityDailyActivities')) 143 -#set($visibilityElection = $!doc.getValue('visibilityElection')) 144 -#set($visibilityMeeting = $!doc.getValue('visibilityMeeting')) 145 -#set($visibilityActivityEnv = $!doc.getValue('visibilityActivityEnv')) 146 -#set($visibilityAssembly = $!doc.getValue('visibilityAssembly')) 147 -#set($visibilityPublicity = $!doc.getValue('visibilityPublicity')) 148 -#set($visibilityExternal = $!doc.getValue('visibilityExternal')) 149 -#set($visibilityAnnualEvents = $!doc.getValue('visibilityAnnualEvents')) 150 150 ## デフォルト値（未設定なら全体公開） 151 151 #if(!$visibilityOrgChart || $visibilityOrgChart == '') #set($visibilityOrgChart = 'public') #end 152 152 #if(!$visibilityBudget || $visibilityBudget == '') #set($visibilityBudget = 'public') #end ... ... @@ -158,7 +158,6 @@ 158 158 #set($isGuest = $viewerUser == 'XWiki.XWikiGuest') 159 159 #set($isViewerAdmin = false) 160 160 #set($viewerSchoolCode = '') 161 -#set($viewerSecondaryGraduated = false) 162 162 #if(!$isGuest) 163 163 #set($viewerDoc = $xwiki.getDocument($viewerUser)) 164 164 #set($viewerAccountType = $!viewerDoc.getValue('accountType')) ... ... @@ -168,24 +168,6 @@ 168 168 #if($viewerAccountType == 'admin') 169 169 #set($isViewerAdmin = true) 170 170 #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 189 189 #end 190 190 191 191 ## --- 関連校（中高一貫校）情報 --- ... ... @@ -195,7 +195,7 @@ 195 195 #if($affiliatedSchoolCode && $affiliatedSchoolCode != '') 196 196 #if($viewerSchoolCode == $affiliatedSchoolCode) 197 197 #set($isAffiliated = true) 198 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode && !$viewerSecondaryGraduated)157 + #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode) 199 199 #set($isAffiliated = true) 200 200 #end 201 201 #end ... ... @@ -205,7 +205,7 @@ 205 205 #if(!$isGuest && $viewerUserRole != 'graduate') 206 206 #if($viewerSchoolCode == $schoolCode || $isAffiliated) 207 207 #set($isSchoolMember = true) 208 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode && !$viewerSecondaryGraduated)167 + #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode) 209 209 #set($isSchoolMember = true) 210 210 #end 211 211 #end ... ... @@ -465,132 +465,10 @@ 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 - #set($canViewDA = true) 588 - #if($visibilityDailyActivities == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewDA = false) 589 - #elseif($visibilityDailyActivities == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewDA = false) 590 - #end 591 - #if($canViewDA) 592 592 <div class="seitokai-subsection"> 593 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z"/><polyline points="14 2 14 8 20 8"/><line x1="16" y1="13" x2="8" y2="13"/><line x1="16" y1="17" x2="8" y2="17"/></svg> 日常の活動 #if($visibilityDailyActivities != '' && $visibilityDailyActivities != 'public')<span class="visibility-badge visibility-${visibilityDailyActivities}">#if($visibilityDailyActivities == '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"><pathd="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>430 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z"/><polyline points="14 2 14 8 20 8"/><line x1="16" y1="13" x2="8" y2="13"/><line x1="16" y1="17" x2="8" y2="17"/></svg> 日常の活動</h3> 594 594 <div class="seitokai-subsection-content"> 595 595 <p class="activity-hint">活動時間が多い3つ</p> 596 596 <div class="tag-container"> ... ... @@ -603,20 +603,34 @@ 603 603 #end 604 604 </div> 605 605 </div> 606 - #else 607 - <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($visibilityDailyActivities == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div> 608 - #end 609 609 #end 610 610 445 + ## --- 選挙 --- 446 + #if($electionExists && $electionExists != '') 447 + <div class="seitokai-subsection"> 448 + <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> 選挙</h3> 449 + <div class="seitokai-subsection-content"> 450 + <div class="info-row"> 451 + <span class="info-label">役員選挙</span> 452 + <span class="info-value">$!escapetool.xml($!electionExists)</span> 453 + </div> 454 + #if($electionType && $electionType != '') 455 + <div class="info-row"> 456 + <span class="info-label">直近の選挙方式</span> 457 + <span class="info-value">$!escapetool.xml($!electionType)</span> 458 + </div> 459 + #end 460 + #if($electionNote && $electionNote.trim() != '') 461 + <div class="free-note">$!escapetool.xml($electionNote)</div> 462 + #end 463 + </div> 464 + </div> 465 + #end 466 + 611 611 ## --- 定例活動 --- 612 612 #if($meetingFrequency && $meetingFrequency != '') 613 - #set($canViewMT = true) 614 - #if($visibilityMeeting == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewMT = false) 615 - #elseif($visibilityMeeting == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewMT = false) 616 - #end 617 - #if($canViewMT) 618 618 <div class="seitokai-subsection"> 619 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="4" width="18" height="18" rx="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($visibilityMeeting != '' && $visibilityMeeting != 'public')<span class="visibility-badge visibility-${visibilityMeeting}">#if($visibilityMeeting == '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"><pathd="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>470 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="4" width="18" height="18" rx="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> 定例活動</h3> 620 620 <div class="seitokai-subsection-content"> 621 621 <div class="info-row"> 622 622 <span class="info-label">役員定例会の頻度</span> ... ... @@ -627,101 +627,70 @@ 627 627 #end 628 628 </div> 629 629 </div> 630 - #else 631 - <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($visibilityMeeting == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div> 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)483 + ## --- 予算 --- 484 + #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != '')) 485 + #if($hasBudget) 486 + #set($canViewBudget = true) 487 + #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewBudget = false) 488 + #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false) 641 641 #end 642 - #if($canView AS)490 + #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>492 + <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!= '')494 + #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> 496 + <span class="info-label">作成過程の生徒関与</span> 497 + <span class="info-value"> 498 + <div class="selection-display"> 499 + #set($allBpOpts = ["各部・委員会等への予算希望額調査","予算額調整（折衝等）","生徒会予算案の作成","生徒総会での議決","生徒関与なし","その他"]) 500 + #foreach($bpOpt in $allBpOpts) 501 + #if($budgetProcess.contains($bpOpt)) 502 + <span class="selection-item">$!escapetool.xml($bpOpt)</span> 503 + #else 504 + <span class="selection-item selection-item-off">$!escapetool.xml($bpOpt)</span> 505 + #end 506 + #end 507 + </div> 508 + </span> 650 650 </div> 651 651 #end 652 - #if($ assemblyCount && $assemblyCount>0)511 + #if($studentFee && $studentFee != '') 653 653 <div class="info-row"> 654 - <span class="info-label"> 開催回数（年）</span>655 - <span class="info-value">$!escapetool.xml($ assemblyCount)回</span>513 + <span class="info-label">生徒会費（年額）</span> 514 + <span class="info-value">$!escapetool.xml($!studentFee)</span> 656 656 </div> 657 657 #end 658 - #if($ assemblyAgenda &&!$assemblyAgenda.isEmpty())517 + #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> 519 + <span class="info-label">予算規模</span> 520 + <span class="info-value">$!escapetool.xml($!budgetScale)</span> 668 668 </div> 669 669 #end 670 - #if($ assemblyTopics&& !$assemblyTopics.isEmpty())523 + #if($budgetAllocation && !$budgetAllocation.isEmpty()) 671 671 <div class="info-row"> 672 - <span class="info-label"> 扱う内容</span>525 + <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>528 + #foreach($ba in $budgetAllocation) 529 + <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> 535 + #if($budgetNote && $budgetNote.trim() != '') 536 + <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>541 + <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,78 +787,103 @@ 787 787 #end 788 788 #end 789 789 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) 796 - #end 797 - #if($canViewBudget) 610 + ## --- 活動環境 --- 611 + #set($hasActivityEnv = ($activityPlace && $activityPlace != '') || ($activityRoomEquipment && $activityRoomEquipment != '') || ($activityRoomImage && $activityRoomImage != '') || ($ictUsage && !$ictUsage.isEmpty())) 612 + #if($hasActivityEnv) 798 798 <div class="seitokai-subsection"> 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.53.5 0 0007h5a3.53.50 0107H6"/></svg> 予算 #if($visibilityBudget != 'public')<spanclass="visibility-badgevisibility-${visibilityBudget}">#if($visibilityBudget == 'school_trusted')<svg class="ico" viewBox="0 0424"><path d="M12 22s8-48-10V5l-8-3-83v7c06 810 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="00 24 24"><path d="M220h20"/><pathd="M520V10l7-575v10"/><pathd="M920v-5h6v5"/></svg>校内限定#end</span>#end</h3>614 + <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> 生徒会の活動環境</h3> 800 800 <div class="seitokai-subsection-content"> 801 - #if($ budgetProcess&&!$budgetProcess.isEmpty())616 + #if($activityPlace && $activityPlace != '') 802 802 <div class="info-row"> 803 - <span class="info-label">作成過程の生徒関与</span> 618 + <span class="info-label">普段の活動場所</span> 619 + <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($activityPlace)</span></span> 620 + </div> 621 + #end 622 + #if($activityRoomEquipment && $activityRoomEquipment != '') 623 + <div class="info-row"> 624 + <span class="info-label">生徒会室の設備</span> 625 + <span class="info-value free-text-value">$!escapetool.xml($activityRoomEquipment)</span> 626 + </div> 627 + #end 628 + #if($activityRoomImage && $activityRoomImage != '') 629 + <div class="info-row"> 630 + <span class="info-label">活動場所の写真</span> 631 + <span class="info-value"><div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($activityRoomImage)" alt="活動場所の写真" class="org-chart-img" /></div></span> 632 + </div> 633 + #end 634 + #if($ictUsage && !$ictUsage.isEmpty()) 635 + <div class="info-row"> 636 + <span class="info-label">ICT活用している場面</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 639 + #foreach($iu in $ictUsage) 640 + <span class="selection-item">$!escapetool.xml($iu.trim())</span> 813 813 #end 814 814 </div> 815 815 </span> 816 816 </div> 817 817 #end 818 - #if($studentFee && $studentFee != '') 646 + </div> 647 + </div> 648 + #end 649 + 650 + ## --- 生徒総会 --- 651 + #set($hasAssembly = ($assemblyFormat && $assemblyFormat != '') || ($assemblyCount && $assemblyCount > 0) || ($assemblyAgenda && !$assemblyAgenda.isEmpty()) || ($assemblyTopics && !$assemblyTopics.isEmpty()) || ($assemblyNote && $assemblyNote != '')) 652 + #if($hasAssembly) 653 + <div class="seitokai-subsection"> 654 + <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> 生徒総会</h3> 655 + <div class="seitokai-subsection-content"> 656 + #if($assemblyFormat && $assemblyFormat != '') 819 819 <div class="info-row"> 820 - <span class="info-label"> 生徒会費（年額）</span>821 - <span class="info-value">$!escapetool.xml($ !studentFee)</span>658 + <span class="info-label">開催方式</span> 659 + <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($assemblyFormat)</span></span> 822 822 </div> 823 823 #end 824 - #if($bu dgetScale&& $budgetScale!='')662 + #if($assemblyCount && $assemblyCount > 0) 825 825 <div class="info-row"> 826 - <span class="info-label"> 予算規模</span>827 - <span class="info-value">$!escapetool.xml($ !budgetScale)</span>664 + <span class="info-label">開催回数（年）</span> 665 + <span class="info-value">$!escapetool.xml($assemblyCount)回</span> 828 828 </div> 829 829 #end 830 - #if($b udgetAllocation && !$budgetAllocation.isEmpty())668 + #if($assemblyAgenda && !$assemblyAgenda.isEmpty()) 831 831 <div class="info-row"> 832 - <span class="info-label"> 主な予算配分</span>670 + <span class="info-label">議案の集め方</span> 833 833 <span class="info-value"> 834 834 <div class="selection-display"> 835 - #foreach($ ba in $budgetAllocation)836 - <span class="selection-item">$!escapetool.xml($ ba.trim())</span>673 + #foreach($aa in $assemblyAgenda) 674 + <span class="selection-item">$!escapetool.xml($aa.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> 680 + #if($assemblyTopics && !$assemblyTopics.isEmpty()) 681 + <div class="info-row"> 682 + <span class="info-label">扱う内容</span> 683 + <span class="info-value"> 684 + <div class="selection-display"> 685 + #foreach($at in $assemblyTopics) 686 + <span class="selection-item">$!escapetool.xml($at.trim())</span> 687 + #end 688 + </div> 689 + </span> 690 + </div> 844 844 #end 692 + #if($assemblyNote && $assemblyNote != '') 693 + <div class="info-row"> 694 + <span class="info-label">自由記述</span> 695 + <span class="info-value free-text-value">$!escapetool.xml($assemblyNote)</span> 696 + </div> 697 + #end 845 845 </div> 846 846 </div> 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> 849 - #end 850 850 #end 851 851 852 852 ## --- 広報 --- 853 853 #set($hasPublicity = ($publicityMethod && !$publicityMethod.isEmpty()) || ($publicityFrequency && $publicityFrequency != '') || ($publicityNote && $publicityNote != '')) 854 854 #if($hasPublicity) 855 - #set($canViewPB = true) 856 - #if($visibilityPublicity == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewPB = false) 857 - #elseif($visibilityPublicity == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPB = false) 858 - #end 859 - #if($canViewPB) 860 860 <div class="seitokai-subsection"> 861 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M1 12s4-8 11-8 11 8 11 8-4 8-11 8-11-8-11-8z"/><circle cx="12" cy="12" r="3"/></svg> 広報 #if($visibilityPublicity != '' && $visibilityPublicity != 'public')<span class="visibility-badge visibility-${visibilityPublicity}">#if($visibilityPublicity == '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"><pathd="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>706 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M1 12s4-8 11-8 11 8 11 8-4 8-11 8-11-8-11-8z"/><circle cx="12" cy="12" r="3"/></svg> 広報</h3> 862 862 <div class="seitokai-subsection-content"> 863 863 #if($publicityMethod && !$publicityMethod.isEmpty()) 864 864 <div class="info-row"> ... ... @@ -886,21 +886,13 @@ 886 886 #end 887 887 </div> 888 888 </div> 889 - #else 890 - <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($visibilityPublicity == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div> 891 - #end 892 892 #end 893 893 894 894 ## --- 外部連携 --- 895 895 #set($hasExternal = ($externalCooperation && $externalCooperation != '') || ($externalOrgName && $externalOrgName != '') || ($socialParticipation && !$socialParticipation.isEmpty())) 896 896 #if($hasExternal) 897 - #set($canViewEX = true) 898 - #if($visibilityExternal == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewEX = false) 899 - #elseif($visibilityExternal == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewEX = false) 900 - #end 901 - #if($canViewEX) 902 902 <div class="seitokai-subsection"> 903 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><circle cx="18" cy="5" r="3"/><circle cx="6" cy="12" r="3"/><circle cx="18" cy="19" r="3"/><line x1="8.59" y1="13.51" x2="15.42" y2="17.49"/><line x1="15.41" y1="6.51" x2="8.59" y2="10.49"/></svg> 外部連携 #if($visibilityExternal != '' && $visibilityExternal != 'public')<span class="visibility-badge visibility-${visibilityExternal}">#if($visibilityExternal == '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"><pathd="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>740 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><circle cx="18" cy="5" r="3"/><circle cx="6" cy="12" r="3"/><circle cx="18" cy="19" r="3"/><line x1="8.59" y1="13.51" x2="15.42" y2="17.49"/><line x1="15.41" y1="6.51" x2="8.59" y2="10.49"/></svg> 外部連携</h3> 904 904 <div class="seitokai-subsection-content"> 905 905 #if($externalCooperation && $externalCooperation != '') 906 906 <div class="info-row"> ... ... @@ -928,11 +928,29 @@ 928 928 #end 929 929 </div> 930 930 </div> 931 - #else 932 - <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($visibilityExternal == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div> 933 - #end 934 934 #end 935 935 770 + ## --- 年間主要行事 --- 771 + #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]]) 772 + #set($hasAnyEvent = false) 773 + #foreach($m in $months) 774 + #if($m.get(1) && $m.get(1) != '') #set($hasAnyEvent = true) #end 775 + #end 776 + #if($hasAnyEvent) 777 + <div class="seitokai-subsection"> 778 + <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> 年間主要行事</h3> 779 + <div class="seitokai-subsection-content"> 780 + <table class="wiki-table school-info-table" style="margin:0"> 781 + #foreach($m in $months) 782 + #if($m.get(1) && $m.get(1) != '') 783 + <tr><td style="width:60px;font-weight:600;white-space:nowrap">$m.get(0)</td><td>$!escapetool.xml($m.get(1))</td></tr> 784 + #end 785 + #end 786 + </table> 787 + </div> 788 + </div> 789 + #end 790 + 936 936 ## --- 生徒会の課題意識 --- 937 937 #if($challenges && $challenges != '') 938 938 #set($canViewChallenges = true) ... ... @@ -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'); ... ... @@ -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); 1428 + 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) + '">' +1476 + 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) + '" />' +1479 + '<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>' +1493 + html += '<div class="edit-attach-item" data-name="' + f.replace(/"/g,'"') + '">' + 1494 + '<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) + '" />' +1496 + '<input type="hidden" name="keepFiles" value="' + f.replace(/"/g,'"') + '" />' + 1728 1728 '</div>'; 1729 1729 } 1730 1730 html += '</div>';