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

Summary

Details

Icon Page properties
Content
... ... @@ -7,19 +7,6 @@
7 7   #stop
8 8  #end
9 9  {{html clean="false"}}
10 -## --- OGP メタタグ（SNSシェア対応） ---
11 -#set($ogTitle = "$!{schoolName} — 生徒会Wiki")
12 -#set($ogDesc = "$!{schoolName}の生徒会活動情報。全国の高校の生徒会活動事例を集積・共有するプラットフォーム。")
13 -#set($ogUrl = "https://${request.serverName}${doc.getURL('view')}")
14 -<meta property="og:type" content="article" />
15 -<meta property="og:title" content="$escapetool.xml($ogTitle)" />
16 -<meta property="og:description" content="$escapetool.xml($ogDesc)" />
17 -<meta property="og:url" content="$escapetool.xml($ogUrl)" />
18 -<meta property="og:site_name" content="生徒会Wiki" />
19 -<meta property="og:locale" content="ja_JP" />
20 -<meta name="twitter:card" content="summary" />
21 -<meta name="twitter:title" content="$escapetool.xml($ogTitle)" />
22 -<meta name="twitter:description" content="$escapetool.xml($ogDesc)" />
23 23  ## メンテナンスバナー（{{include}}ではなくインラインで記述し、<p>タグ挿入を回避）
24 24  #set($bannerDoc = $xwiki.getDocument('SeitokaiAdmin.MaintenanceBanner'))
25 25  #set($bannerObj = $bannerDoc.getObject('SeitokaiCode.MaintenanceBannerClass'))
... ... @@ -48,9 +48,8 @@
48 48  #set($schoolSystem = $doc.getValue('schoolSystem'))
49 49  #set($website = $doc.getValue('website'))
50 50  #set($schoolPhoto = $doc.getValue('schoolPhoto'))
51 -#set($schoolDescription = $doc.getValue('schoolDescription'))
52 52  
53 -## --- 生徒会組織 ---
39 +## --- 組織図 ---
54 54  #set($orgChart = $doc.getValue('orgChart'))
55 55  #set($orgChartImage = $doc.getValue('orgChartImage'))
56 56  
... ... @@ -70,7 +70,7 @@
70 70  #set($budgetAllocation = $doc.getValue('budgetAllocation'))
71 71  #set($budgetNote = $doc.getValue('budgetNote'))
72 72  
73 -## --- 校則・生徒会会則の見直し ---
59 +## --- 校則の見直し ---
74 74  #set($ruleReviewStatus = $doc.getValue('ruleReviewStatus'))
75 75  #set($ruleReviewContent = $doc.getValue('ruleReviewContent'))
76 76  #set($ruleReviewProposer = $doc.getValue('ruleReviewProposer'))
... ... @@ -77,44 +77,6 @@
77 77  #set($ruleReviewImplementer = $doc.getValue('ruleReviewImplementer'))
78 78  #set($ruleReviewSystem = $doc.getValue('ruleReviewSystem'))
79 79  
80 -## --- 活動環境 ---
81 -#set($activityPlace = $doc.getValue('activityPlace'))
82 -#set($activityRoomEquipment = $doc.getValue('activityRoomEquipment'))
83 -#set($activityRoomImage = $doc.getValue('activityRoomImage'))
84 -#set($ictTools = $doc.getValue('ictTools'))
85 -#set($ictUsage = $doc.getValue('ictUsage'))
86 -
87 -## --- 生徒総会 ---
88 -#set($assemblyFormat = $doc.getValue('assemblyFormat'))
89 -#set($assemblyCount = $doc.getValue('assemblyCount'))
90 -#set($assemblyAgenda = $doc.getValue('assemblyAgenda'))
91 -#set($assemblyTopics = $doc.getValue('assemblyTopics'))
92 -#set($assemblyNote = $doc.getValue('assemblyNote'))
93 -
94 -## --- 広報 ---
95 -#set($publicityMethod = $doc.getValue('publicityMethod'))
96 -#set($publicityFrequency = $doc.getValue('publicityFrequency'))
97 -#set($publicityNote = $doc.getValue('publicityNote'))
98 -
99 -## --- 外部連携 ---
100 -#set($externalCooperation = $doc.getValue('externalCooperation'))
101 -#set($externalOrgName = $doc.getValue('externalOrgName'))
102 -#set($socialParticipation = $doc.getValue('socialParticipation'))
103 -
104 -## --- 年間主要行事 ---
105 -#set($eventApril = $doc.getValue('eventApril'))
106 -#set($eventMay = $doc.getValue('eventMay'))
107 -#set($eventJune = $doc.getValue('eventJune'))
108 -#set($eventJuly = $doc.getValue('eventJuly'))
109 -#set($eventAugust = $doc.getValue('eventAugust'))
110 -#set($eventSeptember = $doc.getValue('eventSeptember'))
111 -#set($eventOctober = $doc.getValue('eventOctober'))
112 -#set($eventNovember = $doc.getValue('eventNovember'))
113 -#set($eventDecember = $doc.getValue('eventDecember'))
114 -#set($eventJanuary = $doc.getValue('eventJanuary'))
115 -#set($eventFebruary = $doc.getValue('eventFebruary'))
116 -#set($eventMarch = $doc.getValue('eventMarch'))
117 -
118 118  ## --- 課題・連絡先 ---
119 119  #set($challenges = $doc.getValue('challenges'))
120 120  #set($contactInfo = $doc.getValue('contactInfo'))
... ... @@ -139,14 +139,6 @@
139 139  #set($visibilityBudget = $!doc.getValue('visibilityBudget'))
140 140  #set($visibilityRuleReview = $!doc.getValue('visibilityRuleReview'))
141 141  #set($visibilityChallenges = $!doc.getValue('visibilityChallenges'))
142 -#set($visibilityDailyActivities = $!doc.getValue('visibilityDailyActivities'))
143 -#set($visibilityElection = $!doc.getValue('visibilityElection'))
144 -#set($visibilityMeeting = $!doc.getValue('visibilityMeeting'))
145 -#set($visibilityActivityEnv = $!doc.getValue('visibilityActivityEnv'))
146 -#set($visibilityAssembly = $!doc.getValue('visibilityAssembly'))
147 -#set($visibilityPublicity = $!doc.getValue('visibilityPublicity'))
148 -#set($visibilityExternal = $!doc.getValue('visibilityExternal'))
149 -#set($visibilityAnnualEvents = $!doc.getValue('visibilityAnnualEvents'))
150 150  ## デフォルト値（未設定なら全体公開）
151 151  #if(!$visibilityOrgChart || $visibilityOrgChart == '') #set($visibilityOrgChart = 'public') #end
152 152  #if(!$visibilityBudget || $visibilityBudget == '') #set($visibilityBudget = 'public') #end
... ... @@ -158,7 +158,6 @@
158 158  #set($isGuest = $viewerUser == 'XWiki.XWikiGuest')
159 159  #set($isViewerAdmin = false)
160 160  #set($viewerSchoolCode = '')
161 -#set($viewerSecondaryGraduated = false)
162 162  #if(!$isGuest)
163 163   #set($viewerDoc = $xwiki.getDocument($viewerUser))
164 164   #set($viewerAccountType = $!viewerDoc.getValue('accountType'))
... ... @@ -168,24 +168,6 @@
168 168   #if($viewerAccountType == 'admin')
169 169   #set($isViewerAdmin = true)
170 170   #end
171 - ## 第2所属校の在学年数超過チェック
172 - #set($viewerSecEnrollYear = $!viewerDoc.getValue('secondaryEnrollmentYear'))
173 - #if($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecEnrollYear && $viewerSecEnrollYear != '')
174 - #set($vNow = $datetool.date)
175 - #set($vCurYear = $mathtool.toInteger($datetool.format('yyyy', $vNow)))
176 - #set($vCurMonth = $mathtool.toInteger($datetool.format('MM', $vNow)))
177 - #if($vCurMonth >= 4)#set($vSchoolYear = $vCurYear)#else#set($vSchoolYear = $mathtool.sub($vCurYear, 1))#end
178 - #set($vSecEnroll = $mathtool.toInteger($viewerSecEnrollYear))
179 - #set($vSecMax = 3)
180 - #if($viewerSecondarySchoolCode.length() >= 2)
181 - #set($vSecType = $viewerSecondarySchoolCode.substring(0, 2))
182 - #if($vSecType == 'C2')#set($vSecMax = 9)#elseif($vSecType == 'D2')#set($vSecMax = 6)#end
183 - #end
184 - #set($vSecGrade = $mathtool.add($mathtool.sub($vSchoolYear, $vSecEnroll), 1))
185 - #if($vSecGrade > $vSecMax)
186 - #set($viewerSecondaryGraduated = true)
187 - #end
188 - #end
189 189  #end
190 190  
191 191  ## --- 関連校（中高一貫校）情報 ---
... ... @@ -195,7 +195,7 @@
195 195  #if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
196 196   #if($viewerSchoolCode == $affiliatedSchoolCode)
197 197   #set($isAffiliated = true)
198 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode && !$viewerSecondaryGraduated)
119 + #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode)
199 199   #set($isAffiliated = true)
200 200   #end
201 201  #end
... ... @@ -205,7 +205,7 @@
205 205  #if(!$isGuest && $viewerUserRole != 'graduate')
206 206   #if($viewerSchoolCode == $schoolCode || $isAffiliated)
207 207   #set($isSchoolMember = true)
208 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode && !$viewerSecondaryGraduated)
129 + #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode)
209 209   #set($isSchoolMember = true)
210 210   #end
211 211  #end
... ... @@ -382,7 +382,7 @@
382 382  
383 383  ## --- 編集ボタン（権限があるユーザーのみ表示） ---
384 384  #set($canEditSchool = false)
385 -#if(!$isGuest && ($isViewerAdmin || $isSchoolMember || $isAlumniOfSchool))
306 +#if(!$isGuest && ($isViewerAdmin || $isSchoolMember))
386 386   #set($canEditSchool = true)
387 387  #end
388 388  #if($canEditSchool)
... ... @@ -409,106 +409,6 @@
409 409  </div>
410 410  #end
411 411  
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 -
512 512  ## --- ① 学校基本情報 ---
513 513  <div class="school-info-card collapsed" id="card-basic-info">
514 514   <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>
... ... @@ -532,18 +532,19 @@
532 532   </div>
533 533   #end
534 534   </div>
535 - #if($schoolDescription && $schoolDescription.trim() != '')
536 - <div class="free-note" style="margin-top:var(--sp-4);">$!escapetool.xml($schoolDescription)</div>
356 + #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
357 + #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
358 + #if($infoEditDate && $infoEditDate != '')
359 + <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>
537 537   #end
538 -
539 539  </div>
540 540  
541 -## --- ② 生徒会情報（折りたたみカード） ---
363 +## --- ② 生徒会基本情報（折りたたみカード） ---
542 542  <div class="school-info-card" id="card-seitokai-info">
543 - <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>
365 + <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>
544 544   <div class="seitokai-info-body">
545 545  
546 - ## --- 生徒会組織 ---
368 + ## --- 組織図 ---
547 547   #set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
548 548   #if($hasOrgContent)
549 549   #set($canViewOrgChart = true)
... ... @@ -552,33 +552,30 @@
552 552   #end
553 553   #if($canViewOrgChart)
554 554   <div class="seitokai-subsection">
555 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/><line x1="9" y1="10" x2="9" y2="10.01"/><line x1="15" y1="10" x2="15" y2="10.01"/><line x1="9" y1="14" x2="9" y2="14.01"/><line x1="15" y1="14" x2="15" y2="14.01"/></svg> 生徒会組織 #if($visibilityOrgChart != 'public')<span class="visibility-badge visibility-${visibilityOrgChart}">#if($visibilityOrgChart == '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>
377 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/><line x1="9" y1="10" x2="9" y2="10.01"/><line x1="15" y1="10" x2="15" y2="10.01"/><line x1="9" y1="14" x2="9" y2="14.01"/><line x1="15" y1="14" x2="15" y2="14.01"/></svg> 組織図 #if($visibilityOrgChart != 'public')<span class="visibility-badge visibility-${visibilityOrgChart}">#if($visibilityOrgChart == '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>
556 556   <div class="seitokai-subsection-content">
557 557   #if($orgChartImage && $orgChartImage != '')
558 558   <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
559 559   #end
560 - #if($orgChart && $orgChart != '')<div class="free-note">$!escapetool.xml($orgChart)</div>#end
382 + #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end
561 561   </div>
562 562   </div>
563 563   #else
564 - <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($visibilityOrgChart == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
386 + <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($visibilityOrgChart == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
565 565   #end
566 566   #end
567 567  
568 568   ## --- 日常の活動 ---
569 569   #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)
575 575   <div class="seitokai-subsection">
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>
393 + <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>
577 577   <div class="seitokai-subsection-content">
578 - <p class="activity-hint">活動時間が多い3つ</p>
395 + <p class="activity-hint">活動時間の多い順に上位3つ</p>
579 579   <div class="tag-container">
397 + #set($daIdx = 1)
580 580   #foreach($da in $dailyActivities)
581 - <span class="tag tag-accent">$!escapetool.xml($da.trim())</span>
399 + <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
400 + #set($daIdx = $daIdx + 1)
582 582   #end
583 583   </div>
584 584   #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
... ... @@ -586,20 +586,12 @@
586 586   #end
587 587   </div>
588 588   </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
592 592   #end
593 593  
594 594   ## --- 選挙 ---
595 595   #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)
601 601   <div class="seitokai-subsection">
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>
413 + <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>
603 603   <div class="seitokai-subsection-content">
604 604   <div class="info-row">
605 605   <span class="info-label">役員選挙</span>
... ... @@ -616,20 +616,12 @@
616 616   #end
617 617   </div>
618 618   </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
622 622   #end
623 623  
624 624   ## --- 定例活動 ---
625 625   #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)
631 631   <div class="seitokai-subsection">
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>
435 + <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>
633 633   <div class="seitokai-subsection-content">
634 634   <div class="info-row">
635 635   <span class="info-label">役員定例会の頻度</span>
... ... @@ -640,9 +640,6 @@
640 640   #end
641 641   </div>
642 642   </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
646 646   #end
647 647  
648 648   ## --- 予算 ---
... ... @@ -654,7 +654,7 @@
654 654   #end
655 655   #if($canViewBudget)
656 656   <div class="seitokai-subsection">
657 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><line x1="12" y1="1" x2="12" y2="23"/><path d="M17 5H9.5a3.5 3.5 0 000 7h5a3.5 3.5 0 010 7H6"/></svg> 予算 #if($visibilityBudget != 'public')<span class="visibility-badge visibility-${visibilityBudget}">#if($visibilityBudget == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
457 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><line x1="12" y1="1" x2="12" y2="23"/><path d="M17 5H9.5a3.5 3.5 0 000 7h5a3.5 3.5 0 010 7H6"/></svg> 予算 #if($visibilityBudget != 'public')<span class="visibility-badge visibility-${visibilityBudget}">#if($visibilityBudget == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
658 658   <div class="seitokai-subsection-content">
659 659   #if($budgetProcess && !$budgetProcess.isEmpty())
660 660   <div class="info-row">
... ... @@ -661,13 +661,8 @@
661 661   <span class="info-label">作成過程の生徒関与</span>
662 662   <span class="info-value">
663 663   <div class="selection-display">
664 - #set($allBpOpts = ["各部・委員会等への予算希望額調査","予算額調整（折衝等）","生徒会予算案の作成","生徒総会での議決","生徒関与なし","その他"])
665 - #foreach($bpOpt in $allBpOpts)
666 - #if($budgetProcess.contains($bpOpt))
667 - <span class="selection-item">$!escapetool.xml($bpOpt)</span>
668 - #else
669 - <span class="selection-item selection-item-off">$!escapetool.xml($bpOpt)</span>
670 - #end
464 + #foreach($bp in $budgetProcess)
465 + <span class="selection-item">$!escapetool.xml($bp.trim())</span>
671 671   #end
672 672   </div>
673 673   </span>
... ... @@ -707,7 +707,7 @@
707 707   #end
708 708   #end
709 709  
710 - ## --- 校則・生徒会会則の見直し ---
505 + ## --- 校則の見直し ---
711 711   #if($ruleReviewStatus && $ruleReviewStatus != '')
712 712   #set($canViewRuleReview = true)
713 713   #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewRuleReview = false)
... ... @@ -715,13 +715,12 @@
715 715   #end
716 716   #if($canViewRuleReview)
717 717   <div class="seitokai-subsection">
718 - <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>
513 + <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>
719 719   <div class="seitokai-subsection-content">
720 720   <div class="info-row">
721 721   <span class="info-label">見直しの有無（3年以内）</span>
722 722   <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
723 723   </div>
724 - #if($ruleReviewStatus != '実施なし')
725 725   #if($ruleReviewContent && !$ruleReviewContent.isEmpty())
726 726   <div class="info-row">
727 727   <span class="info-label">見直しの内容</span>
... ... @@ -758,7 +758,6 @@
758 758   </span>
759 759   </div>
760 760   #end
761 - #end
762 762   #if($ruleReviewSystem && $ruleReviewSystem != '')
763 763   <div class="info-row">
764 764   <span class="info-label">見直しの仕組み</span>
... ... @@ -768,271 +768,10 @@
768 768   </div>
769 769   </div>
770 770   #else
771 - <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>
564 + <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>
772 772   #end
773 773   #end
774 774  
775 - ## --- 活動環境 ---
776 - #set($hasActivityEnv = ($activityPlace && !$activityPlace.isEmpty()) || ($activityRoomEquipment && $activityRoomEquipment != '') || ($activityRoomImage && $activityRoomImage != '') || ($ictTools && !$ictTools.isEmpty()) || ($ictUsage && !$ictUsage.isEmpty()))
777 - #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)
783 - <div class="seitokai-subsection">
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>
785 - <div class="seitokai-subsection-content">
786 - #if($activityPlace && !$activityPlace.isEmpty())
787 - <div class="info-row">
788 - <span class="info-label">普段の活動場所</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>
796 - </div>
797 - #end
798 - #if($activityRoomEquipment && $activityRoomEquipment != '')
799 - <div class="info-row">
800 - <span class="info-label">生徒会室の設備</span>
801 - <span class="info-value free-text-value">$!escapetool.xml($activityRoomEquipment)</span>
802 - </div>
803 - #end
804 - #if($activityRoomImage && $activityRoomImage != '')
805 - <div class="info-row">
806 - <span class="info-label">活動場所の写真</span>
807 - <span class="info-value"><div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($activityRoomImage)" alt="活動場所の写真" class="org-chart-img" /></div></span>
808 - </div>
809 - #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
844 - #if($ictUsage && !$ictUsage.isEmpty())
845 - <div class="info-row">
846 - <span class="info-label">ICT活用している場面</span>
847 - <span class="info-value">
848 - <div class="selection-display">
849 - #foreach($iu in $ictUsage)
850 - <span class="selection-item">$!escapetool.xml($iu.trim())</span>
851 - #end
852 - </div>
853 - </span>
854 - </div>
855 - #end
856 - </div>
857 - </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
861 - #end
862 -
863 - ## --- 生徒総会 ---
864 - #set($hasAssembly = ($assemblyFormat && $assemblyFormat != '') || ($assemblyCount && $assemblyCount > 0) || ($assemblyAgenda && !$assemblyAgenda.isEmpty()) || ($assemblyTopics && !$assemblyTopics.isEmpty()) || ($assemblyNote && $assemblyNote != ''))
865 - #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)
871 - <div class="seitokai-subsection">
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>
873 - <div class="seitokai-subsection-content">
874 - #if($assemblyFormat && $assemblyFormat != '')
875 - <div class="info-row">
876 - <span class="info-label">開催方式</span>
877 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($assemblyFormat)</span></span>
878 - </div>
879 - #end
880 - #if($assemblyCount && $assemblyCount > 0)
881 - <div class="info-row">
882 - <span class="info-label">開催回数（年）</span>
883 - <span class="info-value">$!escapetool.xml($assemblyCount)回</span>
884 - </div>
885 - #end
886 - #if($assemblyAgenda && !$assemblyAgenda.isEmpty())
887 - <div class="info-row">
888 - <span class="info-label">議案の集め方</span>
889 - <span class="info-value">
890 - <div class="selection-display">
891 - #foreach($aa in $assemblyAgenda)
892 - <span class="selection-item">$!escapetool.xml($aa.trim())</span>
893 - #end
894 - </div>
895 - </span>
896 - </div>
897 - #end
898 - #if($assemblyTopics && !$assemblyTopics.isEmpty())
899 - <div class="info-row">
900 - <span class="info-label">扱う内容</span>
901 - <span class="info-value">
902 - <div class="selection-display">
903 - #foreach($at in $assemblyTopics)
904 - <span class="selection-item">$!escapetool.xml($at.trim())</span>
905 - #end
906 - </div>
907 - </span>
908 - </div>
909 - #end
910 - #if($assemblyNote && $assemblyNote != '')
911 - <div class="info-row">
912 - <span class="info-label">自由記述</span>
913 - <span class="info-value free-text-value">$!escapetool.xml($assemblyNote)</span>
914 - </div>
915 - #end
916 - </div>
917 - </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
921 - #end
922 -
923 - ## --- 広報 ---
924 - #set($hasPublicity = ($publicityMethod && !$publicityMethod.isEmpty()) || ($publicityFrequency && $publicityFrequency != '') || ($publicityNote && $publicityNote != ''))
925 - #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)
931 - <div class="seitokai-subsection">
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>
933 - <div class="seitokai-subsection-content">
934 - #if($publicityMethod && !$publicityMethod.isEmpty())
935 - <div class="info-row">
936 - <span class="info-label">方法</span>
937 - <span class="info-value">
938 - <div class="selection-display">
939 - #foreach($pm in $publicityMethod)
940 - <span class="selection-item">$!escapetool.xml($pm.trim())</span>
941 - #end
942 - </div>
943 - </span>
944 - </div>
945 - #end
946 - #if($publicityFrequency && $publicityFrequency != '')
947 - <div class="info-row">
948 - <span class="info-label">頻度</span>
949 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($publicityFrequency)</span></span>
950 - </div>
951 - #end
952 - #if($publicityNote && $publicityNote != '')
953 - <div class="info-row">
954 - <span class="info-label">自由記述</span>
955 - <span class="info-value free-text-value">$!escapetool.xml($publicityNote)</span>
956 - </div>
957 - #end
958 - </div>
959 - </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
963 - #end
964 -
965 - ## --- 外部連携 ---
966 - #set($hasExternal = ($externalCooperation && $externalCooperation != '') || ($externalOrgName && $externalOrgName != '') || ($socialParticipation && !$socialParticipation.isEmpty()))
967 - #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)
973 - <div class="seitokai-subsection">
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>
975 - <div class="seitokai-subsection-content">
976 - #if($externalCooperation && $externalCooperation != '')
977 - <div class="info-row">
978 - <span class="info-label">他校の生徒会との連携</span>
979 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($externalCooperation)</span></span>
980 - </div>
981 - #end
982 - #if($externalOrgName && $externalOrgName != '')
983 - <div class="info-row">
984 - <span class="info-label">参加している生徒会団体の名前</span>
985 - <span class="info-value">$!escapetool.xml($externalOrgName)</span>
986 - </div>
987 - #end
988 - #if($socialParticipation && !$socialParticipation.isEmpty())
989 - <div class="info-row">
990 - <span class="info-label">社会参加・地域連携・ボランティア</span>
991 - <span class="info-value">
992 - <div class="selection-display">
993 - #foreach($sp2 in $socialParticipation)
994 - <span class="selection-item">$!escapetool.xml($sp2.trim())</span>
995 - #end
996 - </div>
997 - </span>
998 - </div>
999 - #end
1000 - </div>
1001 - </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
1005 - #end
1006 -
1007 - ## --- 年間主要行事 ---
1008 - #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]])
1009 - #set($hasAnyEvent = false)
1010 - #foreach($m in $months)
1011 - #if($m.get(1) && $m.get(1) != '') #set($hasAnyEvent = true) #end
1012 - #end
1013 - #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)
1019 - <div class="seitokai-subsection">
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>
1021 - <div class="seitokai-subsection-content">
1022 - <table class="wiki-table school-info-table" style="margin:0">
1023 - #foreach($m in $months)
1024 - #if($m.get(1) && $m.get(1) != '')
1025 - <tr><td style="width:60px;font-weight:600;white-space:nowrap">$m.get(0)</td><td>$!escapetool.xml($m.get(1))</td></tr>
1026 - #end
1027 - #end
1028 - </table>
1029 - </div>
1030 - </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
1034 - #end
1035 -
1036 1036   ## --- 生徒会の課題意識 ---
1037 1037   #if($challenges && $challenges != '')
1038 1038   #set($canViewChallenges = true)
... ... @@ -1041,7 +1041,7 @@
1041 1041   #end
1042 1042   #if($canViewChallenges)
1043 1043   <div class="seitokai-subsection">
1044 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M12 16v-4"/><path d="M12 8h.01"/></svg> 生徒会の課題意識 #if($visibilityChallenges != 'public')<span class="visibility-badge visibility-${visibilityChallenges}">#if($visibilityChallenges == '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>
576 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M12 16v-4"/><path d="M12 8h.01"/></svg> 生徒会の課題意識 #if($visibilityChallenges != 'public')<span class="visibility-badge visibility-${visibilityChallenges}">#if($visibilityChallenges == '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>
1045 1045   <div class="seitokai-subsection-content">
1046 1046   <div class="challenge-text">$!escapetool.xml($challenges)</div>
1047 1047   </div>
... ... @@ -1065,11 +1065,6 @@
1065 1065   <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>
1066 1066   <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
1067 1067   </table>
1068 - #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
1069 - #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
1070 - #if($infoEditDate && $infoEditDate != '')
1071 - <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>
1072 - #end
1073 1073  </div>
1074 1074  
1075 1075  {{/html}}
... ... @@ -1209,18 +1209,16 @@
1209 1209  <div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)">
1210 1210   <div class="activity-thread-header">
1211 1211   <div class="activity-thread-title">
1212 - <h3 #if($actFeatured == '1')class="featured-title"#end>#if($actFeatured == '1')<svg class="ico ico-fixed-14 ico-star-offset" viewBox="0 0 24 24" fill="currentColor" stroke="none"><polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"/></svg> #end$!escapetool.xml($!actTitle)</h3>
1213 - <div class="activity-meta-line">
1214 - <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
1215 - #set($actTagsList = $activity.getValue('tags'))
1216 - #if($actTagsList && !$actTagsList.isEmpty())
1217 - #foreach($tagItem in $actTagsList)
1218 - #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end
1219 - #end
739 + <h3 #if($actFeatured == '1')class="featured-title"#end>$!escapetool.xml($!actTitle) #if($actFeatured == '1')<svg class="ico ico-fixed-14 ico-star-offset" viewBox="0 0 24 24" fill="currentColor" stroke="none"><polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"/></svg>#end</h3>
740 + <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
741 + #set($actTagsList = $activity.getValue('tags'))
742 + #if($actTagsList && !$actTagsList.isEmpty())
743 + #foreach($tagItem in $actTagsList)
744 + #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end
1220 1220   #end
1221 - </div>
746 + #end
1222 1222   </div>
1223 - <div class="thread-meta-right">
748 + <div class="thread-meta-row">
1224 1224   <span class="thread-post-count">${reportCount}件の報告 ・ ${commentCount}件のコメント</span>
1225 1225   #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred')
1226 1226   #if($actFeatured == '1')
... ... @@ -1356,13 +1356,6 @@
1356 1356   #if($postEdited == 1 || $postEdited == '1')
1357 1357   <span class="post-edited-label">（編集済み）</span>
1358 1358   #end
1359 - #set($postAuthorRefH = $!post.getValue('authorRef'))
1360 - #set($postObjNumH = $post.number)
1361 - #if(!$isGuest && $xcontext.user != $postAuthorRefH)
1362 - <button type="button" class="btn-post-report btn-post-report-header" onclick="openReportDialog(this, '${doc.fullName}', $postObjNumH, '${services.csrf.getToken()}')" title="この投稿を通報">
1363 - <svg class="ico ico-fixed-14" viewBox="0 0 24 24"><path d="M4 15s1-1 4-1 5 2 8 2 4-1 4-1V3s-1 1-4 1-5-2-8-2-4 1-4 1z"/><line x1="4" y1="22" x2="4" y2="15"/></svg> 通報
1364 - </button>
1365 - #end
1366 1366   </div>
1367 1367   <div class="thread-post-body">
1368 1368   $!escapetool.xml($!postContent)
... ... @@ -1427,34 +1427,16 @@
1427 1427   #end
1428 1428   </div>
1429 1429   #if($postVis != 'public')
1430 - <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>
948 + <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>
1431 1431   #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>
1451 1451   ## 固定/編集/削除/通報/非表示ボタン（横並び）
1452 1452   #set($postAuthorRef = $!post.getValue('authorRef'))
1453 1453   #set($postObjNumED = $post.number)
1454 1454   #set($showPinBtn = ($viewerAccountType == 'admin' || $viewerAccountType == 'verified'))
1455 1455   #set($showEditDeleteBtn = ($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin'))
955 + #set($showReportBtn = (!$isGuest && $xcontext.user != $postAuthorRef))
1456 1456   #set($showHideBtn = ($viewerAccountType == 'admin'))
1457 - #if($showPinBtn || $showEditDeleteBtn || $showHideBtn)
957 + #if($showPinBtn || $showEditDeleteBtn || $showReportBtn || $showHideBtn)
1458 1458   <div class="post-edit-actions post-action-mt">
1459 1459   #if($showPinBtn)
1460 1460   #set($postObjNum = $post.number)
... ... @@ -1470,9 +1470,7 @@
1470 1470   #end
1471 1471   #if($showEditDeleteBtn)
1472 1472   #if($xcontext.user == $postAuthorRef)
1473 - #set($editImages = $!post.getValue('images'))
1474 - #set($editFiles = $!post.getValue('files'))
1475 - <button type="button" class="btn-post-edit" data-school="${doc.fullName}" data-obj="$postObjNumED" data-content="$!escapetool.xml($!postContent)" data-images="$!escapetool.xml($!editImages)" data-files="$!escapetool.xml($!editFiles)" data-post-type="$!post.getValue('postType')" onclick="openEditPost(this)" title="この投稿を編集">
973 + <button type="button" class="btn-post-edit" onclick="openEditPost(this, '${doc.fullName}', $postObjNumED, '$!escapetool.javascript($!postContent)')" title="この投稿を編集">
1476 1476   <svg class="ico ico-fixed-14" 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> 編集
1477 1477   </button>
1478 1478   #end
... ... @@ -1480,6 +1480,11 @@
1480 1480   <svg class="ico ico-fixed-14" viewBox="0 0 24 24"><polyline points="3 6 5 6 21 6"/><path d="M19 6v14a2 2 0 01-2 2H7a2 2 0 01-2-2V6m3 0V4a2 2 0 012-2h4a2 2 0 012 2v2"/></svg> 削除
1481 1481   </button>
1482 1482   #end
981 + #if($showReportBtn)
982 + <button type="button" class="btn-post-report" onclick="openReportDialog(this, '${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を通報">
983 + <svg class="ico ico-fixed-14" viewBox="0 0 24 24"><path d="M4 15s1-1 4-1 5 2 8 2 4-1 4-1V3s-1 1-4 1-5-2-8-2-4 1-4 1z"/><line x1="4" y1="22" x2="4" y2="15"/></svg> 通報
984 + </button>
985 + #end
1483 1483   #if($showHideBtn)
1484 1484   <button type="button" class="btn-post-hide" onclick="openHideDialog(this, '${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を非表示にする">
1485 1485   <svg class="ico ico-fixed-14" viewBox="0 0 24 24"><path d="M17.94 17.94A10.07 10.07 0 0112 20c-7 0-11-8-11-8a18.45 18.45 0 015.06-5.94M9.9 4.24A9.12 9.12 0 0112 4c7 0 11 8 11 8a18.5 18.5 0 01-2.16 3.19m-6.72-1.07a3 3 0 11-4.24-4.24"/><line x1="1" y1="1" x2="23" y2="23"/></svg> 非表示
... ... @@ -1534,11 +1534,9 @@
1534 1534  
1535 1535   #if($xcontext.user != "XWiki.XWikiGuest")
1536 1536   <div class="thread-add-post">
1537 - #if($isSchoolMember || $isAlumniOfSchool || $isViewerAdmin)
1538 1538   <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
1539 1539   ＋ 活動報告を追加
1540 1540   </a>
1541 - #end
1542 1542   <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
1543 1543   <svg class="ico" viewBox="0 0 24 24"><path d="M21 15a2 2 0 01-2 2H7l-4 4V5a2 2 0 012-2h14a2 2 0 012 2z"/></svg> コメントを書く
1544 1544   </a>
... ... @@ -1568,68 +1568,10 @@
1568 1568  {{/html}}
1569 1569  #end
1570 1570  
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 -
1579 1579  ## --- 年度タブ切り替え JavaScript ---
1580 1580  {{html clean="false"}}
1581 1581  <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 -})();
1604 1604  // コンパクト表示（タイトルのみ）トグル
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 -
1633 1633  function toggleCompactView() {
1634 1634   var container = document.querySelector('.xwiki-content') || document.body;
1635 1635   var isCompact = container.classList.toggle('activity-compact-view');
... ... @@ -1747,15 +1747,7 @@
1747 1747   };
1748 1748   var toast = document.createElement('div');
1749 1749   toast.className = 'toast toast-' + type;
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);
1193 + toast.innerHTML = (icons[type] || '') + '<span>' + message + '</span>';
1759 1759   container.appendChild(toast);
1760 1760   setTimeout(function() { toast.remove(); }, 3200);
1761 1761  }
... ... @@ -1771,131 +1771,37 @@
1771 1771  }
1772 1772  
1773 1773  // 投稿の編集（インライン編集フォームを開く）
1774 -function openEditPost(btn) {
1209 +function openEditPost(btn, schoolPage, postObjNum, currentContent) {
1775 1775   var postEl = btn.closest('.thread-post');
1776 1776   if (!postEl) return;
1212 + // 既存の編集フォームがあれば閉じる
1777 1777   var existing = postEl.querySelector('.post-edit-form');
1778 1778   if (existing) { existing.remove(); return; }
1779 1779   var bodyEl = postEl.querySelector('.thread-post-body');
1780 1780   if (!bodyEl) return;
1781 -
1782 - var schoolPage = btn.getAttribute('data-school');
1783 - var postObjNum = btn.getAttribute('data-obj');
1784 - var currentContent = btn.getAttribute('data-content') || '';
1785 - var currentImages = btn.getAttribute('data-images') || '';
1786 - var currentFiles = btn.getAttribute('data-files') || '';
1787 - var postType = btn.getAttribute('data-post-type') || 'report';
1788 -
1789 1789   var form = document.createElement('div');
1790 1790   form.className = 'post-edit-form';
1791 - form.setAttribute('data-school', schoolPage);
1792 - form.setAttribute('data-obj', postObjNum);
1793 -
1794 - var html = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>';
1795 -
1796 - // コメント以外は添付ファイル編集を表示
1797 - function escAttr(s) { return s.replace(/&/g,'&amp;').replace(/"/g,'&quot;').replace(/'/g,'&#39;').replace(/</g,'&lt;').replace(/>/g,'&gt;'); }
1798 - if (postType !== 'comment') {
1799 - // 既存画像
1800 - html += '<div class="edit-attachments">';
1801 - if (currentImages.trim()) {
1802 - html += '<div class="edit-attach-section"><span class="edit-attach-label">画像</span>';
1803 - var imgs = currentImages.trim().split('\n');
1804 - for (var i = 0; i < imgs.length; i++) {
1805 - var img = imgs[i].trim();
1806 - if (!img) continue;
1807 - html += '<div class="edit-attach-item" data-name="' + escAttr(img) + '">' +
1808 - '<img src="/xwiki/bin/download/' + schoolPage.replace(/\./g,'/') + '/' + encodeURIComponent(img) + '" class="edit-attach-thumb" />' +
1809 - '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1810 - '<input type="hidden" name="keepImages" value="' + escAttr(img) + '" />' +
1811 - '</div>';
1812 - }
1813 - html += '</div>';
1814 - }
1815 - // 既存ファイル
1816 - if (currentFiles.trim()) {
1817 - html += '<div class="edit-attach-section"><span class="edit-attach-label">ファイル</span>';
1818 - var files = currentFiles.trim().split('\n');
1819 - for (var j = 0; j < files.length; j++) {
1820 - var f = files[j].trim();
1821 - if (!f) continue;
1822 - var displayName = f;
1823 - if (/^file_\d{14}_\d+_/.test(f)) displayName = f.replace(/^file_\d{14}_\d+_/, '');
1824 - html += '<div class="edit-attach-item" data-name="' + escAttr(f) + '">' +
1825 - '<span class="edit-attach-fname">' + escAttr(displayName) + '</span>' +
1826 - '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1827 - '<input type="hidden" name="keepFiles" value="' + escAttr(f) + '" />' +
1828 - '</div>';
1829 - }
1830 - html += '</div>';
1831 - }
1832 - // 新規追加
1833 - html += '<div class="edit-attach-add">' +
1834 - '<label class="form-label-sm">画像を追加（最大4枚まで）</label>' +
1835 - '<input type="file" name="editNewImages" accept="image/*" multiple class="form-file-input-sm" />' +
1836 - '<div class="form-hint">JPEG / PNG / GIF / WebP、各5MBまで</div>' +
1837 - '<label class="form-label-sm" style="margin-top:8px;">ファイルを追加（最大2つまで）</label>' +
1838 - '<input type="file" name="editNewFiles" accept=".pdf,.docx,.xlsx,.pptx" multiple class="form-file-input-sm" />' +
1839 - '<div class="form-hint">PDF / Word / Excel / PowerPoint、各10MBまで</div>' +
1840 - '</div>';
1841 - html += '</div>';
1842 - }
1843 -
1844 - html += '<div class="post-edit-form-actions">' +
1219 + form.innerHTML = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>' +
1220 + '<div class="post-edit-form-actions">' +
1845 1845   '<button type="button" class="btn-cancel-edit" onclick="this.closest(\'.post-edit-form\').remove()">キャンセル</button>' +
1846 - '<button type="button" class="btn-save" onclick="saveEditPost(this)">保存</button>' +
1222 + '<button type="button" class="btn-save" onclick="saveEditPost(\'' + schoolPage + '\', ' + postObjNum + ')">保存</button>' +
1847 1847   '</div>';
1848 -
1849 - form.innerHTML = html;
1850 1850   bodyEl.parentNode.insertBefore(form, bodyEl.nextSibling);
1851 1851   form.querySelector('textarea').focus();
1852 1852  }
1853 1853  
1854 -function removeEditAttach(btn) {
1855 - var item = btn.closest('.edit-attach-item');
1856 - if (item) item.remove();
1857 -}
1858 -
1859 1859  // 投稿の編集を保存
1860 -function saveEditPost(btn) {
1861 - var formEl = btn.closest('.post-edit-form');
1862 - if (!formEl) return;
1863 - var schoolPage = formEl.getAttribute('data-school');
1864 - var postObjNum = formEl.getAttribute('data-obj');
1865 - var textarea = formEl.querySelector('textarea');
1229 +function saveEditPost(schoolPage, postObjNum) {
1230 + var textarea = document.getElementById('editContent_' + postObjNum);
1866 1866   if (!textarea) return;
1867 1867   var newContent = textarea.value.trim();
1868 1868   if (!newContent) { alert('投稿内容を入力してください'); return; }
1869 -
1870 1870   var csrfEl = document.querySelector('input[name="form_token"]');
1871 1871   var csrfToken = csrfEl ? csrfEl.value : '';
1872 -
1873 - var fd = new FormData();
1874 - fd.append('schoolPage', schoolPage);
1875 - fd.append('postObj', postObjNum);
1876 - fd.append('newContent', newContent);
1877 - fd.append('form_token', csrfToken);
1878 -
1879 - // 残す画像・ファイル
1880 - formEl.querySelectorAll('input[name="keepImages"]').forEach(function(el) { fd.append('keepImages', el.value); });
1881 - formEl.querySelectorAll('input[name="keepFiles"]').forEach(function(el) { fd.append('keepFiles', el.value); });
1882 -
1883 - // 新規画像
1884 - var newImgInput = formEl.querySelector('input[name="editNewImages"]');
1885 - if (newImgInput && newImgInput.files) {
1886 - for (var i = 0; i < newImgInput.files.length; i++) { fd.append('editNewImages', newImgInput.files[i]); }
1887 - }
1888 - // 新規ファイル
1889 - var newFileInput = formEl.querySelector('input[name="editNewFiles"]');
1890 - if (newFileInput && newFileInput.files) {
1891 - for (var j = 0; j < newFileInput.files.length; j++) { fd.append('editNewFiles', newFileInput.files[j]); }
1892 - }
1893 -
1894 - btn.disabled = true;
1895 - btn.textContent = '保存中...';
1896 -
1897 1897   var xhr = new XMLHttpRequest();
1898 1898   xhr.open('POST', '/bin/get/SeitokaiCode/EditPost?outputSyntax=plain', true);
1238 + xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1239 + var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken);
1899 1899   xhr.onload = function() {
1900 1900   try {
1901 1901   var res = JSON.parse(xhr.responseText);
... ... @@ -1903,13 +1903,12 @@
1903 1903   showToast('投稿を更新しました', 'success');
1904 1904   setTimeout(function() { location.reload(); }, 800);
1905 1905   } else {
1906 - btn.disabled = false; btn.textContent = '保存';
1907 1907   alert('編集に失敗しました: ' + (res.error || ''));
1908 1908   }
1909 - } catch(e) { btn.disabled = false; btn.textContent = '保存'; alert('編集に失敗しました'); }
1249 + } catch(e) { alert('編集に失敗しました'); }
1910 1910   };
1911 - xhr.onerror = function() { btn.disabled = false; btn.textContent = '保存'; alert('通信エラーが発生しました'); };
1912 - xhr.send(fd);
1251 + xhr.onerror = function() { alert('通信エラーが発生しました'); };
1252 + xhr.send(editPostData);
1913 1913  }
1914 1914  
1915 1915  // 投稿の削除（確認ダイアログ付き）