Last modified by Super Admin on 2026/04/05 18:59

From version Icon 86.1 Icon
edited by Super Admin
on 2026/03/20 02:01
Change comment: There is no comment for this version
To version Icon 108.1 Icon
edited by Super Admin
on 2026/03/24 17:20
Change comment: There is no comment for this version

Summary

Details

Icon Page properties
Content
... ... @@ -57,7 +57,7 @@
57 57  #set($budgetAllocation = $doc.getValue('budgetAllocation'))
58 58  #set($budgetNote = $doc.getValue('budgetNote'))
59 59  
60 -## --- 校則の見直し ---
60 +## --- 校則・生徒会会則の見直し ---
61 61  #set($ruleReviewStatus = $doc.getValue('ruleReviewStatus'))
62 62  #set($ruleReviewContent = $doc.getValue('ruleReviewContent'))
63 63  #set($ruleReviewProposer = $doc.getValue('ruleReviewProposer'))
... ... @@ -64,6 +64,44 @@
64 64  #set($ruleReviewImplementer = $doc.getValue('ruleReviewImplementer'))
65 65  #set($ruleReviewSystem = $doc.getValue('ruleReviewSystem'))
66 66  
67 +## --- 活動環境 ---
68 +#set($activityPlace = $doc.getValue('activityPlace'))
69 +#set($activityRoomEquipment = $doc.getValue('activityRoomEquipment'))
70 +#set($activityRoomImage = $doc.getValue('activityRoomImage'))
71 +#set($ictTools = $doc.getValue('ictTools'))
72 +#set($ictUsage = $doc.getValue('ictUsage'))
73 +
74 +## --- 生徒総会 ---
75 +#set($assemblyFormat = $doc.getValue('assemblyFormat'))
76 +#set($assemblyCount = $doc.getValue('assemblyCount'))
77 +#set($assemblyAgenda = $doc.getValue('assemblyAgenda'))
78 +#set($assemblyTopics = $doc.getValue('assemblyTopics'))
79 +#set($assemblyNote = $doc.getValue('assemblyNote'))
80 +
81 +## --- 広報 ---
82 +#set($publicityMethod = $doc.getValue('publicityMethod'))
83 +#set($publicityFrequency = $doc.getValue('publicityFrequency'))
84 +#set($publicityNote = $doc.getValue('publicityNote'))
85 +
86 +## --- 外部連携 ---
87 +#set($externalCooperation = $doc.getValue('externalCooperation'))
88 +#set($externalOrgName = $doc.getValue('externalOrgName'))
89 +#set($socialParticipation = $doc.getValue('socialParticipation'))
90 +
91 +## --- 年間主要行事 ---
92 +#set($eventApril = $doc.getValue('eventApril'))
93 +#set($eventMay = $doc.getValue('eventMay'))
94 +#set($eventJune = $doc.getValue('eventJune'))
95 +#set($eventJuly = $doc.getValue('eventJuly'))
96 +#set($eventAugust = $doc.getValue('eventAugust'))
97 +#set($eventSeptember = $doc.getValue('eventSeptember'))
98 +#set($eventOctober = $doc.getValue('eventOctober'))
99 +#set($eventNovember = $doc.getValue('eventNovember'))
100 +#set($eventDecember = $doc.getValue('eventDecember'))
101 +#set($eventJanuary = $doc.getValue('eventJanuary'))
102 +#set($eventFebruary = $doc.getValue('eventFebruary'))
103 +#set($eventMarch = $doc.getValue('eventMarch'))
104 +
67 67  ## --- 課題・連絡先 ---
68 68  #set($challenges = $doc.getValue('challenges'))
69 69  #set($contactInfo = $doc.getValue('contactInfo'))
... ... @@ -88,6 +88,14 @@
88 88  #set($visibilityBudget = $!doc.getValue('visibilityBudget'))
89 89  #set($visibilityRuleReview = $!doc.getValue('visibilityRuleReview'))
90 90  #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'))
91 91  ## デフォルト値(未設定なら全体公開)
92 92  #if(!$visibilityOrgChart || $visibilityOrgChart == '') #set($visibilityOrgChart = 'public') #end
93 93  #if(!$visibilityBudget || $visibilityBudget == '') #set($visibilityBudget = 'public') #end
... ... @@ -99,6 +99,7 @@
99 99  #set($isGuest = $viewerUser == 'XWiki.XWikiGuest')
100 100  #set($isViewerAdmin = false)
101 101  #set($viewerSchoolCode = '')
148 +#set($viewerSecondaryGraduated = false)
102 102  #if(!$isGuest)
103 103   #set($viewerDoc = $xwiki.getDocument($viewerUser))
104 104   #set($viewerAccountType = $!viewerDoc.getValue('accountType'))
... ... @@ -108,6 +108,24 @@
108 108   #if($viewerAccountType == 'admin')
109 109   #set($isViewerAdmin = true)
110 110   #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
111 111  #end
112 112  
113 113  ## --- 関連校(中高一貫校)情報 ---
... ... @@ -117,7 +117,7 @@
117 117  #if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
118 118   #if($viewerSchoolCode == $affiliatedSchoolCode)
119 119   #set($isAffiliated = true)
120 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode)
185 + #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode && !$viewerSecondaryGraduated)
121 121   #set($isAffiliated = true)
122 122   #end
123 123  #end
... ... @@ -127,7 +127,7 @@
127 127  #if(!$isGuest && $viewerUserRole != 'graduate')
128 128   #if($viewerSchoolCode == $schoolCode || $isAffiliated)
129 129   #set($isSchoolMember = true)
130 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode)
195 + #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode && !$viewerSecondaryGraduated)
131 131   #set($isSchoolMember = true)
132 132   #end
133 133  #end
... ... @@ -304,7 +304,7 @@
304 304  
305 305  ## --- 編集ボタン(権限があるユーザーのみ表示) ---
306 306  #set($canEditSchool = false)
307 -#if(!$isGuest && ($isViewerAdmin || $isSchoolMember))
372 +#if(!$isGuest && ($isViewerAdmin || $isSchoolMember || $isAlumniOfSchool))
308 308   #set($canEditSchool = true)
309 309  #end
310 310  #if($canEditSchool)
... ... @@ -331,6 +331,27 @@
331 331  </div>
332 332  #end
333 333  
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 +
334 334  ## --- ① 学校基本情報 ---
335 335  <div class="school-info-card collapsed" id="card-basic-info">
336 336   <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>
... ... @@ -357,16 +357,12 @@
357 357   #if($schoolDescription && $schoolDescription.trim() != '')
358 358   <div class="free-note" style="margin-top:var(--sp-4);">$!escapetool.xml($schoolDescription)</div>
359 359   #end
360 - #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
361 - #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
362 - #if($infoEditDate && $infoEditDate != '')
363 - <div class="info-last-updated"><svg class="ico" viewBox="0 0 24 24"><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> 基本情報の最終更新: $!escapetool.xml($infoEditBy) — $!escapetool.xml($infoEditDate)</div>
364 - #end
446 +
365 365  </div>
366 366  
367 -## --- ② 生徒会基本情報(折りたたみカード) ---
449 +## --- ② 生徒会情報(折りたたみカード) ---
368 368  <div class="school-info-card" id="card-seitokai-info">
369 - <h2 role="button" tabindex="0" aria-expanded="true" onclick="toggleInfoCard('card-seitokai-info')" onkeydown="if(event.key==='Enter'||event.key===' '){event.preventDefault();toggleInfoCard('card-seitokai-info')}"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/></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>
451 + <h2 role="button" tabindex="0" aria-expanded="true" onclick="toggleInfoCard('card-seitokai-info')" onkeydown="if(event.key==='Enter'||event.key===' '){event.preventDefault();toggleInfoCard('card-seitokai-info')}"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/></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>
370 370   <div class="seitokai-info-body">
371 371  
372 372   ## --- 生徒会組織 ---
... ... @@ -393,8 +393,13 @@
393 393  
394 394   ## --- 日常の活動 ---
395 395   #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)
396 396   <div class="seitokai-subsection">
397 - <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>
398 398   <div class="seitokai-subsection-content">
399 399   <p class="activity-hint">活動時間が多い3つ</p>
400 400   <div class="tag-container">
... ... @@ -407,12 +407,20 @@
407 407   #end
408 408   </div>
409 409   </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
410 410   #end
411 411  
412 412   ## --- 選挙 ---
413 413   #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)
414 414   <div class="seitokai-subsection">
415 - <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>
416 416   <div class="seitokai-subsection-content">
417 417   <div class="info-row">
418 418   <span class="info-label">役員選挙</span>
... ... @@ -429,12 +429,20 @@
429 429   #end
430 430   </div>
431 431   </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
432 432   #end
433 433  
434 434   ## --- 定例活動 ---
435 435   #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)
436 436   <div class="seitokai-subsection">
437 - <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>
438 438   <div class="seitokai-subsection-content">
439 439   <div class="info-row">
440 440   <span class="info-label">役員定例会の頻度</span>
... ... @@ -445,6 +445,9 @@
445 445   #end
446 446   </div>
447 447   </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
448 448   #end
449 449  
450 450   ## --- 予算 ---
... ... @@ -463,8 +463,13 @@
463 463   <span class="info-label">作成過程の生徒関与</span>
464 464   <span class="info-value">
465 465   <div class="selection-display">
466 - #foreach($bp in $budgetProcess)
467 - <span class="selection-item">$!escapetool.xml($bp.trim())</span>
572 + #set($allBpOpts = ["各部・委員会等への予算希望額調査","予算額調整(折衝等)","生徒会予算案の作成","生徒総会での議決","生徒関与なし","その他"])
573 + #foreach($bpOpt in $allBpOpts)
574 + #if($budgetProcess.contains($bpOpt))
575 + <span class="selection-item">$!escapetool.xml($bpOpt)</span>
576 + #else
577 + <span class="selection-item selection-item-off">$!escapetool.xml($bpOpt)</span>
578 + #end
468 468   #end
469 469   </div>
470 470   </span>
... ... @@ -504,7 +504,7 @@
504 504   #end
505 505   #end
506 506  
507 - ## --- 校則の見直し ---
618 + ## --- 校則・生徒会会則の見直し ---
508 508   #if($ruleReviewStatus && $ruleReviewStatus != '')
509 509   #set($canViewRuleReview = true)
510 510   #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewRuleReview = false)
... ... @@ -512,12 +512,13 @@
512 512   #end
513 513   #if($canViewRuleReview)
514 514   <div class="seitokai-subsection">
515 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M16 4h2a2 2 0 012 2v12a2 2 0 01-2 2h-2"/><path d="M8 4H6a2 2 0 00-2 2v12a2 2 0 002 2h2"/><line x1="12" y1="4" x2="12" y2="8"/><line x1="12" y1="16" x2="12" y2="20"/><line x1="8" y1="8" x2="16" y2="8"/><line x1="8" y1="16" x2="16" y2="16"/></svg> 校則の見直し #if($visibilityRuleReview != 'public')<span class="visibility-badge visibility-${visibilityRuleReview}">#if($visibilityRuleReview == '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>
626 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M16 4h2a2 2 0 012 2v12a2 2 0 01-2 2h-2"/><path d="M8 4H6a2 2 0 00-2 2v12a2 2 0 002 2h2"/><line x1="12" y1="4" x2="12" y2="8"/><line x1="12" y1="16" x2="12" y2="20"/><line x1="8" y1="8" x2="16" y2="8"/><line x1="8" y1="16" x2="16" y2="16"/></svg> 校則・生徒会会則の見直し #if($visibilityRuleReview != 'public')<span class="visibility-badge visibility-${visibilityRuleReview}">#if($visibilityRuleReview == '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>
516 516   <div class="seitokai-subsection-content">
517 517   <div class="info-row">
518 518   <span class="info-label">見直しの有無(3年以内)</span>
519 519   <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
520 520   </div>
632 + #if($ruleReviewStatus != '実施なし')
521 521   #if($ruleReviewContent && !$ruleReviewContent.isEmpty())
522 522   <div class="info-row">
523 523   <span class="info-label">見直しの内容</span>
... ... @@ -554,6 +554,7 @@
554 554   </span>
555 555   </div>
556 556   #end
669 + #end
557 557   #if($ruleReviewSystem && $ruleReviewSystem != '')
558 558   <div class="info-row">
559 559   <span class="info-label">見直しの仕組み</span>
... ... @@ -563,10 +563,271 @@
563 563   </div>
564 564   </div>
565 565   #else
566 - <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($visibilityRuleReview == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
679 + <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($visibilityRuleReview == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
567 567   #end
568 568   #end
569 569  
683 + ## --- 活動環境 ---
684 + #set($hasActivityEnv = ($activityPlace && !$activityPlace.isEmpty()) || ($activityRoomEquipment && $activityRoomEquipment != '') || ($activityRoomImage && $activityRoomImage != '') || ($ictTools && !$ictTools.isEmpty()) || ($ictUsage && !$ictUsage.isEmpty()))
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 + <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"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
693 + <div class="seitokai-subsection-content">
694 + #if($activityPlace && !$activityPlace.isEmpty())
695 + <div class="info-row">
696 + <span class="info-label">普段の活動場所</span>
697 + <span class="info-value">
698 + <div class="selection-display">
699 + #foreach($ap in $activityPlace)
700 + <span class="selection-item">$!escapetool.xml($ap.trim())</span>
701 + #end
702 + </div>
703 + </span>
704 + </div>
705 + #end
706 + #if($activityRoomEquipment && $activityRoomEquipment != '')
707 + <div class="info-row">
708 + <span class="info-label">生徒会室の設備</span>
709 + <span class="info-value free-text-value">$!escapetool.xml($activityRoomEquipment)</span>
710 + </div>
711 + #end
712 + #if($activityRoomImage && $activityRoomImage != '')
713 + <div class="info-row">
714 + <span class="info-label">活動場所の写真</span>
715 + <span class="info-value"><div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($activityRoomImage)" alt="活動場所の写真" class="org-chart-img" /></div></span>
716 + </div>
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 + #if($ictUsage && !$ictUsage.isEmpty())
753 + <div class="info-row">
754 + <span class="info-label">ICT活用している場面</span>
755 + <span class="info-value">
756 + <div class="selection-display">
757 + #foreach($iu in $ictUsage)
758 + <span class="selection-item">$!escapetool.xml($iu.trim())</span>
759 + #end
760 + </div>
761 + </span>
762 + </div>
763 + #end
764 + </div>
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 + #end
770 +
771 + ## --- 生徒総会 ---
772 + #set($hasAssembly = ($assemblyFormat && $assemblyFormat != '') || ($assemblyCount && $assemblyCount > 0) || ($assemblyAgenda && !$assemblyAgenda.isEmpty()) || ($assemblyTopics && !$assemblyTopics.isEmpty()) || ($assemblyNote && $assemblyNote != ''))
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 + <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"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
781 + <div class="seitokai-subsection-content">
782 + #if($assemblyFormat && $assemblyFormat != '')
783 + <div class="info-row">
784 + <span class="info-label">開催方式</span>
785 + <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($assemblyFormat)</span></span>
786 + </div>
787 + #end
788 + #if($assemblyCount && $assemblyCount > 0)
789 + <div class="info-row">
790 + <span class="info-label">開催回数(年)</span>
791 + <span class="info-value">$!escapetool.xml($assemblyCount)回</span>
792 + </div>
793 + #end
794 + #if($assemblyAgenda && !$assemblyAgenda.isEmpty())
795 + <div class="info-row">
796 + <span class="info-label">議案の集め方</span>
797 + <span class="info-value">
798 + <div class="selection-display">
799 + #foreach($aa in $assemblyAgenda)
800 + <span class="selection-item">$!escapetool.xml($aa.trim())</span>
801 + #end
802 + </div>
803 + </span>
804 + </div>
805 + #end
806 + #if($assemblyTopics && !$assemblyTopics.isEmpty())
807 + <div class="info-row">
808 + <span class="info-label">扱う内容</span>
809 + <span class="info-value">
810 + <div class="selection-display">
811 + #foreach($at in $assemblyTopics)
812 + <span class="selection-item">$!escapetool.xml($at.trim())</span>
813 + #end
814 + </div>
815 + </span>
816 + </div>
817 + #end
818 + #if($assemblyNote && $assemblyNote != '')
819 + <div class="info-row">
820 + <span class="info-label">自由記述</span>
821 + <span class="info-value free-text-value">$!escapetool.xml($assemblyNote)</span>
822 + </div>
823 + #end
824 + </div>
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 + #end
830 +
831 + ## --- 広報 ---
832 + #set($hasPublicity = ($publicityMethod && !$publicityMethod.isEmpty()) || ($publicityFrequency && $publicityFrequency != '') || ($publicityNote && $publicityNote != ''))
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 + <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"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
841 + <div class="seitokai-subsection-content">
842 + #if($publicityMethod && !$publicityMethod.isEmpty())
843 + <div class="info-row">
844 + <span class="info-label">方法</span>
845 + <span class="info-value">
846 + <div class="selection-display">
847 + #foreach($pm in $publicityMethod)
848 + <span class="selection-item">$!escapetool.xml($pm.trim())</span>
849 + #end
850 + </div>
851 + </span>
852 + </div>
853 + #end
854 + #if($publicityFrequency && $publicityFrequency != '')
855 + <div class="info-row">
856 + <span class="info-label">頻度</span>
857 + <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($publicityFrequency)</span></span>
858 + </div>
859 + #end
860 + #if($publicityNote && $publicityNote != '')
861 + <div class="info-row">
862 + <span class="info-label">自由記述</span>
863 + <span class="info-value free-text-value">$!escapetool.xml($publicityNote)</span>
864 + </div>
865 + #end
866 + </div>
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 + #end
872 +
873 + ## --- 外部連携 ---
874 + #set($hasExternal = ($externalCooperation && $externalCooperation != '') || ($externalOrgName && $externalOrgName != '') || ($socialParticipation && !$socialParticipation.isEmpty()))
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 + <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"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
883 + <div class="seitokai-subsection-content">
884 + #if($externalCooperation && $externalCooperation != '')
885 + <div class="info-row">
886 + <span class="info-label">他校の生徒会との連携</span>
887 + <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($externalCooperation)</span></span>
888 + </div>
889 + #end
890 + #if($externalOrgName && $externalOrgName != '')
891 + <div class="info-row">
892 + <span class="info-label">参加している生徒会団体の名前</span>
893 + <span class="info-value">$!escapetool.xml($externalOrgName)</span>
894 + </div>
895 + #end
896 + #if($socialParticipation && !$socialParticipation.isEmpty())
897 + <div class="info-row">
898 + <span class="info-label">社会参加・地域連携・ボランティア</span>
899 + <span class="info-value">
900 + <div class="selection-display">
901 + #foreach($sp2 in $socialParticipation)
902 + <span class="selection-item">$!escapetool.xml($sp2.trim())</span>
903 + #end
904 + </div>
905 + </span>
906 + </div>
907 + #end
908 + </div>
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 + #end
914 +
915 + ## --- 年間主要行事 ---
916 + #set($months = [["4月", $eventApril], ["5月", $eventMay], ["6月", $eventJune], ["7月", $eventJuly], ["8月", $eventAugust], ["9月", $eventSeptember], ["10月", $eventOctober], ["11月", $eventNovember], ["12月", $eventDecember], ["1月", $eventJanuary], ["2月", $eventFebruary], ["3月", $eventMarch]])
917 + #set($hasAnyEvent = false)
918 + #foreach($m in $months)
919 + #if($m.get(1) && $m.get(1) != '') #set($hasAnyEvent = true) #end
920 + #end
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 + <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"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
929 + <div class="seitokai-subsection-content">
930 + <table class="wiki-table school-info-table" style="margin:0">
931 + #foreach($m in $months)
932 + #if($m.get(1) && $m.get(1) != '')
933 + <tr><td style="width:60px;font-weight:600;white-space:nowrap">$m.get(0)</td><td>$!escapetool.xml($m.get(1))</td></tr>
934 + #end
935 + #end
936 + </table>
937 + </div>
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 + #end
943 +
570 570   ## --- 生徒会の課題意識 ---
571 571   #if($challenges && $challenges != '')
572 572   #set($canViewChallenges = true)
... ... @@ -599,6 +599,11 @@
599 599   <tr><th>YouTube</th><td>#if($seitokaiYoutube && $seitokaiYoutube != '')<a href="$!escapetool.xml($seitokaiYoutube)" target="_blank" rel="noopener"><svg class="ico" viewBox="0 0 24 24"><polygon points="5 3 19 12 5 21 5 3"/></svg> YouTubeチャンネル</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
600 600   <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
601 601   </table>
976 + #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
977 + #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
978 + #if($infoEditDate && $infoEditDate != '')
979 + <div class="info-last-updated"><svg class="ico" viewBox="0 0 24 24"><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> 基本情報の最終更新: $!escapetool.xml($infoEditBy) — $!escapetool.xml($infoEditDate)</div>
980 + #end
602 602  </div>
603 603  
604 604  {{/html}}
... ... @@ -958,6 +958,25 @@
958 958   #if($postVis != 'public')
959 959   <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>
960 960   #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>
961 961   ## 固定/編集/削除/通報/非表示ボタン(横並び)
962 962   #set($postAuthorRef = $!post.getValue('authorRef'))
963 963   #set($postObjNumED = $post.number)
... ... @@ -1044,7 +1044,7 @@
1044 1044  
1045 1045   #if($xcontext.user != "XWiki.XWikiGuest")
1046 1046   <div class="thread-add-post">
1047 - #if($isSchoolMember || $isViewerAdmin)
1445 + #if($isSchoolMember || $isAlumniOfSchool || $isViewerAdmin)
1048 1048   <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
1049 1049   + 活動報告を追加
1050 1050   </a>
... ... @@ -1078,10 +1078,68 @@
1078 1078  {{/html}}
1079 1079  #end
1080 1080  
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 +
1081 1081  ## --- 年度タブ切り替え JavaScript ---
1082 1082  {{html clean="false"}}
1083 1083  <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 +})();
1084 1084  // コンパクト表示(タイトルのみ)トグル
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 +
1085 1085  function toggleCompactView() {
1086 1086   var container = document.querySelector('.xwiki-content') || document.body;
1087 1087   var isCompact = container.classList.toggle('activity-compact-view');
... ... @@ -1199,7 +1199,15 @@
1199 1199   };
1200 1200   var toast = document.createElement('div');
1201 1201   toast.className = 'toast toast-' + type;
1202 - 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);
1203 1203   container.appendChild(toast);
1204 1204   setTimeout(function() { toast.remove(); }, 3200);
1205 1205  }
... ... @@ -1238,6 +1238,7 @@
1238 1238   var html = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>';
1239 1239  
1240 1240   // コメント以外は添付ファイル編集を表示
1705 + function escAttr(s) { return s.replace(/&/g,'&amp;').replace(/"/g,'&quot;').replace(/'/g,'&#39;').replace(/</g,'&lt;').replace(/>/g,'&gt;'); }
1241 1241   if (postType !== 'comment') {
1242 1242   // 既存画像
1243 1243   html += '<div class="edit-attachments">';
... ... @@ -1247,10 +1247,10 @@
1247 1247   for (var i = 0; i < imgs.length; i++) {
1248 1248   var img = imgs[i].trim();
1249 1249   if (!img) continue;
1250 - html += '<div class="edit-attach-item" data-name="' + img.replace(/"/g,'&quot;') + '">' +
1715 + html += '<div class="edit-attach-item" data-name="' + escAttr(img) + '">' +
1251 1251   '<img src="/xwiki/bin/download/' + schoolPage.replace(/\./g,'/') + '/' + encodeURIComponent(img) + '" class="edit-attach-thumb" />' +
1252 1252   '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1253 - '<input type="hidden" name="keepImages" value="' + img.replace(/"/g,'&quot;') + '" />' +
1718 + '<input type="hidden" name="keepImages" value="' + escAttr(img) + '" />' +
1254 1254   '</div>';
1255 1255   }
1256 1256   html += '</div>';
... ... @@ -1264,10 +1264,10 @@
1264 1264   if (!f) continue;
1265 1265   var displayName = f;
1266 1266   if (/^file_\d{14}_\d+_/.test(f)) displayName = f.replace(/^file_\d{14}_\d+_/, '');
1267 - html += '<div class="edit-attach-item" data-name="' + f.replace(/"/g,'&quot;') + '">' +
1268 - '<span class="edit-attach-fname">' + displayName.replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</span>' +
1732 + html += '<div class="edit-attach-item" data-name="' + escAttr(f) + '">' +
1733 + '<span class="edit-attach-fname">' + escAttr(displayName) + '</span>' +
1269 1269   '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1270 - '<input type="hidden" name="keepFiles" value="' + f.replace(/"/g,'&quot;') + '" />' +
1735 + '<input type="hidden" name="keepFiles" value="' + escAttr(f) + '" />' +
1271 1271   '</div>';
1272 1272   }
1273 1273   html += '</div>';