Skip to Content
Last modified by Super Admin on 2026/04/05 18:59
From version Icon 56.1 Icon
edited by Super Admin
on 2026/03/15 16:10
Change comment: There is no comment for this version
To version Icon 95.1 Icon
edited by Super Admin
on 2026/03/20 18:03
Change comment: There is no comment for this version

Summary

Details

Icon Page properties
Content
... ... @@ -1,5 +1,11 @@
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
3 3  {{html clean="false"}}
4 4  ## メンテナンスバナー（{{include}}ではなくインラインで記述し、<p>タグ挿入を回避）
5 5  #set($bannerDoc = $xwiki.getDocument('SeitokaiAdmin.MaintenanceBanner'))
... ... @@ -28,8 +28,10 @@
28 28  #set($schoolLevel = $doc.getValue('schoolLevel'))
29 29  #set($schoolSystem = $doc.getValue('schoolSystem'))
30 30  #set($website = $doc.getValue('website'))
37 +#set($schoolPhoto = $doc.getValue('schoolPhoto'))
38 +#set($schoolDescription = $doc.getValue('schoolDescription'))
31 31  
32 -## --- 組織図 ---
40 +## --- 生徒会組織 ---
33 33  #set($orgChart = $doc.getValue('orgChart'))
34 34  #set($orgChartImage = $doc.getValue('orgChartImage'))
35 35  
... ... @@ -49,7 +49,7 @@
49 49  #set($budgetAllocation = $doc.getValue('budgetAllocation'))
50 50  #set($budgetNote = $doc.getValue('budgetNote'))
51 51  
52 -## --- 校則の見直し ---
60 +## --- 校則・生徒会会則の見直し ---
53 53  #set($ruleReviewStatus = $doc.getValue('ruleReviewStatus'))
54 54  #set($ruleReviewContent = $doc.getValue('ruleReviewContent'))
55 55  #set($ruleReviewProposer = $doc.getValue('ruleReviewProposer'))
... ... @@ -56,6 +56,43 @@
56 56  #set($ruleReviewImplementer = $doc.getValue('ruleReviewImplementer'))
57 57  #set($ruleReviewSystem = $doc.getValue('ruleReviewSystem'))
58 58  
67 +## --- 活動環境 ---
68 +#set($activityPlace = $doc.getValue('activityPlace'))
69 +#set($activityRoomEquipment = $doc.getValue('activityRoomEquipment'))
70 +#set($activityRoomImage = $doc.getValue('activityRoomImage'))
71 +#set($ictUsage = $doc.getValue('ictUsage'))
72 +
73 +## --- 生徒総会 ---
74 +#set($assemblyFormat = $doc.getValue('assemblyFormat'))
75 +#set($assemblyCount = $doc.getValue('assemblyCount'))
76 +#set($assemblyAgenda = $doc.getValue('assemblyAgenda'))
77 +#set($assemblyTopics = $doc.getValue('assemblyTopics'))
78 +#set($assemblyNote = $doc.getValue('assemblyNote'))
79 +
80 +## --- 広報 ---
81 +#set($publicityMethod = $doc.getValue('publicityMethod'))
82 +#set($publicityFrequency = $doc.getValue('publicityFrequency'))
83 +#set($publicityNote = $doc.getValue('publicityNote'))
84 +
85 +## --- 外部連携 ---
86 +#set($externalCooperation = $doc.getValue('externalCooperation'))
87 +#set($externalOrgName = $doc.getValue('externalOrgName'))
88 +#set($socialParticipation = $doc.getValue('socialParticipation'))
89 +
90 +## --- 年間主要行事 ---
91 +#set($eventApril = $doc.getValue('eventApril'))
92 +#set($eventMay = $doc.getValue('eventMay'))
93 +#set($eventJune = $doc.getValue('eventJune'))
94 +#set($eventJuly = $doc.getValue('eventJuly'))
95 +#set($eventAugust = $doc.getValue('eventAugust'))
96 +#set($eventSeptember = $doc.getValue('eventSeptember'))
97 +#set($eventOctober = $doc.getValue('eventOctober'))
98 +#set($eventNovember = $doc.getValue('eventNovember'))
99 +#set($eventDecember = $doc.getValue('eventDecember'))
100 +#set($eventJanuary = $doc.getValue('eventJanuary'))
101 +#set($eventFebruary = $doc.getValue('eventFebruary'))
102 +#set($eventMarch = $doc.getValue('eventMarch'))
103 +
59 59  ## --- 課題・連絡先 ---
60 60  #set($challenges = $doc.getValue('challenges'))
61 61  #set($contactInfo = $doc.getValue('contactInfo'))
... ... @@ -95,11 +95,42 @@
95 95   #set($viewerDoc = $xwiki.getDocument($viewerUser))
96 96   #set($viewerAccountType = $!viewerDoc.getValue('accountType'))
97 97   #set($viewerSchoolCode = $!viewerDoc.getValue('schoolCode'))
143 + #set($viewerSecondarySchoolCode = $!viewerDoc.getValue('secondarySchoolCode'))
144 + #set($viewerUserRole = $!viewerDoc.getValue('userRole'))
98 98   #if($viewerAccountType == 'admin')
99 99   #set($isViewerAdmin = true)
100 100   #end
101 101  #end
102 102  
150 +## --- 関連校（中高一貫校）情報 ---
151 +#set($affiliatedSchoolCode = $!doc.getValue('affiliatedSchoolCode'))
152 +#set($affiliatedSchoolName = $!doc.getValue('affiliatedSchoolName'))
153 +#set($isAffiliated = false)
154 +#if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
155 + #if($viewerSchoolCode == $affiliatedSchoolCode)
156 + #set($isAffiliated = true)
157 + #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode)
158 + #set($isAffiliated = true)
159 + #end
160 +#end
161 +
162 +## --- 校内判定（卒業生を除外、secondarySchoolCodeも含む） ---
163 +#set($isSchoolMember = false)
164 +#if(!$isGuest && $viewerUserRole != 'graduate')
165 + #if($viewerSchoolCode == $schoolCode || $isAffiliated)
166 + #set($isSchoolMember = true)
167 + #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode)
168 + #set($isSchoolMember = true)
169 + #end
170 +#end
171 +## 卒業生の母校判定（投稿バッジ用）
172 +#set($isAlumniOfSchool = false)
173 +#if(!$isGuest && $viewerUserRole == 'graduate')
174 + #if($viewerSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $viewerSchoolCode == $affiliatedSchoolCode))
175 + #set($isAlumniOfSchool = true)
176 + #end
177 +#end
178 +
103 103  ## --- 学校ページ非表示チェック ---
104 104  #set($schoolHidden = $doc.getValue('hidden'))
105 105  #if($schoolHidden == 1)
... ... @@ -133,7 +133,7 @@
133 133  
134 134  ## --- 投稿固定/解除処理 ---
135 135  #set($pinAction = $!request.action)
136 -#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token))
212 +#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $isSchoolMember)) && $services.csrf.isTokenValid($request.form_token))
137 137   #set($pinPostObjStr = $!request.postObj)
138 138   #if(!$pinPostObjStr.matches('^\d+$'))
139 139   ## 不正な値 → 無視
... ... @@ -163,7 +163,7 @@
163 163  
164 164  ## --- 特色ある活動 選定/解除処理 ---
165 165  #set($featAction = $!request.action)
166 -#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token))
242 +#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $isSchoolMember)) && $services.csrf.isTokenValid($request.form_token))
167 167   #set($featActObjStr = $!request.actObj)
168 168   #if($featActObjStr.matches('^\d+$'))
169 169   #set($actObjNum = $mathtool.toInteger($featActObjStr))
... ... @@ -265,7 +265,7 @@
265 265  
266 266  ## --- 編集ボタン（権限があるユーザーのみ表示） ---
267 267  #set($canEditSchool = false)
268 -#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode))
344 +#if(!$isGuest && ($isViewerAdmin || $isSchoolMember || $isAlumniOfSchool))
269 269   #set($canEditSchool = true)
270 270  #end
271 271  #if($canEditSchool)
... ... @@ -274,51 +274,77 @@
274 274  </div>
275 275  #end
276 276  
353 +## --- 関連校（中高一貫校）バナー ---
354 +#if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
355 + #set($affiliatedPageRef = "Schools.${affiliatedSchoolCode}.WebHome")
356 + #set($affiliatedPageExists = $xwiki.exists($affiliatedPageRef))
357 +<div class="affiliated-school-banner">
358 + <svg class="ico" viewBox="0 0 24 24" stroke-width="1.5"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg>
359 + <div>
360 + <strong>中高一貫校</strong>：
361 + #if($affiliatedPageExists)
362 + <a href="$xwiki.getURL($affiliatedPageRef, 'view')">$!escapetool.xml($affiliatedSchoolName)</a>
363 + #else
364 + $!escapetool.xml($affiliatedSchoolName)
365 + #end
366 + と連携しています
367 + </div>
368 +</div>
369 +#end
370 +
277 277  ## --- ① 学校基本情報 ---
278 278  <div class="school-info-card collapsed" id="card-basic-info">
279 279   <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>
280 - <table class="wiki-table school-info-table">
281 - <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
282 - <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
283 - <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
284 - <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
285 - <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
286 - <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
287 - <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
288 - <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
289 - <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>
290 - </table>
291 - #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
292 - #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
293 - #if($infoEditDate && $infoEditDate != '')
294 - <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>
374 + <div class="school-basic-info-layout">
375 + <div class="school-basic-info-table">
376 + <table class="wiki-table school-info-table">
377 + <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
378 + <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
379 + <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
380 + <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
381 + <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
382 + <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
383 + <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
384 + <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
385 + <tr><th>公式サイト</th><td>#if($website && $website != '')<a href="$!escapetool.xml($website)" target="_blank" rel="noopener">$!escapetool.xml($website)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
386 + </table>
387 + </div>
388 + #if($schoolPhoto && $schoolPhoto != '')
389 + <div class="school-photo-area">
390 + <img src="$doc.getAttachmentURL($schoolPhoto)" alt="$!escapetool.xml($schoolName)" class="school-photo" />
391 + </div>
392 + #end
393 + </div>
394 + #if($schoolDescription && $schoolDescription.trim() != '')
395 + <div class="free-note" style="margin-top:var(--sp-4);">$!escapetool.xml($schoolDescription)</div>
295 295   #end
397 +
296 296  </div>
297 297  
298 -## --- ② 生徒会基本情報（折りたたみカード） ---
400 +## --- ② 生徒会情報（折りたたみカード） ---
299 299  <div class="school-info-card" id="card-seitokai-info">
300 - <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>
402 + <h2 role="button" tabindex="0" aria-expanded="true" onclick="toggleInfoCard('card-seitokai-info')" onkeydown="if(event.key==='Enter'||event.key===' '){event.preventDefault();toggleInfoCard('card-seitokai-info')}"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/></svg> 生徒会情報</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2>
301 301   <div class="seitokai-info-body">
302 302  
303 - ## --- 組織図 ---
405 + ## --- 生徒会組織 ---
304 304   #set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
305 305   #if($hasOrgContent)
306 306   #set($canViewOrgChart = true)
307 - #if($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewOrgChart = false)
308 - #elseif($visibilityOrgChart == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ($viewerSchoolCode != $schoolCode || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewOrgChart = false)
409 + #if($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewOrgChart = false)
410 + #elseif($visibilityOrgChart == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewOrgChart = false)
309 309   #end
310 310   #if($canViewOrgChart)
311 311   <div class="seitokai-subsection">
312 - <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>
414 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/><line x1="9" y1="10" x2="9" y2="10.01"/><line x1="15" y1="10" x2="15" y2="10.01"/><line x1="9" y1="14" x2="9" y2="14.01"/><line x1="15" y1="14" x2="15" y2="14.01"/></svg> 生徒会組織 #if($visibilityOrgChart != 'public')<span class="visibility-badge visibility-${visibilityOrgChart}">#if($visibilityOrgChart == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
313 313   <div class="seitokai-subsection-content">
314 314   #if($orgChartImage && $orgChartImage != '')
315 315   <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
316 316   #end
317 - #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end
419 + #if($orgChart && $orgChart != '')<div class="free-note">$!escapetool.xml($orgChart)</div>#end
318 318   </div>
319 319   </div>
320 320   #else
321 - <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>
423 + <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 生徒会組織は #if($visibilityOrgChart == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
322 322   #end
323 323   #end
324 324  
... ... @@ -327,12 +327,10 @@
327 327   <div class="seitokai-subsection">
328 328   <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>
329 329   <div class="seitokai-subsection-content">
330 - <p class="activity-hint">活動時間の多い順に上位3つ</p>
432 + <p class="activity-hint">活動時間が多い3つ</p>
331 331   <div class="tag-container">
332 - #set($daIdx = 1)
333 333   #foreach($da in $dailyActivities)
334 - <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
335 - #set($daIdx = $daIdx + 1)
435 + <span class="tag tag-accent">$!escapetool.xml($da.trim())</span>
336 336   #end
337 337   </div>
338 338   #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
... ... @@ -384,12 +384,12 @@
384 384   #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
385 385   #if($hasBudget)
386 386   #set($canViewBudget = true)
387 - #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewBudget = false)
388 - #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ($viewerSchoolCode != $schoolCode || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false)
487 + #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewBudget = false)
488 + #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false)
389 389   #end
390 390   #if($canViewBudget)
391 391   <div class="seitokai-subsection">
392 - <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>
492 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><line x1="12" y1="1" x2="12" y2="23"/><path d="M17 5H9.5a3.5 3.5 0 000 7h5a3.5 3.5 0 010 7H6"/></svg> 予算 #if($visibilityBudget != 'public')<span class="visibility-badge visibility-${visibilityBudget}">#if($visibilityBudget == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
393 393   <div class="seitokai-subsection-content">
394 394   #if($budgetProcess && !$budgetProcess.isEmpty())
395 395   <div class="info-row">
... ... @@ -396,8 +396,13 @@
396 396   <span class="info-label">作成過程の生徒関与</span>
397 397   <span class="info-value">
398 398   <div class="selection-display">
399 - #foreach($bp in $budgetProcess)
400 - <span class="selection-item">$!escapetool.xml($bp.trim())</span>
499 + #set($allBpOpts = ["各部・委員会等への予算希望額調査","予算額調整（折衝等）","生徒会予算案の作成","生徒総会での議決","生徒関与なし","その他"])
500 + #foreach($bpOpt in $allBpOpts)
501 + #if($budgetProcess.contains($bpOpt))
502 + <span class="selection-item">$!escapetool.xml($bpOpt)</span>
503 + #else
504 + <span class="selection-item selection-item-off">$!escapetool.xml($bpOpt)</span>
505 + #end
401 401   #end
402 402   </div>
403 403   </span>
... ... @@ -437,20 +437,21 @@
437 437   #end
438 438   #end
439 439  
440 - ## --- 校則の見直し ---
545 + ## --- 校則・生徒会会則の見直し ---
441 441   #if($ruleReviewStatus && $ruleReviewStatus != '')
442 442   #set($canViewRuleReview = true)
443 - #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewRuleReview = false)
444 - #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ($viewerSchoolCode != $schoolCode || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false)
548 + #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewRuleReview = false)
549 + #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false)
445 445   #end
446 446   #if($canViewRuleReview)
447 447   <div class="seitokai-subsection">
448 - <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>
553 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M16 4h2a2 2 0 012 2v12a2 2 0 01-2 2h-2"/><path d="M8 4H6a2 2 0 00-2 2v12a2 2 0 002 2h2"/><line x1="12" y1="4" x2="12" y2="8"/><line x1="12" y1="16" x2="12" y2="20"/><line x1="8" y1="8" x2="16" y2="8"/><line x1="8" y1="16" x2="16" y2="16"/></svg> 校則・生徒会会則の見直し #if($visibilityRuleReview != 'public')<span class="visibility-badge visibility-${visibilityRuleReview}">#if($visibilityRuleReview == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
449 449   <div class="seitokai-subsection-content">
450 450   <div class="info-row">
451 451   <span class="info-label">見直しの有無（3年以内）</span>
452 452   <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
453 453   </div>
559 + #if($ruleReviewStatus != '実施なし')
454 454   #if($ruleReviewContent && !$ruleReviewContent.isEmpty())
455 455   <div class="info-row">
456 456   <span class="info-label">見直しの内容</span>
... ... @@ -487,6 +487,7 @@
487 487   </span>
488 488   </div>
489 489   #end
596 + #end
490 490   #if($ruleReviewSystem && $ruleReviewSystem != '')
491 491   <div class="info-row">
492 492   <span class="info-label">見直しの仕組み</span>
... ... @@ -496,19 +496,206 @@
496 496   </div>
497 497   </div>
498 498   #else
499 - <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 校則の見直し情報は #if($visibilityRuleReview == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
606 + <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 校則・生徒会会則の見直し情報は #if($visibilityRuleReview == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
500 500   #end
501 501   #end
502 502  
610 + ## --- 活動環境 ---
611 + #set($hasActivityEnv = ($activityPlace && !$activityPlace.isEmpty()) || ($activityRoomEquipment && $activityRoomEquipment != '') || ($activityRoomImage && $activityRoomImage != '') || ($ictUsage && !$ictUsage.isEmpty()))
612 + #if($hasActivityEnv)
613 + <div class="seitokai-subsection">
614 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M3 9l9-7 9 7v11a2 2 0 01-2 2H5a2 2 0 01-2-2z"/><polyline points="9 22 9 12 15 12 15 22"/></svg> 生徒会の活動環境</h3>
615 + <div class="seitokai-subsection-content">
616 + #if($activityPlace && !$activityPlace.isEmpty())
617 + <div class="info-row">
618 + <span class="info-label">普段の活動場所</span>
619 + <span class="info-value">
620 + <div class="selection-display">
621 + #foreach($ap in $activityPlace)
622 + <span class="selection-item">$!escapetool.xml($ap.trim())</span>
623 + #end
624 + </div>
625 + </span>
626 + </div>
627 + #end
628 + #if($activityRoomEquipment && $activityRoomEquipment != '')
629 + <div class="info-row">
630 + <span class="info-label">生徒会室の設備</span>
631 + <span class="info-value free-text-value">$!escapetool.xml($activityRoomEquipment)</span>
632 + </div>
633 + #end
634 + #if($activityRoomImage && $activityRoomImage != '')
635 + <div class="info-row">
636 + <span class="info-label">活動場所の写真</span>
637 + <span class="info-value"><div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($activityRoomImage)" alt="活動場所の写真" class="org-chart-img" /></div></span>
638 + </div>
639 + #end
640 + #if($ictUsage && !$ictUsage.isEmpty())
641 + <div class="info-row">
642 + <span class="info-label">ICT活用している場面</span>
643 + <span class="info-value">
644 + <div class="selection-display">
645 + #foreach($iu in $ictUsage)
646 + <span class="selection-item">$!escapetool.xml($iu.trim())</span>
647 + #end
648 + </div>
649 + </span>
650 + </div>
651 + #end
652 + </div>
653 + </div>
654 + #end
655 +
656 + ## --- 生徒総会 ---
657 + #set($hasAssembly = ($assemblyFormat && $assemblyFormat != '') || ($assemblyCount && $assemblyCount > 0) || ($assemblyAgenda && !$assemblyAgenda.isEmpty()) || ($assemblyTopics && !$assemblyTopics.isEmpty()) || ($assemblyNote && $assemblyNote != ''))
658 + #if($hasAssembly)
659 + <div class="seitokai-subsection">
660 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 生徒総会</h3>
661 + <div class="seitokai-subsection-content">
662 + #if($assemblyFormat && $assemblyFormat != '')
663 + <div class="info-row">
664 + <span class="info-label">開催方式</span>
665 + <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($assemblyFormat)</span></span>
666 + </div>
667 + #end
668 + #if($assemblyCount && $assemblyCount > 0)
669 + <div class="info-row">
670 + <span class="info-label">開催回数（年）</span>
671 + <span class="info-value">$!escapetool.xml($assemblyCount)回</span>
672 + </div>
673 + #end
674 + #if($assemblyAgenda && !$assemblyAgenda.isEmpty())
675 + <div class="info-row">
676 + <span class="info-label">議案の集め方</span>
677 + <span class="info-value">
678 + <div class="selection-display">
679 + #foreach($aa in $assemblyAgenda)
680 + <span class="selection-item">$!escapetool.xml($aa.trim())</span>
681 + #end
682 + </div>
683 + </span>
684 + </div>
685 + #end
686 + #if($assemblyTopics && !$assemblyTopics.isEmpty())
687 + <div class="info-row">
688 + <span class="info-label">扱う内容</span>
689 + <span class="info-value">
690 + <div class="selection-display">
691 + #foreach($at in $assemblyTopics)
692 + <span class="selection-item">$!escapetool.xml($at.trim())</span>
693 + #end
694 + </div>
695 + </span>
696 + </div>
697 + #end
698 + #if($assemblyNote && $assemblyNote != '')
699 + <div class="info-row">
700 + <span class="info-label">自由記述</span>
701 + <span class="info-value free-text-value">$!escapetool.xml($assemblyNote)</span>
702 + </div>
703 + #end
704 + </div>
705 + </div>
706 + #end
707 +
708 + ## --- 広報 ---
709 + #set($hasPublicity = ($publicityMethod && !$publicityMethod.isEmpty()) || ($publicityFrequency && $publicityFrequency != '') || ($publicityNote && $publicityNote != ''))
710 + #if($hasPublicity)
711 + <div class="seitokai-subsection">
712 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M1 12s4-8 11-8 11 8 11 8-4 8-11 8-11-8-11-8z"/><circle cx="12" cy="12" r="3"/></svg> 広報</h3>
713 + <div class="seitokai-subsection-content">
714 + #if($publicityMethod && !$publicityMethod.isEmpty())
715 + <div class="info-row">
716 + <span class="info-label">方法</span>
717 + <span class="info-value">
718 + <div class="selection-display">
719 + #foreach($pm in $publicityMethod)
720 + <span class="selection-item">$!escapetool.xml($pm.trim())</span>
721 + #end
722 + </div>
723 + </span>
724 + </div>
725 + #end
726 + #if($publicityFrequency && $publicityFrequency != '')
727 + <div class="info-row">
728 + <span class="info-label">頻度</span>
729 + <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($publicityFrequency)</span></span>
730 + </div>
731 + #end
732 + #if($publicityNote && $publicityNote != '')
733 + <div class="info-row">
734 + <span class="info-label">自由記述</span>
735 + <span class="info-value free-text-value">$!escapetool.xml($publicityNote)</span>
736 + </div>
737 + #end
738 + </div>
739 + </div>
740 + #end
741 +
742 + ## --- 外部連携 ---
743 + #set($hasExternal = ($externalCooperation && $externalCooperation != '') || ($externalOrgName && $externalOrgName != '') || ($socialParticipation && !$socialParticipation.isEmpty()))
744 + #if($hasExternal)
745 + <div class="seitokai-subsection">
746 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><circle cx="18" cy="5" r="3"/><circle cx="6" cy="12" r="3"/><circle cx="18" cy="19" r="3"/><line x1="8.59" y1="13.51" x2="15.42" y2="17.49"/><line x1="15.41" y1="6.51" x2="8.59" y2="10.49"/></svg> 外部連携</h3>
747 + <div class="seitokai-subsection-content">
748 + #if($externalCooperation && $externalCooperation != '')
749 + <div class="info-row">
750 + <span class="info-label">他校の生徒会との連携</span>
751 + <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($externalCooperation)</span></span>
752 + </div>
753 + #end
754 + #if($externalOrgName && $externalOrgName != '')
755 + <div class="info-row">
756 + <span class="info-label">参加している生徒会団体の名前</span>
757 + <span class="info-value">$!escapetool.xml($externalOrgName)</span>
758 + </div>
759 + #end
760 + #if($socialParticipation && !$socialParticipation.isEmpty())
761 + <div class="info-row">
762 + <span class="info-label">社会参加・地域連携・ボランティア</span>
763 + <span class="info-value">
764 + <div class="selection-display">
765 + #foreach($sp2 in $socialParticipation)
766 + <span class="selection-item">$!escapetool.xml($sp2.trim())</span>
767 + #end
768 + </div>
769 + </span>
770 + </div>
771 + #end
772 + </div>
773 + </div>
774 + #end
775 +
776 + ## --- 年間主要行事 ---
777 + #set($months = [["4月", $eventApril], ["5月", $eventMay], ["6月", $eventJune], ["7月", $eventJuly], ["8月", $eventAugust], ["9月", $eventSeptember], ["10月", $eventOctober], ["11月", $eventNovember], ["12月", $eventDecember], ["1月", $eventJanuary], ["2月", $eventFebruary], ["3月", $eventMarch]])
778 + #set($hasAnyEvent = false)
779 + #foreach($m in $months)
780 + #if($m.get(1) && $m.get(1) != '') #set($hasAnyEvent = true) #end
781 + #end
782 + #if($hasAnyEvent)
783 + <div class="seitokai-subsection">
784 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="4" width="18" height="18" rx="2" ry="2"/><line x1="16" y1="2" x2="16" y2="6"/><line x1="8" y1="2" x2="8" y2="6"/><line x1="3" y1="10" x2="21" y2="10"/></svg> 年間主要行事</h3>
785 + <div class="seitokai-subsection-content">
786 + <table class="wiki-table school-info-table" style="margin:0">
787 + #foreach($m in $months)
788 + #if($m.get(1) && $m.get(1) != '')
789 + <tr><td style="width:60px;font-weight:600;white-space:nowrap">$m.get(0)</td><td>$!escapetool.xml($m.get(1))</td></tr>
790 + #end
791 + #end
792 + </table>
793 + </div>
794 + </div>
795 + #end
796 +
503 503   ## --- 生徒会の課題意識 ---
504 504   #if($challenges && $challenges != '')
505 505   #set($canViewChallenges = true)
506 - #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewChallenges = false)
507 - #elseif($visibilityChallenges == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ($viewerSchoolCode != $schoolCode || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewChallenges = false)
800 + #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewChallenges = false)
801 + #elseif($visibilityChallenges == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewChallenges = false)
508 508   #end
509 509   #if($canViewChallenges)
510 510   <div class="seitokai-subsection">
511 - <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>
805 + <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>
512 512   <div class="seitokai-subsection-content">
513 513   <div class="challenge-text">$!escapetool.xml($challenges)</div>
514 514   </div>
... ... @@ -532,6 +532,11 @@
532 532   <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>
533 533   <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
534 534   </table>
829 + #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
830 + #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
831 + #if($infoEditDate && $infoEditDate != '')
832 + <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>
833 + #end
535 535  </div>
536 536  
537 537  {{/html}}
... ... @@ -574,27 +574,35 @@
574 574   #end
575 575   <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
576 576   </div>
876 + <div class="activity-toolbar-right">
877 + <button class="btn-view-toggle" id="btnViewToggle" onclick="toggleCompactView()" title="タイトルのみ表示">
878 + <svg class="ico-list" viewBox="0 0 24 24" stroke="currentColor" fill="none" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><line x1="8" y1="6" x2="21" y2="6"/><line x1="8" y1="12" x2="21" y2="12"/><line x1="8" y1="18" x2="21" y2="18"/><line x1="3" y1="6" x2="3.01" y2="6"/><line x1="3" y1="12" x2="3.01" y2="12"/><line x1="3" y1="18" x2="3.01" y2="18"/></svg>
879 + <svg class="ico-detail" viewBox="0 0 24 24" stroke="currentColor" fill="none" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="3" width="7" height="7"/><rect x="14" y="3" width="7" height="7"/><rect x="3" y="14" width="7" height="7"/><rect x="14" y="14" width="7" height="7"/></svg>
880 + <span class="toggle-label">一覧表示</span>
881 + </button>
882 + </div>
577 577   <div class="author-legend-wrapper">
578 578   <button class="author-legend-toggle" onclick="this.classList.toggle('open');this.nextElementSibling.classList.toggle('open')"><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> バッジの見方 <span class="chevron">▼</span></button>
579 579   <div class="author-legend-body">
580 580   <div class="author-legend">
581 581   <span class="author-legend-title">投稿者の信頼度:</span>
582 - <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者</span>
583 - <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み</span>
584 - <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介</span>
585 - <span class="author-legend-item"><span class="bar bar-general"></span> 一般（未承認）</span>
888 + <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者 <span class="text-hint">— 運営スタッフ</span></span>
889 + <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み <span class="text-hint">— 本人確認済みのユーザー</span></span>
890 + <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介 <span class="text-hint">— 承認済みユーザーからの紹介</span></span>
891 + <span class="author-legend-item"><span class="bar bar-general"></span> 一般 <span class="text-hint">— 一般登録ユーザー</span></span>
586 586   </div>
587 587   <div class="author-legend">
588 588   <span class="author-legend-title">所属:</span>
589 - <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>
590 - <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>
591 - <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>
592 - <span class="author-legend-item text-hint">※一般アカウントは所属未確認のため非表示</span>
895 + <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>
896 + <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>
897 + <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>
898 + <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>
899 + <span class="author-legend-item text-hint">※一般アカウントは所属バッジが表示されません</span>
593 593   </div>
594 594   <div class="author-legend">
595 595   <span class="author-legend-title">役割:</span>
596 596   <span class="author-legend-item"><span class="badge badge-role-student badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M22 10v6M2 10l10-5 10 5-10 5z"/><path d="M6 12v5c0 2 4 3 6 3s6-1 6-3v-5"/></svg> 生徒</span></span>
597 - <span class="author-legend-item"><span class="badge badge-role-officer badge-sm"><svg class="ico" viewBox="0 0 24 24"><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> 役員</span></span>
904 + <span class="author-legend-item"><span class="badge badge-role-officer badge-sm"><svg class="ico" viewBox="0 0 24 24"><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> 役員</span> <span class="text-hint">生徒会役員</span></span>
598 598   <span class="author-legend-item"><span class="badge badge-role-teacher badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M20 21v-2a4 4 0 00-4-4H8a4 4 0 00-4 4v2"/><circle cx="12" cy="7" r="4"/></svg> 教員</span></span>
599 599   </div>
600 600   </div>
... ... @@ -663,10 +663,18 @@
663 663  <div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)">
664 664   <div class="activity-thread-header">
665 665   <div class="activity-thread-title">
666 - <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>
667 - <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
973 + <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>
974 + <div class="activity-meta-line">
975 + <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
976 + #set($actTagsList = $activity.getValue('tags'))
977 + #if($actTagsList && !$actTagsList.isEmpty())
978 + #foreach($tagItem in $actTagsList)
979 + #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end
980 + #end
981 + #end
982 + </div>
668 668   </div>
669 - <div class="thread-meta-row">
984 + <div class="thread-meta-right">
670 670   <span class="thread-post-count">${reportCount}件の報告 ・ ${commentCount}件のコメント</span>
671 671   #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred')
672 672   #if($actFeatured == '1')
... ... @@ -726,8 +726,8 @@
726 726   #set($postVis = $!post.getValue('visibility'))
727 727   #if(!$postVis || $postVis == '') #set($postVis = 'public') #end
728 728   #set($canViewPost = true)
729 - #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewPost = false)
730 - #elseif($postVis == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ($viewerSchoolCode != $schoolCode || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPost = false)
1044 + #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewPost = false)
1045 + #elseif($postVis == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPost = false)
731 731   #end
732 732   #if(!$canViewPost)
733 733   <div class="thread-post visibility-restricted-post">
... ... @@ -771,8 +771,11 @@
771 771   <span class="badge badge-general badge-sm">一般</span>
772 772   #end
773 773   ## 所属バッジ（投稿者の学校コードとページの学校コードを比較）
1089 + #set($postIsSchoolMatch = ($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode)))
774 774   #if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general')
775 - #if($postSchoolCode == $schoolCode)
1091 + #if($postUserRole == 'graduate' && $postIsSchoolMatch)
1092 + <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>
1093 + #elseif($postIsSchoolMatch && $postUserRole != 'graduate')
776 776   #if($postAccountType == 'verified' || $postAccountType == 'admin')
777 777   <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>
778 778   #else
... ... @@ -799,6 +799,13 @@
799 799   #if($postEdited == 1 || $postEdited == '1')
800 800   <span class="post-edited-label">（編集済み）</span>
801 801   #end
1120 + #set($postAuthorRefH = $!post.getValue('authorRef'))
1121 + #set($postObjNumH = $post.number)
1122 + #if(!$isGuest && $xcontext.user != $postAuthorRefH)
1123 + <button type="button" class="btn-post-report btn-post-report-header" onclick="openReportDialog(this, '${doc.fullName}', $postObjNumH, '${services.csrf.getToken()}')" title="この投稿を通報">
1124 + <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> 通報
1125 + </button>
1126 + #end
802 802   </div>
803 803   <div class="thread-post-body">
804 804   $!escapetool.xml($!postContent)
... ... @@ -863,12 +863,18 @@
863 863   #end
864 864   </div>
865 865   #if($postVis != 'public')
866 - <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>
1191 + <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>
867 867   #end
868 - ## 固定/解除ボタン（承認済み・管理者のみ）
869 - #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
870 - #set($postObjNum = $post.number)
871 - <div class="post-pin-action post-action-mt">
1193 + ## 固定/編集/削除/通報/非表示ボタン（横並び）
1194 + #set($postAuthorRef = $!post.getValue('authorRef'))
1195 + #set($postObjNumED = $post.number)
1196 + #set($showPinBtn = ($viewerAccountType == 'admin' || $viewerAccountType == 'verified'))
1197 + #set($showEditDeleteBtn = ($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin'))
1198 + #set($showHideBtn = ($viewerAccountType == 'admin'))
1199 + #if($showPinBtn || $showEditDeleteBtn || $showHideBtn)
1200 + <div class="post-edit-actions post-action-mt">
1201 + #if($showPinBtn)
1202 + #set($postObjNum = $post.number)
872 872   #if($isPinned == '1')
873 873   <a href="$doc.getURL('view', "action=unpin&postObj=${postObjNum}&form_token=${services.csrf.getToken()}")" class="btn-pin-toggle btn-unpin" title="固定を解除">
874 874   <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> 固定を解除
... ... @@ -878,15 +878,12 @@
878 878   <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> 固定する
879 879   </a>
880 880   #end
881 - </div>
882 - #end
883 - ## 編集・削除ボタン（投稿者本人 or 管理者）
884 - #set($postAuthorRef = $!post.getValue('authorRef'))
885 - #set($postObjNumED = $post.number)
886 - #if($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin')
887 - <div class="post-edit-actions post-action-mt">
1212 + #end
1213 + #if($showEditDeleteBtn)
888 888   #if($xcontext.user == $postAuthorRef)
889 - <button type="button" class="btn-post-edit" onclick="openEditPost(this, '${doc.fullName}', $postObjNumED, '$!escapetool.javascript($!postContent)')" title="この投稿を編集">
1215 + #set($editImages = $!post.getValue('images'))
1216 + #set($editFiles = $!post.getValue('files'))
1217 + <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="この投稿を編集">
890 890   <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> 編集
891 891   </button>
892 892   #end
... ... @@ -893,6 +893,12 @@
893 893   <button type="button" class="btn-post-delete" onclick="confirmDeletePost('${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を削除">
894 894   <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> 削除
895 895   </button>
1224 + #end
1225 + #if($showHideBtn)
1226 + <button type="button" class="btn-post-hide" onclick="openHideDialog(this, '${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を非表示にする">
1227 + <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> 非表示
1228 + </button>
1229 + #end
896 896   </div>
897 897   #end
898 898   </div>
... ... @@ -942,9 +942,11 @@
942 942  
943 943   #if($xcontext.user != "XWiki.XWikiGuest")
944 944   <div class="thread-add-post">
1279 + #if($isSchoolMember || $isAlumniOfSchool || $isViewerAdmin)
945 945   <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
946 946   ＋ 活動報告を追加
947 947   </a>
1283 + #end
948 948   <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
949 949   <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> コメントを書く
950 950   </a>
... ... @@ -977,6 +977,35 @@
977 977  ## --- 年度タブ切り替え JavaScript ---
978 978  {{html clean="false"}}
979 979  <script>
1316 +// コンパクト表示（タイトルのみ）トグル
1317 +function toggleCompactView() {
1318 + var container = document.querySelector('.xwiki-content') || document.body;
1319 + var isCompact = container.classList.toggle('activity-compact-view');
1320 + var btn = document.getElementById('btnViewToggle');
1321 + if (btn) {
1322 + btn.querySelector('.toggle-label').textContent = isCompact ? '詳細表示' : '一覧表示';
1323 + btn.title = isCompact ? '詳細表示に戻す' : 'タイトルのみ表示';
1324 + }
1325 + // コンパクトモードでは各スレッドヘッダーをクリックで個別展開可能にする
1326 + document.querySelectorAll('.activity-thread').forEach(function(thread) {
1327 + if (isCompact) {
1328 + thread.classList.remove('compact-expanded');
1329 + }
1330 + });
1331 +}
1332 +
1333 +// コンパクトモードで個別スレッドを展開/折りたたみ
1334 +function toggleThreadExpand(e) {
1335 + var container = document.querySelector('.xwiki-content') || document.body;
1336 + if (!container.classList.contains('activity-compact-view')) return;
1337 + // リンクやボタンのクリックはスルー
1338 + if (e.target.closest('a, button, .btn-featured-toggle')) return;
1339 + var thread = e.target.closest('.activity-thread');
1340 + if (thread) {
1341 + thread.classList.toggle('compact-expanded');
1342 + }
1343 +}
1344 +
980 980  function switchActivityFY(fy, btn) {
981 981   // タブのアクティブ状態を切り替え
982 982   document.querySelectorAll('.activity-fy-tab').forEach(function(t) { t.classList.remove('active'); });
... ... @@ -992,6 +992,27 @@
992 992  }
993 993  // ページ読み込み時の初期化
994 994  document.addEventListener('DOMContentLoaded', function() {
1360 + // 年度タブを降順にソート（「全期間」タブは末尾に固定）
1361 + var tabContainer = document.querySelector('.activity-fy-tabs');
1362 + if (tabContainer) {
1363 + var tabs = Array.from(tabContainer.querySelectorAll('.activity-fy-tab'));
1364 + var allTab = null;
1365 + var fyTabs = [];
1366 + tabs.forEach(function(t) {
1367 + var onclickStr = t.getAttribute('onclick') || '';
1368 + if (onclickStr.indexOf("'all'") !== -1) { allTab = t; }
1369 + else { fyTabs.push(t); }
1370 + });
1371 + // 年度タブを数値の降順でソート
1372 + fyTabs.sort(function(a, b) {
1373 + var aYear = parseInt(a.textContent) || 0;
1374 + var bYear = parseInt(b.textContent) || 0;
1375 + return bYear - aYear;
1376 + });
1377 + // DOM再配置
1378 + fyTabs.forEach(function(t) { tabContainer.appendChild(t); });
1379 + if (allTab) { tabContainer.appendChild(allTab); }
1380 + }
995 995   // デフォルトで現在の年度を表示
996 996   var defaultTab = document.querySelector('.activity-fy-tab.active');
997 997   if (defaultTab) { defaultTab.click(); }
... ... @@ -1003,6 +1003,30 @@
1003 1003   window.history.replaceState({}, document.title, window.location.pathname);
1004 1004   }
1005 1005   }
1392 + // コンパクトモード: スレッドヘッダークリックで個別展開
1393 + document.querySelectorAll('.activity-thread-header').forEach(function(header) {
1394 + header.addEventListener('click', toggleThreadExpand);
1395 + });
1396 + // 長文投稿の折りたたみ初期化（max-height: 12em 超で省略）
1397 + document.querySelectorAll('.thread-post-body').forEach(function(body) {
1398 + // pre-wrapのまま高さを測定し、max-height(12em ≒ ~200px)を超える場合に折りたたむ
1399 + var fullH = body.scrollHeight;
1400 + // 12em を px に変換（font-size × line-height × 行数 の近似値ではなくCSSと同じ値を取得）
1401 + body.classList.add('truncated');
1402 + var maxH = body.clientHeight; // max-height: 12em 適用後の高さ
1403 + body.classList.remove('truncated');
1404 + if (fullH > maxH + 30) {
1405 + body.classList.add('truncated');
1406 + var btn = document.createElement('button');
1407 + btn.className = 'btn-read-more';
1408 + btn.textContent = '広げて読む ▼';
1409 + btn.addEventListener('click', function() {
1410 + var isExpanded = body.classList.toggle('expanded');
1411 + btn.textContent = isExpanded ? '折りたたむ ▲' : '広げて読む ▼';
1412 + });
1413 + body.parentNode.insertBefore(btn, body.nextSibling);
1414 + }
1415 + });
1006 1006  });
1007 1007  
1008 1008  // トースト通知表示
... ... @@ -1037,37 +1037,130 @@
1037 1037  }
1038 1038  
1039 1039  // 投稿の編集（インライン編集フォームを開く）
1040 -function openEditPost(btn, schoolPage, postObjNum, currentContent) {
1450 +function openEditPost(btn) {
1041 1041   var postEl = btn.closest('.thread-post');
1042 1042   if (!postEl) return;
1043 - // 既存の編集フォームがあれば閉じる
1044 1044   var existing = postEl.querySelector('.post-edit-form');
1045 1045   if (existing) { existing.remove(); return; }
1046 1046   var bodyEl = postEl.querySelector('.thread-post-body');
1047 1047   if (!bodyEl) return;
1457 +
1458 + var schoolPage = btn.getAttribute('data-school');
1459 + var postObjNum = btn.getAttribute('data-obj');
1460 + var currentContent = btn.getAttribute('data-content') || '';
1461 + var currentImages = btn.getAttribute('data-images') || '';
1462 + var currentFiles = btn.getAttribute('data-files') || '';
1463 + var postType = btn.getAttribute('data-post-type') || 'report';
1464 +
1048 1048   var form = document.createElement('div');
1049 1049   form.className = 'post-edit-form';
1050 - form.innerHTML = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>' +
1051 - '<div class="post-edit-form-actions">' +
1467 + form.setAttribute('data-school', schoolPage);
1468 + form.setAttribute('data-obj', postObjNum);
1469 +
1470 + var html = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>';
1471 +
1472 + // コメント以外は添付ファイル編集を表示
1473 + if (postType !== 'comment') {
1474 + // 既存画像
1475 + html += '<div class="edit-attachments">';
1476 + if (currentImages.trim()) {
1477 + html += '<div class="edit-attach-section"><span class="edit-attach-label">画像</span>';
1478 + var imgs = currentImages.trim().split('\n');
1479 + for (var i = 0; i < imgs.length; i++) {
1480 + var img = imgs[i].trim();
1481 + if (!img) continue;
1482 + html += '<div class="edit-attach-item" data-name="' + img.replace(/"/g,'&quot;') + '">' +
1483 + '<img src="/xwiki/bin/download/' + schoolPage.replace(/\./g,'/') + '/' + encodeURIComponent(img) + '" class="edit-attach-thumb" />' +
1484 + '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1485 + '<input type="hidden" name="keepImages" value="' + img.replace(/"/g,'&quot;') + '" />' +
1486 + '</div>';
1487 + }
1488 + html += '</div>';
1489 + }
1490 + // 既存ファイル
1491 + if (currentFiles.trim()) {
1492 + html += '<div class="edit-attach-section"><span class="edit-attach-label">ファイル</span>';
1493 + var files = currentFiles.trim().split('\n');
1494 + for (var j = 0; j < files.length; j++) {
1495 + var f = files[j].trim();
1496 + if (!f) continue;
1497 + var displayName = f;
1498 + if (/^file_\d{14}_\d+_/.test(f)) displayName = f.replace(/^file_\d{14}_\d+_/, '');
1499 + html += '<div class="edit-attach-item" data-name="' + f.replace(/"/g,'&quot;') + '">' +
1500 + '<span class="edit-attach-fname">' + displayName.replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</span>' +
1501 + '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1502 + '<input type="hidden" name="keepFiles" value="' + f.replace(/"/g,'&quot;') + '" />' +
1503 + '</div>';
1504 + }
1505 + html += '</div>';
1506 + }
1507 + // 新規追加
1508 + html += '<div class="edit-attach-add">' +
1509 + '<label class="form-label-sm">画像を追加（最大4枚まで）</label>' +
1510 + '<input type="file" name="editNewImages" accept="image/*" multiple class="form-file-input-sm" />' +
1511 + '<div class="form-hint">JPEG / PNG / GIF / WebP、各5MBまで</div>' +
1512 + '<label class="form-label-sm" style="margin-top:8px;">ファイルを追加（最大2つまで）</label>' +
1513 + '<input type="file" name="editNewFiles" accept=".pdf,.docx,.xlsx,.pptx" multiple class="form-file-input-sm" />' +
1514 + '<div class="form-hint">PDF / Word / Excel / PowerPoint、各10MBまで</div>' +
1515 + '</div>';
1516 + html += '</div>';
1517 + }
1518 +
1519 + html += '<div class="post-edit-form-actions">' +
1052 1052   '<button type="button" class="btn-cancel-edit" onclick="this.closest(\'.post-edit-form\').remove()">キャンセル</button>' +
1053 - '<button type="button" class="btn-save" onclick="saveEditPost(\'' + schoolPage + '\', ' + postObjNum + ')">保存</button>' +
1521 + '<button type="button" class="btn-save" onclick="saveEditPost(this)">保存</button>' +
1054 1054   '</div>';
1523 +
1524 + form.innerHTML = html;
1055 1055   bodyEl.parentNode.insertBefore(form, bodyEl.nextSibling);
1056 1056   form.querySelector('textarea').focus();
1057 1057  }
1058 1058  
1529 +function removeEditAttach(btn) {
1530 + var item = btn.closest('.edit-attach-item');
1531 + if (item) item.remove();
1532 +}
1533 +
1059 1059  // 投稿の編集を保存
1060 -function saveEditPost(schoolPage, postObjNum) {
1061 - var textarea = document.getElementById('editContent_' + postObjNum);
1535 +function saveEditPost(btn) {
1536 + var formEl = btn.closest('.post-edit-form');
1537 + if (!formEl) return;
1538 + var schoolPage = formEl.getAttribute('data-school');
1539 + var postObjNum = formEl.getAttribute('data-obj');
1540 + var textarea = formEl.querySelector('textarea');
1062 1062   if (!textarea) return;
1063 1063   var newContent = textarea.value.trim();
1064 1064   if (!newContent) { alert('投稿内容を入力してください'); return; }
1544 +
1065 1065   var csrfEl = document.querySelector('input[name="form_token"]');
1066 1066   var csrfToken = csrfEl ? csrfEl.value : '';
1547 +
1548 + var fd = new FormData();
1549 + fd.append('schoolPage', schoolPage);
1550 + fd.append('postObj', postObjNum);
1551 + fd.append('newContent', newContent);
1552 + fd.append('form_token', csrfToken);
1553 +
1554 + // 残す画像・ファイル
1555 + formEl.querySelectorAll('input[name="keepImages"]').forEach(function(el) { fd.append('keepImages', el.value); });
1556 + formEl.querySelectorAll('input[name="keepFiles"]').forEach(function(el) { fd.append('keepFiles', el.value); });
1557 +
1558 + // 新規画像
1559 + var newImgInput = formEl.querySelector('input[name="editNewImages"]');
1560 + if (newImgInput && newImgInput.files) {
1561 + for (var i = 0; i < newImgInput.files.length; i++) { fd.append('editNewImages', newImgInput.files[i]); }
1562 + }
1563 + // 新規ファイル
1564 + var newFileInput = formEl.querySelector('input[name="editNewFiles"]');
1565 + if (newFileInput && newFileInput.files) {
1566 + for (var j = 0; j < newFileInput.files.length; j++) { fd.append('editNewFiles', newFileInput.files[j]); }
1567 + }
1568 +
1569 + btn.disabled = true;
1570 + btn.textContent = '保存中...';
1571 +
1067 1067   var xhr = new XMLHttpRequest();
1068 - xhr.open('POST', '/bin/SeitokaiCode/EditPost?outputSyntax=plain', true);
1069 - xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1070 - var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken);
1573 + xhr.open('POST', '/bin/get/SeitokaiCode/EditPost?outputSyntax=plain', true);
1071 1071   xhr.onload = function() {
1072 1072   try {
1073 1073   var res = JSON.parse(xhr.responseText);
... ... @@ -1075,12 +1075,13 @@
1075 1075   showToast('投稿を更新しました', 'success');
1076 1076   setTimeout(function() { location.reload(); }, 800);
1077 1077   } else {
1581 + btn.disabled = false; btn.textContent = '保存';
1078 1078   alert('編集に失敗しました: ' + (res.error || ''));
1079 1079   }
1080 - } catch(e) { alert('編集に失敗しました'); }
1584 + } catch(e) { btn.disabled = false; btn.textContent = '保存'; alert('編集に失敗しました'); }
1081 1081   };
1082 - xhr.onerror = function() { alert('通信エラーが発生しました'); };
1083 - xhr.send(editPostData);
1586 + xhr.onerror = function() { btn.disabled = false; btn.textContent = '保存'; alert('通信エラーが発生しました'); };
1587 + xhr.send(fd);
1084 1084  }
1085 1085  
1086 1086  // 投稿の削除（確認ダイアログ付き）
... ... @@ -1087,7 +1087,7 @@
1087 1087  function confirmDeletePost(schoolPage, postObjNum, token) {
1088 1088   if (!confirm('この投稿を削除しますか？\\n削除後は「この投稿は削除されました」と表示されます。')) return;
1089 1089   var xhr = new XMLHttpRequest();
1090 - xhr.open('POST', '/bin/SeitokaiCode/DeletePost?outputSyntax=plain', true);
1594 + xhr.open('POST', '/bin/get/SeitokaiCode/DeletePost?outputSyntax=plain', true);
1091 1091   xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1092 1092   var deletePostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token);
1093 1093   xhr.onload = function() {
... ... @@ -1104,6 +1104,80 @@
1104 1104   xhr.onerror = function() { alert('通信エラーが発生しました'); };
1105 1105   xhr.send(deletePostData);
1106 1106  }
1611 +
1612 +/* --- 通報ダイアログ --- */
1613 +function openReportDialog(btn, targetPage, postObjNum, token) {
1614 + if (document.getElementById('report-dialog-overlay')) return;
1615 + var reasons = ['宣伝・スパム','不適切な内容','個人情報の露出','誹謗中傷','誤情報','その他'];
1616 + var overlay = document.createElement('div');
1617 + overlay.id = 'report-dialog-overlay';
1618 + 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;';
1619 + var dialog = document.createElement('div');
1620 + dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;max-height:80vh;overflow-y:auto;';
1621 + var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を通報</h3>';
1622 + html += '<p style="margin:0 0 12px;font-size:0.9em;color:#4b5563;">通報された投稿は管理者が確認するまで一時的に非表示になります。</p>';
1623 + html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">通報理由</label>';
1624 + html += '<select id="report-reason" style="width:100%;padding:8px;border:1px solid #d1d5db;border-radius:8px;margin-bottom:12px;font-size:0.9em;">';
1625 + for (var i=0; i<reasons.length; i++) html += '<option value="'+reasons[i]+'">'+reasons[i]+'</option>';
1626 + html += '</select>';
1627 + html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">補足コメント（任意）</label>';
1628 + 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>';
1629 + html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
1630 + html += '<button type="button" id="report-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
1631 + 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>';
1632 + html += '</div>';
1633 + dialog.innerHTML = html;
1634 + overlay.appendChild(dialog);
1635 + document.body.appendChild(overlay);
1636 + overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
1637 + document.getElementById('report-cancel-btn').addEventListener('click', function() { overlay.remove(); });
1638 + document.getElementById('report-submit-btn').addEventListener('click', function() {
1639 + var reason = document.getElementById('report-reason').value;
1640 + var detail = document.getElementById('report-detail').value;
1641 + var submitBtn = document.getElementById('report-submit-btn');
1642 + submitBtn.disabled = true; submitBtn.textContent = '送信中...';
1643 + var xhr = new XMLHttpRequest();
1644 + xhr.open('POST', '/bin/get/SeitokaiCode/ReportAction?outputSyntax=plain', true);
1645 + xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1646 + var data = 'targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&detail=' + encodeURIComponent(detail) + '&form_token=' + encodeURIComponent(token);
1647 + xhr.onload = function() {
1648 + overlay.remove();
1649 + showToast('通報を受け付けました', 'success');
1650 + setTimeout(function() { location.reload(); }, 1000);
1651 + };
1652 + xhr.onerror = function() { overlay.remove(); alert('通信エラーが発生しました'); };
1653 + xhr.send(data);
1654 + });
1655 +}
1656 +
1657 +/* --- 非表示ダイアログ（管理者用） --- */
1658 +function openHideDialog(btn, targetPage, postObjNum, token) {
1659 + if (document.getElementById('hide-dialog-overlay')) return;
1660 + var overlay = document.createElement('div');
1661 + overlay.id = 'hide-dialog-overlay';
1662 + 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;';
1663 + var dialog = document.createElement('div');
1664 + dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;';
1665 + var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を非表示にする</h3>';
1666 + html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">非表示の理由</label>';
1667 + 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="理由を入力" />';
1668 + html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
1669 + html += '<button type="button" id="hide-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
1670 + 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>';
1671 + 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>';
1672 + html += '</div>';
1673 + dialog.innerHTML = html;
1674 + overlay.appendChild(dialog);
1675 + document.body.appendChild(overlay);
1676 + overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
1677 + document.getElementById('hide-cancel-btn').addEventListener('click', function() { overlay.remove(); });
1678 + function doHide(action) {
1679 + var reason = document.getElementById('hide-reason').value || '管理者判断';
1680 + window.location.href = '/bin/view/SeitokaiCode/ModerationAction?action=' + action + '&targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&form_token=' + encodeURIComponent(token);
1681 + }
1682 + document.getElementById('hide-submit-btn').addEventListener('click', function() { doHide('hide'); });
1683 + document.getElementById('hide-warn-btn').addEventListener('click', function() { doHide('hide-warn'); });
1684 +}
1107 1107  </script>
1108 1108  {{/html}}
1109 1109  {{/velocity}}