Skip to Content
Last modified by Super Admin on 2026/04/05 18:59
From version Icon 98.1 Icon
edited by Super Admin
on 2026/03/20 18:16
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
... ... @@ -35,9 +35,8 @@
35 35  #set($schoolSystem = $doc.getValue('schoolSystem'))
36 36  #set($website = $doc.getValue('website'))
37 37  #set($schoolPhoto = $doc.getValue('schoolPhoto'))
38 -#set($schoolDescription = $doc.getValue('schoolDescription'))
39 39  
40 -## --- 生徒会組織 ---
39 +## --- 組織図 ---
41 41  #set($orgChart = $doc.getValue('orgChart'))
42 42  #set($orgChartImage = $doc.getValue('orgChartImage'))
43 43  
... ... @@ -57,7 +57,7 @@
57 57  #set($budgetAllocation = $doc.getValue('budgetAllocation'))
58 58  #set($budgetNote = $doc.getValue('budgetNote'))
59 59  
60 -## --- 校則・生徒会会則の見直し ---
59 +## --- 校則の見直し ---
61 61  #set($ruleReviewStatus = $doc.getValue('ruleReviewStatus'))
62 62  #set($ruleReviewContent = $doc.getValue('ruleReviewContent'))
63 63  #set($ruleReviewProposer = $doc.getValue('ruleReviewProposer'))
... ... @@ -64,44 +64,6 @@
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 -
105 105  ## --- 課題・連絡先 ---
106 106  #set($challenges = $doc.getValue('challenges'))
107 107  #set($contactInfo = $doc.getValue('contactInfo'))
... ... @@ -126,14 +126,6 @@
126 126  #set($visibilityBudget = $!doc.getValue('visibilityBudget'))
127 127  #set($visibilityRuleReview = $!doc.getValue('visibilityRuleReview'))
128 128  #set($visibilityChallenges = $!doc.getValue('visibilityChallenges'))
129 -#set($visibilityDailyActivities = $!doc.getValue('visibilityDailyActivities'))
130 -#set($visibilityElection = $!doc.getValue('visibilityElection'))
131 -#set($visibilityMeeting = $!doc.getValue('visibilityMeeting'))
132 -#set($visibilityActivityEnv = $!doc.getValue('visibilityActivityEnv'))
133 -#set($visibilityAssembly = $!doc.getValue('visibilityAssembly'))
134 -#set($visibilityPublicity = $!doc.getValue('visibilityPublicity'))
135 -#set($visibilityExternal = $!doc.getValue('visibilityExternal'))
136 -#set($visibilityAnnualEvents = $!doc.getValue('visibilityAnnualEvents'))
137 137  ## デフォルト値（未設定なら全体公開）
138 138  #if(!$visibilityOrgChart || $visibilityOrgChart == '') #set($visibilityOrgChart = 'public') #end
139 139  #if(!$visibilityBudget || $visibilityBudget == '') #set($visibilityBudget = 'public') #end
... ... @@ -350,7 +350,7 @@
350 350  
351 351  ## --- 編集ボタン（権限があるユーザーのみ表示） ---
352 352  #set($canEditSchool = false)
353 -#if(!$isGuest && ($isViewerAdmin || $isSchoolMember || $isAlumniOfSchool))
306 +#if(!$isGuest && ($isViewerAdmin || $isSchoolMember))
354 354   #set($canEditSchool = true)
355 355  #end
356 356  #if($canEditSchool)
... ... @@ -400,18 +400,19 @@
400 400   </div>
401 401   #end
402 402   </div>
403 - #if($schoolDescription && $schoolDescription.trim() != '')
404 - <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>
405 405   #end
406 -
407 407  </div>
408 408  
409 -## --- ② 生徒会情報（折りたたみカード） ---
363 +## --- ② 生徒会基本情報（折りたたみカード） ---
410 410  <div class="school-info-card" id="card-seitokai-info">
411 - <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>
412 412   <div class="seitokai-info-body">
413 413  
414 - ## --- 生徒会組織 ---
368 + ## --- 組織図 ---
415 415   #set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
416 416   #if($hasOrgContent)
417 417   #set($canViewOrgChart = true)
... ... @@ -420,33 +420,30 @@
420 420   #end
421 421   #if($canViewOrgChart)
422 422   <div class="seitokai-subsection">
423 - <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>
424 424   <div class="seitokai-subsection-content">
425 425   #if($orgChartImage && $orgChartImage != '')
426 426   <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
427 427   #end
428 - #if($orgChart && $orgChart != '')<div class="free-note">$!escapetool.xml($orgChart)</div>#end
382 + #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end
429 429   </div>
430 430   </div>
431 431   #else
432 - <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>
433 433   #end
434 434   #end
435 435  
436 436   ## --- 日常の活動 ---
437 437   #if($dailyActivities && !$dailyActivities.isEmpty())
438 - #set($canViewDA = true)
439 - #if($visibilityDailyActivities == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewDA = false)
440 - #elseif($visibilityDailyActivities == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewDA = false)
441 - #end
442 - #if($canViewDA)
443 443   <div class="seitokai-subsection">
444 - <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>
445 445   <div class="seitokai-subsection-content">
446 - <p class="activity-hint">活動時間が多い3つ</p>
395 + <p class="activity-hint">活動時間の多い順に上位3つ</p>
447 447   <div class="tag-container">
397 + #set($daIdx = 1)
448 448   #foreach($da in $dailyActivities)
449 - <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)
450 450   #end
451 451   </div>
452 452   #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
... ... @@ -454,20 +454,12 @@
454 454   #end
455 455   </div>
456 456   </div>
457 - #else
458 - <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>
459 - #end
460 460   #end
461 461  
462 462   ## --- 選挙 ---
463 463   #if($electionExists && $electionExists != '')
464 - #set($canViewEL = true)
465 - #if($visibilityElection == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewEL = false)
466 - #elseif($visibilityElection == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewEL = false)
467 - #end
468 - #if($canViewEL)
469 469   <div class="seitokai-subsection">
470 - <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>
471 471   <div class="seitokai-subsection-content">
472 472   <div class="info-row">
473 473   <span class="info-label">役員選挙</span>
... ... @@ -484,20 +484,12 @@
484 484   #end
485 485   </div>
486 486   </div>
487 - #else
488 - <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>
489 - #end
490 490   #end
491 491  
492 492   ## --- 定例活動 ---
493 493   #if($meetingFrequency && $meetingFrequency != '')
494 - #set($canViewMT = true)
495 - #if($visibilityMeeting == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewMT = false)
496 - #elseif($visibilityMeeting == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewMT = false)
497 - #end
498 - #if($canViewMT)
499 499   <div class="seitokai-subsection">
500 - <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>
501 501   <div class="seitokai-subsection-content">
502 502   <div class="info-row">
503 503   <span class="info-label">役員定例会の頻度</span>
... ... @@ -508,9 +508,6 @@
508 508   #end
509 509   </div>
510 510   </div>
511 - #else
512 - <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>
513 - #end
514 514   #end
515 515  
516 516   ## --- 予算 ---
... ... @@ -522,7 +522,7 @@
522 522   #end
523 523   #if($canViewBudget)
524 524   <div class="seitokai-subsection">
525 - <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>
526 526   <div class="seitokai-subsection-content">
527 527   #if($budgetProcess && !$budgetProcess.isEmpty())
528 528   <div class="info-row">
... ... @@ -529,13 +529,8 @@
529 529   <span class="info-label">作成過程の生徒関与</span>
530 530   <span class="info-value">
531 531   <div class="selection-display">
532 - #set($allBpOpts = ["各部・委員会等への予算希望額調査","予算額調整（折衝等）","生徒会予算案の作成","生徒総会での議決","生徒関与なし","その他"])
533 - #foreach($bpOpt in $allBpOpts)
534 - #if($budgetProcess.contains($bpOpt))
535 - <span class="selection-item">$!escapetool.xml($bpOpt)</span>
536 - #else
537 - <span class="selection-item selection-item-off">$!escapetool.xml($bpOpt)</span>
538 - #end
464 + #foreach($bp in $budgetProcess)
465 + <span class="selection-item">$!escapetool.xml($bp.trim())</span>
539 539   #end
540 540   </div>
541 541   </span>
... ... @@ -575,7 +575,7 @@
575 575   #end
576 576   #end
577 577  
578 - ## --- 校則・生徒会会則の見直し ---
505 + ## --- 校則の見直し ---
579 579   #if($ruleReviewStatus && $ruleReviewStatus != '')
580 580   #set($canViewRuleReview = true)
581 581   #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewRuleReview = false)
... ... @@ -583,13 +583,12 @@
583 583   #end
584 584   #if($canViewRuleReview)
585 585   <div class="seitokai-subsection">
586 - <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>
587 587   <div class="seitokai-subsection-content">
588 588   <div class="info-row">
589 589   <span class="info-label">見直しの有無（3年以内）</span>
590 590   <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
591 591   </div>
592 - #if($ruleReviewStatus != '実施なし')
593 593   #if($ruleReviewContent && !$ruleReviewContent.isEmpty())
594 594   <div class="info-row">
595 595   <span class="info-label">見直しの内容</span>
... ... @@ -626,7 +626,6 @@
626 626   </span>
627 627   </div>
628 628   #end
629 - #end
630 630   #if($ruleReviewSystem && $ruleReviewSystem != '')
631 631   <div class="info-row">
632 632   <span class="info-label">見直しの仕組み</span>
... ... @@ -636,271 +636,10 @@
636 636   </div>
637 637   </div>
638 638   #else
639 - <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>
640 640   #end
641 641   #end
642 642  
643 - ## --- 活動環境 ---
644 - #set($hasActivityEnv = ($activityPlace && !$activityPlace.isEmpty()) || ($activityRoomEquipment && $activityRoomEquipment != '') || ($activityRoomImage && $activityRoomImage != '') || ($ictTools && !$ictTools.isEmpty()) || ($ictUsage && !$ictUsage.isEmpty()))
645 - #if($hasActivityEnv)
646 - #set($canViewAE = true)
647 - #if($visibilityActivityEnv == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAE = false)
648 - #elseif($visibilityActivityEnv == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAE = false)
649 - #end
650 - #if($canViewAE)
651 - <div class="seitokai-subsection">
652 - <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>
653 - <div class="seitokai-subsection-content">
654 - #if($activityPlace && !$activityPlace.isEmpty())
655 - <div class="info-row">
656 - <span class="info-label">普段の活動場所</span>
657 - <span class="info-value">
658 - <div class="selection-display">
659 - #foreach($ap in $activityPlace)
660 - <span class="selection-item">$!escapetool.xml($ap.trim())</span>
661 - #end
662 - </div>
663 - </span>
664 - </div>
665 - #end
666 - #if($activityRoomEquipment && $activityRoomEquipment != '')
667 - <div class="info-row">
668 - <span class="info-label">生徒会室の設備</span>
669 - <span class="info-value free-text-value">$!escapetool.xml($activityRoomEquipment)</span>
670 - </div>
671 - #end
672 - #if($activityRoomImage && $activityRoomImage != '')
673 - <div class="info-row">
674 - <span class="info-label">活動場所の写真</span>
675 - <span class="info-value"><div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($activityRoomImage)" alt="活動場所の写真" class="org-chart-img" /></div></span>
676 - </div>
677 - #end
678 - #if($ictTools && !$ictTools.isEmpty())
679 - <div class="info-row">
680 - <span class="info-label">利用しているICTツール</span>
681 - <span class="info-value">
682 - #set($ictCatDisplay = [
683 - ["連絡ツール", ["メール","LINE","LINE WORKS","Discord","Slack","Microsoft Teams","Google Chat","InstagramのDM","XのDM","その他（連絡）"]],
684 - ["ドキュメント作成・共有", ["Googleドキュメント","Googleスプレッドシート","Googleスライド","Googleドライブ","Word","Excel","PowerPoint","OneDrive","SharePoint","Notion","Pages","Numbers","Keynote","Dropbox","Box","その他（ドキュメント）"]],
685 - ["タスク管理", ["Googleカレンダー","Google ToDoリスト","Trello","Asana","Excel等スプレッドシート","その他（タスク管理）"]],
686 - ["ビデオ会議ツール", ["Zoom","Google Meet","その他（ビデオ会議）"]],
687 - ["アンケート", ["Googleフォーム","Microsoft Forms","その他（アンケート）"]],
688 - ["デザイン・クリエイティブ", ["Canva","各種Adobe","CapCut","LumaFusion","AviUtl","ibisPaint","その他（デザイン）"]],
689 - ["その他", ["独自のWebシステム・自作アプリ"]]
690 - ])
691 - #foreach($catD in $ictCatDisplay)
692 - #set($catHasItems = false)
693 - #foreach($t in $catD.get(1))
694 - #if($ictTools.contains($t)) #set($catHasItems = true) #end
695 - #end
696 - #if($catHasItems)
697 - <div style="margin-bottom:6px">
698 - <span style="font-size:0.8em;font-weight:600;color:var(--text-mid)">$catD.get(0):</span>
699 - <div class="selection-display" style="margin-top:2px">
700 - #foreach($t in $catD.get(1))
701 - #if($ictTools.contains($t))
702 - <span class="selection-item">$!escapetool.xml($t)</span>
703 - #end
704 - #end
705 - </div>
706 - </div>
707 - #end
708 - #end
709 - </span>
710 - </div>
711 - #end
712 - #if($ictUsage && !$ictUsage.isEmpty())
713 - <div class="info-row">
714 - <span class="info-label">ICT活用している場面</span>
715 - <span class="info-value">
716 - <div class="selection-display">
717 - #foreach($iu in $ictUsage)
718 - <span class="selection-item">$!escapetool.xml($iu.trim())</span>
719 - #end
720 - </div>
721 - </span>
722 - </div>
723 - #end
724 - </div>
725 - </div>
726 - #else
727 - <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>
728 - #end
729 - #end
730 -
731 - ## --- 生徒総会 ---
732 - #set($hasAssembly = ($assemblyFormat && $assemblyFormat != '') || ($assemblyCount && $assemblyCount > 0) || ($assemblyAgenda && !$assemblyAgenda.isEmpty()) || ($assemblyTopics && !$assemblyTopics.isEmpty()) || ($assemblyNote && $assemblyNote != ''))
733 - #if($hasAssembly)
734 - #set($canViewAS = true)
735 - #if($visibilityAssembly == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAS = false)
736 - #elseif($visibilityAssembly == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAS = false)
737 - #end
738 - #if($canViewAS)
739 - <div class="seitokai-subsection">
740 - <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>
741 - <div class="seitokai-subsection-content">
742 - #if($assemblyFormat && $assemblyFormat != '')
743 - <div class="info-row">
744 - <span class="info-label">開催方式</span>
745 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($assemblyFormat)</span></span>
746 - </div>
747 - #end
748 - #if($assemblyCount && $assemblyCount > 0)
749 - <div class="info-row">
750 - <span class="info-label">開催回数（年）</span>
751 - <span class="info-value">$!escapetool.xml($assemblyCount)回</span>
752 - </div>
753 - #end
754 - #if($assemblyAgenda && !$assemblyAgenda.isEmpty())
755 - <div class="info-row">
756 - <span class="info-label">議案の集め方</span>
757 - <span class="info-value">
758 - <div class="selection-display">
759 - #foreach($aa in $assemblyAgenda)
760 - <span class="selection-item">$!escapetool.xml($aa.trim())</span>
761 - #end
762 - </div>
763 - </span>
764 - </div>
765 - #end
766 - #if($assemblyTopics && !$assemblyTopics.isEmpty())
767 - <div class="info-row">
768 - <span class="info-label">扱う内容</span>
769 - <span class="info-value">
770 - <div class="selection-display">
771 - #foreach($at in $assemblyTopics)
772 - <span class="selection-item">$!escapetool.xml($at.trim())</span>
773 - #end
774 - </div>
775 - </span>
776 - </div>
777 - #end
778 - #if($assemblyNote && $assemblyNote != '')
779 - <div class="info-row">
780 - <span class="info-label">自由記述</span>
781 - <span class="info-value free-text-value">$!escapetool.xml($assemblyNote)</span>
782 - </div>
783 - #end
784 - </div>
785 - </div>
786 - #else
787 - <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>
788 - #end
789 - #end
790 -
791 - ## --- 広報 ---
792 - #set($hasPublicity = ($publicityMethod && !$publicityMethod.isEmpty()) || ($publicityFrequency && $publicityFrequency != '') || ($publicityNote && $publicityNote != ''))
793 - #if($hasPublicity)
794 - #set($canViewPB = true)
795 - #if($visibilityPublicity == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewPB = false)
796 - #elseif($visibilityPublicity == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPB = false)
797 - #end
798 - #if($canViewPB)
799 - <div class="seitokai-subsection">
800 - <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>
801 - <div class="seitokai-subsection-content">
802 - #if($publicityMethod && !$publicityMethod.isEmpty())
803 - <div class="info-row">
804 - <span class="info-label">方法</span>
805 - <span class="info-value">
806 - <div class="selection-display">
807 - #foreach($pm in $publicityMethod)
808 - <span class="selection-item">$!escapetool.xml($pm.trim())</span>
809 - #end
810 - </div>
811 - </span>
812 - </div>
813 - #end
814 - #if($publicityFrequency && $publicityFrequency != '')
815 - <div class="info-row">
816 - <span class="info-label">頻度</span>
817 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($publicityFrequency)</span></span>
818 - </div>
819 - #end
820 - #if($publicityNote && $publicityNote != '')
821 - <div class="info-row">
822 - <span class="info-label">自由記述</span>
823 - <span class="info-value free-text-value">$!escapetool.xml($publicityNote)</span>
824 - </div>
825 - #end
826 - </div>
827 - </div>
828 - #else
829 - <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>
830 - #end
831 - #end
832 -
833 - ## --- 外部連携 ---
834 - #set($hasExternal = ($externalCooperation && $externalCooperation != '') || ($externalOrgName && $externalOrgName != '') || ($socialParticipation && !$socialParticipation.isEmpty()))
835 - #if($hasExternal)
836 - #set($canViewEX = true)
837 - #if($visibilityExternal == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewEX = false)
838 - #elseif($visibilityExternal == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewEX = false)
839 - #end
840 - #if($canViewEX)
841 - <div class="seitokai-subsection">
842 - <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>
843 - <div class="seitokai-subsection-content">
844 - #if($externalCooperation && $externalCooperation != '')
845 - <div class="info-row">
846 - <span class="info-label">他校の生徒会との連携</span>
847 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($externalCooperation)</span></span>
848 - </div>
849 - #end
850 - #if($externalOrgName && $externalOrgName != '')
851 - <div class="info-row">
852 - <span class="info-label">参加している生徒会団体の名前</span>
853 - <span class="info-value">$!escapetool.xml($externalOrgName)</span>
854 - </div>
855 - #end
856 - #if($socialParticipation && !$socialParticipation.isEmpty())
857 - <div class="info-row">
858 - <span class="info-label">社会参加・地域連携・ボランティア</span>
859 - <span class="info-value">
860 - <div class="selection-display">
861 - #foreach($sp2 in $socialParticipation)
862 - <span class="selection-item">$!escapetool.xml($sp2.trim())</span>
863 - #end
864 - </div>
865 - </span>
866 - </div>
867 - #end
868 - </div>
869 - </div>
870 - #else
871 - <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>
872 - #end
873 - #end
874 -
875 - ## --- 年間主要行事 ---
876 - #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]])
877 - #set($hasAnyEvent = false)
878 - #foreach($m in $months)
879 - #if($m.get(1) && $m.get(1) != '') #set($hasAnyEvent = true) #end
880 - #end
881 - #if($hasAnyEvent)
882 - #set($canViewAN = true)
883 - #if($visibilityAnnualEvents == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAN = false)
884 - #elseif($visibilityAnnualEvents == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAN = false)
885 - #end
886 - #if($canViewAN)
887 - <div class="seitokai-subsection">
888 - <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>
889 - <div class="seitokai-subsection-content">
890 - <table class="wiki-table school-info-table" style="margin:0">
891 - #foreach($m in $months)
892 - #if($m.get(1) && $m.get(1) != '')
893 - <tr><td style="width:60px;font-weight:600;white-space:nowrap">$m.get(0)</td><td>$!escapetool.xml($m.get(1))</td></tr>
894 - #end
895 - #end
896 - </table>
897 - </div>
898 - </div>
899 - #else
900 - <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>
901 - #end
902 - #end
903 -
904 904   ## --- 生徒会の課題意識 ---
905 905   #if($challenges && $challenges != '')
906 906   #set($canViewChallenges = true)
... ... @@ -909,7 +909,7 @@
909 909   #end
910 910   #if($canViewChallenges)
911 911   <div class="seitokai-subsection">
912 - <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>
913 913   <div class="seitokai-subsection-content">
914 914   <div class="challenge-text">$!escapetool.xml($challenges)</div>
915 915   </div>
... ... @@ -933,11 +933,6 @@
933 933   <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>
934 934   <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
935 935   </table>
936 - #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
937 - #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
938 - #if($infoEditDate && $infoEditDate != '')
939 - <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>
940 - #end
941 941  </div>
942 942  
943 943  {{/html}}
... ... @@ -1077,18 +1077,16 @@
1077 1077  <div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)">
1078 1078   <div class="activity-thread-header">
1079 1079   <div class="activity-thread-title">
1080 - <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>
1081 - <div class="activity-meta-line">
1082 - <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
1083 - #set($actTagsList = $activity.getValue('tags'))
1084 - #if($actTagsList && !$actTagsList.isEmpty())
1085 - #foreach($tagItem in $actTagsList)
1086 - #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end
1087 - #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
1088 1088   #end
1089 - </div>
746 + #end
1090 1090   </div>
1091 - <div class="thread-meta-right">
748 + <div class="thread-meta-row">
1092 1092   <span class="thread-post-count">${reportCount}件の報告 ・ ${commentCount}件のコメント</span>
1093 1093   #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred')
1094 1094   #if($actFeatured == '1')
... ... @@ -1224,13 +1224,6 @@
1224 1224   #if($postEdited == 1 || $postEdited == '1')
1225 1225   <span class="post-edited-label">（編集済み）</span>
1226 1226   #end
1227 - #set($postAuthorRefH = $!post.getValue('authorRef'))
1228 - #set($postObjNumH = $post.number)
1229 - #if(!$isGuest && $xcontext.user != $postAuthorRefH)
1230 - <button type="button" class="btn-post-report btn-post-report-header" onclick="openReportDialog(this, '${doc.fullName}', $postObjNumH, '${services.csrf.getToken()}')" title="この投稿を通報">
1231 - <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> 通報
1232 - </button>
1233 - #end
1234 1234   </div>
1235 1235   <div class="thread-post-body">
1236 1236   $!escapetool.xml($!postContent)
... ... @@ -1295,7 +1295,7 @@
1295 1295   #end
1296 1296   </div>
1297 1297   #if($postVis != 'public')
1298 - <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>
1299 1299   #end
1300 1300   ## 固定/編集/削除/通報/非表示ボタン（横並び）
1301 1301   #set($postAuthorRef = $!post.getValue('authorRef'))
... ... @@ -1302,8 +1302,9 @@
1302 1302   #set($postObjNumED = $post.number)
1303 1303   #set($showPinBtn = ($viewerAccountType == 'admin' || $viewerAccountType == 'verified'))
1304 1304   #set($showEditDeleteBtn = ($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin'))
955 + #set($showReportBtn = (!$isGuest && $xcontext.user != $postAuthorRef))
1305 1305   #set($showHideBtn = ($viewerAccountType == 'admin'))
1306 - #if($showPinBtn || $showEditDeleteBtn || $showHideBtn)
957 + #if($showPinBtn || $showEditDeleteBtn || $showReportBtn || $showHideBtn)
1307 1307   <div class="post-edit-actions post-action-mt">
1308 1308   #if($showPinBtn)
1309 1309   #set($postObjNum = $post.number)
... ... @@ -1319,9 +1319,7 @@
1319 1319   #end
1320 1320   #if($showEditDeleteBtn)
1321 1321   #if($xcontext.user == $postAuthorRef)
1322 - #set($editImages = $!post.getValue('images'))
1323 - #set($editFiles = $!post.getValue('files'))
1324 - <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="この投稿を編集">
1325 1325   <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> 編集
1326 1326   </button>
1327 1327   #end
... ... @@ -1329,6 +1329,11 @@
1329 1329   <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> 削除
1330 1330   </button>
1331 1331   #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
1332 1332   #if($showHideBtn)
1333 1333   <button type="button" class="btn-post-hide" onclick="openHideDialog(this, '${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を非表示にする">
1334 1334   <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> 非表示
... ... @@ -1383,11 +1383,9 @@
1383 1383  
1384 1384   #if($xcontext.user != "XWiki.XWikiGuest")
1385 1385   <div class="thread-add-post">
1386 - #if($isSchoolMember || $isAlumniOfSchool || $isViewerAdmin)
1387 1387   <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
1388 1388   ＋ 活動報告を追加
1389 1389   </a>
1390 - #end
1391 1391   <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
1392 1392   <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> コメントを書く
1393 1393   </a>
... ... @@ -1554,130 +1554,37 @@
1554 1554  }
1555 1555  
1556 1556  // 投稿の編集（インライン編集フォームを開く）
1557 -function openEditPost(btn) {
1209 +function openEditPost(btn, schoolPage, postObjNum, currentContent) {
1558 1558   var postEl = btn.closest('.thread-post');
1559 1559   if (!postEl) return;
1212 + // 既存の編集フォームがあれば閉じる
1560 1560   var existing = postEl.querySelector('.post-edit-form');
1561 1561   if (existing) { existing.remove(); return; }
1562 1562   var bodyEl = postEl.querySelector('.thread-post-body');
1563 1563   if (!bodyEl) return;
1564 -
1565 - var schoolPage = btn.getAttribute('data-school');
1566 - var postObjNum = btn.getAttribute('data-obj');
1567 - var currentContent = btn.getAttribute('data-content') || '';
1568 - var currentImages = btn.getAttribute('data-images') || '';
1569 - var currentFiles = btn.getAttribute('data-files') || '';
1570 - var postType = btn.getAttribute('data-post-type') || 'report';
1571 -
1572 1572   var form = document.createElement('div');
1573 1573   form.className = 'post-edit-form';
1574 - form.setAttribute('data-school', schoolPage);
1575 - form.setAttribute('data-obj', postObjNum);
1576 -
1577 - var html = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>';
1578 -
1579 - // コメント以外は添付ファイル編集を表示
1580 - if (postType !== 'comment') {
1581 - // 既存画像
1582 - html += '<div class="edit-attachments">';
1583 - if (currentImages.trim()) {
1584 - html += '<div class="edit-attach-section"><span class="edit-attach-label">画像</span>';
1585 - var imgs = currentImages.trim().split('\n');
1586 - for (var i = 0; i < imgs.length; i++) {
1587 - var img = imgs[i].trim();
1588 - if (!img) continue;
1589 - html += '<div class="edit-attach-item" data-name="' + img.replace(/"/g,'&quot;') + '">' +
1590 - '<img src="/xwiki/bin/download/' + schoolPage.replace(/\./g,'/') + '/' + encodeURIComponent(img) + '" class="edit-attach-thumb" />' +
1591 - '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1592 - '<input type="hidden" name="keepImages" value="' + img.replace(/"/g,'&quot;') + '" />' +
1593 - '</div>';
1594 - }
1595 - html += '</div>';
1596 - }
1597 - // 既存ファイル
1598 - if (currentFiles.trim()) {
1599 - html += '<div class="edit-attach-section"><span class="edit-attach-label">ファイル</span>';
1600 - var files = currentFiles.trim().split('\n');
1601 - for (var j = 0; j < files.length; j++) {
1602 - var f = files[j].trim();
1603 - if (!f) continue;
1604 - var displayName = f;
1605 - if (/^file_\d{14}_\d+_/.test(f)) displayName = f.replace(/^file_\d{14}_\d+_/, '');
1606 - html += '<div class="edit-attach-item" data-name="' + f.replace(/"/g,'&quot;') + '">' +
1607 - '<span class="edit-attach-fname">' + displayName.replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</span>' +
1608 - '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1609 - '<input type="hidden" name="keepFiles" value="' + f.replace(/"/g,'&quot;') + '" />' +
1610 - '</div>';
1611 - }
1612 - html += '</div>';
1613 - }
1614 - // 新規追加
1615 - html += '<div class="edit-attach-add">' +
1616 - '<label class="form-label-sm">画像を追加（最大4枚まで）</label>' +
1617 - '<input type="file" name="editNewImages" accept="image/*" multiple class="form-file-input-sm" />' +
1618 - '<div class="form-hint">JPEG / PNG / GIF / WebP、各5MBまで</div>' +
1619 - '<label class="form-label-sm" style="margin-top:8px;">ファイルを追加（最大2つまで）</label>' +
1620 - '<input type="file" name="editNewFiles" accept=".pdf,.docx,.xlsx,.pptx" multiple class="form-file-input-sm" />' +
1621 - '<div class="form-hint">PDF / Word / Excel / PowerPoint、各10MBまで</div>' +
1622 - '</div>';
1623 - html += '</div>';
1624 - }
1625 -
1626 - 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">' +
1627 1627   '<button type="button" class="btn-cancel-edit" onclick="this.closest(\'.post-edit-form\').remove()">キャンセル</button>' +
1628 - '<button type="button" class="btn-save" onclick="saveEditPost(this)">保存</button>' +
1222 + '<button type="button" class="btn-save" onclick="saveEditPost(\'' + schoolPage + '\', ' + postObjNum + ')">保存</button>' +
1629 1629   '</div>';
1630 -
1631 - form.innerHTML = html;
1632 1632   bodyEl.parentNode.insertBefore(form, bodyEl.nextSibling);
1633 1633   form.querySelector('textarea').focus();
1634 1634  }
1635 1635  
1636 -function removeEditAttach(btn) {
1637 - var item = btn.closest('.edit-attach-item');
1638 - if (item) item.remove();
1639 -}
1640 -
1641 1641  // 投稿の編集を保存
1642 -function saveEditPost(btn) {
1643 - var formEl = btn.closest('.post-edit-form');
1644 - if (!formEl) return;
1645 - var schoolPage = formEl.getAttribute('data-school');
1646 - var postObjNum = formEl.getAttribute('data-obj');
1647 - var textarea = formEl.querySelector('textarea');
1229 +function saveEditPost(schoolPage, postObjNum) {
1230 + var textarea = document.getElementById('editContent_' + postObjNum);
1648 1648   if (!textarea) return;
1649 1649   var newContent = textarea.value.trim();
1650 1650   if (!newContent) { alert('投稿内容を入力してください'); return; }
1651 -
1652 1652   var csrfEl = document.querySelector('input[name="form_token"]');
1653 1653   var csrfToken = csrfEl ? csrfEl.value : '';
1654 -
1655 - var fd = new FormData();
1656 - fd.append('schoolPage', schoolPage);
1657 - fd.append('postObj', postObjNum);
1658 - fd.append('newContent', newContent);
1659 - fd.append('form_token', csrfToken);
1660 -
1661 - // 残す画像・ファイル
1662 - formEl.querySelectorAll('input[name="keepImages"]').forEach(function(el) { fd.append('keepImages', el.value); });
1663 - formEl.querySelectorAll('input[name="keepFiles"]').forEach(function(el) { fd.append('keepFiles', el.value); });
1664 -
1665 - // 新規画像
1666 - var newImgInput = formEl.querySelector('input[name="editNewImages"]');
1667 - if (newImgInput && newImgInput.files) {
1668 - for (var i = 0; i < newImgInput.files.length; i++) { fd.append('editNewImages', newImgInput.files[i]); }
1669 - }
1670 - // 新規ファイル
1671 - var newFileInput = formEl.querySelector('input[name="editNewFiles"]');
1672 - if (newFileInput && newFileInput.files) {
1673 - for (var j = 0; j < newFileInput.files.length; j++) { fd.append('editNewFiles', newFileInput.files[j]); }
1674 - }
1675 -
1676 - btn.disabled = true;
1677 - btn.textContent = '保存中...';
1678 -
1679 1679   var xhr = new XMLHttpRequest();
1680 1680   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);
1681 1681   xhr.onload = function() {
1682 1682   try {
1683 1683   var res = JSON.parse(xhr.responseText);
... ... @@ -1685,13 +1685,12 @@
1685 1685   showToast('投稿を更新しました', 'success');
1686 1686   setTimeout(function() { location.reload(); }, 800);
1687 1687   } else {
1688 - btn.disabled = false; btn.textContent = '保存';
1689 1689   alert('編集に失敗しました: ' + (res.error || ''));
1690 1690   }
1691 - } catch(e) { btn.disabled = false; btn.textContent = '保存'; alert('編集に失敗しました'); }
1249 + } catch(e) { alert('編集に失敗しました'); }
1692 1692   };
1693 - xhr.onerror = function() { btn.disabled = false; btn.textContent = '保存'; alert('通信エラーが発生しました'); };
1694 - xhr.send(fd);
1251 + xhr.onerror = function() { alert('通信エラーが発生しました'); };
1252 + xhr.send(editPostData);
1695 1695  }
1696 1696  
1697 1697  // 投稿の削除（確認ダイアログ付き）