Skip to Content
Last modified by Super Admin on 2026/04/05 18:59
From version Icon 64.1 Icon
edited by Super Admin
on 2026/03/18 03:55
Change comment: There is no comment for this version
To version Icon 85.1 Icon
edited by Super Admin
on 2026/03/20 01:46
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  
... ... @@ -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'))
106 + #set($viewerSecondarySchoolCode = $!viewerDoc.getValue('secondarySchoolCode'))
107 + #set($viewerUserRole = $!viewerDoc.getValue('userRole'))
98 98   #if($viewerAccountType == 'admin')
99 99   #set($isViewerAdmin = true)
100 100   #end
101 101  #end
102 102  
113 +## --- 関連校（中高一貫校）情報 ---
114 +#set($affiliatedSchoolCode = $!doc.getValue('affiliatedSchoolCode'))
115 +#set($affiliatedSchoolName = $!doc.getValue('affiliatedSchoolName'))
116 +#set($isAffiliated = false)
117 +#if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
118 + #if($viewerSchoolCode == $affiliatedSchoolCode)
119 + #set($isAffiliated = true)
120 + #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode)
121 + #set($isAffiliated = true)
122 + #end
123 +#end
124 +
125 +## --- 校内判定（卒業生を除外、secondarySchoolCodeも含む） ---
126 +#set($isSchoolMember = false)
127 +#if(!$isGuest && $viewerUserRole != 'graduate')
128 + #if($viewerSchoolCode == $schoolCode || $isAffiliated)
129 + #set($isSchoolMember = true)
130 + #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode)
131 + #set($isSchoolMember = true)
132 + #end
133 +#end
134 +## 卒業生の母校判定（投稿バッジ用）
135 +#set($isAlumniOfSchool = false)
136 +#if(!$isGuest && $viewerUserRole == 'graduate')
137 + #if($viewerSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $viewerSchoolCode == $affiliatedSchoolCode))
138 + #set($isAlumniOfSchool = true)
139 + #end
140 +#end
141 +
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))
175 +#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))
205 +#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))
307 +#if(!$isGuest && ($isViewerAdmin || $isSchoolMember))
269 269   #set($canEditSchool = true)
270 270  #end
271 271  #if($canEditSchool)
... ... @@ -274,20 +274,50 @@
274 274  </div>
275 275  #end
276 276  
316 +## --- 関連校（中高一貫校）バナー ---
317 +#if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
318 + #set($affiliatedPageRef = "Schools.${affiliatedSchoolCode}.WebHome")
319 + #set($affiliatedPageExists = $xwiki.exists($affiliatedPageRef))
320 +<div class="affiliated-school-banner">
321 + <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>
322 + <div>
323 + <strong>中高一貫校</strong>：
324 + #if($affiliatedPageExists)
325 + <a href="$xwiki.getURL($affiliatedPageRef, 'view')">$!escapetool.xml($affiliatedSchoolName)</a>
326 + #else
327 + $!escapetool.xml($affiliatedSchoolName)
328 + #end
329 + と連携しています
330 + </div>
331 +</div>
332 +#end
333 +
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>
337 + <div class="school-basic-info-layout">
338 + <div class="school-basic-info-table">
339 + <table class="wiki-table school-info-table">
340 + <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
341 + <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
342 + <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
343 + <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
344 + <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
345 + <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
346 + <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
347 + <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
348 + <tr><th>公式サイト</th><td>#if($website && $website != '')<a href="$!escapetool.xml($website)" target="_blank" rel="noopener">$!escapetool.xml($website)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
349 + </table>
350 + </div>
351 + #if($schoolPhoto && $schoolPhoto != '')
352 + <div class="school-photo-area">
353 + <img src="$doc.getAttachmentURL($schoolPhoto)" alt="$!escapetool.xml($schoolName)" class="school-photo" />
354 + </div>
355 + #end
356 + </div>
357 + #if($schoolDescription && $schoolDescription.trim() != '')
358 + <div class="free-note" style="margin-top:var(--sp-4);">$!escapetool.xml($schoolDescription)</div>
359 + #end
291 291   #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
292 292   #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
293 293   #if($infoEditDate && $infoEditDate != '')
... ... @@ -300,25 +300,25 @@
300 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>
301 301   <div class="seitokai-info-body">
302 302  
303 - ## --- 組織図 ---
372 + ## --- 生徒会組織 ---
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)
376 + #if($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewOrgChart = false)
377 + #elseif($visibilityOrgChart == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewOrgChart = false)
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>
381 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/><line x1="9" y1="10" x2="9" y2="10.01"/><line x1="15" y1="10" x2="15" y2="10.01"/><line x1="9" y1="14" x2="9" y2="14.01"/><line x1="15" y1="14" x2="15" y2="14.01"/></svg> 生徒会組織 #if($visibilityOrgChart != 'public')<span class="visibility-badge visibility-${visibilityOrgChart}">#if($visibilityOrgChart == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
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
386 + #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>
390 + <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 生徒会組織は #if($visibilityOrgChart == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
322 322   #end
323 323   #end
324 324  
... ... @@ -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)
456 + #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewBudget = false)
457 + #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false)
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>
461 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><line x1="12" y1="1" x2="12" y2="23"/><path d="M17 5H9.5a3.5 3.5 0 000 7h5a3.5 3.5 0 010 7H6"/></svg> 予算 #if($visibilityBudget != 'public')<span class="visibility-badge visibility-${visibilityBudget}">#if($visibilityBudget == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
393 393   <div class="seitokai-subsection-content">
394 394   #if($budgetProcess && !$budgetProcess.isEmpty())
395 395   <div class="info-row">
... ... @@ -440,12 +440,12 @@
440 440   ## --- 校則の見直し ---
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)
512 + #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewRuleReview = false)
513 + #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false)
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>
517 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M16 4h2a2 2 0 012 2v12a2 2 0 01-2 2h-2"/><path d="M8 4H6a2 2 0 00-2 2v12a2 2 0 002 2h2"/><line x1="12" y1="4" x2="12" y2="8"/><line x1="12" y1="16" x2="12" y2="20"/><line x1="8" y1="8" x2="16" y2="8"/><line x1="8" y1="16" x2="16" y2="16"/></svg> 校則の見直し #if($visibilityRuleReview != 'public')<span class="visibility-badge visibility-${visibilityRuleReview}">#if($visibilityRuleReview == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
449 449   <div class="seitokai-subsection-content">
450 450   <div class="info-row">
451 451   <span class="info-label">見直しの有無（3年以内）</span>
... ... @@ -503,12 +503,12 @@
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)
575 + #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewChallenges = false)
576 + #elseif($visibilityChallenges == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewChallenges = false)
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>
580 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M12 16v-4"/><path d="M12 8h.01"/></svg> 生徒会の課題意識 #if($visibilityChallenges != 'public')<span class="visibility-badge visibility-${visibilityChallenges}">#if($visibilityChallenges == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
512 512   <div class="seitokai-subsection-content">
513 513   <div class="challenge-text">$!escapetool.xml($challenges)</div>
514 514   </div>
... ... @@ -574,27 +574,35 @@
574 574   #end
575 575   <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
576 576   </div>
646 + <div class="activity-toolbar-right">
647 + <button class="btn-view-toggle" id="btnViewToggle" onclick="toggleCompactView()" title="タイトルのみ表示">
648 + <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>
649 + <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>
650 + <span class="toggle-label">一覧表示</span>
651 + </button>
652 + </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>
658 + <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者 <span class="text-hint">— 運営スタッフ</span></span>
659 + <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み <span class="text-hint">— 本人確認済みのユーザー</span></span>
660 + <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介 <span class="text-hint">— 承認済みユーザーからの紹介</span></span>
661 + <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>
665 + <span class="author-legend-item"><span class="badge badge-school-internal-confirmed badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内（確認済）</span> <span class="text-hint">所属が確認されたこの学校のユーザー</span></span>
666 + <span class="author-legend-item"><span class="badge badge-school-internal badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内</span> <span class="text-hint">この学校に所属登録しているユーザー</span></span>
667 + <span class="author-legend-item"><span class="badge badge-alumni badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M22 10l-10-5L2 10l10 5 10-5z"/><path d="M6 12v5c0 1.66 2.69 3 6 3s6-1.34 6-3v-5"/></svg> 卒業生</span> <span class="text-hint">この学校の卒業生</span></span>
668 + <span class="author-legend-item"><span class="badge badge-school-external badge-sm"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M2 12h20"/><path d="M12 2a15.3 15.3 0 014 10 15.3 15.3 0 01-4 10 15.3 15.3 0 01-4-10 15.3 15.3 0 014-10z"/></svg> 他校</span> <span class="text-hint">別の学校に所属しているユーザー</span></span>
669 + <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>
674 + <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,16 +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>
668 - #set($actTagsList = $activity.getValue('tags'))
669 - #if($actTagsList && !$actTagsList.isEmpty())
670 - #foreach($tagItem in $actTagsList)
671 - #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end
743 + <h3 #if($actFeatured == '1')class="featured-title"#end>#if($actFeatured == '1')<svg class="ico ico-fixed-14 ico-star-offset" viewBox="0 0 24 24" fill="currentColor" stroke="none"><polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"/></svg> #end$!escapetool.xml($!actTitle)</h3>
744 + <div class="activity-meta-line">
745 + <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
746 + #set($actTagsList = $activity.getValue('tags'))
747 + #if($actTagsList && !$actTagsList.isEmpty())
748 + #foreach($tagItem in $actTagsList)
749 + #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end
750 + #end
672 672   #end
673 - #end
752 + </div>
674 674   </div>
675 - <div class="thread-meta-row">
754 + <div class="thread-meta-right">
676 676   <span class="thread-post-count">${reportCount}件の報告 ・ ${commentCount}件のコメント</span>
677 677   #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred')
678 678   #if($actFeatured == '1')
... ... @@ -732,8 +732,8 @@
732 732   #set($postVis = $!post.getValue('visibility'))
733 733   #if(!$postVis || $postVis == '') #set($postVis = 'public') #end
734 734   #set($canViewPost = true)
735 - #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewPost = false)
736 - #elseif($postVis == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ($viewerSchoolCode != $schoolCode || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPost = false)
814 + #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewPost = false)
815 + #elseif($postVis == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPost = false)
737 737   #end
738 738   #if(!$canViewPost)
739 739   <div class="thread-post visibility-restricted-post">
... ... @@ -777,8 +777,11 @@
777 777   <span class="badge badge-general badge-sm">一般</span>
778 778   #end
779 779   ## 所属バッジ（投稿者の学校コードとページの学校コードを比較）
859 + #set($postIsSchoolMatch = ($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode)))
780 780   #if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general')
781 - #if($postSchoolCode == $schoolCode)
861 + #if($postUserRole == 'graduate' && $postIsSchoolMatch)
862 + <span class="badge badge-alumni badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M22 10l-10-5L2 10l10 5 10-5z"/><path d="M6 12v5c0 1.66 2.69 3 6 3s6-1.34 6-3v-5"/></svg> 卒業生</span>
863 + #elseif($postIsSchoolMatch && $postUserRole != 'graduate')
782 782   #if($postAccountType == 'verified' || $postAccountType == 'admin')
783 783   <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>
784 784   #else
... ... @@ -805,6 +805,13 @@
805 805   #if($postEdited == 1 || $postEdited == '1')
806 806   <span class="post-edited-label">（編集済み）</span>
807 807   #end
890 + #set($postAuthorRefH = $!post.getValue('authorRef'))
891 + #set($postObjNumH = $post.number)
892 + #if(!$isGuest && $xcontext.user != $postAuthorRefH)
893 + <button type="button" class="btn-post-report btn-post-report-header" onclick="openReportDialog(this, '${doc.fullName}', $postObjNumH, '${services.csrf.getToken()}')" title="この投稿を通報">
894 + <svg class="ico ico-fixed-14" viewBox="0 0 24 24"><path d="M4 15s1-1 4-1 5 2 8 2 4-1 4-1V3s-1 1-4 1-5-2-8-2-4 1-4 1z"/><line x1="4" y1="22" x2="4" y2="15"/></svg> 通報
895 + </button>
896 + #end
808 808   </div>
809 809   <div class="thread-post-body">
810 810   $!escapetool.xml($!postContent)
... ... @@ -869,12 +869,18 @@
869 869   #end
870 870   </div>
871 871   #if($postVis != 'public')
872 - <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>
961 + <div class="visibility-badge visibility-${postVis} post-action-mt">#if($postVis == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</div>
873 873   #end
874 - ## 固定/解除ボタン（承認済み・管理者のみ）
875 - #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
876 - #set($postObjNum = $post.number)
877 - <div class="post-pin-action post-action-mt">
963 + ## 固定/編集/削除/通報/非表示ボタン（横並び）
964 + #set($postAuthorRef = $!post.getValue('authorRef'))
965 + #set($postObjNumED = $post.number)
966 + #set($showPinBtn = ($viewerAccountType == 'admin' || $viewerAccountType == 'verified'))
967 + #set($showEditDeleteBtn = ($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin'))
968 + #set($showHideBtn = ($viewerAccountType == 'admin'))
969 + #if($showPinBtn || $showEditDeleteBtn || $showHideBtn)
970 + <div class="post-edit-actions post-action-mt">
971 + #if($showPinBtn)
972 + #set($postObjNum = $post.number)
878 878   #if($isPinned == '1')
879 879   <a href="$doc.getURL('view', "action=unpin&postObj=${postObjNum}&form_token=${services.csrf.getToken()}")" class="btn-pin-toggle btn-unpin" title="固定を解除">
880 880   <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> 固定を解除
... ... @@ -884,15 +884,12 @@
884 884   <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> 固定する
885 885   </a>
886 886   #end
887 - </div>
888 - #end
889 - ## 編集・削除ボタン（投稿者本人 or 管理者）
890 - #set($postAuthorRef = $!post.getValue('authorRef'))
891 - #set($postObjNumED = $post.number)
892 - #if($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin')
893 - <div class="post-edit-actions post-action-mt">
982 + #end
983 + #if($showEditDeleteBtn)
894 894   #if($xcontext.user == $postAuthorRef)
895 - <button type="button" class="btn-post-edit" onclick="openEditPost(this, '${doc.fullName}', $postObjNumED, '$!escapetool.javascript($!postContent)')" title="この投稿を編集">
985 + #set($editImages = $!post.getValue('images'))
986 + #set($editFiles = $!post.getValue('files'))
987 + <button type="button" class="btn-post-edit" data-school="${doc.fullName}" data-obj="$postObjNumED" data-content="$!escapetool.xml($!postContent)" data-images="$!escapetool.xml($!editImages)" data-files="$!escapetool.xml($!editFiles)" data-post-type="$!post.getValue('postType')" onclick="openEditPost(this)" title="この投稿を編集">
896 896   <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> 編集
897 897   </button>
898 898   #end
... ... @@ -899,6 +899,12 @@
899 899   <button type="button" class="btn-post-delete" onclick="confirmDeletePost('${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を削除">
900 900   <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> 削除
901 901   </button>
994 + #end
995 + #if($showHideBtn)
996 + <button type="button" class="btn-post-hide" onclick="openHideDialog(this, '${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を非表示にする">
997 + <svg class="ico ico-fixed-14" viewBox="0 0 24 24"><path d="M17.94 17.94A10.07 10.07 0 0112 20c-7 0-11-8-11-8a18.45 18.45 0 015.06-5.94M9.9 4.24A9.12 9.12 0 0112 4c7 0 11 8 11 8a18.5 18.5 0 01-2.16 3.19m-6.72-1.07a3 3 0 11-4.24-4.24"/><line x1="1" y1="1" x2="23" y2="23"/></svg> 非表示
998 + </button>
999 + #end
902 902   </div>
903 903   #end
904 904   </div>
... ... @@ -948,9 +948,11 @@
948 948  
949 949   #if($xcontext.user != "XWiki.XWikiGuest")
950 950   <div class="thread-add-post">
1049 + #if($isSchoolMember || $isViewerAdmin)
951 951   <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
952 952   ＋ 活動報告を追加
953 953   </a>
1053 + #end
954 954   <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
955 955   <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> コメントを書く
956 956   </a>
... ... @@ -983,6 +983,35 @@
983 983  ## --- 年度タブ切り替え JavaScript ---
984 984  {{html clean="false"}}
985 985  <script>
1086 +// コンパクト表示（タイトルのみ）トグル
1087 +function toggleCompactView() {
1088 + var container = document.querySelector('.xwiki-content') || document.body;
1089 + var isCompact = container.classList.toggle('activity-compact-view');
1090 + var btn = document.getElementById('btnViewToggle');
1091 + if (btn) {
1092 + btn.querySelector('.toggle-label').textContent = isCompact ? '詳細表示' : '一覧表示';
1093 + btn.title = isCompact ? '詳細表示に戻す' : 'タイトルのみ表示';
1094 + }
1095 + // コンパクトモードでは各スレッドヘッダーをクリックで個別展開可能にする
1096 + document.querySelectorAll('.activity-thread').forEach(function(thread) {
1097 + if (isCompact) {
1098 + thread.classList.remove('compact-expanded');
1099 + }
1100 + });
1101 +}
1102 +
1103 +// コンパクトモードで個別スレッドを展開/折りたたみ
1104 +function toggleThreadExpand(e) {
1105 + var container = document.querySelector('.xwiki-content') || document.body;
1106 + if (!container.classList.contains('activity-compact-view')) return;
1107 + // リンクやボタンのクリックはスルー
1108 + if (e.target.closest('a, button, .btn-featured-toggle')) return;
1109 + var thread = e.target.closest('.activity-thread');
1110 + if (thread) {
1111 + thread.classList.toggle('compact-expanded');
1112 + }
1113 +}
1114 +
986 986  function switchActivityFY(fy, btn) {
987 987   // タブのアクティブ状態を切り替え
988 988   document.querySelectorAll('.activity-fy-tab').forEach(function(t) { t.classList.remove('active'); });
... ... @@ -998,6 +998,27 @@
998 998  }
999 999  // ページ読み込み時の初期化
1000 1000  document.addEventListener('DOMContentLoaded', function() {
1130 + // 年度タブを降順にソート（「全期間」タブは末尾に固定）
1131 + var tabContainer = document.querySelector('.activity-fy-tabs');
1132 + if (tabContainer) {
1133 + var tabs = Array.from(tabContainer.querySelectorAll('.activity-fy-tab'));
1134 + var allTab = null;
1135 + var fyTabs = [];
1136 + tabs.forEach(function(t) {
1137 + var onclickStr = t.getAttribute('onclick') || '';
1138 + if (onclickStr.indexOf("'all'") !== -1) { allTab = t; }
1139 + else { fyTabs.push(t); }
1140 + });
1141 + // 年度タブを数値の降順でソート
1142 + fyTabs.sort(function(a, b) {
1143 + var aYear = parseInt(a.textContent) || 0;
1144 + var bYear = parseInt(b.textContent) || 0;
1145 + return bYear - aYear;
1146 + });
1147 + // DOM再配置
1148 + fyTabs.forEach(function(t) { tabContainer.appendChild(t); });
1149 + if (allTab) { tabContainer.appendChild(allTab); }
1150 + }
1001 1001   // デフォルトで現在の年度を表示
1002 1002   var defaultTab = document.querySelector('.activity-fy-tab.active');
1003 1003   if (defaultTab) { defaultTab.click(); }
... ... @@ -1009,14 +1009,19 @@
1009 1009   window.history.replaceState({}, document.title, window.location.pathname);
1010 1010   }
1011 1011   }
1012 - // 長文投稿の折りたたみ初期化
1162 + // コンパクトモード: スレッドヘッダークリックで個別展開
1163 + document.querySelectorAll('.activity-thread-header').forEach(function(header) {
1164 + header.addEventListener('click', toggleThreadExpand);
1165 + });
1166 + // 長文投稿の折りたたみ初期化（max-height: 12em 超で省略）
1013 1013   document.querySelectorAll('.thread-post-body').forEach(function(body) {
1014 - // 先にtruncatedを仮適用してline-clampを有効にし、高さの差分で判定
1168 + // pre-wrapのまま高さを測定し、max-height(12em ≒ ~200px)を超える場合に折りたたむ
1015 1015   var fullH = body.scrollHeight;
1170 + // 12em を px に変換（font-size × line-height × 行数 の近似値ではなくCSSと同じ値を取得）
1016 1016   body.classList.add('truncated');
1017 - var clampedH = body.clientHeight;
1172 + var maxH = body.clientHeight; // max-height: 12em 適用後の高さ
1018 1018   body.classList.remove('truncated');
1019 - if (fullH > clampedH + 10) {
1174 + if (fullH > maxH + 30) {
1020 1020   body.classList.add('truncated');
1021 1021   var btn = document.createElement('button');
1022 1022   btn.className = 'btn-read-more';
... ... @@ -1062,37 +1062,130 @@
1062 1062  }
1063 1063  
1064 1064  // 投稿の編集（インライン編集フォームを開く）
1065 -function openEditPost(btn, schoolPage, postObjNum, currentContent) {
1220 +function openEditPost(btn) {
1066 1066   var postEl = btn.closest('.thread-post');
1067 1067   if (!postEl) return;
1068 - // 既存の編集フォームがあれば閉じる
1069 1069   var existing = postEl.querySelector('.post-edit-form');
1070 1070   if (existing) { existing.remove(); return; }
1071 1071   var bodyEl = postEl.querySelector('.thread-post-body');
1072 1072   if (!bodyEl) return;
1227 +
1228 + var schoolPage = btn.getAttribute('data-school');
1229 + var postObjNum = btn.getAttribute('data-obj');
1230 + var currentContent = btn.getAttribute('data-content') || '';
1231 + var currentImages = btn.getAttribute('data-images') || '';
1232 + var currentFiles = btn.getAttribute('data-files') || '';
1233 + var postType = btn.getAttribute('data-post-type') || 'report';
1234 +
1073 1073   var form = document.createElement('div');
1074 1074   form.className = 'post-edit-form';
1075 - form.innerHTML = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>' +
1076 - '<div class="post-edit-form-actions">' +
1237 + form.setAttribute('data-school', schoolPage);
1238 + form.setAttribute('data-obj', postObjNum);
1239 +
1240 + var html = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>';
1241 +
1242 + // コメント以外は添付ファイル編集を表示
1243 + if (postType !== 'comment') {
1244 + // 既存画像
1245 + html += '<div class="edit-attachments">';
1246 + if (currentImages.trim()) {
1247 + html += '<div class="edit-attach-section"><span class="edit-attach-label">画像</span>';
1248 + var imgs = currentImages.trim().split('\n');
1249 + for (var i = 0; i < imgs.length; i++) {
1250 + var img = imgs[i].trim();
1251 + if (!img) continue;
1252 + html += '<div class="edit-attach-item" data-name="' + img.replace(/"/g,'&quot;') + '">' +
1253 + '<img src="/xwiki/bin/download/' + schoolPage.replace(/\./g,'/') + '/' + encodeURIComponent(img) + '" class="edit-attach-thumb" />' +
1254 + '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1255 + '<input type="hidden" name="keepImages" value="' + img.replace(/"/g,'&quot;') + '" />' +
1256 + '</div>';
1257 + }
1258 + html += '</div>';
1259 + }
1260 + // 既存ファイル
1261 + if (currentFiles.trim()) {
1262 + html += '<div class="edit-attach-section"><span class="edit-attach-label">ファイル</span>';
1263 + var files = currentFiles.trim().split('\n');
1264 + for (var j = 0; j < files.length; j++) {
1265 + var f = files[j].trim();
1266 + if (!f) continue;
1267 + var displayName = f;
1268 + if (/^file_\d{14}_\d+_/.test(f)) displayName = f.replace(/^file_\d{14}_\d+_/, '');
1269 + html += '<div class="edit-attach-item" data-name="' + f.replace(/"/g,'&quot;') + '">' +
1270 + '<span class="edit-attach-fname">' + displayName.replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</span>' +
1271 + '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1272 + '<input type="hidden" name="keepFiles" value="' + f.replace(/"/g,'&quot;') + '" />' +
1273 + '</div>';
1274 + }
1275 + html += '</div>';
1276 + }
1277 + // 新規追加
1278 + html += '<div class="edit-attach-add">' +
1279 + '<label class="form-label-sm">画像を追加（最大4枚まで）</label>' +
1280 + '<input type="file" name="editNewImages" accept="image/*" multiple class="form-file-input-sm" />' +
1281 + '<div class="form-hint">JPEG / PNG / GIF / WebP、各5MBまで</div>' +
1282 + '<label class="form-label-sm" style="margin-top:8px;">ファイルを追加（最大2つまで）</label>' +
1283 + '<input type="file" name="editNewFiles" accept=".pdf,.docx,.xlsx,.pptx" multiple class="form-file-input-sm" />' +
1284 + '<div class="form-hint">PDF / Word / Excel / PowerPoint、各10MBまで</div>' +
1285 + '</div>';
1286 + html += '</div>';
1287 + }
1288 +
1289 + html += '<div class="post-edit-form-actions">' +
1077 1077   '<button type="button" class="btn-cancel-edit" onclick="this.closest(\'.post-edit-form\').remove()">キャンセル</button>' +
1078 - '<button type="button" class="btn-save" onclick="saveEditPost(\'' + schoolPage + '\', ' + postObjNum + ')">保存</button>' +
1291 + '<button type="button" class="btn-save" onclick="saveEditPost(this)">保存</button>' +
1079 1079   '</div>';
1293 +
1294 + form.innerHTML = html;
1080 1080   bodyEl.parentNode.insertBefore(form, bodyEl.nextSibling);
1081 1081   form.querySelector('textarea').focus();
1082 1082  }
1083 1083  
1299 +function removeEditAttach(btn) {
1300 + var item = btn.closest('.edit-attach-item');
1301 + if (item) item.remove();
1302 +}
1303 +
1084 1084  // 投稿の編集を保存
1085 -function saveEditPost(schoolPage, postObjNum) {
1086 - var textarea = document.getElementById('editContent_' + postObjNum);
1305 +function saveEditPost(btn) {
1306 + var formEl = btn.closest('.post-edit-form');
1307 + if (!formEl) return;
1308 + var schoolPage = formEl.getAttribute('data-school');
1309 + var postObjNum = formEl.getAttribute('data-obj');
1310 + var textarea = formEl.querySelector('textarea');
1087 1087   if (!textarea) return;
1088 1088   var newContent = textarea.value.trim();
1089 1089   if (!newContent) { alert('投稿内容を入力してください'); return; }
1314 +
1090 1090   var csrfEl = document.querySelector('input[name="form_token"]');
1091 1091   var csrfToken = csrfEl ? csrfEl.value : '';
1317 +
1318 + var fd = new FormData();
1319 + fd.append('schoolPage', schoolPage);
1320 + fd.append('postObj', postObjNum);
1321 + fd.append('newContent', newContent);
1322 + fd.append('form_token', csrfToken);
1323 +
1324 + // 残す画像・ファイル
1325 + formEl.querySelectorAll('input[name="keepImages"]').forEach(function(el) { fd.append('keepImages', el.value); });
1326 + formEl.querySelectorAll('input[name="keepFiles"]').forEach(function(el) { fd.append('keepFiles', el.value); });
1327 +
1328 + // 新規画像
1329 + var newImgInput = formEl.querySelector('input[name="editNewImages"]');
1330 + if (newImgInput && newImgInput.files) {
1331 + for (var i = 0; i < newImgInput.files.length; i++) { fd.append('editNewImages', newImgInput.files[i]); }
1332 + }
1333 + // 新規ファイル
1334 + var newFileInput = formEl.querySelector('input[name="editNewFiles"]');
1335 + if (newFileInput && newFileInput.files) {
1336 + for (var j = 0; j < newFileInput.files.length; j++) { fd.append('editNewFiles', newFileInput.files[j]); }
1337 + }
1338 +
1339 + btn.disabled = true;
1340 + btn.textContent = '保存中...';
1341 +
1092 1092   var xhr = new XMLHttpRequest();
1093 1093   xhr.open('POST', '/bin/get/SeitokaiCode/EditPost?outputSyntax=plain', true);
1094 - xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1095 - var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken);
1096 1096   xhr.onload = function() {
1097 1097   try {
1098 1098   var res = JSON.parse(xhr.responseText);
... ... @@ -1100,12 +1100,13 @@
1100 1100   showToast('投稿を更新しました', 'success');
1101 1101   setTimeout(function() { location.reload(); }, 800);
1102 1102   } else {
1351 + btn.disabled = false; btn.textContent = '保存';
1103 1103   alert('編集に失敗しました: ' + (res.error || ''));
1104 1104   }
1105 - } catch(e) { alert('編集に失敗しました'); }
1354 + } catch(e) { btn.disabled = false; btn.textContent = '保存'; alert('編集に失敗しました'); }
1106 1106   };
1107 - xhr.onerror = function() { alert('通信エラーが発生しました'); };
1108 - xhr.send(editPostData);
1356 + xhr.onerror = function() { btn.disabled = false; btn.textContent = '保存'; alert('通信エラーが発生しました'); };
1357 + xhr.send(fd);
1109 1109  }
1110 1110  
1111 1111  // 投稿の削除（確認ダイアログ付き）
... ... @@ -1129,6 +1129,80 @@
1129 1129   xhr.onerror = function() { alert('通信エラーが発生しました'); };
1130 1130   xhr.send(deletePostData);
1131 1131  }
1381 +
1382 +/* --- 通報ダイアログ --- */
1383 +function openReportDialog(btn, targetPage, postObjNum, token) {
1384 + if (document.getElementById('report-dialog-overlay')) return;
1385 + var reasons = ['宣伝・スパム','不適切な内容','個人情報の露出','誹謗中傷','誤情報','その他'];
1386 + var overlay = document.createElement('div');
1387 + overlay.id = 'report-dialog-overlay';
1388 + overlay.style.cssText = 'position:fixed;inset:0;background:rgba(0,0,0,0.5);z-index:9999;display:flex;align-items:center;justify-content:center;';
1389 + var dialog = document.createElement('div');
1390 + dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;max-height:80vh;overflow-y:auto;';
1391 + var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を通報</h3>';
1392 + html += '<p style="margin:0 0 12px;font-size:0.9em;color:#4b5563;">通報された投稿は管理者が確認するまで一時的に非表示になります。</p>';
1393 + html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">通報理由</label>';
1394 + html += '<select id="report-reason" style="width:100%;padding:8px;border:1px solid #d1d5db;border-radius:8px;margin-bottom:12px;font-size:0.9em;">';
1395 + for (var i=0; i<reasons.length; i++) html += '<option value="'+reasons[i]+'">'+reasons[i]+'</option>';
1396 + html += '</select>';
1397 + html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">補足コメント（任意）</label>';
1398 + html += '<textarea id="report-detail" rows="3" maxlength="500" style="width:100%;padding:8px;border:1px solid #d1d5db;border-radius:8px;resize:vertical;font-size:0.9em;box-sizing:border-box;" placeholder="具体的な内容があればご記入ください"></textarea>';
1399 + html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
1400 + html += '<button type="button" id="report-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
1401 + html += '<button type="button" id="report-submit-btn" style="padding:8px 16px;border:none;border-radius:8px;background:#dc2626;color:#fff;cursor:pointer;font-weight:600;">通報する</button>';
1402 + html += '</div>';
1403 + dialog.innerHTML = html;
1404 + overlay.appendChild(dialog);
1405 + document.body.appendChild(overlay);
1406 + overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
1407 + document.getElementById('report-cancel-btn').addEventListener('click', function() { overlay.remove(); });
1408 + document.getElementById('report-submit-btn').addEventListener('click', function() {
1409 + var reason = document.getElementById('report-reason').value;
1410 + var detail = document.getElementById('report-detail').value;
1411 + var submitBtn = document.getElementById('report-submit-btn');
1412 + submitBtn.disabled = true; submitBtn.textContent = '送信中...';
1413 + var xhr = new XMLHttpRequest();
1414 + xhr.open('POST', '/bin/get/SeitokaiCode/ReportAction?outputSyntax=plain', true);
1415 + xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1416 + var data = 'targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&detail=' + encodeURIComponent(detail) + '&form_token=' + encodeURIComponent(token);
1417 + xhr.onload = function() {
1418 + overlay.remove();
1419 + showToast('通報を受け付けました', 'success');
1420 + setTimeout(function() { location.reload(); }, 1000);
1421 + };
1422 + xhr.onerror = function() { overlay.remove(); alert('通信エラーが発生しました'); };
1423 + xhr.send(data);
1424 + });
1425 +}
1426 +
1427 +/* --- 非表示ダイアログ（管理者用） --- */
1428 +function openHideDialog(btn, targetPage, postObjNum, token) {
1429 + if (document.getElementById('hide-dialog-overlay')) return;
1430 + var overlay = document.createElement('div');
1431 + overlay.id = 'hide-dialog-overlay';
1432 + overlay.style.cssText = 'position:fixed;inset:0;background:rgba(0,0,0,0.5);z-index:9999;display:flex;align-items:center;justify-content:center;';
1433 + var dialog = document.createElement('div');
1434 + dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;';
1435 + var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を非表示にする</h3>';
1436 + html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">非表示の理由</label>';
1437 + html += '<input type="text" id="hide-reason" style="width:100%;padding:8px;border:1px solid #d1d5db;border-radius:8px;margin-bottom:12px;font-size:0.9em;box-sizing:border-box;" placeholder="理由を入力" />';
1438 + html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
1439 + html += '<button type="button" id="hide-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
1440 + html += '<button type="button" id="hide-submit-btn" style="padding:8px 16px;border:none;border-radius:8px;background:#d97706;color:#fff;cursor:pointer;font-weight:600;">非表示にする</button>';
1441 + html += '<button type="button" id="hide-warn-btn" style="padding:8px 16px;border:none;border-radius:8px;background:#dc2626;color:#fff;cursor:pointer;font-weight:600;">非表示+警告</button>';
1442 + html += '</div>';
1443 + dialog.innerHTML = html;
1444 + overlay.appendChild(dialog);
1445 + document.body.appendChild(overlay);
1446 + overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
1447 + document.getElementById('hide-cancel-btn').addEventListener('click', function() { overlay.remove(); });
1448 + function doHide(action) {
1449 + var reason = document.getElementById('hide-reason').value || '管理者判断';
1450 + window.location.href = '/bin/view/SeitokaiCode/ModerationAction?action=' + action + '&targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&form_token=' + encodeURIComponent(token);
1451 + }
1452 + document.getElementById('hide-submit-btn').addEventListener('click', function() { doHide('hide'); });
1453 + document.getElementById('hide-warn-btn').addEventListener('click', function() { doHide('hide-warn'); });
1454 +}
1132 1132  </script>
1133 1133  {{/html}}
1134 1134  {{/velocity}}