Skip to Content
Last modified by Super Admin on 2026/04/05 18:59
From version Icon 94.1 Icon
edited by Super Admin
on 2026/03/20 17:50
Change comment: There is no comment for this version
To version Icon 110.1 Icon
edited by Super Admin
on 2026/03/24 19:13
Change comment: There is no comment for this version

Summary

Details

Icon Page properties
Content
... ... @@ -7,6 +7,19 @@
7 7   #stop
8 8  #end
9 9  {{html clean="false"}}
10 +## --- OGP メタタグ（SNSシェア対応） ---
11 +#set($ogTitle = "$!{schoolName} — 生徒会Wiki")
12 +#set($ogDesc = "$!{schoolName}の生徒会活動情報。全国の高校の生徒会活動事例を集積・共有するプラットフォーム。")
13 +#set($ogUrl = "https://${request.serverName}${doc.getURL('view')}")
14 +<meta property="og:type" content="article" />
15 +<meta property="og:title" content="$escapetool.xml($ogTitle)" />
16 +<meta property="og:description" content="$escapetool.xml($ogDesc)" />
17 +<meta property="og:url" content="$escapetool.xml($ogUrl)" />
18 +<meta property="og:site_name" content="生徒会Wiki" />
19 +<meta property="og:locale" content="ja_JP" />
20 +<meta name="twitter:card" content="summary" />
21 +<meta name="twitter:title" content="$escapetool.xml($ogTitle)" />
22 +<meta name="twitter:description" content="$escapetool.xml($ogDesc)" />
10 10  ## メンテナンスバナー（{{include}}ではなくインラインで記述し、<p>タグ挿入を回避）
11 11  #set($bannerDoc = $xwiki.getDocument('SeitokaiAdmin.MaintenanceBanner'))
12 12  #set($bannerObj = $bannerDoc.getObject('SeitokaiCode.MaintenanceBannerClass'))
... ... @@ -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'))
84 +#set($ictTools = $doc.getValue('ictTools'))
71 71  #set($ictUsage = $doc.getValue('ictUsage'))
72 72  
73 73  ## --- 生徒総会 ---
... ... @@ -125,6 +125,14 @@
125 125  #set($visibilityBudget = $!doc.getValue('visibilityBudget'))
126 126  #set($visibilityRuleReview = $!doc.getValue('visibilityRuleReview'))
127 127  #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'))
128 128  ## デフォルト値（未設定なら全体公開）
129 129  #if(!$visibilityOrgChart || $visibilityOrgChart == '') #set($visibilityOrgChart = 'public') #end
130 130  #if(!$visibilityBudget || $visibilityBudget == '') #set($visibilityBudget = 'public') #end
... ... @@ -136,6 +136,7 @@
136 136  #set($isGuest = $viewerUser == 'XWiki.XWikiGuest')
137 137  #set($isViewerAdmin = false)
138 138  #set($viewerSchoolCode = '')
161 +#set($viewerSecondaryGraduated = false)
139 139  #if(!$isGuest)
140 140   #set($viewerDoc = $xwiki.getDocument($viewerUser))
141 141   #set($viewerAccountType = $!viewerDoc.getValue('accountType'))
... ... @@ -145,6 +145,24 @@
145 145   #if($viewerAccountType == 'admin')
146 146   #set($isViewerAdmin = true)
147 147   #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
148 148  #end
149 149  
150 150  ## --- 関連校（中高一貫校）情報 ---
... ... @@ -154,7 +154,7 @@
154 154  #if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
155 155   #if($viewerSchoolCode == $affiliatedSchoolCode)
156 156   #set($isAffiliated = true)
157 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode)
198 + #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode && !$viewerSecondaryGraduated)
158 158   #set($isAffiliated = true)
159 159   #end
160 160  #end
... ... @@ -164,7 +164,7 @@
164 164  #if(!$isGuest && $viewerUserRole != 'graduate')
165 165   #if($viewerSchoolCode == $schoolCode || $isAffiliated)
166 166   #set($isSchoolMember = true)
167 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode)
208 + #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode && !$viewerSecondaryGraduated)
168 168   #set($isSchoolMember = true)
169 169   #end
170 170  #end
... ... @@ -368,6 +368,106 @@
368 368  </div>
369 369  #end
370 370  
412 +## --- 入力進捗ガイド（自校ユーザー向け） ---
413 +#if(!$isGuest && $canEdit)
414 + #set($stepItems = [])
415 + #set($completedCount = 0)
416 + #set($totalSteps = 8)
417 + ## 1. 基本情報（生徒数）
418 + #if($studentCount && $studentCount != '' && $studentCount != '0')
419 + #set($discard = $stepItems.add({'name': '基本情報（生徒数・学級数）', 'done': true}))
420 + #set($completedCount = $completedCount + 1)
421 + #else
422 + #set($discard = $stepItems.add({'name': '基本情報（生徒数・学級数）', 'done': false}))
423 + #end
424 + ## 2. 生徒会組織
425 + #if($orgChart && $orgChart != '')
426 + #set($discard = $stepItems.add({'name': '生徒会組織', 'done': true}))
427 + #set($completedCount = $completedCount + 1)
428 + #else
429 + #set($discard = $stepItems.add({'name': '生徒会組織', 'done': false}))
430 + #end
431 + ## 3. 日常の活動
432 + #if($dailyActivities && $dailyActivities != '')
433 + #set($discard = $stepItems.add({'name': '日常の活動', 'done': true}))
434 + #set($completedCount = $completedCount + 1)
435 + #else
436 + #set($discard = $stepItems.add({'name': '日常の活動', 'done': false}))
437 + #end
438 + ## 4. 選挙
439 + #if($electionExists && $electionExists != '')
440 + #set($discard = $stepItems.add({'name': '選挙', 'done': true}))
441 + #set($completedCount = $completedCount + 1)
442 + #else
443 + #set($discard = $stepItems.add({'name': '選挙', 'done': false}))
444 + #end
445 + ## 5. 予算
446 + #set($budgetFilled = false)
447 + #if(($budgetScale && $budgetScale != '') || ($studentFee && $studentFee != '')) #set($budgetFilled = true) #end
448 + #if($budgetFilled)
449 + #set($discard = $stepItems.add({'name': '予算', 'done': true}))
450 + #set($completedCount = $completedCount + 1)
451 + #else
452 + #set($discard = $stepItems.add({'name': '予算', 'done': false}))
453 + #end
454 + ## 6. 校則の見直し
455 + #if($ruleReviewStatus && $ruleReviewStatus != '')
456 + #set($discard = $stepItems.add({'name': '校則・生徒会会則の見直し', 'done': true}))
457 + #set($completedCount = $completedCount + 1)
458 + #else
459 + #set($discard = $stepItems.add({'name': '校則・生徒会会則の見直し', 'done': false}))
460 + #end
461 + ## 7. 生徒総会
462 + #if($assemblyFormat && $assemblyFormat != '')
463 + #set($discard = $stepItems.add({'name': '生徒総会', 'done': true}))
464 + #set($completedCount = $completedCount + 1)
465 + #else
466 + #set($discard = $stepItems.add({'name': '生徒総会', 'done': false}))
467 + #end
468 + ## 8. 活動報告
469 + #set($activityCount = $doc.getObjects('SeitokaiCode.ActivityClass').size())
470 + #if($activityCount > 0)
471 + #set($discard = $stepItems.add({'name': '活動報告', 'done': true}))
472 + #set($completedCount = $completedCount + 1)
473 + #else
474 + #set($discard = $stepItems.add({'name': '活動報告（まだ投稿がありません）', 'done': false}))
475 + #end
476 + ## 全完了なら非表示
477 + #if($completedCount < $totalSteps)
478 + #set($progressPct = $mathtool.mul($mathtool.div($completedCount, $totalSteps), 100))
479 + #set($progressPctInt = $mathtool.toInteger($progressPct))
480 + #set($firstMissing = false)
481 +<div class="progress-guide" style="margin-bottom:var(--sp-4);">
482 + <div class="progress-guide-header">
483 + <span class="progress-guide-title"><svg class="ico" viewBox="0 0 24 24" style="width:1.1em;height:1.1em;vertical-align:-2px;"><circle cx="12" cy="12" r="10"/><polyline points="12 6 12 12 16 14"/></svg> 学校情報の入力状況</span>
484 + <span class="progress-guide-count">${completedCount} / ${totalSteps} 完了</span>
485 + </div>
486 + <div class="progress-bar-track">
487 + <div class="progress-bar-fill" style="width:${progressPctInt}%"></div>
488 + </div>
489 + <ul class="progress-step-list">
490 + #foreach($step in $stepItems)
491 + #if($step.done)
492 + <li class="progress-step done"><svg class="ico" viewBox="0 0 24 24" style="width:0.9em;height:0.9em;"><path d="M20 6L9 17l-5-5"/></svg> $step.name</li>
493 + #else
494 + #if(!$firstMissing)
495 + <li class="progress-step next"><svg class="ico" viewBox="0 0 24 24" style="width:0.9em;height:0.9em;"><circle cx="12" cy="12" r="10"/></svg> $step.name <span class="progress-next-label">← 次はここ！</span></li>
496 + #set($firstMissing = true)
497 + #else
498 + <li class="progress-step pending"><svg class="ico" viewBox="0 0 24 24" style="width:0.9em;height:0.9em;"><rect x="3" y="3" width="18" height="18" rx="2"/></svg> $step.name</li>
499 + #end
500 + #end
501 + #end
502 + </ul>
503 + <div style="margin-top:var(--sp-3);">
504 + <a href="$doc.getURL('view', 'sheet=SeitokaiCode.SchoolEditForm')" class="btn-primary-sm">
505 + <svg class="ico" viewBox="0 0 24 24" style="width:0.9em;height:0.9em;"><path d="M11 4H4a2 2 0 00-2 2v14a2 2 0 002 2h14a2 2 0 002-2v-7"/><path d="M18.5 2.5a2.121 2.121 0 013 3L12 15l-4 1 1-4 9.5-9.5z"/></svg> 編集画面を開く
506 + </a>
507 + </div>
508 +</div>
509 + #end
510 +#end
511 +
371 371  ## --- ① 学校基本情報 ---
372 372  <div class="school-info-card collapsed" id="card-basic-info">
373 373   <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>
... ... @@ -426,8 +426,13 @@
426 426  
427 427   ## --- 日常の活動 ---
428 428   #if($dailyActivities && !$dailyActivities.isEmpty())
570 + #set($canViewDA = true)
571 + #if($visibilityDailyActivities == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewDA = false)
572 + #elseif($visibilityDailyActivities == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewDA = false)
573 + #end
574 + #if($canViewDA)
429 429   <div class="seitokai-subsection">
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>
576 + <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>
431 431   <div class="seitokai-subsection-content">
432 432   <p class="activity-hint">活動時間が多い3つ</p>
433 433   <div class="tag-container">
... ... @@ -440,12 +440,20 @@
440 440   #end
441 441   </div>
442 442   </div>
589 + #else
590 + <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>
591 + #end
443 443   #end
444 444  
445 445   ## --- 選挙 ---
446 446   #if($electionExists && $electionExists != '')
596 + #set($canViewEL = true)
597 + #if($visibilityElection == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewEL = false)
598 + #elseif($visibilityElection == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewEL = false)
599 + #end
600 + #if($canViewEL)
447 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>
602 + <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>
449 449   <div class="seitokai-subsection-content">
450 450   <div class="info-row">
451 451   <span class="info-label">役員選挙</span>
... ... @@ -462,12 +462,20 @@
462 462   #end
463 463   </div>
464 464   </div>
619 + #else
620 + <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>
621 + #end
465 465   #end
466 466  
467 467   ## --- 定例活動 ---
468 468   #if($meetingFrequency && $meetingFrequency != '')
626 + #set($canViewMT = true)
627 + #if($visibilityMeeting == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewMT = false)
628 + #elseif($visibilityMeeting == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewMT = false)
629 + #end
630 + #if($canViewMT)
469 469   <div class="seitokai-subsection">
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>
632 + <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>
471 471   <div class="seitokai-subsection-content">
472 472   <div class="info-row">
473 473   <span class="info-label">役員定例会の頻度</span>
... ... @@ -478,6 +478,9 @@
478 478   #end
479 479   </div>
480 480   </div>
643 + #else
644 + <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>
645 + #end
481 481   #end
482 482  
483 483   ## --- 予算 ---
... ... @@ -608,15 +608,26 @@
608 608   #end
609 609  
610 610   ## --- 活動環境 ---
611 - #set($hasActivityEnv = ($activityPlace && $activityPlace != '') || ($activityRoomEquipment && $activityRoomEquipment != '') || ($activityRoomImage && $activityRoomImage != '') || ($ictUsage && !$ictUsage.isEmpty()))
776 + #set($hasActivityEnv = ($activityPlace && !$activityPlace.isEmpty()) || ($activityRoomEquipment && $activityRoomEquipment != '') || ($activityRoomImage && $activityRoomImage != '') || ($ictTools && !$ictTools.isEmpty()) || ($ictUsage && !$ictUsage.isEmpty()))
612 612   #if($hasActivityEnv)
778 + #set($canViewAE = true)
779 + #if($visibilityActivityEnv == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAE = false)
780 + #elseif($visibilityActivityEnv == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAE = false)
781 + #end
782 + #if($canViewAE)
613 613   <div class="seitokai-subsection">
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>
784 + <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>
615 615   <div class="seitokai-subsection-content">
616 - #if($activityPlace && $activityPlace != '')
786 + #if($activityPlace && !$activityPlace.isEmpty())
617 617   <div class="info-row">
618 618   <span class="info-label">普段の活動場所</span>
619 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($activityPlace)</span></span>
789 + <span class="info-value">
790 + <div class="selection-display">
791 + #foreach($ap in $activityPlace)
792 + <span class="selection-item">$!escapetool.xml($ap.trim())</span>
793 + #end
794 + </div>
795 + </span>
620 620   </div>
621 621   #end
622 622   #if($activityRoomEquipment && $activityRoomEquipment != '')
... ... @@ -631,6 +631,40 @@
631 631   <span class="info-value"><div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($activityRoomImage)" alt="活動場所の写真" class="org-chart-img" /></div></span>
632 632   </div>
633 633   #end
810 + #if($ictTools && !$ictTools.isEmpty())
811 + <div class="info-row">
812 + <span class="info-label">利用しているICTツール</span>
813 + <span class="info-value">
814 + #set($ictCatDisplay = [
815 + ["連絡ツール", ["メール","LINE","LINE WORKS","Discord","Slack","Microsoft Teams","Google Chat","InstagramのDM","XのDM","その他（連絡）"]],
816 + ["ドキュメント作成・共有", ["Googleドキュメント","Googleスプレッドシート","Googleスライド","Googleドライブ","Word","Excel","PowerPoint","OneDrive","SharePoint","Notion","Pages","Numbers","Keynote","Dropbox","Box","その他（ドキュメント）"]],
817 + ["タスク管理", ["Googleカレンダー","Google ToDoリスト","Trello","Asana","Excel等スプレッドシート","その他（タスク管理）"]],
818 + ["ビデオ会議ツール", ["Zoom","Google Meet","その他（ビデオ会議）"]],
819 + ["アンケート", ["Googleフォーム","Microsoft Forms","その他（アンケート）"]],
820 + ["デザイン・クリエイティブ", ["Canva","各種Adobe","CapCut","LumaFusion","AviUtl","ibisPaint","その他（デザイン）"]],
821 + ["その他", ["独自のWebシステム・自作アプリ"]]
822 + ])
823 + #foreach($catD in $ictCatDisplay)
824 + #set($catHasItems = false)
825 + #foreach($t in $catD.get(1))
826 + #if($ictTools.contains($t)) #set($catHasItems = true) #end
827 + #end
828 + #if($catHasItems)
829 + <div style="margin-bottom:6px">
830 + <span style="font-size:0.8em;font-weight:600;color:var(--text-mid)">$catD.get(0):</span>
831 + <div class="selection-display" style="margin-top:2px">
832 + #foreach($t in $catD.get(1))
833 + #if($ictTools.contains($t))
834 + <span class="selection-item">$!escapetool.xml($t)</span>
835 + #end
836 + #end
837 + </div>
838 + </div>
839 + #end
840 + #end
841 + </span>
842 + </div>
843 + #end
634 634   #if($ictUsage && !$ictUsage.isEmpty())
635 635   <div class="info-row">
636 636   <span class="info-label">ICT活用している場面</span>
... ... @@ -645,13 +645,21 @@
645 645   #end
646 646   </div>
647 647   </div>
858 + #else
859 + <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>
860 + #end
648 648   #end
649 649  
650 650   ## --- 生徒総会 ---
651 651   #set($hasAssembly = ($assemblyFormat && $assemblyFormat != '') || ($assemblyCount && $assemblyCount > 0) || ($assemblyAgenda && !$assemblyAgenda.isEmpty()) || ($assemblyTopics && !$assemblyTopics.isEmpty()) || ($assemblyNote && $assemblyNote != ''))
652 652   #if($hasAssembly)
866 + #set($canViewAS = true)
867 + #if($visibilityAssembly == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAS = false)
868 + #elseif($visibilityAssembly == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAS = false)
869 + #end
870 + #if($canViewAS)
653 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>
872 + <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>
655 655   <div class="seitokai-subsection-content">
656 656   #if($assemblyFormat && $assemblyFormat != '')
657 657   <div class="info-row">
... ... @@ -697,13 +697,21 @@
697 697   #end
698 698   </div>
699 699   </div>
918 + #else
919 + <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 生徒総会情報は #if($visibilityAssembly == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
920 + #end
700 700   #end
701 701  
702 702   ## --- 広報 ---
703 703   #set($hasPublicity = ($publicityMethod && !$publicityMethod.isEmpty()) || ($publicityFrequency && $publicityFrequency != '') || ($publicityNote && $publicityNote != ''))
704 704   #if($hasPublicity)
926 + #set($canViewPB = true)
927 + #if($visibilityPublicity == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewPB = false)
928 + #elseif($visibilityPublicity == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPB = false)
929 + #end
930 + #if($canViewPB)
705 705   <div class="seitokai-subsection">
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>
932 + <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>
707 707   <div class="seitokai-subsection-content">
708 708   #if($publicityMethod && !$publicityMethod.isEmpty())
709 709   <div class="info-row">
... ... @@ -731,13 +731,21 @@
731 731   #end
732 732   </div>
733 733   </div>
960 + #else
961 + <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>
962 + #end
734 734   #end
735 735  
736 736   ## --- 外部連携 ---
737 737   #set($hasExternal = ($externalCooperation && $externalCooperation != '') || ($externalOrgName && $externalOrgName != '') || ($socialParticipation && !$socialParticipation.isEmpty()))
738 738   #if($hasExternal)
968 + #set($canViewEX = true)
969 + #if($visibilityExternal == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewEX = false)
970 + #elseif($visibilityExternal == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewEX = false)
971 + #end
972 + #if($canViewEX)
739 739   <div class="seitokai-subsection">
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>
974 + <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>
741 741   <div class="seitokai-subsection-content">
742 742   #if($externalCooperation && $externalCooperation != '')
743 743   <div class="info-row">
... ... @@ -765,6 +765,9 @@
765 765   #end
766 766   </div>
767 767   </div>
1002 + #else
1003 + <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>
1004 + #end
768 768   #end
769 769  
770 770   ## --- 年間主要行事 ---
... ... @@ -774,8 +774,13 @@
774 774   #if($m.get(1) && $m.get(1) != '') #set($hasAnyEvent = true) #end
775 775   #end
776 776   #if($hasAnyEvent)
1014 + #set($canViewAN = true)
1015 + #if($visibilityAnnualEvents == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAN = false)
1016 + #elseif($visibilityAnnualEvents == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAN = false)
1017 + #end
1018 + #if($canViewAN)
777 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>
1020 + <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>
779 779   <div class="seitokai-subsection-content">
780 780   <table class="wiki-table school-info-table" style="margin:0">
781 781   #foreach($m in $months)
... ... @@ -786,6 +786,9 @@
786 786   </table>
787 787   </div>
788 788   </div>
1031 + #else
1032 + <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>
1033 + #end
789 789   #end
790 790  
791 791   ## --- 生徒会の課題意識 ---
... ... @@ -1184,6 +1184,25 @@
1184 1184   #if($postVis != 'public')
1185 1185   <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>
1186 1186   #end
1432 + ## いいねボタン
1433 + #set($postLikeCount = $!post.getValue('likeCount'))
1434 + #if(!$postLikeCount || $postLikeCount == '') #set($postLikeCount = 0) #end
1435 + #set($postLikedBy = $!post.getValue('likedBy'))
1436 + #set($isLikedByMe = false)
1437 + #if($postLikedBy && $postLikedBy.contains($xcontext.user)) #set($isLikedByMe = true) #end
1438 + <div class="post-like-row post-action-mt">
1439 + #if($xcontext.user != 'XWiki.XWikiGuest')
1440 + <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)">
1441 + <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>
1442 + <span class="like-count">$postLikeCount</span>
1443 + </button>
1444 + #else
1445 + <span class="btn-like disabled">
1446 + <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>
1447 + <span class="like-count">$postLikeCount</span>
1448 + </span>
1449 + #end
1450 + </div>
1187 1187   ## 固定/編集/削除/通報/非表示ボタン（横並び）
1188 1188   #set($postAuthorRef = $!post.getValue('authorRef'))
1189 1189   #set($postObjNumED = $post.number)
... ... @@ -1304,10 +1304,68 @@
1304 1304  {{/html}}
1305 1305  #end
1306 1306  
1571 +## --- OGP / SNSシェア対応 ---
1572 +#set($ogpTitle = "${schoolName} — 生徒会Wiki")
1573 +#set($ogpDesc = "${schoolName}の生徒会活動情報。")
1574 +#if($prefecture && $prefecture != '') #set($ogpDesc = "${ogpDesc}${prefecture}") #end
1575 +#if($city && $city != '') #set($ogpDesc = "${ogpDesc}${city}。") #end
1576 +#if($dailyActivities && $dailyActivities != '') #set($ogpDesc = "${ogpDesc} 主な活動: ${dailyActivities}") #end
1577 +#set($ogpUrl = "https://${request.serverName}${doc.getURL()}")
1578 +
1307 1307  ## --- 年度タブ切り替え JavaScript ---
1308 1308  {{html clean="false"}}
1309 1309  <script>
1582 +// OGPメタタグ挿入
1583 +(function() {
1584 + var ogp = {
1585 + 'og:title': '$escapetool.javascript($ogpTitle)',
1586 + 'og:description': '$escapetool.javascript($ogpDesc)',
1587 + 'og:type': 'article',
1588 + 'og:url': '$escapetool.javascript($ogpUrl)',
1589 + 'og:site_name': '生徒会Wiki',
1590 + 'twitter:card': 'summary'
1591 + };
1592 + for (var p in ogp) {
1593 + var meta = document.createElement('meta');
1594 + meta.setAttribute('property', p);
1595 + meta.setAttribute('content', ogp[p]);
1596 + document.head.appendChild(meta);
1597 + }
1598 + // twitter用
1599 + var tw = document.createElement('meta');
1600 + tw.setAttribute('name', 'twitter:card');
1601 + tw.setAttribute('content', 'summary');
1602 + document.head.appendChild(tw);
1603 +})();
1310 1310  // コンパクト表示（タイトルのみ）トグル
1605 +// いいねトグル
1606 +function toggleLike(btn) {
1607 + var page = btn.getAttribute('data-page');
1608 + var obj = btn.getAttribute('data-obj');
1609 + var csrf = btn.getAttribute('data-csrf');
1610 + btn.disabled = true;
1611 + var fd = new FormData();
1612 + fd.append('page', page);
1613 + fd.append('obj', obj);
1614 + fd.append('form_token', csrf);
1615 + fetch('/bin/SeitokaiCode/LikePost', { method: 'POST', body: fd })
1616 + .then(function(r) { return r.json(); })
1617 + .then(function(data) {
1618 + btn.querySelector('.like-count').textContent = data.count;
1619 + if (data.action === 'liked') {
1620 + btn.classList.add('liked');
1621 + btn.querySelector('svg').setAttribute('fill', 'currentColor');
1622 + btn.querySelector('svg').setAttribute('stroke', 'none');
1623 + } else {
1624 + btn.classList.remove('liked');
1625 + btn.querySelector('svg').removeAttribute('fill');
1626 + btn.querySelector('svg').setAttribute('stroke', 'currentColor');
1627 + }
1628 + })
1629 + .catch(function() { alert('エラーが発生しました'); })
1630 + .finally(function() { btn.disabled = false; });
1631 +}
1632 +
1311 1311  function toggleCompactView() {
1312 1312   var container = document.querySelector('.xwiki-content') || document.body;
1313 1313   var isCompact = container.classList.toggle('activity-compact-view');
... ... @@ -1425,7 +1425,15 @@
1425 1425   };
1426 1426   var toast = document.createElement('div');
1427 1427   toast.className = 'toast toast-' + type;
1428 - toast.innerHTML = (icons[type] || '') + '<span>' + message + '</span>';
1750 + var iconSvg = icons[type] || '';
1751 + if (iconSvg) {
1752 + var iconSpan = document.createElement('span');
1753 + iconSpan.innerHTML = iconSvg;
1754 + toast.appendChild(iconSpan);
1755 + }
1756 + var msgSpan = document.createElement('span');
1757 + msgSpan.textContent = message;
1758 + toast.appendChild(msgSpan);
1429 1429   container.appendChild(toast);
1430 1430   setTimeout(function() { toast.remove(); }, 3200);
1431 1431  }
... ... @@ -1464,6 +1464,7 @@
1464 1464   var html = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>';
1465 1465  
1466 1466   // コメント以外は添付ファイル編集を表示
1797 + function escAttr(s) { return s.replace(/&/g,'&amp;').replace(/"/g,'&quot;').replace(/'/g,'&#39;').replace(/</g,'&lt;').replace(/>/g,'&gt;'); }
1467 1467   if (postType !== 'comment') {
1468 1468   // 既存画像
1469 1469   html += '<div class="edit-attachments">';
... ... @@ -1473,10 +1473,10 @@
1473 1473   for (var i = 0; i < imgs.length; i++) {
1474 1474   var img = imgs[i].trim();
1475 1475   if (!img) continue;
1476 - html += '<div class="edit-attach-item" data-name="' + img.replace(/"/g,'&quot;') + '">' +
1807 + html += '<div class="edit-attach-item" data-name="' + escAttr(img) + '">' +
1477 1477   '<img src="/xwiki/bin/download/' + schoolPage.replace(/\./g,'/') + '/' + encodeURIComponent(img) + '" class="edit-attach-thumb" />' +
1478 1478   '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1479 - '<input type="hidden" name="keepImages" value="' + img.replace(/"/g,'&quot;') + '" />' +
1810 + '<input type="hidden" name="keepImages" value="' + escAttr(img) + '" />' +
1480 1480   '</div>';
1481 1481   }
1482 1482   html += '</div>';
... ... @@ -1490,10 +1490,10 @@
1490 1490   if (!f) continue;
1491 1491   var displayName = f;
1492 1492   if (/^file_\d{14}_\d+_/.test(f)) displayName = f.replace(/^file_\d{14}_\d+_/, '');
1493 - html += '<div class="edit-attach-item" data-name="' + f.replace(/"/g,'&quot;') + '">' +
1494 - '<span class="edit-attach-fname">' + displayName.replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</span>' +
1824 + html += '<div class="edit-attach-item" data-name="' + escAttr(f) + '">' +
1825 + '<span class="edit-attach-fname">' + escAttr(displayName) + '</span>' +
1495 1495   '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1496 - '<input type="hidden" name="keepFiles" value="' + f.replace(/"/g,'&quot;') + '" />' +
1827 + '<input type="hidden" name="keepFiles" value="' + escAttr(f) + '" />' +
1497 1497   '</div>';
1498 1498   }
1499 1499   html += '</div>';