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

From version Icon 107.1 Icon
edited by Super Admin
on 2026/03/24 15:28
Change comment: There is no comment for this version
To version Icon 70.1 Icon
edited by Super Admin
on 2026/03/18 18:54
Change comment: There is no comment for this version

Summary

Details

Icon Page properties
Content
... ... @@ -34,10 +34,8 @@
34 34  #set($schoolLevel = $doc.getValue('schoolLevel'))
35 35  #set($schoolSystem = $doc.getValue('schoolSystem'))
36 36  #set($website = $doc.getValue('website'))
37 -#set($schoolPhoto = $doc.getValue('schoolPhoto'))
38 -#set($schoolDescription = $doc.getValue('schoolDescription'))
39 39  
40 -## --- 生徒会組織 ---
38 +## --- 組織 ---
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 -## --- 校則・生徒会会則の見直し ---
58 +## --- 校則の見直し ---
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
... ... @@ -145,34 +145,13 @@
145 145  #set($isGuest = $viewerUser == 'XWiki.XWikiGuest')
146 146  #set($isViewerAdmin = false)
147 147  #set($viewerSchoolCode = '')
148 -#set($viewerSecondaryGraduated = false)
149 149  #if(!$isGuest)
150 150   #set($viewerDoc = $xwiki.getDocument($viewerUser))
151 151   #set($viewerAccountType = $!viewerDoc.getValue('accountType'))
152 152   #set($viewerSchoolCode = $!viewerDoc.getValue('schoolCode'))
153 - #set($viewerSecondarySchoolCode = $!viewerDoc.getValue('secondarySchoolCode'))
154 - #set($viewerUserRole = $!viewerDoc.getValue('userRole'))
155 155   #if($viewerAccountType == 'admin')
156 156   #set($isViewerAdmin = true)
157 157   #end
158 - ## 第2所属校の在学年数超過チェック
159 - #set($viewerSecEnrollYear = $!viewerDoc.getValue('secondaryEnrollmentYear'))
160 - #if($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecEnrollYear && $viewerSecEnrollYear != '')
161 - #set($vNow = $datetool.date)
162 - #set($vCurYear = $mathtool.toInteger($datetool.format('yyyy', $vNow)))
163 - #set($vCurMonth = $mathtool.toInteger($datetool.format('MM', $vNow)))
164 - #if($vCurMonth >= 4)#set($vSchoolYear = $vCurYear)#else#set($vSchoolYear = $mathtool.sub($vCurYear, 1))#end
165 - #set($vSecEnroll = $mathtool.toInteger($viewerSecEnrollYear))
166 - #set($vSecMax = 3)
167 - #if($viewerSecondarySchoolCode.length() >= 2)
168 - #set($vSecType = $viewerSecondarySchoolCode.substring(0, 2))
169 - #if($vSecType == 'C2')#set($vSecMax = 9)#elseif($vSecType == 'D2')#set($vSecMax = 6)#end
170 - #end
171 - #set($vSecGrade = $mathtool.add($mathtool.sub($vSchoolYear, $vSecEnroll), 1))
172 - #if($vSecGrade > $vSecMax)
173 - #set($viewerSecondaryGraduated = true)
174 - #end
175 - #end
176 176  #end
177 177  
178 178  ## --- 関連校(中高一貫校)情報 ---
... ... @@ -179,31 +179,10 @@
179 179  #set($affiliatedSchoolCode = $!doc.getValue('affiliatedSchoolCode'))
180 180  #set($affiliatedSchoolName = $!doc.getValue('affiliatedSchoolName'))
181 181  #set($isAffiliated = false)
182 -#if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
183 - #if($viewerSchoolCode == $affiliatedSchoolCode)
184 - #set($isAffiliated = true)
185 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode && !$viewerSecondaryGraduated)
186 - #set($isAffiliated = true)
187 - #end
113 +#if($affiliatedSchoolCode && $affiliatedSchoolCode != '' && $viewerSchoolCode == $affiliatedSchoolCode)
114 + #set($isAffiliated = true)
188 188  #end
189 189  
190 -## --- 校内判定(卒業生を除外、secondarySchoolCodeも含む) ---
191 -#set($isSchoolMember = false)
192 -#if(!$isGuest && $viewerUserRole != 'graduate')
193 - #if($viewerSchoolCode == $schoolCode || $isAffiliated)
194 - #set($isSchoolMember = true)
195 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode && !$viewerSecondaryGraduated)
196 - #set($isSchoolMember = true)
197 - #end
198 -#end
199 -## 卒業生の母校判定(投稿バッジ用)
200 -#set($isAlumniOfSchool = false)
201 -#if(!$isGuest && $viewerUserRole == 'graduate')
202 - #if($viewerSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $viewerSchoolCode == $affiliatedSchoolCode))
203 - #set($isAlumniOfSchool = true)
204 - #end
205 -#end
206 -
207 207  ## --- 学校ページ非表示チェック ---
208 208  #set($schoolHidden = $doc.getValue('hidden'))
209 209  #if($schoolHidden == 1)
... ... @@ -237,7 +237,7 @@
237 237  
238 238  ## --- 投稿固定/解除処理 ---
239 239  #set($pinAction = $!request.action)
240 -#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $isSchoolMember)) && $services.csrf.isTokenValid($request.form_token))
150 +#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && ($viewerSchoolCode == $schoolCode || $isAffiliated))) && $services.csrf.isTokenValid($request.form_token))
241 241   #set($pinPostObjStr = $!request.postObj)
242 242   #if(!$pinPostObjStr.matches('^\d+$'))
243 243   ## 不正な値 → 無視
... ... @@ -267,7 +267,7 @@
267 267  
268 268  ## --- 特色ある活動 選定/解除処理 ---
269 269  #set($featAction = $!request.action)
270 -#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $isSchoolMember)) && $services.csrf.isTokenValid($request.form_token))
180 +#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token))
271 271   #set($featActObjStr = $!request.actObj)
272 272   #if($featActObjStr.matches('^\d+$'))
273 273   #set($actObjNum = $mathtool.toInteger($featActObjStr))
... ... @@ -369,7 +369,7 @@
369 369  
370 370  ## --- 編集ボタン(権限があるユーザーのみ表示) ---
371 371  #set($canEditSchool = false)
372 -#if(!$isGuest && ($isViewerAdmin || $isSchoolMember || $isAlumniOfSchool))
282 +#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode || $isAffiliated))
373 373   #set($canEditSchool = true)
374 374  #end
375 375  #if($canEditSchool)
... ... @@ -396,97 +396,65 @@
396 396  </div>
397 397  #end
398 398  
399 -## --- 未入力ガイド(自校ユーザー向け) ---
400 -#if(!$isGuest && $canEdit)
401 - #set($missingItems = [])
402 - #if(!$studentCount || $studentCount == '' || $studentCount == '0') #set($discard = $missingItems.add('生徒数')) #end
403 - #if(!$orgChart || $orgChart == '') #set($discard = $missingItems.add('生徒会組織')) #end
404 - #if(!$dailyActivities || $dailyActivities == '') #set($discard = $missingItems.add('日常の活動')) #end
405 - #if(!$ruleReviewStatus || $ruleReviewStatus == '') #set($discard = $missingItems.add('校則・生徒会会則の見直し')) #end
406 - #set($activityCount = $doc.getObjects('SeitokaiCode.ActivityClass').size())
407 - #if($activityCount == 0) #set($discard = $missingItems.add('活動報告(まだ投稿がありません)')) #end
408 - #if($missingItems.size() > 0)
409 -<div class="form-message-info" style="margin-bottom:var(--sp-4);">
410 - <strong>入力のお願い</strong> — 以下の項目がまだ入力されていません。<a href="$doc.getURL('view', 'sheet=SeitokaiCode.SchoolEditForm')">編集画面</a>から入力すると、他校の生徒会の参考になります。
411 - <ul style="margin:var(--sp-2) 0 0; padding-left:var(--sp-5);">
412 - #foreach($item in $missingItems)
413 - <li>$item</li>
414 - #end
415 - </ul>
416 -</div>
417 - #end
418 -#end
419 -
420 420  ## --- ① 学校基本情報 ---
421 421  <div class="school-info-card collapsed" id="card-basic-info">
422 422   <h2 role="button" tabindex="0" aria-expanded="false" onclick="toggleInfoCard('card-basic-info')" onkeydown="if(event.key==='Enter'||event.key===' '){event.preventDefault();toggleInfoCard('card-basic-info')}"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M4 19.5A2.5 2.5 0 016.5 17H20"/><path d="M6.5 2H20v20H6.5A2.5 2.5 0 014 19.5v-15A2.5 2.5 0 016.5 2z"/></svg> 学校基本情報</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2>
423 - <div class="school-basic-info-layout">
424 - <div class="school-basic-info-table">
425 - <table class="wiki-table school-info-table">
426 - <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
427 - <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
428 - <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
429 - <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
430 - <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
431 - <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
432 - <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
433 - <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
434 - <tr><th>公式サイト</th><td>#if($website && $website != '')<a href="$!escapetool.xml($website)" target="_blank" rel="noopener">$!escapetool.xml($website)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
435 - </table>
436 - </div>
437 - #if($schoolPhoto && $schoolPhoto != '')
438 - <div class="school-photo-area">
439 - <img src="$doc.getAttachmentURL($schoolPhoto)" alt="$!escapetool.xml($schoolName)" class="school-photo" />
440 - </div>
441 - #end
442 - </div>
443 - #if($schoolDescription && $schoolDescription.trim() != '')
444 - <div class="free-note" style="margin-top:var(--sp-4);">$!escapetool.xml($schoolDescription)</div>
312 + <table class="wiki-table school-info-table">
313 + <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
314 + <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
315 + <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
316 + <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
317 + <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
318 + <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
319 + <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
320 + <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
321 + <tr><th>公式サイト</th><td>#if($website && $website != '')<a href="$!escapetool.xml($website)" target="_blank" rel="noopener">$!escapetool.xml($website)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
322 + </table>
323 + #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
324 + #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
325 + #if($infoEditDate && $infoEditDate != '')
326 + <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>
445 445   #end
446 -
447 447  </div>
448 448  
449 -## --- ② 生徒会情報(折りたたみカード) ---
330 +## --- ② 生徒会基本情報(折りたたみカード) ---
450 450  <div class="school-info-card" id="card-seitokai-info">
451 - <h2 role="button" tabindex="0" aria-expanded="true" onclick="toggleInfoCard('card-seitokai-info')" onkeydown="if(event.key==='Enter'||event.key===' '){event.preventDefault();toggleInfoCard('card-seitokai-info')}"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/></svg> 生徒会情報</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2>
332 + <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>
452 452   <div class="seitokai-info-body">
453 453  
454 - ## --- 生徒会組織 ---
335 + ## --- 組織 ---
455 455   #set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
456 456   #if($hasOrgContent)
457 457   #set($canViewOrgChart = true)
458 - #if($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewOrgChart = false)
459 - #elseif($visibilityOrgChart == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewOrgChart = false)
339 + #if($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewOrgChart = false)
340 + #elseif($visibilityOrgChart == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewOrgChart = false)
460 460   #end
461 461   #if($canViewOrgChart)
462 462   <div class="seitokai-subsection">
463 - <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>
344 + <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>
464 464   <div class="seitokai-subsection-content">
465 465   #if($orgChartImage && $orgChartImage != '')
466 466   <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
467 467   #end
468 - #if($orgChart && $orgChart != '')<div class="free-note">$!escapetool.xml($orgChart)</div>#end
349 + #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end
469 469   </div>
470 470   </div>
471 471   #else
472 - <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>
353 + <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>
473 473   #end
474 474   #end
475 475  
476 476   ## --- 日常の活動 ---
477 477   #if($dailyActivities && !$dailyActivities.isEmpty())
478 - #set($canViewDA = true)
479 - #if($visibilityDailyActivities == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewDA = false)
480 - #elseif($visibilityDailyActivities == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewDA = false)
481 - #end
482 - #if($canViewDA)
483 483   <div class="seitokai-subsection">
484 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z"/><polyline points="14 2 14 8 20 8"/><line x1="16" y1="13" x2="8" y2="13"/><line x1="16" y1="17" x2="8" y2="17"/></svg> 日常の活動 #if($visibilityDailyActivities != '' && $visibilityDailyActivities != 'public')<span class="visibility-badge visibility-${visibilityDailyActivities}">#if($visibilityDailyActivities == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
360 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z"/><polyline points="14 2 14 8 20 8"/><line x1="16" y1="13" x2="8" y2="13"/><line x1="16" y1="17" x2="8" y2="17"/></svg> 日常の活動</h3>
485 485   <div class="seitokai-subsection-content">
486 - <p class="activity-hint">活動時間多い3つ</p>
362 + <p class="activity-hint">活動時間多い順に上位3つ</p>
487 487   <div class="tag-container">
364 + #set($daIdx = 1)
488 488   #foreach($da in $dailyActivities)
489 - <span class="tag tag-accent">$!escapetool.xml($da.trim())</span>
366 + <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
367 + #set($daIdx = $daIdx + 1)
490 490   #end
491 491   </div>
492 492   #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
... ... @@ -494,20 +494,12 @@
494 494   #end
495 495   </div>
496 496   </div>
497 - #else
498 - <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 日常の活動情報は #if($visibilityDailyActivities == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
499 - #end
500 500   #end
501 501  
502 502   ## --- 選挙 ---
503 503   #if($electionExists && $electionExists != '')
504 - #set($canViewEL = true)
505 - #if($visibilityElection == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewEL = false)
506 - #elseif($visibilityElection == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewEL = false)
507 - #end
508 - #if($canViewEL)
509 509   <div class="seitokai-subsection">
510 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="3" width="18" height="18" rx="2"/><path d="M7 13l3 3 7-7"/></svg> 選挙 #if($visibilityElection != '' && $visibilityElection != 'public')<span class="visibility-badge visibility-${visibilityElection}">#if($visibilityElection == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
380 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="3" width="18" height="18" rx="2"/><path d="M7 13l3 3 7-7"/></svg> 選挙</h3>
511 511   <div class="seitokai-subsection-content">
512 512   <div class="info-row">
513 513   <span class="info-label">役員選挙</span>
... ... @@ -524,20 +524,12 @@
524 524   #end
525 525   </div>
526 526   </div>
527 - #else
528 - <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 選挙情報は #if($visibilityElection == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
529 - #end
530 530   #end
531 531  
532 532   ## --- 定例活動 ---
533 533   #if($meetingFrequency && $meetingFrequency != '')
534 - #set($canViewMT = true)
535 - #if($visibilityMeeting == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewMT = false)
536 - #elseif($visibilityMeeting == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewMT = false)
537 - #end
538 - #if($canViewMT)
539 539   <div class="seitokai-subsection">
540 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="4" width="18" height="18" rx="2"/><line x1="16" y1="2" x2="16" y2="6"/><line x1="8" y1="2" x2="8" y2="6"/><line x1="3" y1="10" x2="21" y2="10"/></svg> 定例活動 #if($visibilityMeeting != '' && $visibilityMeeting != 'public')<span class="visibility-badge visibility-${visibilityMeeting}">#if($visibilityMeeting == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
402 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="4" width="18" height="18" rx="2"/><line x1="16" y1="2" x2="16" y2="6"/><line x1="8" y1="2" x2="8" y2="6"/><line x1="3" y1="10" x2="21" y2="10"/></svg> 定例活動</h3>
541 541   <div class="seitokai-subsection-content">
542 542   <div class="info-row">
543 543   <span class="info-label">役員定例会の頻度</span>
... ... @@ -548,9 +548,6 @@
548 548   #end
549 549   </div>
550 550   </div>
551 - #else
552 - <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 定例活動情報は #if($visibilityMeeting == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
553 - #end
554 554   #end
555 555  
556 556   ## --- 予算 ---
... ... @@ -557,12 +557,12 @@
557 557   #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
558 558   #if($hasBudget)
559 559   #set($canViewBudget = true)
560 - #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewBudget = false)
561 - #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false)
419 + #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewBudget = false)
420 + #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false)
562 562   #end
563 563   #if($canViewBudget)
564 564   <div class="seitokai-subsection">
565 - <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>
424 + <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>
566 566   <div class="seitokai-subsection-content">
567 567   #if($budgetProcess && !$budgetProcess.isEmpty())
568 568   <div class="info-row">
... ... @@ -569,13 +569,8 @@
569 569   <span class="info-label">作成過程の生徒関与</span>
570 570   <span class="info-value">
571 571   <div class="selection-display">
572 - #set($allBpOpts = ["各部・委員会等への予算希望額調査","予算額調整(折衝等)","生徒会予算案の作成","生徒総会での議決","生徒関与なし","その他"])
573 - #foreach($bpOpt in $allBpOpts)
574 - #if($budgetProcess.contains($bpOpt))
575 - <span class="selection-item">$!escapetool.xml($bpOpt)</span>
576 - #else
577 - <span class="selection-item selection-item-off">$!escapetool.xml($bpOpt)</span>
578 - #end
431 + #foreach($bp in $budgetProcess)
432 + <span class="selection-item">$!escapetool.xml($bp.trim())</span>
579 579   #end
580 580   </div>
581 581   </span>
... ... @@ -615,21 +615,20 @@
615 615   #end
616 616   #end
617 617  
618 - ## --- 校則・生徒会会則の見直し ---
472 + ## --- 校則の見直し ---
619 619   #if($ruleReviewStatus && $ruleReviewStatus != '')
620 620   #set($canViewRuleReview = true)
621 - #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewRuleReview = false)
622 - #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false)
475 + #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewRuleReview = false)
476 + #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false)
623 623   #end
624 624   #if($canViewRuleReview)
625 625   <div class="seitokai-subsection">
626 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M16 4h2a2 2 0 012 2v12a2 2 0 01-2 2h-2"/><path d="M8 4H6a2 2 0 00-2 2v12a2 2 0 002 2h2"/><line x1="12" y1="4" x2="12" y2="8"/><line x1="12" y1="16" x2="12" y2="20"/><line x1="8" y1="8" x2="16" y2="8"/><line x1="8" y1="16" x2="16" y2="16"/></svg> 校則・生徒会会則の見直し #if($visibilityRuleReview != 'public')<span class="visibility-badge visibility-${visibilityRuleReview}">#if($visibilityRuleReview == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
480 + <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>
627 627   <div class="seitokai-subsection-content">
628 628   <div class="info-row">
629 629   <span class="info-label">見直しの有無(3年以内)</span>
630 630   <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
631 631   </div>
632 - #if($ruleReviewStatus != '実施なし')
633 633   #if($ruleReviewContent && !$ruleReviewContent.isEmpty())
634 634   <div class="info-row">
635 635   <span class="info-label">見直しの内容</span>
... ... @@ -666,7 +666,6 @@
666 666   </span>
667 667   </div>
668 668   #end
669 - #end
670 670   #if($ruleReviewSystem && $ruleReviewSystem != '')
671 671   <div class="info-row">
672 672   <span class="info-label">見直しの仕組み</span>
... ... @@ -676,280 +676,19 @@
676 676   </div>
677 677   </div>
678 678   #else
679 - <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 校則・生徒会会則の見直し情報は #if($visibilityRuleReview == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
531 + <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>
680 680   #end
681 681   #end
682 682  
683 - ## --- 活動環境 ---
684 - #set($hasActivityEnv = ($activityPlace && !$activityPlace.isEmpty()) || ($activityRoomEquipment && $activityRoomEquipment != '') || ($activityRoomImage && $activityRoomImage != '') || ($ictTools && !$ictTools.isEmpty()) || ($ictUsage && !$ictUsage.isEmpty()))
685 - #if($hasActivityEnv)
686 - #set($canViewAE = true)
687 - #if($visibilityActivityEnv == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAE = false)
688 - #elseif($visibilityActivityEnv == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAE = false)
689 - #end
690 - #if($canViewAE)
691 - <div class="seitokai-subsection">
692 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M3 9l9-7 9 7v11a2 2 0 01-2 2H5a2 2 0 01-2-2z"/><polyline points="9 22 9 12 15 12 15 22"/></svg> 生徒会の活動環境 #if($visibilityActivityEnv != '' && $visibilityActivityEnv != 'public')<span class="visibility-badge visibility-${visibilityActivityEnv}">#if($visibilityActivityEnv == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
693 - <div class="seitokai-subsection-content">
694 - #if($activityPlace && !$activityPlace.isEmpty())
695 - <div class="info-row">
696 - <span class="info-label">普段の活動場所</span>
697 - <span class="info-value">
698 - <div class="selection-display">
699 - #foreach($ap in $activityPlace)
700 - <span class="selection-item">$!escapetool.xml($ap.trim())</span>
701 - #end
702 - </div>
703 - </span>
704 - </div>
705 - #end
706 - #if($activityRoomEquipment && $activityRoomEquipment != '')
707 - <div class="info-row">
708 - <span class="info-label">生徒会室の設備</span>
709 - <span class="info-value free-text-value">$!escapetool.xml($activityRoomEquipment)</span>
710 - </div>
711 - #end
712 - #if($activityRoomImage && $activityRoomImage != '')
713 - <div class="info-row">
714 - <span class="info-label">活動場所の写真</span>
715 - <span class="info-value"><div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($activityRoomImage)" alt="活動場所の写真" class="org-chart-img" /></div></span>
716 - </div>
717 - #end
718 - #if($ictTools && !$ictTools.isEmpty())
719 - <div class="info-row">
720 - <span class="info-label">利用しているICTツール</span>
721 - <span class="info-value">
722 - #set($ictCatDisplay = [
723 - ["連絡ツール", ["メール","LINE","LINE WORKS","Discord","Slack","Microsoft Teams","Google Chat","InstagramのDM","XのDM","その他(連絡)"]],
724 - ["ドキュメント作成・共有", ["Googleドキュメント","Googleスプレッドシート","Googleスライド","Googleドライブ","Word","Excel","PowerPoint","OneDrive","SharePoint","Notion","Pages","Numbers","Keynote","Dropbox","Box","その他(ドキュメント)"]],
725 - ["タスク管理", ["Googleカレンダー","Google ToDoリスト","Trello","Asana","Excel等スプレッドシート","その他(タスク管理)"]],
726 - ["ビデオ会議ツール", ["Zoom","Google Meet","その他(ビデオ会議)"]],
727 - ["アンケート", ["Googleフォーム","Microsoft Forms","その他(アンケート)"]],
728 - ["デザイン・クリエイティブ", ["Canva","各種Adobe","CapCut","LumaFusion","AviUtl","ibisPaint","その他(デザイン)"]],
729 - ["その他", ["独自のWebシステム・自作アプリ"]]
730 - ])
731 - #foreach($catD in $ictCatDisplay)
732 - #set($catHasItems = false)
733 - #foreach($t in $catD.get(1))
734 - #if($ictTools.contains($t)) #set($catHasItems = true) #end
735 - #end
736 - #if($catHasItems)
737 - <div style="margin-bottom:6px">
738 - <span style="font-size:0.8em;font-weight:600;color:var(--text-mid)">$catD.get(0):</span>
739 - <div class="selection-display" style="margin-top:2px">
740 - #foreach($t in $catD.get(1))
741 - #if($ictTools.contains($t))
742 - <span class="selection-item">$!escapetool.xml($t)</span>
743 - #end
744 - #end
745 - </div>
746 - </div>
747 - #end
748 - #end
749 - </span>
750 - </div>
751 - #end
752 - #if($ictUsage && !$ictUsage.isEmpty())
753 - <div class="info-row">
754 - <span class="info-label">ICT活用している場面</span>
755 - <span class="info-value">
756 - <div class="selection-display">
757 - #foreach($iu in $ictUsage)
758 - <span class="selection-item">$!escapetool.xml($iu.trim())</span>
759 - #end
760 - </div>
761 - </span>
762 - </div>
763 - #end
764 - </div>
765 - </div>
766 - #else
767 - <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 活動環境情報は #if($visibilityActivityEnv == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
768 - #end
769 - #end
770 -
771 - ## --- 生徒総会 ---
772 - #set($hasAssembly = ($assemblyFormat && $assemblyFormat != '') || ($assemblyCount && $assemblyCount > 0) || ($assemblyAgenda && !$assemblyAgenda.isEmpty()) || ($assemblyTopics && !$assemblyTopics.isEmpty()) || ($assemblyNote && $assemblyNote != ''))
773 - #if($hasAssembly)
774 - #set($canViewAS = true)
775 - #if($visibilityAssembly == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAS = false)
776 - #elseif($visibilityAssembly == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAS = false)
777 - #end
778 - #if($canViewAS)
779 - <div class="seitokai-subsection">
780 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 生徒総会 #if($visibilityAssembly != '' && $visibilityAssembly != 'public')<span class="visibility-badge visibility-${visibilityAssembly}">#if($visibilityAssembly == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
781 - <div class="seitokai-subsection-content">
782 - #if($assemblyFormat && $assemblyFormat != '')
783 - <div class="info-row">
784 - <span class="info-label">開催方式</span>
785 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($assemblyFormat)</span></span>
786 - </div>
787 - #end
788 - #if($assemblyCount && $assemblyCount > 0)
789 - <div class="info-row">
790 - <span class="info-label">開催回数(年)</span>
791 - <span class="info-value">$!escapetool.xml($assemblyCount)回</span>
792 - </div>
793 - #end
794 - #if($assemblyAgenda && !$assemblyAgenda.isEmpty())
795 - <div class="info-row">
796 - <span class="info-label">議案の集め方</span>
797 - <span class="info-value">
798 - <div class="selection-display">
799 - #foreach($aa in $assemblyAgenda)
800 - <span class="selection-item">$!escapetool.xml($aa.trim())</span>
801 - #end
802 - </div>
803 - </span>
804 - </div>
805 - #end
806 - #if($assemblyTopics && !$assemblyTopics.isEmpty())
807 - <div class="info-row">
808 - <span class="info-label">扱う内容</span>
809 - <span class="info-value">
810 - <div class="selection-display">
811 - #foreach($at in $assemblyTopics)
812 - <span class="selection-item">$!escapetool.xml($at.trim())</span>
813 - #end
814 - </div>
815 - </span>
816 - </div>
817 - #end
818 - #if($assemblyNote && $assemblyNote != '')
819 - <div class="info-row">
820 - <span class="info-label">自由記述</span>
821 - <span class="info-value free-text-value">$!escapetool.xml($assemblyNote)</span>
822 - </div>
823 - #end
824 - </div>
825 - </div>
826 - #else
827 - <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 生徒総会情報は #if($visibilityAssembly == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
828 - #end
829 - #end
830 -
831 - ## --- 広報 ---
832 - #set($hasPublicity = ($publicityMethod && !$publicityMethod.isEmpty()) || ($publicityFrequency && $publicityFrequency != '') || ($publicityNote && $publicityNote != ''))
833 - #if($hasPublicity)
834 - #set($canViewPB = true)
835 - #if($visibilityPublicity == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewPB = false)
836 - #elseif($visibilityPublicity == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPB = false)
837 - #end
838 - #if($canViewPB)
839 - <div class="seitokai-subsection">
840 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M1 12s4-8 11-8 11 8 11 8-4 8-11 8-11-8-11-8z"/><circle cx="12" cy="12" r="3"/></svg> 広報 #if($visibilityPublicity != '' && $visibilityPublicity != 'public')<span class="visibility-badge visibility-${visibilityPublicity}">#if($visibilityPublicity == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
841 - <div class="seitokai-subsection-content">
842 - #if($publicityMethod && !$publicityMethod.isEmpty())
843 - <div class="info-row">
844 - <span class="info-label">方法</span>
845 - <span class="info-value">
846 - <div class="selection-display">
847 - #foreach($pm in $publicityMethod)
848 - <span class="selection-item">$!escapetool.xml($pm.trim())</span>
849 - #end
850 - </div>
851 - </span>
852 - </div>
853 - #end
854 - #if($publicityFrequency && $publicityFrequency != '')
855 - <div class="info-row">
856 - <span class="info-label">頻度</span>
857 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($publicityFrequency)</span></span>
858 - </div>
859 - #end
860 - #if($publicityNote && $publicityNote != '')
861 - <div class="info-row">
862 - <span class="info-label">自由記述</span>
863 - <span class="info-value free-text-value">$!escapetool.xml($publicityNote)</span>
864 - </div>
865 - #end
866 - </div>
867 - </div>
868 - #else
869 - <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 広報情報は #if($visibilityPublicity == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
870 - #end
871 - #end
872 -
873 - ## --- 外部連携 ---
874 - #set($hasExternal = ($externalCooperation && $externalCooperation != '') || ($externalOrgName && $externalOrgName != '') || ($socialParticipation && !$socialParticipation.isEmpty()))
875 - #if($hasExternal)
876 - #set($canViewEX = true)
877 - #if($visibilityExternal == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewEX = false)
878 - #elseif($visibilityExternal == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewEX = false)
879 - #end
880 - #if($canViewEX)
881 - <div class="seitokai-subsection">
882 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><circle cx="18" cy="5" r="3"/><circle cx="6" cy="12" r="3"/><circle cx="18" cy="19" r="3"/><line x1="8.59" y1="13.51" x2="15.42" y2="17.49"/><line x1="15.41" y1="6.51" x2="8.59" y2="10.49"/></svg> 外部連携 #if($visibilityExternal != '' && $visibilityExternal != 'public')<span class="visibility-badge visibility-${visibilityExternal}">#if($visibilityExternal == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
883 - <div class="seitokai-subsection-content">
884 - #if($externalCooperation && $externalCooperation != '')
885 - <div class="info-row">
886 - <span class="info-label">他校の生徒会との連携</span>
887 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($externalCooperation)</span></span>
888 - </div>
889 - #end
890 - #if($externalOrgName && $externalOrgName != '')
891 - <div class="info-row">
892 - <span class="info-label">参加している生徒会団体の名前</span>
893 - <span class="info-value">$!escapetool.xml($externalOrgName)</span>
894 - </div>
895 - #end
896 - #if($socialParticipation && !$socialParticipation.isEmpty())
897 - <div class="info-row">
898 - <span class="info-label">社会参加・地域連携・ボランティア</span>
899 - <span class="info-value">
900 - <div class="selection-display">
901 - #foreach($sp2 in $socialParticipation)
902 - <span class="selection-item">$!escapetool.xml($sp2.trim())</span>
903 - #end
904 - </div>
905 - </span>
906 - </div>
907 - #end
908 - </div>
909 - </div>
910 - #else
911 - <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 外部連携情報は #if($visibilityExternal == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
912 - #end
913 - #end
914 -
915 - ## --- 年間主要行事 ---
916 - #set($months = [["4月", $eventApril], ["5月", $eventMay], ["6月", $eventJune], ["7月", $eventJuly], ["8月", $eventAugust], ["9月", $eventSeptember], ["10月", $eventOctober], ["11月", $eventNovember], ["12月", $eventDecember], ["1月", $eventJanuary], ["2月", $eventFebruary], ["3月", $eventMarch]])
917 - #set($hasAnyEvent = false)
918 - #foreach($m in $months)
919 - #if($m.get(1) && $m.get(1) != '') #set($hasAnyEvent = true) #end
920 - #end
921 - #if($hasAnyEvent)
922 - #set($canViewAN = true)
923 - #if($visibilityAnnualEvents == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAN = false)
924 - #elseif($visibilityAnnualEvents == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAN = false)
925 - #end
926 - #if($canViewAN)
927 - <div class="seitokai-subsection">
928 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="4" width="18" height="18" rx="2" ry="2"/><line x1="16" y1="2" x2="16" y2="6"/><line x1="8" y1="2" x2="8" y2="6"/><line x1="3" y1="10" x2="21" y2="10"/></svg> 年間主要行事 #if($visibilityAnnualEvents != '' && $visibilityAnnualEvents != 'public')<span class="visibility-badge visibility-${visibilityAnnualEvents}">#if($visibilityAnnualEvents == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
929 - <div class="seitokai-subsection-content">
930 - <table class="wiki-table school-info-table" style="margin:0">
931 - #foreach($m in $months)
932 - #if($m.get(1) && $m.get(1) != '')
933 - <tr><td style="width:60px;font-weight:600;white-space:nowrap">$m.get(0)</td><td>$!escapetool.xml($m.get(1))</td></tr>
934 - #end
935 - #end
936 - </table>
937 - </div>
938 - </div>
939 - #else
940 - <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 年間主要行事情報は #if($visibilityAnnualEvents == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
941 - #end
942 - #end
943 -
944 944   ## --- 生徒会の課題意識 ---
945 945   #if($challenges && $challenges != '')
946 946   #set($canViewChallenges = true)
947 - #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewChallenges = false)
948 - #elseif($visibilityChallenges == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewChallenges = false)
538 + #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewChallenges = false)
539 + #elseif($visibilityChallenges == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewChallenges = false)
949 949   #end
950 950   #if($canViewChallenges)
951 951   <div class="seitokai-subsection">
952 - <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>
543 + <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>
953 953   <div class="seitokai-subsection-content">
954 954   <div class="challenge-text">$!escapetool.xml($challenges)</div>
955 955   </div>
... ... @@ -973,11 +973,6 @@
973 973   <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>
974 974   <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
975 975   </table>
976 - #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
977 - #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
978 - #if($infoEditDate && $infoEditDate != '')
979 - <div class="info-last-updated"><svg class="ico" viewBox="0 0 24 24"><path d="M11 4H4a2 2 0 00-2 2v14a2 2 0 002 2h14a2 2 0 002-2v-7"/><path d="M18.5 2.5a2.121 2.121 0 013 3L12 15l-4 1 1-4 9.5-9.5z"/></svg> 基本情報の最終更新: $!escapetool.xml($infoEditBy) — $!escapetool.xml($infoEditDate)</div>
980 - #end
981 981  </div>
982 982  
983 983  {{/html}}
... ... @@ -1041,7 +1041,6 @@
1041 1041   <span class="author-legend-title">所属:</span>
1042 1042   <span class="author-legend-item"><span class="badge badge-school-internal-confirmed badge-sm"><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> 校内(確認済)</span> <span class="text-hint">所属が確認されたこの学校のユーザー</span></span>
1043 1043   <span class="author-legend-item"><span class="badge badge-school-internal badge-sm"><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> 校内</span> <span class="text-hint">この学校に所属登録しているユーザー</span></span>
1044 - <span class="author-legend-item"><span class="badge badge-alumni badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M22 10l-10-5L2 10l10 5 10-5z"/><path d="M6 12v5c0 1.66 2.69 3 6 3s6-1.34 6-3v-5"/></svg> 卒業生</span> <span class="text-hint">この学校の卒業生</span></span>
1045 1045   <span class="author-legend-item"><span class="badge badge-school-external badge-sm"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M2 12h20"/><path d="M12 2a15.3 15.3 0 014 10 15.3 15.3 0 01-4 10 15.3 15.3 0 01-4-10 15.3 15.3 0 014-10z"/></svg> 他校</span> <span class="text-hint">別の学校に所属しているユーザー</span></span>
1046 1046   <span class="author-legend-item text-hint">※一般アカウントは所属バッジが表示されません</span>
1047 1047   </div>
... ... @@ -1117,18 +1117,16 @@
1117 1117  <div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)">
1118 1118   <div class="activity-thread-header">
1119 1119   <div class="activity-thread-title">
1120 - <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>
1121 - <div class="activity-meta-line">
1122 - <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
1123 - #set($actTagsList = $activity.getValue('tags'))
1124 - #if($actTagsList && !$actTagsList.isEmpty())
1125 - #foreach($tagItem in $actTagsList)
1126 - #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end
1127 - #end
705 + <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>
706 + <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
707 + #set($actTagsList = $activity.getValue('tags'))
708 + #if($actTagsList && !$actTagsList.isEmpty())
709 + #foreach($tagItem in $actTagsList)
710 + #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end
1128 1128   #end
1129 - </div>
712 + #end
1130 1130   </div>
1131 - <div class="thread-meta-right">
714 + <div class="thread-meta-row">
1132 1132   <span class="thread-post-count">${reportCount}件の報告 ・ ${commentCount}件のコメント</span>
1133 1133   #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred')
1134 1134   #if($actFeatured == '1')
... ... @@ -1188,8 +1188,8 @@
1188 1188   #set($postVis = $!post.getValue('visibility'))
1189 1189   #if(!$postVis || $postVis == '') #set($postVis = 'public') #end
1190 1190   #set($canViewPost = true)
1191 - #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewPost = false)
1192 - #elseif($postVis == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPost = false)
774 + #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewPost = false)
775 + #elseif($postVis == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPost = false)
1193 1193   #end
1194 1194   #if(!$canViewPost)
1195 1195   <div class="thread-post visibility-restricted-post">
... ... @@ -1233,11 +1233,8 @@
1233 1233   <span class="badge badge-general badge-sm">一般</span>
1234 1234   #end
1235 1235   ## 所属バッジ(投稿者の学校コードとページの学校コードを比較)
1236 - #set($postIsSchoolMatch = ($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode)))
1237 1237   #if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general')
1238 - #if($postUserRole == 'graduate' && $postIsSchoolMatch)
1239 - <span class="badge badge-alumni badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M22 10l-10-5L2 10l10 5 10-5z"/><path d="M6 12v5c0 1.66 2.69 3 6 3s6-1.34 6-3v-5"/></svg> 卒業生</span>
1240 - #elseif($postIsSchoolMatch && $postUserRole != 'graduate')
820 + #if($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode))
1241 1241   #if($postAccountType == 'verified' || $postAccountType == 'admin')
1242 1242   <span class="badge badge-school-internal-confirmed badge-sm"><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> 校内(確認済)</span>
1243 1243   #else
... ... @@ -1264,13 +1264,6 @@
1264 1264   #if($postEdited == 1 || $postEdited == '1')
1265 1265   <span class="post-edited-label">(編集済み)</span>
1266 1266   #end
1267 - #set($postAuthorRefH = $!post.getValue('authorRef'))
1268 - #set($postObjNumH = $post.number)
1269 - #if(!$isGuest && $xcontext.user != $postAuthorRefH)
1270 - <button type="button" class="btn-post-report btn-post-report-header" onclick="openReportDialog(this, '${doc.fullName}', $postObjNumH, '${services.csrf.getToken()}')" title="この投稿を通報">
1271 - <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> 通報
1272 - </button>
1273 - #end
1274 1274   </div>
1275 1275   <div class="thread-post-body">
1276 1276   $!escapetool.xml($!postContent)
... ... @@ -1335,18 +1335,12 @@
1335 1335   #end
1336 1336   </div>
1337 1337   #if($postVis != 'public')
1338 - <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>
911 + <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>
1339 1339   #end
1340 - ## 固定/編集/削除/通報/非表示ボタン(横並び)
1341 - #set($postAuthorRef = $!post.getValue('authorRef'))
1342 - #set($postObjNumED = $post.number)
1343 - #set($showPinBtn = ($viewerAccountType == 'admin' || $viewerAccountType == 'verified'))
1344 - #set($showEditDeleteBtn = ($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin'))
1345 - #set($showHideBtn = ($viewerAccountType == 'admin'))
1346 - #if($showPinBtn || $showEditDeleteBtn || $showHideBtn)
1347 - <div class="post-edit-actions post-action-mt">
1348 - #if($showPinBtn)
1349 - #set($postObjNum = $post.number)
913 + ## 固定/解除ボタン(承認済み・管理者のみ)
914 + #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
915 + #set($postObjNum = $post.number)
916 + <div class="post-pin-action post-action-mt">
1350 1350   #if($isPinned == '1')
1351 1351   <a href="$doc.getURL('view', "action=unpin&postObj=${postObjNum}&form_token=${services.csrf.getToken()}")" class="btn-pin-toggle btn-unpin" title="固定を解除">
1352 1352   <svg class="ico ico-fixed-14" viewBox="0 0 24 24" fill="currentColor" stroke="none"><path d="M16 2l-4 4-2-1-5 5 3 3-6 6h4l4-4 3 3 5-5-1-2 4-4-5-5z"/></svg> 固定を解除
... ... @@ -1356,12 +1356,15 @@
1356 1356   <svg class="ico ico-fixed-14" viewBox="0 0 24 24"><path d="M16 2l-4 4-2-1-5 5 3 3-6 6h4l4-4 3 3 5-5-1-2 4-4-5-5z"/></svg> 固定する
1357 1357   </a>
1358 1358   #end
1359 - #end
1360 - #if($showEditDeleteBtn)
926 + </div>
927 + #end
928 + ## 編集・削除ボタン(投稿者本人 or 管理者)
929 + #set($postAuthorRef = $!post.getValue('authorRef'))
930 + #set($postObjNumED = $post.number)
931 + #if($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin')
932 + <div class="post-edit-actions post-action-mt">
1361 1361   #if($xcontext.user == $postAuthorRef)
1362 - #set($editImages = $!post.getValue('images'))
1363 - #set($editFiles = $!post.getValue('files'))
1364 - <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="この投稿を編集">
934 + <button type="button" class="btn-post-edit" onclick="openEditPost(this, '${doc.fullName}', $postObjNumED, '$!escapetool.javascript($!postContent)')" title="この投稿を編集">
1365 1365   <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> 編集
1366 1366   </button>
1367 1367   #end
... ... @@ -1368,12 +1368,6 @@
1368 1368   <button type="button" class="btn-post-delete" onclick="confirmDeletePost('${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を削除">
1369 1369   <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> 削除
1370 1370   </button>
1371 - #end
1372 - #if($showHideBtn)
1373 - <button type="button" class="btn-post-hide" onclick="openHideDialog(this, '${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を非表示にする">
1374 - <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> 非表示
1375 - </button>
1376 - #end
1377 1377   </div>
1378 1378   #end
1379 1379   </div>
... ... @@ -1423,11 +1423,9 @@
1423 1423  
1424 1424   #if($xcontext.user != "XWiki.XWikiGuest")
1425 1425   <div class="thread-add-post">
1426 - #if($isSchoolMember || $isAlumniOfSchool || $isViewerAdmin)
1427 1427   <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
1428 1428   + 活動報告を追加
1429 1429   </a>
1430 - #end
1431 1431   <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
1432 1432   <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> コメントを書く
1433 1433   </a>
... ... @@ -1504,27 +1504,6 @@
1504 1504  }
1505 1505  // ページ読み込み時の初期化
1506 1506  document.addEventListener('DOMContentLoaded', function() {
1507 - // 年度タブを降順にソート(「全期間」タブは末尾に固定)
1508 - var tabContainer = document.querySelector('.activity-fy-tabs');
1509 - if (tabContainer) {
1510 - var tabs = Array.from(tabContainer.querySelectorAll('.activity-fy-tab'));
1511 - var allTab = null;
1512 - var fyTabs = [];
1513 - tabs.forEach(function(t) {
1514 - var onclickStr = t.getAttribute('onclick') || '';
1515 - if (onclickStr.indexOf("'all'") !== -1) { allTab = t; }
1516 - else { fyTabs.push(t); }
1517 - });
1518 - // 年度タブを数値の降順でソート
1519 - fyTabs.sort(function(a, b) {
1520 - var aYear = parseInt(a.textContent) || 0;
1521 - var bYear = parseInt(b.textContent) || 0;
1522 - return bYear - aYear;
1523 - });
1524 - // DOM再配置
1525 - fyTabs.forEach(function(t) { tabContainer.appendChild(t); });
1526 - if (allTab) { tabContainer.appendChild(allTab); }
1527 - }
1528 1528   // デフォルトで現在の年度を表示
1529 1529   var defaultTab = document.querySelector('.activity-fy-tab.active');
1530 1530   if (defaultTab) { defaultTab.click(); }
... ... @@ -1578,15 +1578,7 @@
1578 1578   };
1579 1579   var toast = document.createElement('div');
1580 1580   toast.className = 'toast toast-' + type;
1581 - var iconSvg = icons[type] || '';
1582 - if (iconSvg) {
1583 - var iconSpan = document.createElement('span');
1584 - iconSpan.innerHTML = iconSvg;
1585 - toast.appendChild(iconSpan);
1586 - }
1587 - var msgSpan = document.createElement('span');
1588 - msgSpan.textContent = message;
1589 - toast.appendChild(msgSpan);
1122 + toast.innerHTML = (icons[type] || '') + '<span>' + message + '</span>';
1590 1590   container.appendChild(toast);
1591 1591   setTimeout(function() { toast.remove(); }, 3200);
1592 1592  }
... ... @@ -1602,131 +1602,37 @@
1602 1602  }
1603 1603  
1604 1604  // 投稿の編集(インライン編集フォームを開く)
1605 -function openEditPost(btn) {
1138 +function openEditPost(btn, schoolPage, postObjNum, currentContent) {
1606 1606   var postEl = btn.closest('.thread-post');
1607 1607   if (!postEl) return;
1141 + // 既存の編集フォームがあれば閉じる
1608 1608   var existing = postEl.querySelector('.post-edit-form');
1609 1609   if (existing) { existing.remove(); return; }
1610 1610   var bodyEl = postEl.querySelector('.thread-post-body');
1611 1611   if (!bodyEl) return;
1612 -
1613 - var schoolPage = btn.getAttribute('data-school');
1614 - var postObjNum = btn.getAttribute('data-obj');
1615 - var currentContent = btn.getAttribute('data-content') || '';
1616 - var currentImages = btn.getAttribute('data-images') || '';
1617 - var currentFiles = btn.getAttribute('data-files') || '';
1618 - var postType = btn.getAttribute('data-post-type') || 'report';
1619 -
1620 1620   var form = document.createElement('div');
1621 1621   form.className = 'post-edit-form';
1622 - form.setAttribute('data-school', schoolPage);
1623 - form.setAttribute('data-obj', postObjNum);
1624 -
1625 - var html = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>';
1626 -
1627 - // コメント以外は添付ファイル編集を表示
1628 - function escAttr(s) { return s.replace(/&/g,'&amp;').replace(/"/g,'&quot;').replace(/'/g,'&#39;').replace(/</g,'&lt;').replace(/>/g,'&gt;'); }
1629 - if (postType !== 'comment') {
1630 - // 既存画像
1631 - html += '<div class="edit-attachments">';
1632 - if (currentImages.trim()) {
1633 - html += '<div class="edit-attach-section"><span class="edit-attach-label">画像</span>';
1634 - var imgs = currentImages.trim().split('\n');
1635 - for (var i = 0; i < imgs.length; i++) {
1636 - var img = imgs[i].trim();
1637 - if (!img) continue;
1638 - html += '<div class="edit-attach-item" data-name="' + escAttr(img) + '">' +
1639 - '<img src="/xwiki/bin/download/' + schoolPage.replace(/\./g,'/') + '/' + encodeURIComponent(img) + '" class="edit-attach-thumb" />' +
1640 - '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1641 - '<input type="hidden" name="keepImages" value="' + escAttr(img) + '" />' +
1642 - '</div>';
1643 - }
1644 - html += '</div>';
1645 - }
1646 - // 既存ファイル
1647 - if (currentFiles.trim()) {
1648 - html += '<div class="edit-attach-section"><span class="edit-attach-label">ファイル</span>';
1649 - var files = currentFiles.trim().split('\n');
1650 - for (var j = 0; j < files.length; j++) {
1651 - var f = files[j].trim();
1652 - if (!f) continue;
1653 - var displayName = f;
1654 - if (/^file_\d{14}_\d+_/.test(f)) displayName = f.replace(/^file_\d{14}_\d+_/, '');
1655 - html += '<div class="edit-attach-item" data-name="' + escAttr(f) + '">' +
1656 - '<span class="edit-attach-fname">' + escAttr(displayName) + '</span>' +
1657 - '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1658 - '<input type="hidden" name="keepFiles" value="' + escAttr(f) + '" />' +
1659 - '</div>';
1660 - }
1661 - html += '</div>';
1662 - }
1663 - // 新規追加
1664 - html += '<div class="edit-attach-add">' +
1665 - '<label class="form-label-sm">画像を追加(最大4枚まで)</label>' +
1666 - '<input type="file" name="editNewImages" accept="image/*" multiple class="form-file-input-sm" />' +
1667 - '<div class="form-hint">JPEG / PNG / GIF / WebP、各5MBまで</div>' +
1668 - '<label class="form-label-sm" style="margin-top:8px;">ファイルを追加(最大2つまで)</label>' +
1669 - '<input type="file" name="editNewFiles" accept=".pdf,.docx,.xlsx,.pptx" multiple class="form-file-input-sm" />' +
1670 - '<div class="form-hint">PDF / Word / Excel / PowerPoint、各10MBまで</div>' +
1671 - '</div>';
1672 - html += '</div>';
1673 - }
1674 -
1675 - html += '<div class="post-edit-form-actions">' +
1148 + form.innerHTML = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>' +
1149 + '<div class="post-edit-form-actions">' +
1676 1676   '<button type="button" class="btn-cancel-edit" onclick="this.closest(\'.post-edit-form\').remove()">キャンセル</button>' +
1677 - '<button type="button" class="btn-save" onclick="saveEditPost(this)">保存</button>' +
1151 + '<button type="button" class="btn-save" onclick="saveEditPost(\'' + schoolPage + '\', ' + postObjNum + ')">保存</button>' +
1678 1678   '</div>';
1679 -
1680 - form.innerHTML = html;
1681 1681   bodyEl.parentNode.insertBefore(form, bodyEl.nextSibling);
1682 1682   form.querySelector('textarea').focus();
1683 1683  }
1684 1684  
1685 -function removeEditAttach(btn) {
1686 - var item = btn.closest('.edit-attach-item');
1687 - if (item) item.remove();
1688 -}
1689 -
1690 1690  // 投稿の編集を保存
1691 -function saveEditPost(btn) {
1692 - var formEl = btn.closest('.post-edit-form');
1693 - if (!formEl) return;
1694 - var schoolPage = formEl.getAttribute('data-school');
1695 - var postObjNum = formEl.getAttribute('data-obj');
1696 - var textarea = formEl.querySelector('textarea');
1158 +function saveEditPost(schoolPage, postObjNum) {
1159 + var textarea = document.getElementById('editContent_' + postObjNum);
1697 1697   if (!textarea) return;
1698 1698   var newContent = textarea.value.trim();
1699 1699   if (!newContent) { alert('投稿内容を入力してください'); return; }
1700 -
1701 1701   var csrfEl = document.querySelector('input[name="form_token"]');
1702 1702   var csrfToken = csrfEl ? csrfEl.value : '';
1703 -
1704 - var fd = new FormData();
1705 - fd.append('schoolPage', schoolPage);
1706 - fd.append('postObj', postObjNum);
1707 - fd.append('newContent', newContent);
1708 - fd.append('form_token', csrfToken);
1709 -
1710 - // 残す画像・ファイル
1711 - formEl.querySelectorAll('input[name="keepImages"]').forEach(function(el) { fd.append('keepImages', el.value); });
1712 - formEl.querySelectorAll('input[name="keepFiles"]').forEach(function(el) { fd.append('keepFiles', el.value); });
1713 -
1714 - // 新規画像
1715 - var newImgInput = formEl.querySelector('input[name="editNewImages"]');
1716 - if (newImgInput && newImgInput.files) {
1717 - for (var i = 0; i < newImgInput.files.length; i++) { fd.append('editNewImages', newImgInput.files[i]); }
1718 - }
1719 - // 新規ファイル
1720 - var newFileInput = formEl.querySelector('input[name="editNewFiles"]');
1721 - if (newFileInput && newFileInput.files) {
1722 - for (var j = 0; j < newFileInput.files.length; j++) { fd.append('editNewFiles', newFileInput.files[j]); }
1723 - }
1724 -
1725 - btn.disabled = true;
1726 - btn.textContent = '保存中...';
1727 -
1728 1728   var xhr = new XMLHttpRequest();
1729 1729   xhr.open('POST', '/bin/get/SeitokaiCode/EditPost?outputSyntax=plain', true);
1167 + xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1168 + var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken);
1730 1730   xhr.onload = function() {
1731 1731   try {
1732 1732   var res = JSON.parse(xhr.responseText);
... ... @@ -1734,13 +1734,12 @@
1734 1734   showToast('投稿を更新しました', 'success');
1735 1735   setTimeout(function() { location.reload(); }, 800);
1736 1736   } else {
1737 - btn.disabled = false; btn.textContent = '保存';
1738 1738   alert('編集に失敗しました: ' + (res.error || ''));
1739 1739   }
1740 - } catch(e) { btn.disabled = false; btn.textContent = '保存'; alert('編集に失敗しました'); }
1178 + } catch(e) { alert('編集に失敗しました'); }
1741 1741   };
1742 - xhr.onerror = function() { btn.disabled = false; btn.textContent = '保存'; alert('通信エラーが発生しました'); };
1743 - xhr.send(fd);
1180 + xhr.onerror = function() { alert('通信エラーが発生しました'); };
1181 + xhr.send(editPostData);
1744 1744  }
1745 1745  
1746 1746  // 投稿の削除(確認ダイアログ付き)
... ... @@ -1764,80 +1764,6 @@
1764 1764   xhr.onerror = function() { alert('通信エラーが発生しました'); };
1765 1765   xhr.send(deletePostData);
1766 1766  }
1767 -
1768 -/* --- 通報ダイアログ --- */
1769 -function openReportDialog(btn, targetPage, postObjNum, token) {
1770 - if (document.getElementById('report-dialog-overlay')) return;
1771 - var reasons = ['宣伝・スパム','不適切な内容','個人情報の露出','誹謗中傷','誤情報','その他'];
1772 - var overlay = document.createElement('div');
1773 - overlay.id = 'report-dialog-overlay';
1774 - overlay.style.cssText = 'position:fixed;inset:0;background:rgba(0,0,0,0.5);z-index:9999;display:flex;align-items:center;justify-content:center;';
1775 - var dialog = document.createElement('div');
1776 - dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;max-height:80vh;overflow-y:auto;';
1777 - var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を通報</h3>';
1778 - html += '<p style="margin:0 0 12px;font-size:0.9em;color:#4b5563;">通報された投稿は管理者が確認するまで一時的に非表示になります。</p>';
1779 - html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">通報理由</label>';
1780 - html += '<select id="report-reason" style="width:100%;padding:8px;border:1px solid #d1d5db;border-radius:8px;margin-bottom:12px;font-size:0.9em;">';
1781 - for (var i=0; i<reasons.length; i++) html += '<option value="'+reasons[i]+'">'+reasons[i]+'</option>';
1782 - html += '</select>';
1783 - html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">補足コメント(任意)</label>';
1784 - html += '<textarea id="report-detail" rows="3" maxlength="500" style="width:100%;padding:8px;border:1px solid #d1d5db;border-radius:8px;resize:vertical;font-size:0.9em;box-sizing:border-box;" placeholder="具体的な内容があればご記入ください"></textarea>';
1785 - html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
1786 - html += '<button type="button" id="report-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
1787 - html += '<button type="button" id="report-submit-btn" style="padding:8px 16px;border:none;border-radius:8px;background:#dc2626;color:#fff;cursor:pointer;font-weight:600;">通報する</button>';
1788 - html += '</div>';
1789 - dialog.innerHTML = html;
1790 - overlay.appendChild(dialog);
1791 - document.body.appendChild(overlay);
1792 - overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
1793 - document.getElementById('report-cancel-btn').addEventListener('click', function() { overlay.remove(); });
1794 - document.getElementById('report-submit-btn').addEventListener('click', function() {
1795 - var reason = document.getElementById('report-reason').value;
1796 - var detail = document.getElementById('report-detail').value;
1797 - var submitBtn = document.getElementById('report-submit-btn');
1798 - submitBtn.disabled = true; submitBtn.textContent = '送信中...';
1799 - var xhr = new XMLHttpRequest();
1800 - xhr.open('POST', '/bin/get/SeitokaiCode/ReportAction?outputSyntax=plain', true);
1801 - xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1802 - var data = 'targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&detail=' + encodeURIComponent(detail) + '&form_token=' + encodeURIComponent(token);
1803 - xhr.onload = function() {
1804 - overlay.remove();
1805 - showToast('通報を受け付けました', 'success');
1806 - setTimeout(function() { location.reload(); }, 1000);
1807 - };
1808 - xhr.onerror = function() { overlay.remove(); alert('通信エラーが発生しました'); };
1809 - xhr.send(data);
1810 - });
1811 -}
1812 -
1813 -/* --- 非表示ダイアログ(管理者用) --- */
1814 -function openHideDialog(btn, targetPage, postObjNum, token) {
1815 - if (document.getElementById('hide-dialog-overlay')) return;
1816 - var overlay = document.createElement('div');
1817 - overlay.id = 'hide-dialog-overlay';
1818 - overlay.style.cssText = 'position:fixed;inset:0;background:rgba(0,0,0,0.5);z-index:9999;display:flex;align-items:center;justify-content:center;';
1819 - var dialog = document.createElement('div');
1820 - dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;';
1821 - var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を非表示にする</h3>';
1822 - html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">非表示の理由</label>';
1823 - html += '<input type="text" id="hide-reason" style="width:100%;padding:8px;border:1px solid #d1d5db;border-radius:8px;margin-bottom:12px;font-size:0.9em;box-sizing:border-box;" placeholder="理由を入力" />';
1824 - html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
1825 - html += '<button type="button" id="hide-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
1826 - html += '<button type="button" id="hide-submit-btn" style="padding:8px 16px;border:none;border-radius:8px;background:#d97706;color:#fff;cursor:pointer;font-weight:600;">非表示にする</button>';
1827 - html += '<button type="button" id="hide-warn-btn" style="padding:8px 16px;border:none;border-radius:8px;background:#dc2626;color:#fff;cursor:pointer;font-weight:600;">非表示+警告</button>';
1828 - html += '</div>';
1829 - dialog.innerHTML = html;
1830 - overlay.appendChild(dialog);
1831 - document.body.appendChild(overlay);
1832 - overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
1833 - document.getElementById('hide-cancel-btn').addEventListener('click', function() { overlay.remove(); });
1834 - function doHide(action) {
1835 - var reason = document.getElementById('hide-reason').value || '管理者判断';
1836 - window.location.href = '/bin/view/SeitokaiCode/ModerationAction?action=' + action + '&targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&form_token=' + encodeURIComponent(token);
1837 - }
1838 - document.getElementById('hide-submit-btn').addEventListener('click', function() { doHide('hide'); });
1839 - document.getElementById('hide-warn-btn').addEventListener('click', function() { doHide('hide-warn'); });
1840 -}
1841 1841  </script>
1842 1842  {{/html}}
1843 1843  {{/velocity}}