Changes for page 学校ページ テンプレート
Last modified by Super Admin on 2026/04/05 18:59
From version 
96.1 
96.1
edited by Super Admin
on 2026/03/20 18:06
on 2026/03/20 18:06
Change comment:
There is no comment for this version
To version 108.1
108.1
edited by Super Admin
on 2026/03/24 17:20
on 2026/03/24 17:20
Change comment:
There is no comment for this version
Summary
Details
-
Page properties
-
- Content
-
... ... @@ -68,6 +68,7 @@ 68 68 #set($activityPlace = $doc.getValue('activityPlace')) 69 69 #set($activityRoomEquipment = $doc.getValue('activityRoomEquipment')) 70 70 #set($activityRoomImage = $doc.getValue('activityRoomImage')) 71 +#set($ictTools = $doc.getValue('ictTools')) 71 71 #set($ictUsage = $doc.getValue('ictUsage')) 72 72 73 73 ## --- 生徒総会 --- ... ... @@ -144,6 +144,7 @@ 144 144 #set($isGuest = $viewerUser == 'XWiki.XWikiGuest') 145 145 #set($isViewerAdmin = false) 146 146 #set($viewerSchoolCode = '') 148 +#set($viewerSecondaryGraduated = false) 147 147 #if(!$isGuest) 148 148 #set($viewerDoc = $xwiki.getDocument($viewerUser)) 149 149 #set($viewerAccountType = $!viewerDoc.getValue('accountType')) ... ... @@ -153,6 +153,24 @@ 153 153 #if($viewerAccountType == 'admin') 154 154 #set($isViewerAdmin = true) 155 155 #end 158 + ## 第2所属校の在学年数超過チェック 159 + #set($viewerSecEnrollYear = $!viewerDoc.getValue('secondaryEnrollmentYear')) 160 + #if($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecEnrollYear && $viewerSecEnrollYear != '') 161 + #set($vNow = $datetool.date) 162 + #set($vCurYear = $mathtool.toInteger($datetool.format('yyyy', $vNow))) 163 + #set($vCurMonth = $mathtool.toInteger($datetool.format('MM', $vNow))) 164 + #if($vCurMonth >= 4)#set($vSchoolYear = $vCurYear)#else#set($vSchoolYear = $mathtool.sub($vCurYear, 1))#end 165 + #set($vSecEnroll = $mathtool.toInteger($viewerSecEnrollYear)) 166 + #set($vSecMax = 3) 167 + #if($viewerSecondarySchoolCode.length() >= 2) 168 + #set($vSecType = $viewerSecondarySchoolCode.substring(0, 2)) 169 + #if($vSecType == 'C2')#set($vSecMax = 9)#elseif($vSecType == 'D2')#set($vSecMax = 6)#end 170 + #end 171 + #set($vSecGrade = $mathtool.add($mathtool.sub($vSchoolYear, $vSecEnroll), 1)) 172 + #if($vSecGrade > $vSecMax) 173 + #set($viewerSecondaryGraduated = true) 174 + #end 175 + #end 156 156 #end 157 157 158 158 ## --- 関連校（中高一貫校）情報 --- ... ... @@ -162,7 +162,7 @@ 162 162 #if($affiliatedSchoolCode && $affiliatedSchoolCode != '') 163 163 #if($viewerSchoolCode == $affiliatedSchoolCode) 164 164 #set($isAffiliated = true) 165 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode) 185 + #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode && !$viewerSecondaryGraduated) 166 166 #set($isAffiliated = true) 167 167 #end 168 168 #end ... ... @@ -172,7 +172,7 @@ 172 172 #if(!$isGuest && $viewerUserRole != 'graduate') 173 173 #if($viewerSchoolCode == $schoolCode || $isAffiliated) 174 174 #set($isSchoolMember = true) 175 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode) 195 + #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode && !$viewerSecondaryGraduated) 176 176 #set($isSchoolMember = true) 177 177 #end 178 178 #end ... ... @@ -376,6 +376,27 @@ 376 376 </div> 377 377 #end 378 378 399 +## --- 未入力ガイド（自校ユーザー向け） --- 400 +#if(!$isGuest && $canEdit) 401 + #set($missingItems = []) 402 + #if(!$studentCount || $studentCount == '' || $studentCount == '0') #set($discard = $missingItems.add('生徒数')) #end 403 + #if(!$orgChart || $orgChart == '') #set($discard = $missingItems.add('生徒会組織')) #end 404 + #if(!$dailyActivities || $dailyActivities == '') #set($discard = $missingItems.add('日常の活動')) #end 405 + #if(!$ruleReviewStatus || $ruleReviewStatus == '') #set($discard = $missingItems.add('校則・生徒会会則の見直し')) #end 406 + #set($activityCount = $doc.getObjects('SeitokaiCode.ActivityClass').size()) 407 + #if($activityCount == 0) #set($discard = $missingItems.add('活動報告（まだ投稿がありません）')) #end 408 + #if($missingItems.size() > 0) 409 +<div class="form-message-info" style="margin-bottom:var(--sp-4);"> 410 + <strong>入力のお願い</strong> — 以下の項目がまだ入力されていません。<a href="$doc.getURL('view', 'sheet=SeitokaiCode.SchoolEditForm')">編集画面</a>から入力すると、他校の生徒会の参考になります。 411 + <ul style="margin:var(--sp-2) 0 0; padding-left:var(--sp-5);"> 412 + #foreach($item in $missingItems) 413 + <li>$item</li> 414 + #end 415 + </ul> 416 +</div> 417 + #end 418 +#end 419 + 379 379 ## --- ① 学校基本情報 --- 380 380 <div class="school-info-card collapsed" id="card-basic-info"> 381 381 <h2 role="button" tabindex="0" aria-expanded="false" onclick="toggleInfoCard('card-basic-info')" onkeydown="if(event.key==='Enter'||event.key===' '){event.preventDefault();toggleInfoCard('card-basic-info')}"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M4 19.5A2.5 2.5 0 016.5 17H20"/><path d="M6.5 2H20v20H6.5A2.5 2.5 0 014 19.5v-15A2.5 2.5 0 016.5 2z"/></svg> 学校基本情報</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2> ... ... @@ -434,8 +434,13 @@ 434 434 435 435 ## --- 日常の活動 --- 436 436 #if($dailyActivities && !$dailyActivities.isEmpty()) 478 + #set($canViewDA = true) 479 + #if($visibilityDailyActivities == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewDA = false) 480 + #elseif($visibilityDailyActivities == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewDA = false) 481 + #end 482 + #if($canViewDA) 437 437 <div class="seitokai-subsection"> 438 - <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> 484 + <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"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3> 439 439 <div class="seitokai-subsection-content"> 440 440 <p class="activity-hint">活動時間が多い3つ</p> 441 441 <div class="tag-container"> ... ... @@ -448,12 +448,20 @@ 448 448 #end 449 449 </div> 450 450 </div> 497 + #else 498 + <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> 499 + #end 451 451 #end 452 452 453 453 ## --- 選挙 --- 454 454 #if($electionExists && $electionExists != '') 504 + #set($canViewEL = true) 505 + #if($visibilityElection == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewEL = false) 506 + #elseif($visibilityElection == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewEL = false) 507 + #end 508 + #if($canViewEL) 455 455 <div class="seitokai-subsection"> 456 - <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> 510 + <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> 457 457 <div class="seitokai-subsection-content"> 458 458 <div class="info-row"> 459 459 <span class="info-label">役員選挙</span> ... ... @@ -470,12 +470,20 @@ 470 470 #end 471 471 </div> 472 472 </div> 527 + #else 528 + <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> 529 + #end 473 473 #end 474 474 475 475 ## --- 定例活動 --- 476 476 #if($meetingFrequency && $meetingFrequency != '') 534 + #set($canViewMT = true) 535 + #if($visibilityMeeting == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewMT = false) 536 + #elseif($visibilityMeeting == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewMT = false) 537 + #end 538 + #if($canViewMT) 477 477 <div class="seitokai-subsection"> 478 - <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> 540 + <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"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3> 479 479 <div class="seitokai-subsection-content"> 480 480 <div class="info-row"> 481 481 <span class="info-label">役員定例会の頻度</span> ... ... @@ -486,6 +486,9 @@ 486 486 #end 487 487 </div> 488 488 </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($visibilityMeeting == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div> 553 + #end 489 489 #end 490 490 491 491 ## --- 予算 --- ... ... @@ -616,10 +616,15 @@ 616 616 #end 617 617 618 618 ## --- 活動環境 --- 619 - #set($hasActivityEnv = ($activityPlace && !$activityPlace.isEmpty()) || ($activityRoomEquipment && $activityRoomEquipment != '') || ($activityRoomImage && $activityRoomImage != '') || ($ictUsage && !$ictUsage.isEmpty())) 684 + #set($hasActivityEnv = ($activityPlace && !$activityPlace.isEmpty()) || ($activityRoomEquipment && $activityRoomEquipment != '') || ($activityRoomImage && $activityRoomImage != '') || ($ictTools && !$ictTools.isEmpty()) || ($ictUsage && !$ictUsage.isEmpty())) 620 620 #if($hasActivityEnv) 686 + #set($canViewAE = true) 687 + #if($visibilityActivityEnv == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAE = false) 688 + #elseif($visibilityActivityEnv == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAE = false) 689 + #end 690 + #if($canViewAE) 621 621 <div class="seitokai-subsection"> 622 - <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> 692 + <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> 623 623 <div class="seitokai-subsection-content"> 624 624 #if($activityPlace && !$activityPlace.isEmpty()) 625 625 <div class="info-row"> ... ... @@ -645,6 +645,40 @@ 645 645 <span class="info-value"><div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($activityRoomImage)" alt="活動場所の写真" class="org-chart-img" /></div></span> 646 646 </div> 647 647 #end 718 + #if($ictTools && !$ictTools.isEmpty()) 719 + <div class="info-row"> 720 + <span class="info-label">利用しているICTツール</span> 721 + <span class="info-value"> 722 + #set($ictCatDisplay = [ 723 + ["連絡ツール", ["メール","LINE","LINE WORKS","Discord","Slack","Microsoft Teams","Google Chat","InstagramのDM","XのDM","その他（連絡）"]], 724 + ["ドキュメント作成・共有", ["Googleドキュメント","Googleスプレッドシート","Googleスライド","Googleドライブ","Word","Excel","PowerPoint","OneDrive","SharePoint","Notion","Pages","Numbers","Keynote","Dropbox","Box","その他（ドキュメント）"]], 725 + ["タスク管理", ["Googleカレンダー","Google ToDoリスト","Trello","Asana","Excel等スプレッドシート","その他（タスク管理）"]], 726 + ["ビデオ会議ツール", ["Zoom","Google Meet","その他（ビデオ会議）"]], 727 + ["アンケート", ["Googleフォーム","Microsoft Forms","その他（アンケート）"]], 728 + ["デザイン・クリエイティブ", ["Canva","各種Adobe","CapCut","LumaFusion","AviUtl","ibisPaint","その他（デザイン）"]], 729 + ["その他", ["独自のWebシステム・自作アプリ"]] 730 + ]) 731 + #foreach($catD in $ictCatDisplay) 732 + #set($catHasItems = false) 733 + #foreach($t in $catD.get(1)) 734 + #if($ictTools.contains($t)) #set($catHasItems = true) #end 735 + #end 736 + #if($catHasItems) 737 + <div style="margin-bottom:6px"> 738 + <span style="font-size:0.8em;font-weight:600;color:var(--text-mid)">$catD.get(0):</span> 739 + <div class="selection-display" style="margin-top:2px"> 740 + #foreach($t in $catD.get(1)) 741 + #if($ictTools.contains($t)) 742 + <span class="selection-item">$!escapetool.xml($t)</span> 743 + #end 744 + #end 745 + </div> 746 + </div> 747 + #end 748 + #end 749 + </span> 750 + </div> 751 + #end 648 648 #if($ictUsage && !$ictUsage.isEmpty()) 649 649 <div class="info-row"> 650 650 <span class="info-label">ICT活用している場面</span> ... ... @@ -659,13 +659,21 @@ 659 659 #end 660 660 </div> 661 661 </div> 766 + #else 767 + <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> 768 + #end 662 662 #end 663 663 664 664 ## --- 生徒総会 --- 665 665 #set($hasAssembly = ($assemblyFormat && $assemblyFormat != '') || ($assemblyCount && $assemblyCount > 0) || ($assemblyAgenda && !$assemblyAgenda.isEmpty()) || ($assemblyTopics && !$assemblyTopics.isEmpty()) || ($assemblyNote && $assemblyNote != '')) 666 666 #if($hasAssembly) 774 + #set($canViewAS = true) 775 + #if($visibilityAssembly == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAS = false) 776 + #elseif($visibilityAssembly == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAS = false) 777 + #end 778 + #if($canViewAS) 667 667 <div class="seitokai-subsection"> 668 - <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> 780 + <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> 669 669 <div class="seitokai-subsection-content"> 670 670 #if($assemblyFormat && $assemblyFormat != '') 671 671 <div class="info-row"> ... ... @@ -711,13 +711,21 @@ 711 711 #end 712 712 </div> 713 713 </div> 826 + #else 827 + <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> 828 + #end 714 714 #end 715 715 716 716 ## --- 広報 --- 717 717 #set($hasPublicity = ($publicityMethod && !$publicityMethod.isEmpty()) || ($publicityFrequency && $publicityFrequency != '') || ($publicityNote && $publicityNote != '')) 718 718 #if($hasPublicity) 834 + #set($canViewPB = true) 835 + #if($visibilityPublicity == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewPB = false) 836 + #elseif($visibilityPublicity == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPB = false) 837 + #end 838 + #if($canViewPB) 719 719 <div class="seitokai-subsection"> 720 - <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> 840 + <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"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3> 721 721 <div class="seitokai-subsection-content"> 722 722 #if($publicityMethod && !$publicityMethod.isEmpty()) 723 723 <div class="info-row"> ... ... @@ -745,13 +745,21 @@ 745 745 #end 746 746 </div> 747 747 </div> 868 + #else 869 + <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> 870 + #end 748 748 #end 749 749 750 750 ## --- 外部連携 --- 751 751 #set($hasExternal = ($externalCooperation && $externalCooperation != '') || ($externalOrgName && $externalOrgName != '') || ($socialParticipation && !$socialParticipation.isEmpty())) 752 752 #if($hasExternal) 876 + #set($canViewEX = true) 877 + #if($visibilityExternal == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewEX = false) 878 + #elseif($visibilityExternal == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewEX = false) 879 + #end 880 + #if($canViewEX) 753 753 <div class="seitokai-subsection"> 754 - <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> 882 + <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"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3> 755 755 <div class="seitokai-subsection-content"> 756 756 #if($externalCooperation && $externalCooperation != '') 757 757 <div class="info-row"> ... ... @@ -779,6 +779,9 @@ 779 779 #end 780 780 </div> 781 781 </div> 910 + #else 911 + <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> 912 + #end 782 782 #end 783 783 784 784 ## --- 年間主要行事 --- ... ... @@ -788,8 +788,13 @@ 788 788 #if($m.get(1) && $m.get(1) != '') #set($hasAnyEvent = true) #end 789 789 #end 790 790 #if($hasAnyEvent) 922 + #set($canViewAN = true) 923 + #if($visibilityAnnualEvents == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAN = false) 924 + #elseif($visibilityAnnualEvents == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAN = false) 925 + #end 926 + #if($canViewAN) 791 791 <div class="seitokai-subsection"> 792 - <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> 928 + <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> 793 793 <div class="seitokai-subsection-content"> 794 794 <table class="wiki-table school-info-table" style="margin:0"> 795 795 #foreach($m in $months) ... ... @@ -800,6 +800,9 @@ 800 800 </table> 801 801 </div> 802 802 </div> 939 + #else 940 + <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> 941 + #end 803 803 #end 804 804 805 805 ## --- 生徒会の課題意識 --- ... ... @@ -1198,6 +1198,25 @@ 1198 1198 #if($postVis != 'public') 1199 1199 <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> 1200 1200 #end 1340 + ## いいねボタン 1341 + #set($postLikeCount = $!post.getValue('likeCount')) 1342 + #if(!$postLikeCount || $postLikeCount == '') #set($postLikeCount = 0) #end 1343 + #set($postLikedBy = $!post.getValue('likedBy')) 1344 + #set($isLikedByMe = false) 1345 + #if($postLikedBy && $postLikedBy.contains($xcontext.user)) #set($isLikedByMe = true) #end 1346 + <div class="post-like-row post-action-mt"> 1347 + #if($xcontext.user != 'XWiki.XWikiGuest') 1348 + <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)"> 1349 + <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> 1350 + <span class="like-count">$postLikeCount</span> 1351 + </button> 1352 + #else 1353 + <span class="btn-like disabled"> 1354 + <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> 1355 + <span class="like-count">$postLikeCount</span> 1356 + </span> 1357 + #end 1358 + </div> 1201 1201 ## 固定/編集/削除/通報/非表示ボタン（横並び） 1202 1202 #set($postAuthorRef = $!post.getValue('authorRef')) 1203 1203 #set($postObjNumED = $post.number) ... ... @@ -1318,10 +1318,68 @@ 1318 1318 {{/html}} 1319 1319 #end 1320 1320 1479 +## --- OGP / SNSシェア対応 --- 1480 +#set($ogpTitle = "${schoolName} — 生徒会Wiki") 1481 +#set($ogpDesc = "${schoolName}の生徒会活動情報。") 1482 +#if($prefecture && $prefecture != '') #set($ogpDesc = "${ogpDesc}${prefecture}") #end 1483 +#if($city && $city != '') #set($ogpDesc = "${ogpDesc}${city}。") #end 1484 +#if($dailyActivities && $dailyActivities != '') #set($ogpDesc = "${ogpDesc} 主な活動: ${dailyActivities}") #end 1485 +#set($ogpUrl = "https://${request.serverName}${doc.getURL()}") 1486 + 1321 1321 ## --- 年度タブ切り替え JavaScript --- 1322 1322 {{html clean="false"}} 1323 1323 <script> 1490 +// OGPメタタグ挿入 1491 +(function() { 1492 + var ogp = { 1493 + 'og:title': '$escapetool.javascript($ogpTitle)', 1494 + 'og:description': '$escapetool.javascript($ogpDesc)', 1495 + 'og:type': 'article', 1496 + 'og:url': '$escapetool.javascript($ogpUrl)', 1497 + 'og:site_name': '生徒会Wiki', 1498 + 'twitter:card': 'summary' 1499 + }; 1500 + for (var p in ogp) { 1501 + var meta = document.createElement('meta'); 1502 + meta.setAttribute('property', p); 1503 + meta.setAttribute('content', ogp[p]); 1504 + document.head.appendChild(meta); 1505 + } 1506 + // twitter用 1507 + var tw = document.createElement('meta'); 1508 + tw.setAttribute('name', 'twitter:card'); 1509 + tw.setAttribute('content', 'summary'); 1510 + document.head.appendChild(tw); 1511 +})(); 1324 1324 // コンパクト表示（タイトルのみ）トグル 1513 +// いいねトグル 1514 +function toggleLike(btn) { 1515 + var page = btn.getAttribute('data-page'); 1516 + var obj = btn.getAttribute('data-obj'); 1517 + var csrf = btn.getAttribute('data-csrf'); 1518 + btn.disabled = true; 1519 + var fd = new FormData(); 1520 + fd.append('page', page); 1521 + fd.append('obj', obj); 1522 + fd.append('form_token', csrf); 1523 + fetch('/bin/SeitokaiCode/LikePost', { method: 'POST', body: fd }) 1524 + .then(function(r) { return r.json(); }) 1525 + .then(function(data) { 1526 + btn.querySelector('.like-count').textContent = data.count; 1527 + if (data.action === 'liked') { 1528 + btn.classList.add('liked'); 1529 + btn.querySelector('svg').setAttribute('fill', 'currentColor'); 1530 + btn.querySelector('svg').setAttribute('stroke', 'none'); 1531 + } else { 1532 + btn.classList.remove('liked'); 1533 + btn.querySelector('svg').removeAttribute('fill'); 1534 + btn.querySelector('svg').setAttribute('stroke', 'currentColor'); 1535 + } 1536 + }) 1537 + .catch(function() { alert('エラーが発生しました'); }) 1538 + .finally(function() { btn.disabled = false; }); 1539 +} 1540 + 1325 1325 function toggleCompactView() { 1326 1326 var container = document.querySelector('.xwiki-content') || document.body; 1327 1327 var isCompact = container.classList.toggle('activity-compact-view'); ... ... @@ -1439,7 +1439,15 @@ 1439 1439 }; 1440 1440 var toast = document.createElement('div'); 1441 1441 toast.className = 'toast toast-' + type; 1442 - toast.innerHTML = (icons[type] || '') + '<span>' + message + '</span>'; 1658 + var iconSvg = icons[type] || ''; 1659 + if (iconSvg) { 1660 + var iconSpan = document.createElement('span'); 1661 + iconSpan.innerHTML = iconSvg; 1662 + toast.appendChild(iconSpan); 1663 + } 1664 + var msgSpan = document.createElement('span'); 1665 + msgSpan.textContent = message; 1666 + toast.appendChild(msgSpan); 1443 1443 container.appendChild(toast); 1444 1444 setTimeout(function() { toast.remove(); }, 3200); 1445 1445 } ... ... @@ -1478,6 +1478,7 @@ 1478 1478 var html = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&').replace(/</g,'<').replace(/>/g,'>') + '</textarea>'; 1479 1479 1480 1480 // コメント以外は添付ファイル編集を表示 1705 + function escAttr(s) { return s.replace(/&/g,'&').replace(/"/g,'"').replace(/'/g,''').replace(/</g,'<').replace(/>/g,'>'); } 1481 1481 if (postType !== 'comment') { 1482 1482 // 既存画像 1483 1483 html += '<div class="edit-attachments">'; ... ... @@ -1487,10 +1487,10 @@ 1487 1487 for (var i = 0; i < imgs.length; i++) { 1488 1488 var img = imgs[i].trim(); 1489 1489 if (!img) continue; 1490 - html += '<div class="edit-attach-item" data-name="' + img.replace(/"/g,'"') + '">' +1715 + html += '<div class="edit-attach-item" data-name="' + escAttr(img) + '">' + 1491 1491 '<img src="/xwiki/bin/download/' + schoolPage.replace(/\./g,'/') + '/' + encodeURIComponent(img) + '" class="edit-attach-thumb" />' + 1492 1492 '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' + 1493 - '<input type="hidden" name="keepImages" value="' + img.replace(/"/g,'"') + '" />' +1718 + '<input type="hidden" name="keepImages" value="' + escAttr(img) + '" />' + 1494 1494 '</div>'; 1495 1495 } 1496 1496 html += '</div>'; ... ... @@ -1504,10 +1504,10 @@ 1504 1504 if (!f) continue; 1505 1505 var displayName = f; 1506 1506 if (/^file_\d{14}_\d+_/.test(f)) displayName = f.replace(/^file_\d{14}_\d+_/, ''); 1507 - html += '<div class="edit-attach-item" data-name="' + f.replace(/"/g,'"') + '">' +1508 - '<span class="edit-attach-fname">' + displayName .replace(/</g,'<').replace(/>/g,'>')+ '</span>' +1732 + html += '<div class="edit-attach-item" data-name="' + escAttr(f) + '">' + 1733 + '<span class="edit-attach-fname">' + escAttr(displayName) + '</span>' + 1509 1509 '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' + 1510 - '<input type="hidden" name="keepFiles" value="' + f.replace(/"/g,'"') + '" />' +1735 + '<input type="hidden" name="keepFiles" value="' + escAttr(f) + '" />' + 1511 1511 '</div>'; 1512 1512 } 1513 1513 html += '</div>';