Skip to Content
Last modified by Super Admin on 2026/04/05 18:59
From version Icon 71.1 Icon
edited by Super Admin
on 2026/03/18 20:48
Change comment: There is no comment for this version
To version Icon 88.1 Icon
edited by Super Admin
on 2026/03/20 02:15
Change comment: There is no comment for this version

Summary

Details

Icon Page properties
Content
... ... @@ -34,8 +34,10 @@
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'))
37 37  
38 -## --- 組織図 ---
40 +## --- 生徒会組織 ---
39 39  #set($orgChart = $doc.getValue('orgChart'))
40 40  #set($orgChartImage = $doc.getValue('orgChartImage'))
41 41  
... ... @@ -101,6 +101,8 @@
101 101   #set($viewerDoc = $xwiki.getDocument($viewerUser))
102 102   #set($viewerAccountType = $!viewerDoc.getValue('accountType'))
103 103   #set($viewerSchoolCode = $!viewerDoc.getValue('schoolCode'))
106 + #set($viewerSecondarySchoolCode = $!viewerDoc.getValue('secondarySchoolCode'))
107 + #set($viewerUserRole = $!viewerDoc.getValue('userRole'))
104 104   #if($viewerAccountType == 'admin')
105 105   #set($isViewerAdmin = true)
106 106   #end
... ... @@ -110,10 +110,31 @@
110 110  #set($affiliatedSchoolCode = $!doc.getValue('affiliatedSchoolCode'))
111 111  #set($affiliatedSchoolName = $!doc.getValue('affiliatedSchoolName'))
112 112  #set($isAffiliated = false)
113 -#if($affiliatedSchoolCode && $affiliatedSchoolCode != '' && $viewerSchoolCode == $affiliatedSchoolCode)
114 - #set($isAffiliated = true)
117 +#if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
118 + #if($viewerSchoolCode == $affiliatedSchoolCode)
119 + #set($isAffiliated = true)
120 + #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode)
121 + #set($isAffiliated = true)
122 + #end
115 115  #end
116 116  
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 +
117 117  ## --- 学校ページ非表示チェック ---
118 118  #set($schoolHidden = $doc.getValue('hidden'))
119 119  #if($schoolHidden == 1)
... ... @@ -147,7 +147,7 @@
147 147  
148 148  ## --- 投稿固定/解除処理 ---
149 149  #set($pinAction = $!request.action)
150 -#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && ($viewerSchoolCode == $schoolCode || $isAffiliated))) && $services.csrf.isTokenValid($request.form_token))
175 +#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $isSchoolMember)) && $services.csrf.isTokenValid($request.form_token))
151 151   #set($pinPostObjStr = $!request.postObj)
152 152   #if(!$pinPostObjStr.matches('^\d+$'))
153 153   ## 不正な値 → 無視
... ... @@ -177,7 +177,7 @@
177 177  
178 178  ## --- 特色ある活動 選定/解除処理 ---
179 179  #set($featAction = $!request.action)
180 -#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token))
205 +#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $isSchoolMember)) && $services.csrf.isTokenValid($request.form_token))
181 181   #set($featActObjStr = $!request.actObj)
182 182   #if($featActObjStr.matches('^\d+$'))
183 183   #set($actObjNum = $mathtool.toInteger($featActObjStr))
... ... @@ -279,7 +279,7 @@
279 279  
280 280  ## --- 編集ボタン（権限があるユーザーのみ表示） ---
281 281  #set($canEditSchool = false)
282 -#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode || $isAffiliated))
307 +#if(!$isGuest && ($isViewerAdmin || $isSchoolMember))
283 283   #set($canEditSchool = true)
284 284  #end
285 285  #if($canEditSchool)
... ... @@ -309,22 +309,30 @@
309 309  ## --- ① 学校基本情報 ---
310 310  <div class="school-info-card collapsed" id="card-basic-info">
311 311   <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>
312 - <table class="wiki-table school-info-table">
313 - <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
314 - <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
315 - <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
316 - <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
317 - <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
318 - <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
319 - <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
320 - <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
321 - <tr><th>公式サイト</th><td>#if($website && $website != '')<a href="$!escapetool.xml($website)" target="_blank" rel="noopener">$!escapetool.xml($website)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
322 - </table>
323 - #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
324 - #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
325 - #if($infoEditDate && $infoEditDate != '')
326 - <div class="info-last-updated"><svg class="ico" viewBox="0 0 24 24"><path d="M11 4H4a2 2 0 00-2 2v14a2 2 0 002 2h14a2 2 0 002-2v-7"/><path d="M18.5 2.5a2.121 2.121 0 013 3L12 15l-4 1 1-4 9.5-9.5z"/></svg> 基本情報の最終更新: $!escapetool.xml($infoEditBy) — $!escapetool.xml($infoEditDate)</div>
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>
327 327   #end
360 +
328 328  </div>
329 329  
330 330  ## --- ② 生徒会基本情報（折りたたみカード） ---
... ... @@ -332,25 +332,25 @@
332 332   <h2 role="button" tabindex="0" aria-expanded="true" onclick="toggleInfoCard('card-seitokai-info')" onkeydown="if(event.key==='Enter'||event.key===' '){event.preventDefault();toggleInfoCard('card-seitokai-info')}"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/></svg> 生徒会基本情報</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2>
333 333   <div class="seitokai-info-body">
334 334  
335 - ## --- 組織図 ---
368 + ## --- 生徒会組織 ---
336 336   #set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
337 337   #if($hasOrgContent)
338 338   #set($canViewOrgChart = true)
339 - #if($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewOrgChart = false)
340 - #elseif($visibilityOrgChart == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewOrgChart = false)
372 + #if($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewOrgChart = false)
373 + #elseif($visibilityOrgChart == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewOrgChart = false)
341 341   #end
342 342   #if($canViewOrgChart)
343 343   <div class="seitokai-subsection">
344 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/><line x1="9" y1="10" x2="9" y2="10.01"/><line x1="15" y1="10" x2="15" y2="10.01"/><line x1="9" y1="14" x2="9" y2="14.01"/><line x1="15" y1="14" x2="15" y2="14.01"/></svg> 組織図 #if($visibilityOrgChart != 'public')<span class="visibility-badge visibility-${visibilityOrgChart}">#if($visibilityOrgChart == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
377 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/><line x1="9" y1="10" x2="9" y2="10.01"/><line x1="15" y1="10" x2="15" y2="10.01"/><line x1="9" y1="14" x2="9" y2="14.01"/><line x1="15" y1="14" x2="15" y2="14.01"/></svg> 生徒会組織 #if($visibilityOrgChart != 'public')<span class="visibility-badge visibility-${visibilityOrgChart}">#if($visibilityOrgChart == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
345 345   <div class="seitokai-subsection-content">
346 346   #if($orgChartImage && $orgChartImage != '')
347 347   <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
348 348   #end
349 - #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end
382 + #if($orgChart && $orgChart != '')<div class="free-note">$!escapetool.xml($orgChart)</div>#end
350 350   </div>
351 351   </div>
352 352   #else
353 - <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 組織図は #if($visibilityOrgChart == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
386 + <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 生徒会組織は #if($visibilityOrgChart == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
354 354   #end
355 355   #end
356 356  
... ... @@ -359,12 +359,10 @@
359 359   <div class="seitokai-subsection">
360 360   <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z"/><polyline points="14 2 14 8 20 8"/><line x1="16" y1="13" x2="8" y2="13"/><line x1="16" y1="17" x2="8" y2="17"/></svg> 日常の活動</h3>
361 361   <div class="seitokai-subsection-content">
362 - <p class="activity-hint">活動時間の多い順に上位3つ</p>
395 + <p class="activity-hint">活動時間が多い3つ</p>
363 363   <div class="tag-container">
364 - #set($daIdx = 1)
365 365   #foreach($da in $dailyActivities)
366 - <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
367 - #set($daIdx = $daIdx + 1)
398 + <span class="tag tag-accent">$!escapetool.xml($da.trim())</span>
368 368   #end
369 369   </div>
370 370   #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
... ... @@ -416,12 +416,12 @@
416 416   #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
417 417   #if($hasBudget)
418 418   #set($canViewBudget = true)
419 - #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewBudget = false)
420 - #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false)
450 + #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewBudget = false)
451 + #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false)
421 421   #end
422 422   #if($canViewBudget)
423 423   <div class="seitokai-subsection">
424 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><line x1="12" y1="1" x2="12" y2="23"/><path d="M17 5H9.5a3.5 3.5 0 000 7h5a3.5 3.5 0 010 7H6"/></svg> 予算 #if($visibilityBudget != 'public')<span class="visibility-badge visibility-${visibilityBudget}">#if($visibilityBudget == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
455 + <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>
425 425   <div class="seitokai-subsection-content">
426 426   #if($budgetProcess && !$budgetProcess.isEmpty())
427 427   <div class="info-row">
... ... @@ -428,8 +428,13 @@
428 428   <span class="info-label">作成過程の生徒関与</span>
429 429   <span class="info-value">
430 430   <div class="selection-display">
431 - #foreach($bp in $budgetProcess)
432 - <span class="selection-item">$!escapetool.xml($bp.trim())</span>
462 + #set($allBpOpts = ["各部・委員会等への予算希望額調査","予算額調整（折衝等）","生徒会予算案の作成","生徒総会での議決"])
463 + #foreach($bpOpt in $allBpOpts)
464 + #if($budgetProcess.contains($bpOpt))
465 + <span class="selection-item">$!escapetool.xml($bpOpt)</span>
466 + #else
467 + <span class="selection-item selection-item-off">$!escapetool.xml($bpOpt)</span>
468 + #end
433 433   #end
434 434   </div>
435 435   </span>
... ... @@ -472,12 +472,12 @@
472 472   ## --- 校則の見直し ---
473 473   #if($ruleReviewStatus && $ruleReviewStatus != '')
474 474   #set($canViewRuleReview = true)
475 - #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewRuleReview = false)
476 - #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false)
511 + #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewRuleReview = false)
512 + #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false)
477 477   #end
478 478   #if($canViewRuleReview)
479 479   <div class="seitokai-subsection">
480 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M16 4h2a2 2 0 012 2v12a2 2 0 01-2 2h-2"/><path d="M8 4H6a2 2 0 00-2 2v12a2 2 0 002 2h2"/><line x1="12" y1="4" x2="12" y2="8"/><line x1="12" y1="16" x2="12" y2="20"/><line x1="8" y1="8" x2="16" y2="8"/><line x1="8" y1="16" x2="16" y2="16"/></svg> 校則の見直し #if($visibilityRuleReview != 'public')<span class="visibility-badge visibility-${visibilityRuleReview}">#if($visibilityRuleReview == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
516 + <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>
481 481   <div class="seitokai-subsection-content">
482 482   <div class="info-row">
483 483   <span class="info-label">見直しの有無（3年以内）</span>
... ... @@ -535,12 +535,12 @@
535 535   ## --- 生徒会の課題意識 ---
536 536   #if($challenges && $challenges != '')
537 537   #set($canViewChallenges = true)
538 - #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewChallenges = false)
539 - #elseif($visibilityChallenges == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewChallenges = false)
574 + #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewChallenges = false)
575 + #elseif($visibilityChallenges == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewChallenges = false)
540 540   #end
541 541   #if($canViewChallenges)
542 542   <div class="seitokai-subsection">
543 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M12 16v-4"/><path d="M12 8h.01"/></svg> 生徒会の課題意識 #if($visibilityChallenges != 'public')<span class="visibility-badge visibility-${visibilityChallenges}">#if($visibilityChallenges == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
579 + <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>
544 544   <div class="seitokai-subsection-content">
545 545   <div class="challenge-text">$!escapetool.xml($challenges)</div>
546 546   </div>
... ... @@ -564,6 +564,11 @@
564 564   <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>
565 565   <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
566 566   </table>
603 + #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
604 + #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
605 + #if($infoEditDate && $infoEditDate != '')
606 + <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>
607 + #end
567 567  </div>
568 568  
569 569  {{/html}}
... ... @@ -627,6 +627,7 @@
627 627   <span class="author-legend-title">所属:</span>
628 628   <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>
629 629   <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>
671 + <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>
630 630   <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>
631 631   <span class="author-legend-item text-hint">※一般アカウントは所属バッジが表示されません</span>
632 632   </div>
... ... @@ -702,16 +702,18 @@
702 702  <div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)">
703 703   <div class="activity-thread-header">
704 704   <div class="activity-thread-title">
705 - <h3 #if($actFeatured == '1')class="featured-title"#end>$!escapetool.xml($!actTitle) #if($actFeatured == '1')<svg class="ico ico-fixed-14 ico-star-offset" viewBox="0 0 24 24" fill="currentColor" stroke="none"><polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"/></svg>#end</h3>
706 - <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
707 - #set($actTagsList = $activity.getValue('tags'))
708 - #if($actTagsList && !$actTagsList.isEmpty())
709 - #foreach($tagItem in $actTagsList)
710 - #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end
747 + <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>
748 + <div class="activity-meta-line">
749 + <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
750 + #set($actTagsList = $activity.getValue('tags'))
751 + #if($actTagsList && !$actTagsList.isEmpty())
752 + #foreach($tagItem in $actTagsList)
753 + #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end
754 + #end
711 711   #end
712 - #end
756 + </div>
713 713   </div>
714 - <div class="thread-meta-row">
758 + <div class="thread-meta-right">
715 715   <span class="thread-post-count">${reportCount}件の報告 ・ ${commentCount}件のコメント</span>
716 716   #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred')
717 717   #if($actFeatured == '1')
... ... @@ -771,8 +771,8 @@
771 771   #set($postVis = $!post.getValue('visibility'))
772 772   #if(!$postVis || $postVis == '') #set($postVis = 'public') #end
773 773   #set($canViewPost = true)
774 - #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewPost = false)
775 - #elseif($postVis == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPost = false)
818 + #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewPost = false)
819 + #elseif($postVis == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPost = false)
776 776   #end
777 777   #if(!$canViewPost)
778 778   <div class="thread-post visibility-restricted-post">
... ... @@ -816,8 +816,11 @@
816 816   <span class="badge badge-general badge-sm">一般</span>
817 817   #end
818 818   ## 所属バッジ（投稿者の学校コードとページの学校コードを比較）
863 + #set($postIsSchoolMatch = ($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode)))
819 819   #if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general')
820 - #if($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode))
865 + #if($postUserRole == 'graduate' && $postIsSchoolMatch)
866 + <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>
867 + #elseif($postIsSchoolMatch && $postUserRole != 'graduate')
821 821   #if($postAccountType == 'verified' || $postAccountType == 'admin')
822 822   <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>
823 823   #else
... ... @@ -844,6 +844,13 @@
844 844   #if($postEdited == 1 || $postEdited == '1')
845 845   <span class="post-edited-label">（編集済み）</span>
846 846   #end
894 + #set($postAuthorRefH = $!post.getValue('authorRef'))
895 + #set($postObjNumH = $post.number)
896 + #if(!$isGuest && $xcontext.user != $postAuthorRefH)
897 + <button type="button" class="btn-post-report btn-post-report-header" onclick="openReportDialog(this, '${doc.fullName}', $postObjNumH, '${services.csrf.getToken()}')" title="この投稿を通報">
898 + <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> 通報
899 + </button>
900 + #end
847 847   </div>
848 848   <div class="thread-post-body">
849 849   $!escapetool.xml($!postContent)
... ... @@ -908,12 +908,18 @@
908 908   #end
909 909   </div>
910 910   #if($postVis != 'public')
911 - <div class="visibility-badge visibility-${postVis} post-action-mt">#if($postVis == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</div>
965 + <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>
912 912   #end
913 - ## 固定/解除ボタン（承認済み・管理者のみ）
914 - #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
915 - #set($postObjNum = $post.number)
916 - <div class="post-pin-action post-action-mt">
967 + ## 固定/編集/削除/通報/非表示ボタン（横並び）
968 + #set($postAuthorRef = $!post.getValue('authorRef'))
969 + #set($postObjNumED = $post.number)
970 + #set($showPinBtn = ($viewerAccountType == 'admin' || $viewerAccountType == 'verified'))
971 + #set($showEditDeleteBtn = ($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin'))
972 + #set($showHideBtn = ($viewerAccountType == 'admin'))
973 + #if($showPinBtn || $showEditDeleteBtn || $showHideBtn)
974 + <div class="post-edit-actions post-action-mt">
975 + #if($showPinBtn)
976 + #set($postObjNum = $post.number)
917 917   #if($isPinned == '1')
918 918   <a href="$doc.getURL('view', "action=unpin&postObj=${postObjNum}&form_token=${services.csrf.getToken()}")" class="btn-pin-toggle btn-unpin" title="固定を解除">
919 919   <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> 固定を解除
... ... @@ -923,15 +923,12 @@
923 923   <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> 固定する
924 924   </a>
925 925   #end
926 - </div>
927 - #end
928 - ## 編集・削除ボタン（投稿者本人 or 管理者）
929 - #set($postAuthorRef = $!post.getValue('authorRef'))
930 - #set($postObjNumED = $post.number)
931 - #if($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin')
932 - <div class="post-edit-actions post-action-mt">
986 + #end
987 + #if($showEditDeleteBtn)
933 933   #if($xcontext.user == $postAuthorRef)
934 - <button type="button" class="btn-post-edit" onclick="openEditPost(this, '${doc.fullName}', $postObjNumED, '$!escapetool.javascript($!postContent)')" title="この投稿を編集">
989 + #set($editImages = $!post.getValue('images'))
990 + #set($editFiles = $!post.getValue('files'))
991 + <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="この投稿を編集">
935 935   <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> 編集
936 936   </button>
937 937   #end
... ... @@ -938,6 +938,12 @@
938 938   <button type="button" class="btn-post-delete" onclick="confirmDeletePost('${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を削除">
939 939   <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> 削除
940 940   </button>
998 + #end
999 + #if($showHideBtn)
1000 + <button type="button" class="btn-post-hide" onclick="openHideDialog(this, '${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を非表示にする">
1001 + <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> 非表示
1002 + </button>
1003 + #end
941 941   </div>
942 942   #end
943 943   </div>
... ... @@ -987,9 +987,11 @@
987 987  
988 988   #if($xcontext.user != "XWiki.XWikiGuest")
989 989   <div class="thread-add-post">
1053 + #if($isSchoolMember || $isViewerAdmin)
990 990   <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
991 991   ＋ 活動報告を追加
992 992   </a>
1057 + #end
993 993   <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
994 994   <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> コメントを書く
995 995   </a>
... ... @@ -1156,37 +1156,130 @@
1156 1156  }
1157 1157  
1158 1158  // 投稿の編集（インライン編集フォームを開く）
1159 -function openEditPost(btn, schoolPage, postObjNum, currentContent) {
1224 +function openEditPost(btn) {
1160 1160   var postEl = btn.closest('.thread-post');
1161 1161   if (!postEl) return;
1162 - // 既存の編集フォームがあれば閉じる
1163 1163   var existing = postEl.querySelector('.post-edit-form');
1164 1164   if (existing) { existing.remove(); return; }
1165 1165   var bodyEl = postEl.querySelector('.thread-post-body');
1166 1166   if (!bodyEl) return;
1231 +
1232 + var schoolPage = btn.getAttribute('data-school');
1233 + var postObjNum = btn.getAttribute('data-obj');
1234 + var currentContent = btn.getAttribute('data-content') || '';
1235 + var currentImages = btn.getAttribute('data-images') || '';
1236 + var currentFiles = btn.getAttribute('data-files') || '';
1237 + var postType = btn.getAttribute('data-post-type') || 'report';
1238 +
1167 1167   var form = document.createElement('div');
1168 1168   form.className = 'post-edit-form';
1169 - form.innerHTML = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>' +
1170 - '<div class="post-edit-form-actions">' +
1241 + form.setAttribute('data-school', schoolPage);
1242 + form.setAttribute('data-obj', postObjNum);
1243 +
1244 + var html = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>';
1245 +
1246 + // コメント以外は添付ファイル編集を表示
1247 + if (postType !== 'comment') {
1248 + // 既存画像
1249 + html += '<div class="edit-attachments">';
1250 + if (currentImages.trim()) {
1251 + html += '<div class="edit-attach-section"><span class="edit-attach-label">画像</span>';
1252 + var imgs = currentImages.trim().split('\n');
1253 + for (var i = 0; i < imgs.length; i++) {
1254 + var img = imgs[i].trim();
1255 + if (!img) continue;
1256 + html += '<div class="edit-attach-item" data-name="' + img.replace(/"/g,'&quot;') + '">' +
1257 + '<img src="/xwiki/bin/download/' + schoolPage.replace(/\./g,'/') + '/' + encodeURIComponent(img) + '" class="edit-attach-thumb" />' +
1258 + '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1259 + '<input type="hidden" name="keepImages" value="' + img.replace(/"/g,'&quot;') + '" />' +
1260 + '</div>';
1261 + }
1262 + html += '</div>';
1263 + }
1264 + // 既存ファイル
1265 + if (currentFiles.trim()) {
1266 + html += '<div class="edit-attach-section"><span class="edit-attach-label">ファイル</span>';
1267 + var files = currentFiles.trim().split('\n');
1268 + for (var j = 0; j < files.length; j++) {
1269 + var f = files[j].trim();
1270 + if (!f) continue;
1271 + var displayName = f;
1272 + if (/^file_\d{14}_\d+_/.test(f)) displayName = f.replace(/^file_\d{14}_\d+_/, '');
1273 + html += '<div class="edit-attach-item" data-name="' + f.replace(/"/g,'&quot;') + '">' +
1274 + '<span class="edit-attach-fname">' + displayName.replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</span>' +
1275 + '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1276 + '<input type="hidden" name="keepFiles" value="' + f.replace(/"/g,'&quot;') + '" />' +
1277 + '</div>';
1278 + }
1279 + html += '</div>';
1280 + }
1281 + // 新規追加
1282 + html += '<div class="edit-attach-add">' +
1283 + '<label class="form-label-sm">画像を追加（最大4枚まで）</label>' +
1284 + '<input type="file" name="editNewImages" accept="image/*" multiple class="form-file-input-sm" />' +
1285 + '<div class="form-hint">JPEG / PNG / GIF / WebP、各5MBまで</div>' +
1286 + '<label class="form-label-sm" style="margin-top:8px;">ファイルを追加（最大2つまで）</label>' +
1287 + '<input type="file" name="editNewFiles" accept=".pdf,.docx,.xlsx,.pptx" multiple class="form-file-input-sm" />' +
1288 + '<div class="form-hint">PDF / Word / Excel / PowerPoint、各10MBまで</div>' +
1289 + '</div>';
1290 + html += '</div>';
1291 + }
1292 +
1293 + html += '<div class="post-edit-form-actions">' +
1171 1171   '<button type="button" class="btn-cancel-edit" onclick="this.closest(\'.post-edit-form\').remove()">キャンセル</button>' +
1172 - '<button type="button" class="btn-save" onclick="saveEditPost(\'' + schoolPage + '\', ' + postObjNum + ')">保存</button>' +
1295 + '<button type="button" class="btn-save" onclick="saveEditPost(this)">保存</button>' +
1173 1173   '</div>';
1297 +
1298 + form.innerHTML = html;
1174 1174   bodyEl.parentNode.insertBefore(form, bodyEl.nextSibling);
1175 1175   form.querySelector('textarea').focus();
1176 1176  }
1177 1177  
1303 +function removeEditAttach(btn) {
1304 + var item = btn.closest('.edit-attach-item');
1305 + if (item) item.remove();
1306 +}
1307 +
1178 1178  // 投稿の編集を保存
1179 -function saveEditPost(schoolPage, postObjNum) {
1180 - var textarea = document.getElementById('editContent_' + postObjNum);
1309 +function saveEditPost(btn) {
1310 + var formEl = btn.closest('.post-edit-form');
1311 + if (!formEl) return;
1312 + var schoolPage = formEl.getAttribute('data-school');
1313 + var postObjNum = formEl.getAttribute('data-obj');
1314 + var textarea = formEl.querySelector('textarea');
1181 1181   if (!textarea) return;
1182 1182   var newContent = textarea.value.trim();
1183 1183   if (!newContent) { alert('投稿内容を入力してください'); return; }
1318 +
1184 1184   var csrfEl = document.querySelector('input[name="form_token"]');
1185 1185   var csrfToken = csrfEl ? csrfEl.value : '';
1321 +
1322 + var fd = new FormData();
1323 + fd.append('schoolPage', schoolPage);
1324 + fd.append('postObj', postObjNum);
1325 + fd.append('newContent', newContent);
1326 + fd.append('form_token', csrfToken);
1327 +
1328 + // 残す画像・ファイル
1329 + formEl.querySelectorAll('input[name="keepImages"]').forEach(function(el) { fd.append('keepImages', el.value); });
1330 + formEl.querySelectorAll('input[name="keepFiles"]').forEach(function(el) { fd.append('keepFiles', el.value); });
1331 +
1332 + // 新規画像
1333 + var newImgInput = formEl.querySelector('input[name="editNewImages"]');
1334 + if (newImgInput && newImgInput.files) {
1335 + for (var i = 0; i < newImgInput.files.length; i++) { fd.append('editNewImages', newImgInput.files[i]); }
1336 + }
1337 + // 新規ファイル
1338 + var newFileInput = formEl.querySelector('input[name="editNewFiles"]');
1339 + if (newFileInput && newFileInput.files) {
1340 + for (var j = 0; j < newFileInput.files.length; j++) { fd.append('editNewFiles', newFileInput.files[j]); }
1341 + }
1342 +
1343 + btn.disabled = true;
1344 + btn.textContent = '保存中...';
1345 +
1186 1186   var xhr = new XMLHttpRequest();
1187 1187   xhr.open('POST', '/bin/get/SeitokaiCode/EditPost?outputSyntax=plain', true);
1188 - xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1189 - var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken);
1190 1190   xhr.onload = function() {
1191 1191   try {
1192 1192   var res = JSON.parse(xhr.responseText);
... ... @@ -1194,12 +1194,13 @@
1194 1194   showToast('投稿を更新しました', 'success');
1195 1195   setTimeout(function() { location.reload(); }, 800);
1196 1196   } else {
1355 + btn.disabled = false; btn.textContent = '保存';
1197 1197   alert('編集に失敗しました: ' + (res.error || ''));
1198 1198   }
1199 - } catch(e) { alert('編集に失敗しました'); }
1358 + } catch(e) { btn.disabled = false; btn.textContent = '保存'; alert('編集に失敗しました'); }
1200 1200   };
1201 - xhr.onerror = function() { alert('通信エラーが発生しました'); };
1202 - xhr.send(editPostData);
1360 + xhr.onerror = function() { btn.disabled = false; btn.textContent = '保存'; alert('通信エラーが発生しました'); };
1361 + xhr.send(fd);
1203 1203  }
1204 1204  
1205 1205  // 投稿の削除（確認ダイアログ付き）
... ... @@ -1223,6 +1223,80 @@
1223 1223   xhr.onerror = function() { alert('通信エラーが発生しました'); };
1224 1224   xhr.send(deletePostData);
1225 1225  }
1385 +
1386 +/* --- 通報ダイアログ --- */
1387 +function openReportDialog(btn, targetPage, postObjNum, token) {
1388 + if (document.getElementById('report-dialog-overlay')) return;
1389 + var reasons = ['宣伝・スパム','不適切な内容','個人情報の露出','誹謗中傷','誤情報','その他'];
1390 + var overlay = document.createElement('div');
1391 + overlay.id = 'report-dialog-overlay';
1392 + 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;';
1393 + var dialog = document.createElement('div');
1394 + dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;max-height:80vh;overflow-y:auto;';
1395 + var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を通報</h3>';
1396 + html += '<p style="margin:0 0 12px;font-size:0.9em;color:#4b5563;">通報された投稿は管理者が確認するまで一時的に非表示になります。</p>';
1397 + html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">通報理由</label>';
1398 + html += '<select id="report-reason" style="width:100%;padding:8px;border:1px solid #d1d5db;border-radius:8px;margin-bottom:12px;font-size:0.9em;">';
1399 + for (var i=0; i<reasons.length; i++) html += '<option value="'+reasons[i]+'">'+reasons[i]+'</option>';
1400 + html += '</select>';
1401 + html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">補足コメント（任意）</label>';
1402 + 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>';
1403 + html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
1404 + html += '<button type="button" id="report-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
1405 + 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>';
1406 + html += '</div>';
1407 + dialog.innerHTML = html;
1408 + overlay.appendChild(dialog);
1409 + document.body.appendChild(overlay);
1410 + overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
1411 + document.getElementById('report-cancel-btn').addEventListener('click', function() { overlay.remove(); });
1412 + document.getElementById('report-submit-btn').addEventListener('click', function() {
1413 + var reason = document.getElementById('report-reason').value;
1414 + var detail = document.getElementById('report-detail').value;
1415 + var submitBtn = document.getElementById('report-submit-btn');
1416 + submitBtn.disabled = true; submitBtn.textContent = '送信中...';
1417 + var xhr = new XMLHttpRequest();
1418 + xhr.open('POST', '/bin/get/SeitokaiCode/ReportAction?outputSyntax=plain', true);
1419 + xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1420 + var data = 'targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&detail=' + encodeURIComponent(detail) + '&form_token=' + encodeURIComponent(token);
1421 + xhr.onload = function() {
1422 + overlay.remove();
1423 + showToast('通報を受け付けました', 'success');
1424 + setTimeout(function() { location.reload(); }, 1000);
1425 + };
1426 + xhr.onerror = function() { overlay.remove(); alert('通信エラーが発生しました'); };
1427 + xhr.send(data);
1428 + });
1429 +}
1430 +
1431 +/* --- 非表示ダイアログ（管理者用） --- */
1432 +function openHideDialog(btn, targetPage, postObjNum, token) {
1433 + if (document.getElementById('hide-dialog-overlay')) return;
1434 + var overlay = document.createElement('div');
1435 + overlay.id = 'hide-dialog-overlay';
1436 + 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;';
1437 + var dialog = document.createElement('div');
1438 + dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;';
1439 + var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を非表示にする</h3>';
1440 + html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">非表示の理由</label>';
1441 + 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="理由を入力" />';
1442 + html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
1443 + html += '<button type="button" id="hide-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
1444 + 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>';
1445 + 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>';
1446 + html += '</div>';
1447 + dialog.innerHTML = html;
1448 + overlay.appendChild(dialog);
1449 + document.body.appendChild(overlay);
1450 + overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
1451 + document.getElementById('hide-cancel-btn').addEventListener('click', function() { overlay.remove(); });
1452 + function doHide(action) {
1453 + var reason = document.getElementById('hide-reason').value || '管理者判断';
1454 + window.location.href = '/bin/view/SeitokaiCode/ModerationAction?action=' + action + '&targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&form_token=' + encodeURIComponent(token);
1455 + }
1456 + document.getElementById('hide-submit-btn').addEventListener('click', function() { doHide('hide'); });
1457 + document.getElementById('hide-warn-btn').addEventListener('click', function() { doHide('hide-warn'); });
1458 +}
1226 1226  </script>
1227 1227  {{/html}}
1228 1228  {{/velocity}}