Changes for page 学校ページ テンプレート
Last modified by Super Admin on 2026/04/05 18:59
From version 
107.1 
107.1
edited by Super Admin
on 2026/03/24 15:28
on 2026/03/24 15:28
Change comment:
There is no comment for this version
To version 95.1
95.1
edited by Super Admin
on 2026/03/20 18:03
on 2026/03/20 18:03
Change comment:
There is no comment for this version
Summary
Details
-
Page properties
-
- Content
-
... ... @@ -68,7 +68,6 @@ 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')) 72 72 #set($ictUsage = $doc.getValue('ictUsage')) 73 73 74 74 ## --- 生徒総会 --- ... ... @@ -126,14 +126,6 @@ 126 126 #set($visibilityBudget = $!doc.getValue('visibilityBudget')) 127 127 #set($visibilityRuleReview = $!doc.getValue('visibilityRuleReview')) 128 128 #set($visibilityChallenges = $!doc.getValue('visibilityChallenges')) 129 -#set($visibilityDailyActivities = $!doc.getValue('visibilityDailyActivities')) 130 -#set($visibilityElection = $!doc.getValue('visibilityElection')) 131 -#set($visibilityMeeting = $!doc.getValue('visibilityMeeting')) 132 -#set($visibilityActivityEnv = $!doc.getValue('visibilityActivityEnv')) 133 -#set($visibilityAssembly = $!doc.getValue('visibilityAssembly')) 134 -#set($visibilityPublicity = $!doc.getValue('visibilityPublicity')) 135 -#set($visibilityExternal = $!doc.getValue('visibilityExternal')) 136 -#set($visibilityAnnualEvents = $!doc.getValue('visibilityAnnualEvents')) 137 137 ## デフォルト値（未設定なら全体公開） 138 138 #if(!$visibilityOrgChart || $visibilityOrgChart == '') #set($visibilityOrgChart = 'public') #end 139 139 #if(!$visibilityBudget || $visibilityBudget == '') #set($visibilityBudget = 'public') #end ... ... @@ -145,7 +145,6 @@ 145 145 #set($isGuest = $viewerUser == 'XWiki.XWikiGuest') 146 146 #set($isViewerAdmin = false) 147 147 #set($viewerSchoolCode = '') 148 -#set($viewerSecondaryGraduated = false) 149 149 #if(!$isGuest) 150 150 #set($viewerDoc = $xwiki.getDocument($viewerUser)) 151 151 #set($viewerAccountType = $!viewerDoc.getValue('accountType')) ... ... @@ -155,24 +155,6 @@ 155 155 #if($viewerAccountType == 'admin') 156 156 #set($isViewerAdmin = true) 157 157 #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 176 176 #end 177 177 178 178 ## --- 関連校（中高一貫校）情報 --- ... ... @@ -182,7 +182,7 @@ 182 182 #if($affiliatedSchoolCode && $affiliatedSchoolCode != '') 183 183 #if($viewerSchoolCode == $affiliatedSchoolCode) 184 184 #set($isAffiliated = true) 185 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode && !$viewerSecondaryGraduated)157 + #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode) 186 186 #set($isAffiliated = true) 187 187 #end 188 188 #end ... ... @@ -192,7 +192,7 @@ 192 192 #if(!$isGuest && $viewerUserRole != 'graduate') 193 193 #if($viewerSchoolCode == $schoolCode || $isAffiliated) 194 194 #set($isSchoolMember = true) 195 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode && !$viewerSecondaryGraduated)167 + #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode) 196 196 #set($isSchoolMember = true) 197 197 #end 198 198 #end ... ... @@ -396,27 +396,6 @@ 396 396 </div> 397 397 #end 398 398 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 - 420 420 ## --- ① 学校基本情報 --- 421 421 <div class="school-info-card collapsed" id="card-basic-info"> 422 422 <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> ... ... @@ -475,13 +475,8 @@ 475 475 476 476 ## --- 日常の活動 --- 477 477 #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) 483 483 <div class="seitokai-subsection"> 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"><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> 485 485 <div class="seitokai-subsection-content"> 486 486 <p class="activity-hint">活動時間が多い3つ</p> 487 487 <div class="tag-container"> ... ... @@ -494,20 +494,12 @@ 494 494 #end 495 495 </div> 496 496 </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 500 500 #end 501 501 502 502 ## --- 選挙 --- 503 503 #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) 509 509 <div class="seitokai-subsection"> 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"><pathd="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>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> 511 511 <div class="seitokai-subsection-content"> 512 512 <div class="info-row"> 513 513 <span class="info-label">役員選挙</span> ... ... @@ -524,20 +524,12 @@ 524 524 #end 525 525 </div> 526 526 </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 530 530 #end 531 531 532 532 ## --- 定例活動 --- 533 533 #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) 539 539 <div class="seitokai-subsection"> 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"><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> 541 541 <div class="seitokai-subsection-content"> 542 542 <div class="info-row"> 543 543 <span class="info-label">役員定例会の頻度</span> ... ... @@ -548,9 +548,6 @@ 548 548 #end 549 549 </div> 550 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($visibilityMeeting == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div> 553 - #end 554 554 #end 555 555 556 556 ## --- 予算 --- ... ... @@ -681,15 +681,10 @@ 681 681 #end 682 682 683 683 ## --- 活動環境 --- 684 - #set($hasActivityEnv = ($activityPlace && !$activityPlace.isEmpty()) || ($activityRoomEquipment && $activityRoomEquipment != '') || ($activityRoomImage && $activityRoomImage != '') || ($ict Tools && !$ictTools.isEmpty()) || ($ictUsage && !$ictUsage.isEmpty()))611 + #set($hasActivityEnv = ($activityPlace && !$activityPlace.isEmpty()) || ($activityRoomEquipment && $activityRoomEquipment != '') || ($activityRoomImage && $activityRoomImage != '') || ($ictUsage && !$ictUsage.isEmpty())) 685 685 #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) 691 691 <div class="seitokai-subsection"> 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"><pathd="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-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> 693 693 <div class="seitokai-subsection-content"> 694 694 #if($activityPlace && !$activityPlace.isEmpty()) 695 695 <div class="info-row"> ... ... @@ -715,40 +715,6 @@ 715 715 <span class="info-value"><div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($activityRoomImage)" alt="活動場所の写真" class="org-chart-img" /></div></span> 716 716 </div> 717 717 #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 752 752 #if($ictUsage && !$ictUsage.isEmpty()) 753 753 <div class="info-row"> 754 754 <span class="info-label">ICT活用している場面</span> ... ... @@ -763,21 +763,13 @@ 763 763 #end 764 764 </div> 765 765 </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 769 769 #end 770 770 771 771 ## --- 生徒総会 --- 772 772 #set($hasAssembly = ($assemblyFormat && $assemblyFormat != '') || ($assemblyCount && $assemblyCount > 0) || ($assemblyAgenda && !$assemblyAgenda.isEmpty()) || ($assemblyTopics && !$assemblyTopics.isEmpty()) || ($assemblyNote && $assemblyNote != '')) 773 773 #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) 779 779 <div class="seitokai-subsection"> 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"><pathd="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>660 + <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> 781 781 <div class="seitokai-subsection-content"> 782 782 #if($assemblyFormat && $assemblyFormat != '') 783 783 <div class="info-row"> ... ... @@ -823,21 +823,13 @@ 823 823 #end 824 824 </div> 825 825 </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 829 829 #end 830 830 831 831 ## --- 広報 --- 832 832 #set($hasPublicity = ($publicityMethod && !$publicityMethod.isEmpty()) || ($publicityFrequency && $publicityFrequency != '') || ($publicityNote && $publicityNote != '')) 833 833 #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) 839 839 <div class="seitokai-subsection"> 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"><pathd="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>712 + <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> 841 841 <div class="seitokai-subsection-content"> 842 842 #if($publicityMethod && !$publicityMethod.isEmpty()) 843 843 <div class="info-row"> ... ... @@ -865,21 +865,13 @@ 865 865 #end 866 866 </div> 867 867 </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 871 871 #end 872 872 873 873 ## --- 外部連携 --- 874 874 #set($hasExternal = ($externalCooperation && $externalCooperation != '') || ($externalOrgName && $externalOrgName != '') || ($socialParticipation && !$socialParticipation.isEmpty())) 875 875 #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) 881 881 <div class="seitokai-subsection"> 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"><pathd="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>746 + <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> 883 883 <div class="seitokai-subsection-content"> 884 884 #if($externalCooperation && $externalCooperation != '') 885 885 <div class="info-row"> ... ... @@ -907,9 +907,6 @@ 907 907 #end 908 908 </div> 909 909 </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 913 913 #end 914 914 915 915 ## --- 年間主要行事 --- ... ... @@ -919,13 +919,8 @@ 919 919 #if($m.get(1) && $m.get(1) != '') #set($hasAnyEvent = true) #end 920 920 #end 921 921 #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) 927 927 <div class="seitokai-subsection"> 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"><pathd="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>784 + <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> 929 929 <div class="seitokai-subsection-content"> 930 930 <table class="wiki-table school-info-table" style="margin:0"> 931 931 #foreach($m in $months) ... ... @@ -936,9 +936,6 @@ 936 936 </table> 937 937 </div> 938 938 </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 942 942 #end 943 943 944 944 ## --- 生徒会の課題意識 --- ... ... @@ -1578,15 +1578,7 @@ 1578 1578 }; 1579 1579 var toast = document.createElement('div'); 1580 1580 toast.className = 'toast toast-' + type; 1581 - var iconSvg = icons[type] || ''; 1582 - if (iconSvg) { 1583 - var iconSpan = document.createElement('span'); 1584 - iconSpan.innerHTML = iconSvg; 1585 - toast.appendChild(iconSpan); 1586 - } 1587 - var msgSpan = document.createElement('span'); 1588 - msgSpan.textContent = message; 1589 - toast.appendChild(msgSpan); 1434 + toast.innerHTML = (icons[type] || '') + '<span>' + message + '</span>'; 1590 1590 container.appendChild(toast); 1591 1591 setTimeout(function() { toast.remove(); }, 3200); 1592 1592 } ... ... @@ -1625,7 +1625,6 @@ 1625 1625 var html = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&').replace(/</g,'<').replace(/>/g,'>') + '</textarea>'; 1626 1626 1627 1627 // コメント以外は添付ファイル編集を表示 1628 - function escAttr(s) { return s.replace(/&/g,'&').replace(/"/g,'"').replace(/'/g,''').replace(/</g,'<').replace(/>/g,'>'); } 1629 1629 if (postType !== 'comment') { 1630 1630 // 既存画像 1631 1631 html += '<div class="edit-attachments">'; ... ... @@ -1635,10 +1635,10 @@ 1635 1635 for (var i = 0; i < imgs.length; i++) { 1636 1636 var img = imgs[i].trim(); 1637 1637 if (!img) continue; 1638 - html += '<div class="edit-attach-item" data-name="' + e scAttr(img) + '">' +1482 + html += '<div class="edit-attach-item" data-name="' + img.replace(/"/g,'"') + '">' + 1639 1639 '<img src="/xwiki/bin/download/' + schoolPage.replace(/\./g,'/') + '/' + encodeURIComponent(img) + '" class="edit-attach-thumb" />' + 1640 1640 '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' + 1641 - '<input type="hidden" name="keepImages" value="' + e scAttr(img) + '" />' +1485 + '<input type="hidden" name="keepImages" value="' + img.replace(/"/g,'"') + '" />' + 1642 1642 '</div>'; 1643 1643 } 1644 1644 html += '</div>'; ... ... @@ -1652,10 +1652,10 @@ 1652 1652 if (!f) continue; 1653 1653 var displayName = f; 1654 1654 if (/^file_\d{14}_\d+_/.test(f)) displayName = f.replace(/^file_\d{14}_\d+_/, ''); 1655 - html += '<div class="edit-attach-item" data-name="' + e scAttr(f) + '">' +1656 - '<span class="edit-attach-fname">' + escAttr(displayName) + '</span>' +1499 + html += '<div class="edit-attach-item" data-name="' + f.replace(/"/g,'"') + '">' + 1500 + '<span class="edit-attach-fname">' + displayName.replace(/</g,'<').replace(/>/g,'>') + '</span>' + 1657 1657 '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' + 1658 - '<input type="hidden" name="keepFiles" value="' + e scAttr(f) + '" />' +1502 + '<input type="hidden" name="keepFiles" value="' + f.replace(/"/g,'"') + '" />' + 1659 1659 '</div>'; 1660 1660 } 1661 1661 html += '</div>';