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

From version Icon 94.1 Icon
edited by Super Admin
on 2026/03/20 17:50
Change comment: There is no comment for this version
To version Icon 69.1 Icon
edited by Super Admin
on 2026/03/18 11:44
Change comment: There is no comment for this version

Summary

Details

Icon Page properties
Content
... ... @@ -1,11 +1,5 @@
1 1  {{velocity}}
2 2  ## ===== 学校ページ テンプレート =====
3 -## ゲストが ?sheet= 付きURL(編集フォーム等)に直接アクセスした場合、ログインページへリダイレクト
4 -#if($xcontext.user == 'XWiki.XWikiGuest' && $request.sheet && $request.sheet != '')
5 - #set($currentUrl = $doc.getURL('view', "sheet=${request.sheet}"))
6 - $response.sendRedirect("/bin/login/XWiki/XWikiLogin?srid=$escapetool.url($currentUrl)")
7 - #stop
8 -#end
9 9  {{html clean="false"}}
10 10  ## メンテナンスバナー({{include}}ではなくインラインで記述し、<p>タグ挿入を回避)
11 11  #set($bannerDoc = $xwiki.getDocument('SeitokaiAdmin.MaintenanceBanner'))
... ... @@ -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 -## --- 生徒会組織 ---
32 +## --- 組織 ---
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 -## --- 校則・生徒会会則の見直し ---
52 +## --- 校則の見直し ---
61 61  #set($ruleReviewStatus = $doc.getValue('ruleReviewStatus'))
62 62  #set($ruleReviewContent = $doc.getValue('ruleReviewContent'))
63 63  #set($ruleReviewProposer = $doc.getValue('ruleReviewProposer'))
... ... @@ -64,43 +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($ictUsage = $doc.getValue('ictUsage'))
72 -
73 -## --- 生徒総会 ---
74 -#set($assemblyFormat = $doc.getValue('assemblyFormat'))
75 -#set($assemblyCount = $doc.getValue('assemblyCount'))
76 -#set($assemblyAgenda = $doc.getValue('assemblyAgenda'))
77 -#set($assemblyTopics = $doc.getValue('assemblyTopics'))
78 -#set($assemblyNote = $doc.getValue('assemblyNote'))
79 -
80 -## --- 広報 ---
81 -#set($publicityMethod = $doc.getValue('publicityMethod'))
82 -#set($publicityFrequency = $doc.getValue('publicityFrequency'))
83 -#set($publicityNote = $doc.getValue('publicityNote'))
84 -
85 -## --- 外部連携 ---
86 -#set($externalCooperation = $doc.getValue('externalCooperation'))
87 -#set($externalOrgName = $doc.getValue('externalOrgName'))
88 -#set($socialParticipation = $doc.getValue('socialParticipation'))
89 -
90 -## --- 年間主要行事 ---
91 -#set($eventApril = $doc.getValue('eventApril'))
92 -#set($eventMay = $doc.getValue('eventMay'))
93 -#set($eventJune = $doc.getValue('eventJune'))
94 -#set($eventJuly = $doc.getValue('eventJuly'))
95 -#set($eventAugust = $doc.getValue('eventAugust'))
96 -#set($eventSeptember = $doc.getValue('eventSeptember'))
97 -#set($eventOctober = $doc.getValue('eventOctober'))
98 -#set($eventNovember = $doc.getValue('eventNovember'))
99 -#set($eventDecember = $doc.getValue('eventDecember'))
100 -#set($eventJanuary = $doc.getValue('eventJanuary'))
101 -#set($eventFebruary = $doc.getValue('eventFebruary'))
102 -#set($eventMarch = $doc.getValue('eventMarch'))
103 -
104 104  ## --- 課題・連絡先 ---
105 105  #set($challenges = $doc.getValue('challenges'))
106 106  #set($contactInfo = $doc.getValue('contactInfo'))
... ... @@ -140,8 +140,6 @@
140 140   #set($viewerDoc = $xwiki.getDocument($viewerUser))
141 141   #set($viewerAccountType = $!viewerDoc.getValue('accountType'))
142 142   #set($viewerSchoolCode = $!viewerDoc.getValue('schoolCode'))
143 - #set($viewerSecondarySchoolCode = $!viewerDoc.getValue('secondarySchoolCode'))
144 - #set($viewerUserRole = $!viewerDoc.getValue('userRole'))
145 145   #if($viewerAccountType == 'admin')
146 146   #set($isViewerAdmin = true)
147 147   #end
... ... @@ -151,31 +151,10 @@
151 151  #set($affiliatedSchoolCode = $!doc.getValue('affiliatedSchoolCode'))
152 152  #set($affiliatedSchoolName = $!doc.getValue('affiliatedSchoolName'))
153 153  #set($isAffiliated = false)
154 -#if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
155 - #if($viewerSchoolCode == $affiliatedSchoolCode)
156 - #set($isAffiliated = true)
157 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode)
158 - #set($isAffiliated = true)
159 - #end
107 +#if($affiliatedSchoolCode && $affiliatedSchoolCode != '' && $viewerSchoolCode == $affiliatedSchoolCode)
108 + #set($isAffiliated = true)
160 160  #end
161 161  
162 -## --- 校内判定(卒業生を除外、secondarySchoolCodeも含む) ---
163 -#set($isSchoolMember = false)
164 -#if(!$isGuest && $viewerUserRole != 'graduate')
165 - #if($viewerSchoolCode == $schoolCode || $isAffiliated)
166 - #set($isSchoolMember = true)
167 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode)
168 - #set($isSchoolMember = true)
169 - #end
170 -#end
171 -## 卒業生の母校判定(投稿バッジ用)
172 -#set($isAlumniOfSchool = false)
173 -#if(!$isGuest && $viewerUserRole == 'graduate')
174 - #if($viewerSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $viewerSchoolCode == $affiliatedSchoolCode))
175 - #set($isAlumniOfSchool = true)
176 - #end
177 -#end
178 -
179 179  ## --- 学校ページ非表示チェック ---
180 180  #set($schoolHidden = $doc.getValue('hidden'))
181 181  #if($schoolHidden == 1)
... ... @@ -209,7 +209,7 @@
209 209  
210 210  ## --- 投稿固定/解除処理 ---
211 211  #set($pinAction = $!request.action)
212 -#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $isSchoolMember)) && $services.csrf.isTokenValid($request.form_token))
144 +#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && ($viewerSchoolCode == $schoolCode || $isAffiliated))) && $services.csrf.isTokenValid($request.form_token))
213 213   #set($pinPostObjStr = $!request.postObj)
214 214   #if(!$pinPostObjStr.matches('^\d+$'))
215 215   ## 不正な値 → 無視
... ... @@ -239,7 +239,7 @@
239 239  
240 240  ## --- 特色ある活動 選定/解除処理 ---
241 241  #set($featAction = $!request.action)
242 -#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $isSchoolMember)) && $services.csrf.isTokenValid($request.form_token))
174 +#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token))
243 243   #set($featActObjStr = $!request.actObj)
244 244   #if($featActObjStr.matches('^\d+$'))
245 245   #set($actObjNum = $mathtool.toInteger($featActObjStr))
... ... @@ -341,7 +341,7 @@
341 341  
342 342  ## --- 編集ボタン(権限があるユーザーのみ表示) ---
343 343  #set($canEditSchool = false)
344 -#if(!$isGuest && ($isViewerAdmin || $isSchoolMember || $isAlumniOfSchool))
276 +#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode || $isAffiliated))
345 345   #set($canEditSchool = true)
346 346  #end
347 347  #if($canEditSchool)
... ... @@ -371,56 +371,48 @@
371 371  ## --- ① 学校基本情報 ---
372 372  <div class="school-info-card collapsed" id="card-basic-info">
373 373   <h2 role="button" tabindex="0" aria-expanded="false" onclick="toggleInfoCard('card-basic-info')" onkeydown="if(event.key==='Enter'||event.key===' '){event.preventDefault();toggleInfoCard('card-basic-info')}"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M4 19.5A2.5 2.5 0 016.5 17H20"/><path d="M6.5 2H20v20H6.5A2.5 2.5 0 014 19.5v-15A2.5 2.5 0 016.5 2z"/></svg> 学校基本情報</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2>
374 - <div class="school-basic-info-layout">
375 - <div class="school-basic-info-table">
376 - <table class="wiki-table school-info-table">
377 - <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
378 - <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
379 - <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
380 - <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
381 - <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
382 - <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
383 - <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
384 - <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
385 - <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>
386 - </table>
387 - </div>
388 - #if($schoolPhoto && $schoolPhoto != '')
389 - <div class="school-photo-area">
390 - <img src="$doc.getAttachmentURL($schoolPhoto)" alt="$!escapetool.xml($schoolName)" class="school-photo" />
391 - </div>
392 - #end
393 - </div>
394 - #if($schoolDescription && $schoolDescription.trim() != '')
395 - <div class="free-note" style="margin-top:var(--sp-4);">$!escapetool.xml($schoolDescription)</div>
306 + <table class="wiki-table school-info-table">
307 + <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
308 + <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
309 + <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
310 + <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
311 + <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
312 + <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
313 + <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
314 + <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
315 + <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>
316 + </table>
317 + #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
318 + #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
319 + #if($infoEditDate && $infoEditDate != '')
320 + <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>
396 396   #end
397 -
398 398  </div>
399 399  
400 -## --- ② 生徒会情報(折りたたみカード) ---
324 +## --- ② 生徒会基本情報(折りたたみカード) ---
401 401  <div class="school-info-card" id="card-seitokai-info">
402 - <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>
326 + <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>
403 403   <div class="seitokai-info-body">
404 404  
405 - ## --- 生徒会組織 ---
329 + ## --- 組織 ---
406 406   #set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
407 407   #if($hasOrgContent)
408 408   #set($canViewOrgChart = true)
409 - #if($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewOrgChart = false)
410 - #elseif($visibilityOrgChart == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewOrgChart = false)
333 + #if($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewOrgChart = false)
334 + #elseif($visibilityOrgChart == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewOrgChart = false)
411 411   #end
412 412   #if($canViewOrgChart)
413 413   <div class="seitokai-subsection">
414 - <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>
338 + <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>
415 415   <div class="seitokai-subsection-content">
416 416   #if($orgChartImage && $orgChartImage != '')
417 417   <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
418 418   #end
419 - #if($orgChart && $orgChart != '')<div class="free-note">$!escapetool.xml($orgChart)</div>#end
343 + #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end
420 420   </div>
421 421   </div>
422 422   #else
423 - <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>
347 + <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>
424 424   #end
425 425   #end
426 426  
... ... @@ -429,10 +429,12 @@
429 429   <div class="seitokai-subsection">
430 430   <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z"/><polyline points="14 2 14 8 20 8"/><line x1="16" y1="13" x2="8" y2="13"/><line x1="16" y1="17" x2="8" y2="17"/></svg> 日常の活動</h3>
431 431   <div class="seitokai-subsection-content">
432 - <p class="activity-hint">活動時間多い3つ</p>
356 + <p class="activity-hint">活動時間多い順に上位3つ</p>
433 433   <div class="tag-container">
358 + #set($daIdx = 1)
434 434   #foreach($da in $dailyActivities)
435 - <span class="tag tag-accent">$!escapetool.xml($da.trim())</span>
360 + <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
361 + #set($daIdx = $daIdx + 1)
436 436   #end
437 437   </div>
438 438   #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
... ... @@ -484,12 +484,12 @@
484 484   #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
485 485   #if($hasBudget)
486 486   #set($canViewBudget = true)
487 - #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewBudget = false)
488 - #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false)
413 + #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewBudget = false)
414 + #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false)
489 489   #end
490 490   #if($canViewBudget)
491 491   <div class="seitokai-subsection">
492 - <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>
418 + <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>
493 493   <div class="seitokai-subsection-content">
494 494   #if($budgetProcess && !$budgetProcess.isEmpty())
495 495   <div class="info-row">
... ... @@ -496,13 +496,8 @@
496 496   <span class="info-label">作成過程の生徒関与</span>
497 497   <span class="info-value">
498 498   <div class="selection-display">
499 - #set($allBpOpts = ["各部・委員会等への予算希望額調査","予算額調整(折衝等)","生徒会予算案の作成","生徒総会での議決","生徒関与なし","その他"])
500 - #foreach($bpOpt in $allBpOpts)
501 - #if($budgetProcess.contains($bpOpt))
502 - <span class="selection-item">$!escapetool.xml($bpOpt)</span>
503 - #else
504 - <span class="selection-item selection-item-off">$!escapetool.xml($bpOpt)</span>
505 - #end
425 + #foreach($bp in $budgetProcess)
426 + <span class="selection-item">$!escapetool.xml($bp.trim())</span>
506 506   #end
507 507   </div>
508 508   </span>
... ... @@ -542,21 +542,20 @@
542 542   #end
543 543   #end
544 544  
545 - ## --- 校則・生徒会会則の見直し ---
466 + ## --- 校則の見直し ---
546 546   #if($ruleReviewStatus && $ruleReviewStatus != '')
547 547   #set($canViewRuleReview = true)
548 - #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewRuleReview = false)
549 - #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false)
469 + #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewRuleReview = false)
470 + #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false)
550 550   #end
551 551   #if($canViewRuleReview)
552 552   <div class="seitokai-subsection">
553 - <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>
474 + <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>
554 554   <div class="seitokai-subsection-content">
555 555   <div class="info-row">
556 556   <span class="info-label">見直しの有無(3年以内)</span>
557 557   <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
558 558   </div>
559 - #if($ruleReviewStatus != '実施なし')
560 560   #if($ruleReviewContent && !$ruleReviewContent.isEmpty())
561 561   <div class="info-row">
562 562   <span class="info-label">見直しの内容</span>
... ... @@ -593,7 +593,6 @@
593 593   </span>
594 594   </div>
595 595   #end
596 - #end
597 597   #if($ruleReviewSystem && $ruleReviewSystem != '')
598 598   <div class="info-row">
599 599   <span class="info-label">見直しの仕組み</span>
... ... @@ -603,200 +603,19 @@
603 603   </div>
604 604   </div>
605 605   #else
606 - <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>
525 + <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>
607 607   #end
608 608   #end
609 609  
610 - ## --- 活動環境 ---
611 - #set($hasActivityEnv = ($activityPlace && $activityPlace != '') || ($activityRoomEquipment && $activityRoomEquipment != '') || ($activityRoomImage && $activityRoomImage != '') || ($ictUsage && !$ictUsage.isEmpty()))
612 - #if($hasActivityEnv)
613 - <div class="seitokai-subsection">
614 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M3 9l9-7 9 7v11a2 2 0 01-2 2H5a2 2 0 01-2-2z"/><polyline points="9 22 9 12 15 12 15 22"/></svg> 生徒会の活動環境</h3>
615 - <div class="seitokai-subsection-content">
616 - #if($activityPlace && $activityPlace != '')
617 - <div class="info-row">
618 - <span class="info-label">普段の活動場所</span>
619 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($activityPlace)</span></span>
620 - </div>
621 - #end
622 - #if($activityRoomEquipment && $activityRoomEquipment != '')
623 - <div class="info-row">
624 - <span class="info-label">生徒会室の設備</span>
625 - <span class="info-value free-text-value">$!escapetool.xml($activityRoomEquipment)</span>
626 - </div>
627 - #end
628 - #if($activityRoomImage && $activityRoomImage != '')
629 - <div class="info-row">
630 - <span class="info-label">活動場所の写真</span>
631 - <span class="info-value"><div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($activityRoomImage)" alt="活動場所の写真" class="org-chart-img" /></div></span>
632 - </div>
633 - #end
634 - #if($ictUsage && !$ictUsage.isEmpty())
635 - <div class="info-row">
636 - <span class="info-label">ICT活用している場面</span>
637 - <span class="info-value">
638 - <div class="selection-display">
639 - #foreach($iu in $ictUsage)
640 - <span class="selection-item">$!escapetool.xml($iu.trim())</span>
641 - #end
642 - </div>
643 - </span>
644 - </div>
645 - #end
646 - </div>
647 - </div>
648 - #end
649 -
650 - ## --- 生徒総会 ---
651 - #set($hasAssembly = ($assemblyFormat && $assemblyFormat != '') || ($assemblyCount && $assemblyCount > 0) || ($assemblyAgenda && !$assemblyAgenda.isEmpty()) || ($assemblyTopics && !$assemblyTopics.isEmpty()) || ($assemblyNote && $assemblyNote != ''))
652 - #if($hasAssembly)
653 - <div class="seitokai-subsection">
654 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 生徒総会</h3>
655 - <div class="seitokai-subsection-content">
656 - #if($assemblyFormat && $assemblyFormat != '')
657 - <div class="info-row">
658 - <span class="info-label">開催方式</span>
659 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($assemblyFormat)</span></span>
660 - </div>
661 - #end
662 - #if($assemblyCount && $assemblyCount > 0)
663 - <div class="info-row">
664 - <span class="info-label">開催回数(年)</span>
665 - <span class="info-value">$!escapetool.xml($assemblyCount)回</span>
666 - </div>
667 - #end
668 - #if($assemblyAgenda && !$assemblyAgenda.isEmpty())
669 - <div class="info-row">
670 - <span class="info-label">議案の集め方</span>
671 - <span class="info-value">
672 - <div class="selection-display">
673 - #foreach($aa in $assemblyAgenda)
674 - <span class="selection-item">$!escapetool.xml($aa.trim())</span>
675 - #end
676 - </div>
677 - </span>
678 - </div>
679 - #end
680 - #if($assemblyTopics && !$assemblyTopics.isEmpty())
681 - <div class="info-row">
682 - <span class="info-label">扱う内容</span>
683 - <span class="info-value">
684 - <div class="selection-display">
685 - #foreach($at in $assemblyTopics)
686 - <span class="selection-item">$!escapetool.xml($at.trim())</span>
687 - #end
688 - </div>
689 - </span>
690 - </div>
691 - #end
692 - #if($assemblyNote && $assemblyNote != '')
693 - <div class="info-row">
694 - <span class="info-label">自由記述</span>
695 - <span class="info-value free-text-value">$!escapetool.xml($assemblyNote)</span>
696 - </div>
697 - #end
698 - </div>
699 - </div>
700 - #end
701 -
702 - ## --- 広報 ---
703 - #set($hasPublicity = ($publicityMethod && !$publicityMethod.isEmpty()) || ($publicityFrequency && $publicityFrequency != '') || ($publicityNote && $publicityNote != ''))
704 - #if($hasPublicity)
705 - <div class="seitokai-subsection">
706 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M1 12s4-8 11-8 11 8 11 8-4 8-11 8-11-8-11-8z"/><circle cx="12" cy="12" r="3"/></svg> 広報</h3>
707 - <div class="seitokai-subsection-content">
708 - #if($publicityMethod && !$publicityMethod.isEmpty())
709 - <div class="info-row">
710 - <span class="info-label">方法</span>
711 - <span class="info-value">
712 - <div class="selection-display">
713 - #foreach($pm in $publicityMethod)
714 - <span class="selection-item">$!escapetool.xml($pm.trim())</span>
715 - #end
716 - </div>
717 - </span>
718 - </div>
719 - #end
720 - #if($publicityFrequency && $publicityFrequency != '')
721 - <div class="info-row">
722 - <span class="info-label">頻度</span>
723 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($publicityFrequency)</span></span>
724 - </div>
725 - #end
726 - #if($publicityNote && $publicityNote != '')
727 - <div class="info-row">
728 - <span class="info-label">自由記述</span>
729 - <span class="info-value free-text-value">$!escapetool.xml($publicityNote)</span>
730 - </div>
731 - #end
732 - </div>
733 - </div>
734 - #end
735 -
736 - ## --- 外部連携 ---
737 - #set($hasExternal = ($externalCooperation && $externalCooperation != '') || ($externalOrgName && $externalOrgName != '') || ($socialParticipation && !$socialParticipation.isEmpty()))
738 - #if($hasExternal)
739 - <div class="seitokai-subsection">
740 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><circle cx="18" cy="5" r="3"/><circle cx="6" cy="12" r="3"/><circle cx="18" cy="19" r="3"/><line x1="8.59" y1="13.51" x2="15.42" y2="17.49"/><line x1="15.41" y1="6.51" x2="8.59" y2="10.49"/></svg> 外部連携</h3>
741 - <div class="seitokai-subsection-content">
742 - #if($externalCooperation && $externalCooperation != '')
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($externalCooperation)</span></span>
746 - </div>
747 - #end
748 - #if($externalOrgName && $externalOrgName != '')
749 - <div class="info-row">
750 - <span class="info-label">参加している生徒会団体の名前</span>
751 - <span class="info-value">$!escapetool.xml($externalOrgName)</span>
752 - </div>
753 - #end
754 - #if($socialParticipation && !$socialParticipation.isEmpty())
755 - <div class="info-row">
756 - <span class="info-label">社会参加・地域連携・ボランティア</span>
757 - <span class="info-value">
758 - <div class="selection-display">
759 - #foreach($sp2 in $socialParticipation)
760 - <span class="selection-item">$!escapetool.xml($sp2.trim())</span>
761 - #end
762 - </div>
763 - </span>
764 - </div>
765 - #end
766 - </div>
767 - </div>
768 - #end
769 -
770 - ## --- 年間主要行事 ---
771 - #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]])
772 - #set($hasAnyEvent = false)
773 - #foreach($m in $months)
774 - #if($m.get(1) && $m.get(1) != '') #set($hasAnyEvent = true) #end
775 - #end
776 - #if($hasAnyEvent)
777 - <div class="seitokai-subsection">
778 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="4" width="18" height="18" rx="2" ry="2"/><line x1="16" y1="2" x2="16" y2="6"/><line x1="8" y1="2" x2="8" y2="6"/><line x1="3" y1="10" x2="21" y2="10"/></svg> 年間主要行事</h3>
779 - <div class="seitokai-subsection-content">
780 - <table class="wiki-table school-info-table" style="margin:0">
781 - #foreach($m in $months)
782 - #if($m.get(1) && $m.get(1) != '')
783 - <tr><td style="width:60px;font-weight:600;white-space:nowrap">$m.get(0)</td><td>$!escapetool.xml($m.get(1))</td></tr>
784 - #end
785 - #end
786 - </table>
787 - </div>
788 - </div>
789 - #end
790 -
791 791   ## --- 生徒会の課題意識 ---
792 792   #if($challenges && $challenges != '')
793 793   #set($canViewChallenges = true)
794 - #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewChallenges = false)
795 - #elseif($visibilityChallenges == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewChallenges = false)
532 + #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewChallenges = false)
533 + #elseif($visibilityChallenges == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewChallenges = false)
796 796   #end
797 797   #if($canViewChallenges)
798 798   <div class="seitokai-subsection">
799 - <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>
537 + <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>
800 800   <div class="seitokai-subsection-content">
801 801   <div class="challenge-text">$!escapetool.xml($challenges)</div>
802 802   </div>
... ... @@ -820,11 +820,6 @@
820 820   <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>
821 821   <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
822 822   </table>
823 - #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
824 - #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
825 - #if($infoEditDate && $infoEditDate != '')
826 - <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>
827 - #end
828 828  </div>
829 829  
830 830  {{/html}}
... ... @@ -888,7 +888,6 @@
888 888   <span class="author-legend-title">所属:</span>
889 889   <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>
890 890   <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>
891 - <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>
892 892   <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>
893 893   <span class="author-legend-item text-hint">※一般アカウントは所属バッジが表示されません</span>
894 894   </div>
... ... @@ -964,18 +964,16 @@
964 964  <div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)">
965 965   <div class="activity-thread-header">
966 966   <div class="activity-thread-title">
967 - <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>
968 - <div class="activity-meta-line">
969 - <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
970 - #set($actTagsList = $activity.getValue('tags'))
971 - #if($actTagsList && !$actTagsList.isEmpty())
972 - #foreach($tagItem in $actTagsList)
973 - #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end
974 - #end
699 + <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>
700 + <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
701 + #set($actTagsList = $activity.getValue('tags'))
702 + #if($actTagsList && !$actTagsList.isEmpty())
703 + #foreach($tagItem in $actTagsList)
704 + #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end
975 975   #end
976 - </div>
706 + #end
977 977   </div>
978 - <div class="thread-meta-right">
708 + <div class="thread-meta-row">
979 979   <span class="thread-post-count">${reportCount}件の報告 ・ ${commentCount}件のコメント</span>
980 980   #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred')
981 981   #if($actFeatured == '1')
... ... @@ -1035,8 +1035,8 @@
1035 1035   #set($postVis = $!post.getValue('visibility'))
1036 1036   #if(!$postVis || $postVis == '') #set($postVis = 'public') #end
1037 1037   #set($canViewPost = true)
1038 - #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewPost = false)
1039 - #elseif($postVis == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPost = false)
768 + #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewPost = false)
769 + #elseif($postVis == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPost = false)
1040 1040   #end
1041 1041   #if(!$canViewPost)
1042 1042   <div class="thread-post visibility-restricted-post">
... ... @@ -1080,11 +1080,8 @@
1080 1080   <span class="badge badge-general badge-sm">一般</span>
1081 1081   #end
1082 1082   ## 所属バッジ(投稿者の学校コードとページの学校コードを比較)
1083 - #set($postIsSchoolMatch = ($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode)))
1084 1084   #if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general')
1085 - #if($postUserRole == 'graduate' && $postIsSchoolMatch)
1086 - <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>
1087 - #elseif($postIsSchoolMatch && $postUserRole != 'graduate')
814 + #if($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode))
1088 1088   #if($postAccountType == 'verified' || $postAccountType == 'admin')
1089 1089   <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>
1090 1090   #else
... ... @@ -1111,13 +1111,6 @@
1111 1111   #if($postEdited == 1 || $postEdited == '1')
1112 1112   <span class="post-edited-label">(編集済み)</span>
1113 1113   #end
1114 - #set($postAuthorRefH = $!post.getValue('authorRef'))
1115 - #set($postObjNumH = $post.number)
1116 - #if(!$isGuest && $xcontext.user != $postAuthorRefH)
1117 - <button type="button" class="btn-post-report btn-post-report-header" onclick="openReportDialog(this, '${doc.fullName}', $postObjNumH, '${services.csrf.getToken()}')" title="この投稿を通報">
1118 - <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> 通報
1119 - </button>
1120 - #end
1121 1121   </div>
1122 1122   <div class="thread-post-body">
1123 1123   $!escapetool.xml($!postContent)
... ... @@ -1182,18 +1182,12 @@
1182 1182   #end
1183 1183   </div>
1184 1184   #if($postVis != 'public')
1185 - <div class="visibility-badge visibility-${postVis} post-action-mt">#if($postVis == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</div>
905 + <div class="visibility-badge visibility-${postVis} post-action-mt">#if($postVis == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</div>
1186 1186   #end
1187 - ## 固定/編集/削除/通報/非表示ボタン(横並び)
1188 - #set($postAuthorRef = $!post.getValue('authorRef'))
1189 - #set($postObjNumED = $post.number)
1190 - #set($showPinBtn = ($viewerAccountType == 'admin' || $viewerAccountType == 'verified'))
1191 - #set($showEditDeleteBtn = ($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin'))
1192 - #set($showHideBtn = ($viewerAccountType == 'admin'))
1193 - #if($showPinBtn || $showEditDeleteBtn || $showHideBtn)
1194 - <div class="post-edit-actions post-action-mt">
1195 - #if($showPinBtn)
1196 - #set($postObjNum = $post.number)
907 + ## 固定/解除ボタン(承認済み・管理者のみ)
908 + #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
909 + #set($postObjNum = $post.number)
910 + <div class="post-pin-action post-action-mt">
1197 1197   #if($isPinned == '1')
1198 1198   <a href="$doc.getURL('view', "action=unpin&postObj=${postObjNum}&form_token=${services.csrf.getToken()}")" class="btn-pin-toggle btn-unpin" title="固定を解除">
1199 1199   <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> 固定を解除
... ... @@ -1203,12 +1203,15 @@
1203 1203   <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> 固定する
1204 1204   </a>
1205 1205   #end
1206 - #end
1207 - #if($showEditDeleteBtn)
920 + </div>
921 + #end
922 + ## 編集・削除ボタン(投稿者本人 or 管理者)
923 + #set($postAuthorRef = $!post.getValue('authorRef'))
924 + #set($postObjNumED = $post.number)
925 + #if($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin')
926 + <div class="post-edit-actions post-action-mt">
1208 1208   #if($xcontext.user == $postAuthorRef)
1209 - #set($editImages = $!post.getValue('images'))
1210 - #set($editFiles = $!post.getValue('files'))
1211 - <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="この投稿を編集">
928 + <button type="button" class="btn-post-edit" onclick="openEditPost(this, '${doc.fullName}', $postObjNumED, '$!escapetool.javascript($!postContent)')" title="この投稿を編集">
1212 1212   <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> 編集
1213 1213   </button>
1214 1214   #end
... ... @@ -1215,12 +1215,6 @@
1215 1215   <button type="button" class="btn-post-delete" onclick="confirmDeletePost('${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を削除">
1216 1216   <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> 削除
1217 1217   </button>
1218 - #end
1219 - #if($showHideBtn)
1220 - <button type="button" class="btn-post-hide" onclick="openHideDialog(this, '${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を非表示にする">
1221 - <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> 非表示
1222 - </button>
1223 - #end
1224 1224   </div>
1225 1225   #end
1226 1226   </div>
... ... @@ -1270,11 +1270,9 @@
1270 1270  
1271 1271   #if($xcontext.user != "XWiki.XWikiGuest")
1272 1272   <div class="thread-add-post">
1273 - #if($isSchoolMember || $isAlumniOfSchool || $isViewerAdmin)
1274 1274   <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
1275 1275   + 活動報告を追加
1276 1276   </a>
1277 - #end
1278 1278   <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
1279 1279   <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> コメントを書く
1280 1280   </a>
... ... @@ -1351,27 +1351,6 @@
1351 1351  }
1352 1352  // ページ読み込み時の初期化
1353 1353  document.addEventListener('DOMContentLoaded', function() {
1354 - // 年度タブを降順にソート(「全期間」タブは末尾に固定)
1355 - var tabContainer = document.querySelector('.activity-fy-tabs');
1356 - if (tabContainer) {
1357 - var tabs = Array.from(tabContainer.querySelectorAll('.activity-fy-tab'));
1358 - var allTab = null;
1359 - var fyTabs = [];
1360 - tabs.forEach(function(t) {
1361 - var onclickStr = t.getAttribute('onclick') || '';
1362 - if (onclickStr.indexOf("'all'") !== -1) { allTab = t; }
1363 - else { fyTabs.push(t); }
1364 - });
1365 - // 年度タブを数値の降順でソート
1366 - fyTabs.sort(function(a, b) {
1367 - var aYear = parseInt(a.textContent) || 0;
1368 - var bYear = parseInt(b.textContent) || 0;
1369 - return bYear - aYear;
1370 - });
1371 - // DOM再配置
1372 - fyTabs.forEach(function(t) { tabContainer.appendChild(t); });
1373 - if (allTab) { tabContainer.appendChild(allTab); }
1374 - }
1375 1375   // デフォルトで現在の年度を表示
1376 1376   var defaultTab = document.querySelector('.activity-fy-tab.active');
1377 1377   if (defaultTab) { defaultTab.click(); }
... ... @@ -1441,130 +1441,37 @@
1441 1441  }
1442 1442  
1443 1443  // 投稿の編集(インライン編集フォームを開く)
1444 -function openEditPost(btn) {
1132 +function openEditPost(btn, schoolPage, postObjNum, currentContent) {
1445 1445   var postEl = btn.closest('.thread-post');
1446 1446   if (!postEl) return;
1135 + // 既存の編集フォームがあれば閉じる
1447 1447   var existing = postEl.querySelector('.post-edit-form');
1448 1448   if (existing) { existing.remove(); return; }
1449 1449   var bodyEl = postEl.querySelector('.thread-post-body');
1450 1450   if (!bodyEl) return;
1451 -
1452 - var schoolPage = btn.getAttribute('data-school');
1453 - var postObjNum = btn.getAttribute('data-obj');
1454 - var currentContent = btn.getAttribute('data-content') || '';
1455 - var currentImages = btn.getAttribute('data-images') || '';
1456 - var currentFiles = btn.getAttribute('data-files') || '';
1457 - var postType = btn.getAttribute('data-post-type') || 'report';
1458 -
1459 1459   var form = document.createElement('div');
1460 1460   form.className = 'post-edit-form';
1461 - form.setAttribute('data-school', schoolPage);
1462 - form.setAttribute('data-obj', postObjNum);
1463 -
1464 - var html = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>';
1465 -
1466 - // コメント以外は添付ファイル編集を表示
1467 - if (postType !== 'comment') {
1468 - // 既存画像
1469 - html += '<div class="edit-attachments">';
1470 - if (currentImages.trim()) {
1471 - html += '<div class="edit-attach-section"><span class="edit-attach-label">画像</span>';
1472 - var imgs = currentImages.trim().split('\n');
1473 - for (var i = 0; i < imgs.length; i++) {
1474 - var img = imgs[i].trim();
1475 - if (!img) continue;
1476 - html += '<div class="edit-attach-item" data-name="' + img.replace(/"/g,'&quot;') + '">' +
1477 - '<img src="/xwiki/bin/download/' + schoolPage.replace(/\./g,'/') + '/' + encodeURIComponent(img) + '" class="edit-attach-thumb" />' +
1478 - '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1479 - '<input type="hidden" name="keepImages" value="' + img.replace(/"/g,'&quot;') + '" />' +
1480 - '</div>';
1481 - }
1482 - html += '</div>';
1483 - }
1484 - // 既存ファイル
1485 - if (currentFiles.trim()) {
1486 - html += '<div class="edit-attach-section"><span class="edit-attach-label">ファイル</span>';
1487 - var files = currentFiles.trim().split('\n');
1488 - for (var j = 0; j < files.length; j++) {
1489 - var f = files[j].trim();
1490 - if (!f) continue;
1491 - var displayName = f;
1492 - if (/^file_\d{14}_\d+_/.test(f)) displayName = f.replace(/^file_\d{14}_\d+_/, '');
1493 - html += '<div class="edit-attach-item" data-name="' + f.replace(/"/g,'&quot;') + '">' +
1494 - '<span class="edit-attach-fname">' + displayName.replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</span>' +
1495 - '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1496 - '<input type="hidden" name="keepFiles" value="' + f.replace(/"/g,'&quot;') + '" />' +
1497 - '</div>';
1498 - }
1499 - html += '</div>';
1500 - }
1501 - // 新規追加
1502 - html += '<div class="edit-attach-add">' +
1503 - '<label class="form-label-sm">画像を追加(最大4枚まで)</label>' +
1504 - '<input type="file" name="editNewImages" accept="image/*" multiple class="form-file-input-sm" />' +
1505 - '<div class="form-hint">JPEG / PNG / GIF / WebP、各5MBまで</div>' +
1506 - '<label class="form-label-sm" style="margin-top:8px;">ファイルを追加(最大2つまで)</label>' +
1507 - '<input type="file" name="editNewFiles" accept=".pdf,.docx,.xlsx,.pptx" multiple class="form-file-input-sm" />' +
1508 - '<div class="form-hint">PDF / Word / Excel / PowerPoint、各10MBまで</div>' +
1509 - '</div>';
1510 - html += '</div>';
1511 - }
1512 -
1513 - html += '<div class="post-edit-form-actions">' +
1142 + form.innerHTML = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>' +
1143 + '<div class="post-edit-form-actions">' +
1514 1514   '<button type="button" class="btn-cancel-edit" onclick="this.closest(\'.post-edit-form\').remove()">キャンセル</button>' +
1515 - '<button type="button" class="btn-save" onclick="saveEditPost(this)">保存</button>' +
1145 + '<button type="button" class="btn-save" onclick="saveEditPost(\'' + schoolPage + '\', ' + postObjNum + ')">保存</button>' +
1516 1516   '</div>';
1517 -
1518 - form.innerHTML = html;
1519 1519   bodyEl.parentNode.insertBefore(form, bodyEl.nextSibling);
1520 1520   form.querySelector('textarea').focus();
1521 1521  }
1522 1522  
1523 -function removeEditAttach(btn) {
1524 - var item = btn.closest('.edit-attach-item');
1525 - if (item) item.remove();
1526 -}
1527 -
1528 1528  // 投稿の編集を保存
1529 -function saveEditPost(btn) {
1530 - var formEl = btn.closest('.post-edit-form');
1531 - if (!formEl) return;
1532 - var schoolPage = formEl.getAttribute('data-school');
1533 - var postObjNum = formEl.getAttribute('data-obj');
1534 - var textarea = formEl.querySelector('textarea');
1152 +function saveEditPost(schoolPage, postObjNum) {
1153 + var textarea = document.getElementById('editContent_' + postObjNum);
1535 1535   if (!textarea) return;
1536 1536   var newContent = textarea.value.trim();
1537 1537   if (!newContent) { alert('投稿内容を入力してください'); return; }
1538 -
1539 1539   var csrfEl = document.querySelector('input[name="form_token"]');
1540 1540   var csrfToken = csrfEl ? csrfEl.value : '';
1541 -
1542 - var fd = new FormData();
1543 - fd.append('schoolPage', schoolPage);
1544 - fd.append('postObj', postObjNum);
1545 - fd.append('newContent', newContent);
1546 - fd.append('form_token', csrfToken);
1547 -
1548 - // 残す画像・ファイル
1549 - formEl.querySelectorAll('input[name="keepImages"]').forEach(function(el) { fd.append('keepImages', el.value); });
1550 - formEl.querySelectorAll('input[name="keepFiles"]').forEach(function(el) { fd.append('keepFiles', el.value); });
1551 -
1552 - // 新規画像
1553 - var newImgInput = formEl.querySelector('input[name="editNewImages"]');
1554 - if (newImgInput && newImgInput.files) {
1555 - for (var i = 0; i < newImgInput.files.length; i++) { fd.append('editNewImages', newImgInput.files[i]); }
1556 - }
1557 - // 新規ファイル
1558 - var newFileInput = formEl.querySelector('input[name="editNewFiles"]');
1559 - if (newFileInput && newFileInput.files) {
1560 - for (var j = 0; j < newFileInput.files.length; j++) { fd.append('editNewFiles', newFileInput.files[j]); }
1561 - }
1562 -
1563 - btn.disabled = true;
1564 - btn.textContent = '保存中...';
1565 -
1566 1566   var xhr = new XMLHttpRequest();
1567 1567   xhr.open('POST', '/bin/get/SeitokaiCode/EditPost?outputSyntax=plain', true);
1161 + xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1162 + var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken);
1568 1568   xhr.onload = function() {
1569 1569   try {
1570 1570   var res = JSON.parse(xhr.responseText);
... ... @@ -1572,13 +1572,12 @@
1572 1572   showToast('投稿を更新しました', 'success');
1573 1573   setTimeout(function() { location.reload(); }, 800);
1574 1574   } else {
1575 - btn.disabled = false; btn.textContent = '保存';
1576 1576   alert('編集に失敗しました: ' + (res.error || ''));
1577 1577   }
1578 - } catch(e) { btn.disabled = false; btn.textContent = '保存'; alert('編集に失敗しました'); }
1172 + } catch(e) { alert('編集に失敗しました'); }
1579 1579   };
1580 - xhr.onerror = function() { btn.disabled = false; btn.textContent = '保存'; alert('通信エラーが発生しました'); };
1581 - xhr.send(fd);
1174 + xhr.onerror = function() { alert('通信エラーが発生しました'); };
1175 + xhr.send(editPostData);
1582 1582  }
1583 1583  
1584 1584  // 投稿の削除(確認ダイアログ付き)
... ... @@ -1602,80 +1602,6 @@
1602 1602   xhr.onerror = function() { alert('通信エラーが発生しました'); };
1603 1603   xhr.send(deletePostData);
1604 1604  }
1605 -
1606 -/* --- 通報ダイアログ --- */
1607 -function openReportDialog(btn, targetPage, postObjNum, token) {
1608 - if (document.getElementById('report-dialog-overlay')) return;
1609 - var reasons = ['宣伝・スパム','不適切な内容','個人情報の露出','誹謗中傷','誤情報','その他'];
1610 - var overlay = document.createElement('div');
1611 - overlay.id = 'report-dialog-overlay';
1612 - 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;';
1613 - var dialog = document.createElement('div');
1614 - dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;max-height:80vh;overflow-y:auto;';
1615 - var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を通報</h3>';
1616 - html += '<p style="margin:0 0 12px;font-size:0.9em;color:#4b5563;">通報された投稿は管理者が確認するまで一時的に非表示になります。</p>';
1617 - html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">通報理由</label>';
1618 - html += '<select id="report-reason" style="width:100%;padding:8px;border:1px solid #d1d5db;border-radius:8px;margin-bottom:12px;font-size:0.9em;">';
1619 - for (var i=0; i<reasons.length; i++) html += '<option value="'+reasons[i]+'">'+reasons[i]+'</option>';
1620 - html += '</select>';
1621 - html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">補足コメント(任意)</label>';
1622 - 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>';
1623 - html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
1624 - html += '<button type="button" id="report-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
1625 - 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>';
1626 - html += '</div>';
1627 - dialog.innerHTML = html;
1628 - overlay.appendChild(dialog);
1629 - document.body.appendChild(overlay);
1630 - overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
1631 - document.getElementById('report-cancel-btn').addEventListener('click', function() { overlay.remove(); });
1632 - document.getElementById('report-submit-btn').addEventListener('click', function() {
1633 - var reason = document.getElementById('report-reason').value;
1634 - var detail = document.getElementById('report-detail').value;
1635 - var submitBtn = document.getElementById('report-submit-btn');
1636 - submitBtn.disabled = true; submitBtn.textContent = '送信中...';
1637 - var xhr = new XMLHttpRequest();
1638 - xhr.open('POST', '/bin/get/SeitokaiCode/ReportAction?outputSyntax=plain', true);
1639 - xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1640 - var data = 'targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&detail=' + encodeURIComponent(detail) + '&form_token=' + encodeURIComponent(token);
1641 - xhr.onload = function() {
1642 - overlay.remove();
1643 - showToast('通報を受け付けました', 'success');
1644 - setTimeout(function() { location.reload(); }, 1000);
1645 - };
1646 - xhr.onerror = function() { overlay.remove(); alert('通信エラーが発生しました'); };
1647 - xhr.send(data);
1648 - });
1649 -}
1650 -
1651 -/* --- 非表示ダイアログ(管理者用) --- */
1652 -function openHideDialog(btn, targetPage, postObjNum, token) {
1653 - if (document.getElementById('hide-dialog-overlay')) return;
1654 - var overlay = document.createElement('div');
1655 - overlay.id = 'hide-dialog-overlay';
1656 - 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;';
1657 - var dialog = document.createElement('div');
1658 - dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;';
1659 - var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を非表示にする</h3>';
1660 - html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">非表示の理由</label>';
1661 - 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="理由を入力" />';
1662 - html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
1663 - html += '<button type="button" id="hide-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
1664 - 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>';
1665 - 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>';
1666 - html += '</div>';
1667 - dialog.innerHTML = html;
1668 - overlay.appendChild(dialog);
1669 - document.body.appendChild(overlay);
1670 - overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
1671 - document.getElementById('hide-cancel-btn').addEventListener('click', function() { overlay.remove(); });
1672 - function doHide(action) {
1673 - var reason = document.getElementById('hide-reason').value || '管理者判断';
1674 - window.location.href = '/bin/view/SeitokaiCode/ModerationAction?action=' + action + '&targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&form_token=' + encodeURIComponent(token);
1675 - }
1676 - document.getElementById('hide-submit-btn').addEventListener('click', function() { doHide('hide'); });
1677 - document.getElementById('hide-warn-btn').addEventListener('click', function() { doHide('hide-warn'); });
1678 -}
1679 1679  </script>
1680 1680  {{/html}}
1681 1681  {{/velocity}}