Skip to Content
Last modified by Super Admin on 2026/04/05 18:59
From version Icon 85.1 Icon
edited by Super Admin
on 2026/03/20 01:46
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  
... ... @@ -103,8 +103,6 @@
103 103   #set($viewerDoc = $xwiki.getDocument($viewerUser))
104 104   #set($viewerAccountType = $!viewerDoc.getValue('accountType'))
105 105   #set($viewerSchoolCode = $!viewerDoc.getValue('schoolCode'))
106 - #set($viewerSecondarySchoolCode = $!viewerDoc.getValue('secondarySchoolCode'))
107 - #set($viewerUserRole = $!viewerDoc.getValue('userRole'))
108 108   #if($viewerAccountType == 'admin')
109 109   #set($isViewerAdmin = true)
110 110   #end
... ... @@ -114,31 +114,10 @@
114 114  #set($affiliatedSchoolCode = $!doc.getValue('affiliatedSchoolCode'))
115 115  #set($affiliatedSchoolName = $!doc.getValue('affiliatedSchoolName'))
116 116  #set($isAffiliated = false)
117 -#if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
118 - #if($viewerSchoolCode == $affiliatedSchoolCode)
119 - #set($isAffiliated = true)
120 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode)
121 - #set($isAffiliated = true)
122 - #end
107 +#if($affiliatedSchoolCode && $affiliatedSchoolCode != '' && $viewerSchoolCode == $affiliatedSchoolCode)
108 + #set($isAffiliated = true)
123 123  #end
124 124  
125 -## --- 校内判定（卒業生を除外、secondarySchoolCodeも含む） ---
126 -#set($isSchoolMember = false)
127 -#if(!$isGuest && $viewerUserRole != 'graduate')
128 - #if($viewerSchoolCode == $schoolCode || $isAffiliated)
129 - #set($isSchoolMember = true)
130 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode)
131 - #set($isSchoolMember = true)
132 - #end
133 -#end
134 -## 卒業生の母校判定（投稿バッジ用）
135 -#set($isAlumniOfSchool = false)
136 -#if(!$isGuest && $viewerUserRole == 'graduate')
137 - #if($viewerSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $viewerSchoolCode == $affiliatedSchoolCode))
138 - #set($isAlumniOfSchool = true)
139 - #end
140 -#end
141 -
142 142  ## --- 学校ページ非表示チェック ---
143 143  #set($schoolHidden = $doc.getValue('hidden'))
144 144  #if($schoolHidden == 1)
... ... @@ -172,7 +172,7 @@
172 172  
173 173  ## --- 投稿固定/解除処理 ---
174 174  #set($pinAction = $!request.action)
175 -#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))
176 176   #set($pinPostObjStr = $!request.postObj)
177 177   #if(!$pinPostObjStr.matches('^\d+$'))
178 178   ## 不正な値 → 無視
... ... @@ -202,7 +202,7 @@
202 202  
203 203  ## --- 特色ある活動 選定/解除処理 ---
204 204  #set($featAction = $!request.action)
205 -#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))
206 206   #set($featActObjStr = $!request.actObj)
207 207   #if($featActObjStr.matches('^\d+$'))
208 208   #set($actObjNum = $mathtool.toInteger($featActObjStr))
... ... @@ -304,7 +304,7 @@
304 304  
305 305  ## --- 編集ボタン（権限があるユーザーのみ表示） ---
306 306  #set($canEditSchool = false)
307 -#if(!$isGuest && ($isViewerAdmin || $isSchoolMember))
276 +#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode || $isAffiliated))
308 308   #set($canEditSchool = true)
309 309  #end
310 310  #if($canEditSchool)
... ... @@ -334,29 +334,17 @@
334 334  ## --- ① 学校基本情報 ---
335 335  <div class="school-info-card collapsed" id="card-basic-info">
336 336   <h2 role="button" tabindex="0" aria-expanded="false" onclick="toggleInfoCard('card-basic-info')" onkeydown="if(event.key==='Enter'||event.key===' '){event.preventDefault();toggleInfoCard('card-basic-info')}"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M4 19.5A2.5 2.5 0 016.5 17H20"/><path d="M6.5 2H20v20H6.5A2.5 2.5 0 014 19.5v-15A2.5 2.5 0 016.5 2z"/></svg> 学校基本情報</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2>
337 - <div class="school-basic-info-layout">
338 - <div class="school-basic-info-table">
339 - <table class="wiki-table school-info-table">
340 - <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
341 - <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
342 - <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
343 - <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
344 - <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
345 - <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
346 - <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
347 - <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
348 - <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>
349 - </table>
350 - </div>
351 - #if($schoolPhoto && $schoolPhoto != '')
352 - <div class="school-photo-area">
353 - <img src="$doc.getAttachmentURL($schoolPhoto)" alt="$!escapetool.xml($schoolName)" class="school-photo" />
354 - </div>
355 - #end
356 - </div>
357 - #if($schoolDescription && $schoolDescription.trim() != '')
358 - <div class="free-note" style="margin-top:var(--sp-4);">$!escapetool.xml($schoolDescription)</div>
359 - #end
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>
360 360   #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
361 361   #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
362 362   #if($infoEditDate && $infoEditDate != '')
... ... @@ -369,25 +369,25 @@
369 369   <h2 role="button" tabindex="0" aria-expanded="true" onclick="toggleInfoCard('card-seitokai-info')" onkeydown="if(event.key==='Enter'||event.key===' '){event.preventDefault();toggleInfoCard('card-seitokai-info')}"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/></svg> 生徒会基本情報</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2>
370 370   <div class="seitokai-info-body">
371 371  
372 - ## --- 生徒会組織 ---
329 + ## --- 組織図 ---
373 373   #set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
374 374   #if($hasOrgContent)
375 375   #set($canViewOrgChart = true)
376 - #if($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewOrgChart = false)
377 - #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)
378 378   #end
379 379   #if($canViewOrgChart)
380 380   <div class="seitokai-subsection">
381 - <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>
382 382   <div class="seitokai-subsection-content">
383 383   #if($orgChartImage && $orgChartImage != '')
384 384   <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
385 385   #end
386 - #if($orgChart && $orgChart != '')<div class="free-note">$!escapetool.xml($orgChart)</div>#end
343 + #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end
387 387   </div>
388 388   </div>
389 389   #else
390 - <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>
391 391   #end
392 392   #end
393 393  
... ... @@ -453,12 +453,12 @@
453 453   #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
454 454   #if($hasBudget)
455 455   #set($canViewBudget = true)
456 - #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewBudget = false)
457 - #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)
458 458   #end
459 459   #if($canViewBudget)
460 460   <div class="seitokai-subsection">
461 - <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>
462 462   <div class="seitokai-subsection-content">
463 463   #if($budgetProcess && !$budgetProcess.isEmpty())
464 464   <div class="info-row">
... ... @@ -509,12 +509,12 @@
509 509   ## --- 校則の見直し ---
510 510   #if($ruleReviewStatus && $ruleReviewStatus != '')
511 511   #set($canViewRuleReview = true)
512 - #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewRuleReview = false)
513 - #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)
514 514   #end
515 515   #if($canViewRuleReview)
516 516   <div class="seitokai-subsection">
517 - <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>
518 518   <div class="seitokai-subsection-content">
519 519   <div class="info-row">
520 520   <span class="info-label">見直しの有無（3年以内）</span>
... ... @@ -572,12 +572,12 @@
572 572   ## --- 生徒会の課題意識 ---
573 573   #if($challenges && $challenges != '')
574 574   #set($canViewChallenges = true)
575 - #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewChallenges = false)
576 - #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)
577 577   #end
578 578   #if($canViewChallenges)
579 579   <div class="seitokai-subsection">
580 - <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>
581 581   <div class="seitokai-subsection-content">
582 582   <div class="challenge-text">$!escapetool.xml($challenges)</div>
583 583   </div>
... ... @@ -664,7 +664,6 @@
664 664   <span class="author-legend-title">所属:</span>
665 665   <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>
666 666   <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>
667 - <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>
668 668   <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>
669 669   <span class="author-legend-item text-hint">※一般アカウントは所属バッジが表示されません</span>
670 670   </div>
... ... @@ -740,18 +740,16 @@
740 740  <div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)">
741 741   <div class="activity-thread-header">
742 742   <div class="activity-thread-title">
743 - <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>
744 - <div class="activity-meta-line">
745 - <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
746 - #set($actTagsList = $activity.getValue('tags'))
747 - #if($actTagsList && !$actTagsList.isEmpty())
748 - #foreach($tagItem in $actTagsList)
749 - #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end
750 - #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
751 751   #end
752 - </div>
706 + #end
753 753   </div>
754 - <div class="thread-meta-right">
708 + <div class="thread-meta-row">
755 755   <span class="thread-post-count">${reportCount}件の報告 ・ ${commentCount}件のコメント</span>
756 756   #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred')
757 757   #if($actFeatured == '1')
... ... @@ -811,8 +811,8 @@
811 811   #set($postVis = $!post.getValue('visibility'))
812 812   #if(!$postVis || $postVis == '') #set($postVis = 'public') #end
813 813   #set($canViewPost = true)
814 - #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewPost = false)
815 - #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)
816 816   #end
817 817   #if(!$canViewPost)
818 818   <div class="thread-post visibility-restricted-post">
... ... @@ -856,11 +856,8 @@
856 856   <span class="badge badge-general badge-sm">一般</span>
857 857   #end
858 858   ## 所属バッジ（投稿者の学校コードとページの学校コードを比較）
859 - #set($postIsSchoolMatch = ($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode)))
860 860   #if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general')
861 - #if($postUserRole == 'graduate' && $postIsSchoolMatch)
862 - <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>
863 - #elseif($postIsSchoolMatch && $postUserRole != 'graduate')
814 + #if($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode))
864 864   #if($postAccountType == 'verified' || $postAccountType == 'admin')
865 865   <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>
866 866   #else
... ... @@ -887,13 +887,6 @@
887 887   #if($postEdited == 1 || $postEdited == '1')
888 888   <span class="post-edited-label">（編集済み）</span>
889 889   #end
890 - #set($postAuthorRefH = $!post.getValue('authorRef'))
891 - #set($postObjNumH = $post.number)
892 - #if(!$isGuest && $xcontext.user != $postAuthorRefH)
893 - <button type="button" class="btn-post-report btn-post-report-header" onclick="openReportDialog(this, '${doc.fullName}', $postObjNumH, '${services.csrf.getToken()}')" title="この投稿を通報">
894 - <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> 通報
895 - </button>
896 - #end
897 897   </div>
898 898   <div class="thread-post-body">
899 899   $!escapetool.xml($!postContent)
... ... @@ -958,18 +958,12 @@
958 958   #end
959 959   </div>
960 960   #if($postVis != 'public')
961 - <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>
962 962   #end
963 - ## 固定/編集/削除/通報/非表示ボタン（横並び）
964 - #set($postAuthorRef = $!post.getValue('authorRef'))
965 - #set($postObjNumED = $post.number)
966 - #set($showPinBtn = ($viewerAccountType == 'admin' || $viewerAccountType == 'verified'))
967 - #set($showEditDeleteBtn = ($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin'))
968 - #set($showHideBtn = ($viewerAccountType == 'admin'))
969 - #if($showPinBtn || $showEditDeleteBtn || $showHideBtn)
970 - <div class="post-edit-actions post-action-mt">
971 - #if($showPinBtn)
972 - #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">
973 973   #if($isPinned == '1')
974 974   <a href="$doc.getURL('view', "action=unpin&postObj=${postObjNum}&form_token=${services.csrf.getToken()}")" class="btn-pin-toggle btn-unpin" title="固定を解除">
975 975   <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> 固定を解除
... ... @@ -979,12 +979,15 @@
979 979   <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> 固定する
980 980   </a>
981 981   #end
982 - #end
983 - #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">
984 984   #if($xcontext.user == $postAuthorRef)
985 - #set($editImages = $!post.getValue('images'))
986 - #set($editFiles = $!post.getValue('files'))
987 - <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="この投稿を編集">
988 988   <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> 編集
989 989   </button>
990 990   #end
... ... @@ -991,12 +991,6 @@
991 991   <button type="button" class="btn-post-delete" onclick="confirmDeletePost('${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を削除">
992 992   <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> 削除
993 993   </button>
994 - #end
995 - #if($showHideBtn)
996 - <button type="button" class="btn-post-hide" onclick="openHideDialog(this, '${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を非表示にする">
997 - <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> 非表示
998 - </button>
999 - #end
1000 1000   </div>
1001 1001   #end
1002 1002   </div>
... ... @@ -1046,11 +1046,9 @@
1046 1046  
1047 1047   #if($xcontext.user != "XWiki.XWikiGuest")
1048 1048   <div class="thread-add-post">
1049 - #if($isSchoolMember || $isViewerAdmin)
1050 1050   <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
1051 1051   ＋ 活動報告を追加
1052 1052   </a>
1053 - #end
1054 1054   <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
1055 1055   <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> コメントを書く
1056 1056   </a>
... ... @@ -1127,27 +1127,6 @@
1127 1127  }
1128 1128  // ページ読み込み時の初期化
1129 1129  document.addEventListener('DOMContentLoaded', function() {
1130 - // 年度タブを降順にソート（「全期間」タブは末尾に固定）
1131 - var tabContainer = document.querySelector('.activity-fy-tabs');
1132 - if (tabContainer) {
1133 - var tabs = Array.from(tabContainer.querySelectorAll('.activity-fy-tab'));
1134 - var allTab = null;
1135 - var fyTabs = [];
1136 - tabs.forEach(function(t) {
1137 - var onclickStr = t.getAttribute('onclick') || '';
1138 - if (onclickStr.indexOf("'all'") !== -1) { allTab = t; }
1139 - else { fyTabs.push(t); }
1140 - });
1141 - // 年度タブを数値の降順でソート
1142 - fyTabs.sort(function(a, b) {
1143 - var aYear = parseInt(a.textContent) || 0;
1144 - var bYear = parseInt(b.textContent) || 0;
1145 - return bYear - aYear;
1146 - });
1147 - // DOM再配置
1148 - fyTabs.forEach(function(t) { tabContainer.appendChild(t); });
1149 - if (allTab) { tabContainer.appendChild(allTab); }
1150 - }
1151 1151   // デフォルトで現在の年度を表示
1152 1152   var defaultTab = document.querySelector('.activity-fy-tab.active');
1153 1153   if (defaultTab) { defaultTab.click(); }
... ... @@ -1217,130 +1217,37 @@
1217 1217  }
1218 1218  
1219 1219  // 投稿の編集（インライン編集フォームを開く）
1220 -function openEditPost(btn) {
1132 +function openEditPost(btn, schoolPage, postObjNum, currentContent) {
1221 1221   var postEl = btn.closest('.thread-post');
1222 1222   if (!postEl) return;
1135 + // 既存の編集フォームがあれば閉じる
1223 1223   var existing = postEl.querySelector('.post-edit-form');
1224 1224   if (existing) { existing.remove(); return; }
1225 1225   var bodyEl = postEl.querySelector('.thread-post-body');
1226 1226   if (!bodyEl) return;
1227 -
1228 - var schoolPage = btn.getAttribute('data-school');
1229 - var postObjNum = btn.getAttribute('data-obj');
1230 - var currentContent = btn.getAttribute('data-content') || '';
1231 - var currentImages = btn.getAttribute('data-images') || '';
1232 - var currentFiles = btn.getAttribute('data-files') || '';
1233 - var postType = btn.getAttribute('data-post-type') || 'report';
1234 -
1235 1235   var form = document.createElement('div');
1236 1236   form.className = 'post-edit-form';
1237 - form.setAttribute('data-school', schoolPage);
1238 - form.setAttribute('data-obj', postObjNum);
1239 -
1240 - var html = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>';
1241 -
1242 - // コメント以外は添付ファイル編集を表示
1243 - if (postType !== 'comment') {
1244 - // 既存画像
1245 - html += '<div class="edit-attachments">';
1246 - if (currentImages.trim()) {
1247 - html += '<div class="edit-attach-section"><span class="edit-attach-label">画像</span>';
1248 - var imgs = currentImages.trim().split('\n');
1249 - for (var i = 0; i < imgs.length; i++) {
1250 - var img = imgs[i].trim();
1251 - if (!img) continue;
1252 - html += '<div class="edit-attach-item" data-name="' + img.replace(/"/g,'&quot;') + '">' +
1253 - '<img src="/xwiki/bin/download/' + schoolPage.replace(/\./g,'/') + '/' + encodeURIComponent(img) + '" class="edit-attach-thumb" />' +
1254 - '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1255 - '<input type="hidden" name="keepImages" value="' + img.replace(/"/g,'&quot;') + '" />' +
1256 - '</div>';
1257 - }
1258 - html += '</div>';
1259 - }
1260 - // 既存ファイル
1261 - if (currentFiles.trim()) {
1262 - html += '<div class="edit-attach-section"><span class="edit-attach-label">ファイル</span>';
1263 - var files = currentFiles.trim().split('\n');
1264 - for (var j = 0; j < files.length; j++) {
1265 - var f = files[j].trim();
1266 - if (!f) continue;
1267 - var displayName = f;
1268 - if (/^file_\d{14}_\d+_/.test(f)) displayName = f.replace(/^file_\d{14}_\d+_/, '');
1269 - html += '<div class="edit-attach-item" data-name="' + f.replace(/"/g,'&quot;') + '">' +
1270 - '<span class="edit-attach-fname">' + displayName.replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</span>' +
1271 - '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1272 - '<input type="hidden" name="keepFiles" value="' + f.replace(/"/g,'&quot;') + '" />' +
1273 - '</div>';
1274 - }
1275 - html += '</div>';
1276 - }
1277 - // 新規追加
1278 - html += '<div class="edit-attach-add">' +
1279 - '<label class="form-label-sm">画像を追加（最大4枚まで）</label>' +
1280 - '<input type="file" name="editNewImages" accept="image/*" multiple class="form-file-input-sm" />' +
1281 - '<div class="form-hint">JPEG / PNG / GIF / WebP、各5MBまで</div>' +
1282 - '<label class="form-label-sm" style="margin-top:8px;">ファイルを追加（最大2つまで）</label>' +
1283 - '<input type="file" name="editNewFiles" accept=".pdf,.docx,.xlsx,.pptx" multiple class="form-file-input-sm" />' +
1284 - '<div class="form-hint">PDF / Word / Excel / PowerPoint、各10MBまで</div>' +
1285 - '</div>';
1286 - html += '</div>';
1287 - }
1288 -
1289 - 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">' +
1290 1290   '<button type="button" class="btn-cancel-edit" onclick="this.closest(\'.post-edit-form\').remove()">キャンセル</button>' +
1291 - '<button type="button" class="btn-save" onclick="saveEditPost(this)">保存</button>' +
1145 + '<button type="button" class="btn-save" onclick="saveEditPost(\'' + schoolPage + '\', ' + postObjNum + ')">保存</button>' +
1292 1292   '</div>';
1293 -
1294 - form.innerHTML = html;
1295 1295   bodyEl.parentNode.insertBefore(form, bodyEl.nextSibling);
1296 1296   form.querySelector('textarea').focus();
1297 1297  }
1298 1298  
1299 -function removeEditAttach(btn) {
1300 - var item = btn.closest('.edit-attach-item');
1301 - if (item) item.remove();
1302 -}
1303 -
1304 1304  // 投稿の編集を保存
1305 -function saveEditPost(btn) {
1306 - var formEl = btn.closest('.post-edit-form');
1307 - if (!formEl) return;
1308 - var schoolPage = formEl.getAttribute('data-school');
1309 - var postObjNum = formEl.getAttribute('data-obj');
1310 - var textarea = formEl.querySelector('textarea');
1152 +function saveEditPost(schoolPage, postObjNum) {
1153 + var textarea = document.getElementById('editContent_' + postObjNum);
1311 1311   if (!textarea) return;
1312 1312   var newContent = textarea.value.trim();
1313 1313   if (!newContent) { alert('投稿内容を入力してください'); return; }
1314 -
1315 1315   var csrfEl = document.querySelector('input[name="form_token"]');
1316 1316   var csrfToken = csrfEl ? csrfEl.value : '';
1317 -
1318 - var fd = new FormData();
1319 - fd.append('schoolPage', schoolPage);
1320 - fd.append('postObj', postObjNum);
1321 - fd.append('newContent', newContent);
1322 - fd.append('form_token', csrfToken);
1323 -
1324 - // 残す画像・ファイル
1325 - formEl.querySelectorAll('input[name="keepImages"]').forEach(function(el) { fd.append('keepImages', el.value); });
1326 - formEl.querySelectorAll('input[name="keepFiles"]').forEach(function(el) { fd.append('keepFiles', el.value); });
1327 -
1328 - // 新規画像
1329 - var newImgInput = formEl.querySelector('input[name="editNewImages"]');
1330 - if (newImgInput && newImgInput.files) {
1331 - for (var i = 0; i < newImgInput.files.length; i++) { fd.append('editNewImages', newImgInput.files[i]); }
1332 - }
1333 - // 新規ファイル
1334 - var newFileInput = formEl.querySelector('input[name="editNewFiles"]');
1335 - if (newFileInput && newFileInput.files) {
1336 - for (var j = 0; j < newFileInput.files.length; j++) { fd.append('editNewFiles', newFileInput.files[j]); }
1337 - }
1338 -
1339 - btn.disabled = true;
1340 - btn.textContent = '保存中...';
1341 -
1342 1342   var xhr = new XMLHttpRequest();
1343 1343   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);
1344 1344   xhr.onload = function() {
1345 1345   try {
1346 1346   var res = JSON.parse(xhr.responseText);
... ... @@ -1348,13 +1348,12 @@
1348 1348   showToast('投稿を更新しました', 'success');
1349 1349   setTimeout(function() { location.reload(); }, 800);
1350 1350   } else {
1351 - btn.disabled = false; btn.textContent = '保存';
1352 1352   alert('編集に失敗しました: ' + (res.error || ''));
1353 1353   }
1354 - } catch(e) { btn.disabled = false; btn.textContent = '保存'; alert('編集に失敗しました'); }
1172 + } catch(e) { alert('編集に失敗しました'); }
1355 1355   };
1356 - xhr.onerror = function() { btn.disabled = false; btn.textContent = '保存'; alert('通信エラーが発生しました'); };
1357 - xhr.send(fd);
1174 + xhr.onerror = function() { alert('通信エラーが発生しました'); };
1175 + xhr.send(editPostData);
1358 1358  }
1359 1359  
1360 1360  // 投稿の削除（確認ダイアログ付き）
... ... @@ -1378,80 +1378,6 @@
1378 1378   xhr.onerror = function() { alert('通信エラーが発生しました'); };
1379 1379   xhr.send(deletePostData);
1380 1380  }
1381 -
1382 -/* --- 通報ダイアログ --- */
1383 -function openReportDialog(btn, targetPage, postObjNum, token) {
1384 - if (document.getElementById('report-dialog-overlay')) return;
1385 - var reasons = ['宣伝・スパム','不適切な内容','個人情報の露出','誹謗中傷','誤情報','その他'];
1386 - var overlay = document.createElement('div');
1387 - overlay.id = 'report-dialog-overlay';
1388 - 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;';
1389 - var dialog = document.createElement('div');
1390 - dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;max-height:80vh;overflow-y:auto;';
1391 - var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を通報</h3>';
1392 - html += '<p style="margin:0 0 12px;font-size:0.9em;color:#4b5563;">通報された投稿は管理者が確認するまで一時的に非表示になります。</p>';
1393 - html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">通報理由</label>';
1394 - html += '<select id="report-reason" style="width:100%;padding:8px;border:1px solid #d1d5db;border-radius:8px;margin-bottom:12px;font-size:0.9em;">';
1395 - for (var i=0; i<reasons.length; i++) html += '<option value="'+reasons[i]+'">'+reasons[i]+'</option>';
1396 - html += '</select>';
1397 - html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">補足コメント（任意）</label>';
1398 - 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>';
1399 - html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
1400 - html += '<button type="button" id="report-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
1401 - 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>';
1402 - html += '</div>';
1403 - dialog.innerHTML = html;
1404 - overlay.appendChild(dialog);
1405 - document.body.appendChild(overlay);
1406 - overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
1407 - document.getElementById('report-cancel-btn').addEventListener('click', function() { overlay.remove(); });
1408 - document.getElementById('report-submit-btn').addEventListener('click', function() {
1409 - var reason = document.getElementById('report-reason').value;
1410 - var detail = document.getElementById('report-detail').value;
1411 - var submitBtn = document.getElementById('report-submit-btn');
1412 - submitBtn.disabled = true; submitBtn.textContent = '送信中...';
1413 - var xhr = new XMLHttpRequest();
1414 - xhr.open('POST', '/bin/get/SeitokaiCode/ReportAction?outputSyntax=plain', true);
1415 - xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1416 - var data = 'targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&detail=' + encodeURIComponent(detail) + '&form_token=' + encodeURIComponent(token);
1417 - xhr.onload = function() {
1418 - overlay.remove();
1419 - showToast('通報を受け付けました', 'success');
1420 - setTimeout(function() { location.reload(); }, 1000);
1421 - };
1422 - xhr.onerror = function() { overlay.remove(); alert('通信エラーが発生しました'); };
1423 - xhr.send(data);
1424 - });
1425 -}
1426 -
1427 -/* --- 非表示ダイアログ（管理者用） --- */
1428 -function openHideDialog(btn, targetPage, postObjNum, token) {
1429 - if (document.getElementById('hide-dialog-overlay')) return;
1430 - var overlay = document.createElement('div');
1431 - overlay.id = 'hide-dialog-overlay';
1432 - 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;';
1433 - var dialog = document.createElement('div');
1434 - dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;';
1435 - var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を非表示にする</h3>';
1436 - html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">非表示の理由</label>';
1437 - 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="理由を入力" />';
1438 - html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
1439 - html += '<button type="button" id="hide-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
1440 - 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>';
1441 - 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>';
1442 - html += '</div>';
1443 - dialog.innerHTML = html;
1444 - overlay.appendChild(dialog);
1445 - document.body.appendChild(overlay);
1446 - overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
1447 - document.getElementById('hide-cancel-btn').addEventListener('click', function() { overlay.remove(); });
1448 - function doHide(action) {
1449 - var reason = document.getElementById('hide-reason').value || '管理者判断';
1450 - window.location.href = '/bin/view/SeitokaiCode/ModerationAction?action=' + action + '&targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&form_token=' + encodeURIComponent(token);
1451 - }
1452 - document.getElementById('hide-submit-btn').addEventListener('click', function() { doHide('hide'); });
1453 - document.getElementById('hide-warn-btn').addEventListener('click', function() { doHide('hide-warn'); });
1454 -}
1455 1455  </script>
1456 1456  {{/html}}
1457 1457  {{/velocity}}