Skip to Content
Last modified by Super Admin on 2026/04/05 18:59
From version Icon 86.1 Icon
edited by Super Admin
on 2026/03/20 02:01
Change comment: There is no comment for this version
To version Icon 62.1 Icon
edited by Super Admin
on 2026/03/17 17:13
Change comment: There is no comment for this version

Summary

Details

Icon Page properties
Content
... ... @@ -1,11 +1,5 @@
1 1  {{velocity}}
2 2  ## ===== 学校ページ テンプレート =====
3 -## ゲストが ?sheet= 付きURL（編集フォーム等）に直接アクセスした場合、ログインページへリダイレクト
4 -#if($xcontext.user == 'XWiki.XWikiGuest' && $request.sheet && $request.sheet != '')
5 - #set($currentUrl = $doc.getURL('view', "sheet=${request.sheet}"))
6 - $response.sendRedirect("/bin/login/XWiki/XWikiLogin?srid=$escapetool.url($currentUrl)")
7 - #stop
8 -#end
9 9  {{html clean="false"}}
10 10  ## メンテナンスバナー（{{include}}ではなくインラインで記述し、<p>タグ挿入を回避）
11 11  #set($bannerDoc = $xwiki.getDocument('SeitokaiAdmin.MaintenanceBanner'))
... ... @@ -34,10 +34,8 @@
34 34  #set($schoolLevel = $doc.getValue('schoolLevel'))
35 35  #set($schoolSystem = $doc.getValue('schoolSystem'))
36 36  #set($website = $doc.getValue('website'))
37 -#set($schoolPhoto = $doc.getValue('schoolPhoto'))
38 -#set($schoolDescription = $doc.getValue('schoolDescription'))
39 39  
40 -## --- 生徒会組織 ---
32 +## --- 組織図 ---
41 41  #set($orgChart = $doc.getValue('orgChart'))
42 42  #set($orgChartImage = $doc.getValue('orgChartImage'))
43 43  
... ... @@ -103,42 +103,11 @@
103 103   #set($viewerDoc = $xwiki.getDocument($viewerUser))
104 104   #set($viewerAccountType = $!viewerDoc.getValue('accountType'))
105 105   #set($viewerSchoolCode = $!viewerDoc.getValue('schoolCode'))
106 - #set($viewerSecondarySchoolCode = $!viewerDoc.getValue('secondarySchoolCode'))
107 - #set($viewerUserRole = $!viewerDoc.getValue('userRole'))
108 108   #if($viewerAccountType == 'admin')
109 109   #set($isViewerAdmin = true)
110 110   #end
111 111  #end
112 112  
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 -
142 142  ## --- 学校ページ非表示チェック ---
143 143  #set($schoolHidden = $doc.getValue('hidden'))
144 144  #if($schoolHidden == 1)
... ... @@ -172,7 +172,7 @@
172 172  
173 173  ## --- 投稿固定/解除処理 ---
174 174  #set($pinAction = $!request.action)
175 -#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $isSchoolMember)) && $services.csrf.isTokenValid($request.form_token))
136 +#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token))
176 176   #set($pinPostObjStr = $!request.postObj)
177 177   #if(!$pinPostObjStr.matches('^\d+$'))
178 178   ## 不正な値 → 無視
... ... @@ -202,7 +202,7 @@
202 202  
203 203  ## --- 特色ある活動 選定/解除処理 ---
204 204  #set($featAction = $!request.action)
205 -#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $isSchoolMember)) && $services.csrf.isTokenValid($request.form_token))
166 +#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token))
206 206   #set($featActObjStr = $!request.actObj)
207 207   #if($featActObjStr.matches('^\d+$'))
208 208   #set($actObjNum = $mathtool.toInteger($featActObjStr))
... ... @@ -304,7 +304,7 @@
304 304  
305 305  ## --- 編集ボタン（権限があるユーザーのみ表示） ---
306 306  #set($canEditSchool = false)
307 -#if(!$isGuest && ($isViewerAdmin || $isSchoolMember))
268 +#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode))
308 308   #set($canEditSchool = true)
309 309  #end
310 310  #if($canEditSchool)
... ... @@ -313,50 +313,20 @@
313 313  </div>
314 314  #end
315 315  
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 -
334 334  ## --- ① 学校基本情報 ---
335 335  <div class="school-info-card collapsed" id="card-basic-info">
336 336   <h2 role="button" tabindex="0" aria-expanded="false" onclick="toggleInfoCard('card-basic-info')" onkeydown="if(event.key==='Enter'||event.key===' '){event.preventDefault();toggleInfoCard('card-basic-info')}"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M4 19.5A2.5 2.5 0 016.5 17H20"/><path d="M6.5 2H20v20H6.5A2.5 2.5 0 014 19.5v-15A2.5 2.5 0 016.5 2z"/></svg> 学校基本情報</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2>
337 - <div class="school-basic-info-layout">
338 - <div class="school-basic-info-table">
339 - <table class="wiki-table school-info-table">
340 - <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
341 - <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
342 - <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
343 - <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
344 - <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
345 - <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
346 - <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
347 - <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
348 - <tr><th>公式サイト</th><td>#if($website && $website != '')<a href="$!escapetool.xml($website)" target="_blank" rel="noopener">$!escapetool.xml($website)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
349 - </table>
350 - </div>
351 - #if($schoolPhoto && $schoolPhoto != '')
352 - <div class="school-photo-area">
353 - <img src="$doc.getAttachmentURL($schoolPhoto)" alt="$!escapetool.xml($schoolName)" class="school-photo" />
354 - </div>
355 - #end
356 - </div>
357 - #if($schoolDescription && $schoolDescription.trim() != '')
358 - <div class="free-note" style="margin-top:var(--sp-4);">$!escapetool.xml($schoolDescription)</div>
359 - #end
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>
360 360   #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
361 361   #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
362 362   #if($infoEditDate && $infoEditDate != '')
... ... @@ -369,25 +369,25 @@
369 369   <h2 role="button" tabindex="0" aria-expanded="true" onclick="toggleInfoCard('card-seitokai-info')" onkeydown="if(event.key==='Enter'||event.key===' '){event.preventDefault();toggleInfoCard('card-seitokai-info')}"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/></svg> 生徒会基本情報</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2>
370 370   <div class="seitokai-info-body">
371 371  
372 - ## --- 生徒会組織 ---
303 + ## --- 組織図 ---
373 373   #set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
374 374   #if($hasOrgContent)
375 375   #set($canViewOrgChart = true)
376 - #if($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewOrgChart = false)
377 - #elseif($visibilityOrgChart == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewOrgChart = false)
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)
378 378   #end
379 379   #if($canViewOrgChart)
380 380   <div class="seitokai-subsection">
381 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/><line x1="9" y1="10" x2="9" y2="10.01"/><line x1="15" y1="10" x2="15" y2="10.01"/><line x1="9" y1="14" x2="9" y2="14.01"/><line x1="15" y1="14" x2="15" y2="14.01"/></svg> 生徒会組織 #if($visibilityOrgChart != 'public')<span class="visibility-badge visibility-${visibilityOrgChart}">#if($visibilityOrgChart == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
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>
382 382   <div class="seitokai-subsection-content">
383 383   #if($orgChartImage && $orgChartImage != '')
384 384   <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
385 385   #end
386 - #if($orgChart && $orgChart != '')<div class="free-note">$!escapetool.xml($orgChart)</div>#end
317 + #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end
387 387   </div>
388 388   </div>
389 389   #else
390 - <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 生徒会組織は #if($visibilityOrgChart == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
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>
391 391   #end
392 392   #end
393 393  
... ... @@ -396,10 +396,12 @@
396 396   <div class="seitokai-subsection">
397 397   <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>
398 398   <div class="seitokai-subsection-content">
399 - <p class="activity-hint">活動時間が多い3つ</p>
330 + <p class="activity-hint">活動時間の多い順に上位3つ</p>
400 400   <div class="tag-container">
332 + #set($daIdx = 1)
401 401   #foreach($da in $dailyActivities)
402 - <span class="tag tag-accent">$!escapetool.xml($da.trim())</span>
334 + <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
335 + #set($daIdx = $daIdx + 1)
403 403   #end
404 404   </div>
405 405   #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
... ... @@ -451,12 +451,12 @@
451 451   #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
452 452   #if($hasBudget)
453 453   #set($canViewBudget = true)
454 - #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewBudget = false)
455 - #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false)
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 456   #end
457 457   #if($canViewBudget)
458 458   <div class="seitokai-subsection">
459 - <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>
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>
460 460   <div class="seitokai-subsection-content">
461 461   #if($budgetProcess && !$budgetProcess.isEmpty())
462 462   <div class="info-row">
... ... @@ -507,12 +507,12 @@
507 507   ## --- 校則の見直し ---
508 508   #if($ruleReviewStatus && $ruleReviewStatus != '')
509 509   #set($canViewRuleReview = true)
510 - #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewRuleReview = false)
511 - #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false)
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 512   #end
513 513   #if($canViewRuleReview)
514 514   <div class="seitokai-subsection">
515 - <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>
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>
516 516   <div class="seitokai-subsection-content">
517 517   <div class="info-row">
518 518   <span class="info-label">見直しの有無（3年以内）</span>
... ... @@ -570,12 +570,12 @@
570 570   ## --- 生徒会の課題意識 ---
571 571   #if($challenges && $challenges != '')
572 572   #set($canViewChallenges = true)
573 - #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewChallenges = false)
574 - #elseif($visibilityChallenges == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewChallenges = false)
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 575   #end
576 576   #if($canViewChallenges)
577 577   <div class="seitokai-subsection">
578 - <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>
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>
579 579   <div class="seitokai-subsection-content">
580 580   <div class="challenge-text">$!escapetool.xml($challenges)</div>
581 581   </div>
... ... @@ -641,35 +641,27 @@
641 641   #end
642 642   <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
643 643   </div>
644 - <div class="activity-toolbar-right">
645 - <button class="btn-view-toggle" id="btnViewToggle" onclick="toggleCompactView()" title="タイトルのみ表示">
646 - <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>
647 - <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>
648 - <span class="toggle-label">一覧表示</span>
649 - </button>
650 - </div>
651 651   <div class="author-legend-wrapper">
652 652   <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>
653 653   <div class="author-legend-body">
654 654   <div class="author-legend">
655 655   <span class="author-legend-title">投稿者の信頼度:</span>
656 - <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者 <span class="text-hint">— 運営スタッフ</span></span>
657 - <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み <span class="text-hint">— 本人確認済みのユーザー</span></span>
658 - <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介 <span class="text-hint">— 承認済みユーザーからの紹介</span></span>
659 - <span class="author-legend-item"><span class="bar bar-general"></span> 一般 <span class="text-hint">— 一般登録ユーザー</span></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>
660 660   </div>
661 661   <div class="author-legend">
662 662   <span class="author-legend-title">所属:</span>
663 - <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>
664 - <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>
665 - <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>
666 - <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>
667 - <span class="author-legend-item text-hint">※一般アカウントは所属バッジが表示されません</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>
668 668   </div>
669 669   <div class="author-legend">
670 670   <span class="author-legend-title">役割:</span>
671 671   <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>
672 - <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>
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>
673 673   <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>
674 674   </div>
675 675   </div>
... ... @@ -738,18 +738,16 @@
738 738  <div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)">
739 739   <div class="activity-thread-header">
740 740   <div class="activity-thread-title">
741 - <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>
742 - <div class="activity-meta-line">
743 - <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
744 - #set($actTagsList = $activity.getValue('tags'))
745 - #if($actTagsList && !$actTagsList.isEmpty())
746 - #foreach($tagItem in $actTagsList)
747 - #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end
748 - #end
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
749 749   #end
750 - </div>
673 + #end
751 751   </div>
752 - <div class="thread-meta-right">
675 + <div class="thread-meta-row">
753 753   <span class="thread-post-count">${reportCount}件の報告 ・ ${commentCount}件のコメント</span>
754 754   #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred')
755 755   #if($actFeatured == '1')
... ... @@ -809,8 +809,8 @@
809 809   #set($postVis = $!post.getValue('visibility'))
810 810   #if(!$postVis || $postVis == '') #set($postVis = 'public') #end
811 811   #set($canViewPost = true)
812 - #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewPost = false)
813 - #elseif($postVis == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPost = false)
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 814   #end
815 815   #if(!$canViewPost)
816 816   <div class="thread-post visibility-restricted-post">
... ... @@ -854,11 +854,8 @@
854 854   <span class="badge badge-general badge-sm">一般</span>
855 855   #end
856 856   ## 所属バッジ（投稿者の学校コードとページの学校コードを比較）
857 - #set($postIsSchoolMatch = ($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode)))
858 858   #if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general')
859 - #if($postUserRole == 'graduate' && $postIsSchoolMatch)
860 - <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>
861 - #elseif($postIsSchoolMatch && $postUserRole != 'graduate')
781 + #if($postSchoolCode == $schoolCode)
862 862   #if($postAccountType == 'verified' || $postAccountType == 'admin')
863 863   <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>
864 864   #else
... ... @@ -885,13 +885,6 @@
885 885   #if($postEdited == 1 || $postEdited == '1')
886 886   <span class="post-edited-label">（編集済み）</span>
887 887   #end
888 - #set($postAuthorRefH = $!post.getValue('authorRef'))
889 - #set($postObjNumH = $post.number)
890 - #if(!$isGuest && $xcontext.user != $postAuthorRefH)
891 - <button type="button" class="btn-post-report btn-post-report-header" onclick="openReportDialog(this, '${doc.fullName}', $postObjNumH, '${services.csrf.getToken()}')" title="この投稿を通報">
892 - <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> 通報
893 - </button>
894 - #end
895 895   </div>
896 896   <div class="thread-post-body">
897 897   $!escapetool.xml($!postContent)
... ... @@ -956,18 +956,12 @@
956 956   #end
957 957   </div>
958 958   #if($postVis != 'public')
959 - <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>
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>
960 960   #end
961 - ## 固定/編集/削除/通報/非表示ボタン（横並び）
962 - #set($postAuthorRef = $!post.getValue('authorRef'))
963 - #set($postObjNumED = $post.number)
964 - #set($showPinBtn = ($viewerAccountType == 'admin' || $viewerAccountType == 'verified'))
965 - #set($showEditDeleteBtn = ($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin'))
966 - #set($showHideBtn = ($viewerAccountType == 'admin'))
967 - #if($showPinBtn || $showEditDeleteBtn || $showHideBtn)
968 - <div class="post-edit-actions post-action-mt">
969 - #if($showPinBtn)
970 - #set($postObjNum = $post.number)
874 + ## 固定/解除ボタン（承認済み・管理者のみ）
875 + #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
876 + #set($postObjNum = $post.number)
877 + <div class="post-pin-action post-action-mt">
971 971   #if($isPinned == '1')
972 972   <a href="$doc.getURL('view', "action=unpin&postObj=${postObjNum}&form_token=${services.csrf.getToken()}")" class="btn-pin-toggle btn-unpin" title="固定を解除">
973 973   <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> 固定を解除
... ... @@ -977,12 +977,15 @@
977 977   <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> 固定する
978 978   </a>
979 979   #end
980 - #end
981 - #if($showEditDeleteBtn)
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 982   #if($xcontext.user == $postAuthorRef)
983 - #set($editImages = $!post.getValue('images'))
984 - #set($editFiles = $!post.getValue('files'))
985 - <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="この投稿を編集">
895 + <button type="button" class="btn-post-edit" onclick="openEditPost(this, '${doc.fullName}', $postObjNumED, '$!escapetool.javascript($!postContent)')" title="この投稿を編集">
986 986   <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> 編集
987 987   </button>
988 988   #end
... ... @@ -989,12 +989,6 @@
989 989   <button type="button" class="btn-post-delete" onclick="confirmDeletePost('${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を削除">
990 990   <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> 削除
991 991   </button>
992 - #end
993 - #if($showHideBtn)
994 - <button type="button" class="btn-post-hide" onclick="openHideDialog(this, '${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を非表示にする">
995 - <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> 非表示
996 - </button>
997 - #end
998 998   </div>
999 999   #end
1000 1000   </div>
... ... @@ -1044,11 +1044,9 @@
1044 1044  
1045 1045   #if($xcontext.user != "XWiki.XWikiGuest")
1046 1046   <div class="thread-add-post">
1047 - #if($isSchoolMember || $isViewerAdmin)
1048 1048   <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
1049 1049   ＋ 活動報告を追加
1050 1050   </a>
1051 - #end
1052 1052   <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
1053 1053   <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> コメントを書く
1054 1054   </a>
... ... @@ -1081,35 +1081,6 @@
1081 1081  ## --- 年度タブ切り替え JavaScript ---
1082 1082  {{html clean="false"}}
1083 1083  <script>
1084 -// コンパクト表示（タイトルのみ）トグル
1085 -function toggleCompactView() {
1086 - var container = document.querySelector('.xwiki-content') || document.body;
1087 - var isCompact = container.classList.toggle('activity-compact-view');
1088 - var btn = document.getElementById('btnViewToggle');
1089 - if (btn) {
1090 - btn.querySelector('.toggle-label').textContent = isCompact ? '詳細表示' : '一覧表示';
1091 - btn.title = isCompact ? '詳細表示に戻す' : 'タイトルのみ表示';
1092 - }
1093 - // コンパクトモードでは各スレッドヘッダーをクリックで個別展開可能にする
1094 - document.querySelectorAll('.activity-thread').forEach(function(thread) {
1095 - if (isCompact) {
1096 - thread.classList.remove('compact-expanded');
1097 - }
1098 - });
1099 -}
1100 -
1101 -// コンパクトモードで個別スレッドを展開/折りたたみ
1102 -function toggleThreadExpand(e) {
1103 - var container = document.querySelector('.xwiki-content') || document.body;
1104 - if (!container.classList.contains('activity-compact-view')) return;
1105 - // リンクやボタンのクリックはスルー
1106 - if (e.target.closest('a, button, .btn-featured-toggle')) return;
1107 - var thread = e.target.closest('.activity-thread');
1108 - if (thread) {
1109 - thread.classList.toggle('compact-expanded');
1110 - }
1111 -}
1112 -
1113 1113  function switchActivityFY(fy, btn) {
1114 1114   // タブのアクティブ状態を切り替え
1115 1115   document.querySelectorAll('.activity-fy-tab').forEach(function(t) { t.classList.remove('active'); });
... ... @@ -1125,27 +1125,6 @@
1125 1125  }
1126 1126  // ページ読み込み時の初期化
1127 1127  document.addEventListener('DOMContentLoaded', function() {
1128 - // 年度タブを降順にソート（「全期間」タブは末尾に固定）
1129 - var tabContainer = document.querySelector('.activity-fy-tabs');
1130 - if (tabContainer) {
1131 - var tabs = Array.from(tabContainer.querySelectorAll('.activity-fy-tab'));
1132 - var allTab = null;
1133 - var fyTabs = [];
1134 - tabs.forEach(function(t) {
1135 - var onclickStr = t.getAttribute('onclick') || '';
1136 - if (onclickStr.indexOf("'all'") !== -1) { allTab = t; }
1137 - else { fyTabs.push(t); }
1138 - });
1139 - // 年度タブを数値の降順でソート
1140 - fyTabs.sort(function(a, b) {
1141 - var aYear = parseInt(a.textContent) || 0;
1142 - var bYear = parseInt(b.textContent) || 0;
1143 - return bYear - aYear;
1144 - });
1145 - // DOM再配置
1146 - fyTabs.forEach(function(t) { tabContainer.appendChild(t); });
1147 - if (allTab) { tabContainer.appendChild(allTab); }
1148 - }
1149 1149   // デフォルトで現在の年度を表示
1150 1150   var defaultTab = document.querySelector('.activity-fy-tab.active');
1151 1151   if (defaultTab) { defaultTab.click(); }
... ... @@ -1157,19 +1157,14 @@
1157 1157   window.history.replaceState({}, document.title, window.location.pathname);
1158 1158   }
1159 1159   }
1160 - // コンパクトモード: スレッドヘッダークリックで個別展開
1161 - document.querySelectorAll('.activity-thread-header').forEach(function(header) {
1162 - header.addEventListener('click', toggleThreadExpand);
1163 - });
1164 - // 長文投稿の折りたたみ初期化（max-height: 12em 超で省略）
1012 + // 長文投稿の折りたたみ初期化
1165 1165   document.querySelectorAll('.thread-post-body').forEach(function(body) {
1166 - // pre-wrapのまま高さを測定し、max-height(12em ≒ ~200px)を超える場合に折りたたむ
1014 + // 先にtruncatedを仮適用してline-clampを有効にし、高さの差分で判定
1167 1167   var fullH = body.scrollHeight;
1168 - // 12em を px に変換（font-size × line-height × 行数 の近似値ではなくCSSと同じ値を取得）
1169 1169   body.classList.add('truncated');
1170 - var maxH = body.clientHeight; // max-height: 12em 適用後の高さ
1017 + var clampedH = body.clientHeight;
1171 1171   body.classList.remove('truncated');
1172 - if (fullH > maxH + 30) {
1019 + if (fullH > clampedH + 10) {
1173 1173   body.classList.add('truncated');
1174 1174   var btn = document.createElement('button');
1175 1175   btn.className = 'btn-read-more';
... ... @@ -1215,130 +1215,37 @@
1215 1215  }
1216 1216  
1217 1217  // 投稿の編集（インライン編集フォームを開く）
1218 -function openEditPost(btn) {
1065 +function openEditPost(btn, schoolPage, postObjNum, currentContent) {
1219 1219   var postEl = btn.closest('.thread-post');
1220 1220   if (!postEl) return;
1068 + // 既存の編集フォームがあれば閉じる
1221 1221   var existing = postEl.querySelector('.post-edit-form');
1222 1222   if (existing) { existing.remove(); return; }
1223 1223   var bodyEl = postEl.querySelector('.thread-post-body');
1224 1224   if (!bodyEl) return;
1225 -
1226 - var schoolPage = btn.getAttribute('data-school');
1227 - var postObjNum = btn.getAttribute('data-obj');
1228 - var currentContent = btn.getAttribute('data-content') || '';
1229 - var currentImages = btn.getAttribute('data-images') || '';
1230 - var currentFiles = btn.getAttribute('data-files') || '';
1231 - var postType = btn.getAttribute('data-post-type') || 'report';
1232 -
1233 1233   var form = document.createElement('div');
1234 1234   form.className = 'post-edit-form';
1235 - form.setAttribute('data-school', schoolPage);
1236 - form.setAttribute('data-obj', postObjNum);
1237 -
1238 - var html = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>';
1239 -
1240 - // コメント以外は添付ファイル編集を表示
1241 - if (postType !== 'comment') {
1242 - // 既存画像
1243 - html += '<div class="edit-attachments">';
1244 - if (currentImages.trim()) {
1245 - html += '<div class="edit-attach-section"><span class="edit-attach-label">画像</span>';
1246 - var imgs = currentImages.trim().split('\n');
1247 - for (var i = 0; i < imgs.length; i++) {
1248 - var img = imgs[i].trim();
1249 - if (!img) continue;
1250 - html += '<div class="edit-attach-item" data-name="' + img.replace(/"/g,'&quot;') + '">' +
1251 - '<img src="/xwiki/bin/download/' + schoolPage.replace(/\./g,'/') + '/' + encodeURIComponent(img) + '" class="edit-attach-thumb" />' +
1252 - '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1253 - '<input type="hidden" name="keepImages" value="' + img.replace(/"/g,'&quot;') + '" />' +
1254 - '</div>';
1255 - }
1256 - html += '</div>';
1257 - }
1258 - // 既存ファイル
1259 - if (currentFiles.trim()) {
1260 - html += '<div class="edit-attach-section"><span class="edit-attach-label">ファイル</span>';
1261 - var files = currentFiles.trim().split('\n');
1262 - for (var j = 0; j < files.length; j++) {
1263 - var f = files[j].trim();
1264 - if (!f) continue;
1265 - var displayName = f;
1266 - if (/^file_\d{14}_\d+_/.test(f)) displayName = f.replace(/^file_\d{14}_\d+_/, '');
1267 - html += '<div class="edit-attach-item" data-name="' + f.replace(/"/g,'&quot;') + '">' +
1268 - '<span class="edit-attach-fname">' + displayName.replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</span>' +
1269 - '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1270 - '<input type="hidden" name="keepFiles" value="' + f.replace(/"/g,'&quot;') + '" />' +
1271 - '</div>';
1272 - }
1273 - html += '</div>';
1274 - }
1275 - // 新規追加
1276 - html += '<div class="edit-attach-add">' +
1277 - '<label class="form-label-sm">画像を追加（最大4枚まで）</label>' +
1278 - '<input type="file" name="editNewImages" accept="image/*" multiple class="form-file-input-sm" />' +
1279 - '<div class="form-hint">JPEG / PNG / GIF / WebP、各5MBまで</div>' +
1280 - '<label class="form-label-sm" style="margin-top:8px;">ファイルを追加（最大2つまで）</label>' +
1281 - '<input type="file" name="editNewFiles" accept=".pdf,.docx,.xlsx,.pptx" multiple class="form-file-input-sm" />' +
1282 - '<div class="form-hint">PDF / Word / Excel / PowerPoint、各10MBまで</div>' +
1283 - '</div>';
1284 - html += '</div>';
1285 - }
1286 -
1287 - html += '<div class="post-edit-form-actions">' +
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">' +
1288 1288   '<button type="button" class="btn-cancel-edit" onclick="this.closest(\'.post-edit-form\').remove()">キャンセル</button>' +
1289 - '<button type="button" class="btn-save" onclick="saveEditPost(this)">保存</button>' +
1078 + '<button type="button" class="btn-save" onclick="saveEditPost(\'' + schoolPage + '\', ' + postObjNum + ')">保存</button>' +
1290 1290   '</div>';
1291 -
1292 - form.innerHTML = html;
1293 1293   bodyEl.parentNode.insertBefore(form, bodyEl.nextSibling);
1294 1294   form.querySelector('textarea').focus();
1295 1295  }
1296 1296  
1297 -function removeEditAttach(btn) {
1298 - var item = btn.closest('.edit-attach-item');
1299 - if (item) item.remove();
1300 -}
1301 -
1302 1302  // 投稿の編集を保存
1303 -function saveEditPost(btn) {
1304 - var formEl = btn.closest('.post-edit-form');
1305 - if (!formEl) return;
1306 - var schoolPage = formEl.getAttribute('data-school');
1307 - var postObjNum = formEl.getAttribute('data-obj');
1308 - var textarea = formEl.querySelector('textarea');
1085 +function saveEditPost(schoolPage, postObjNum) {
1086 + var textarea = document.getElementById('editContent_' + postObjNum);
1309 1309   if (!textarea) return;
1310 1310   var newContent = textarea.value.trim();
1311 1311   if (!newContent) { alert('投稿内容を入力してください'); return; }
1312 -
1313 1313   var csrfEl = document.querySelector('input[name="form_token"]');
1314 1314   var csrfToken = csrfEl ? csrfEl.value : '';
1315 -
1316 - var fd = new FormData();
1317 - fd.append('schoolPage', schoolPage);
1318 - fd.append('postObj', postObjNum);
1319 - fd.append('newContent', newContent);
1320 - fd.append('form_token', csrfToken);
1321 -
1322 - // 残す画像・ファイル
1323 - formEl.querySelectorAll('input[name="keepImages"]').forEach(function(el) { fd.append('keepImages', el.value); });
1324 - formEl.querySelectorAll('input[name="keepFiles"]').forEach(function(el) { fd.append('keepFiles', el.value); });
1325 -
1326 - // 新規画像
1327 - var newImgInput = formEl.querySelector('input[name="editNewImages"]');
1328 - if (newImgInput && newImgInput.files) {
1329 - for (var i = 0; i < newImgInput.files.length; i++) { fd.append('editNewImages', newImgInput.files[i]); }
1330 - }
1331 - // 新規ファイル
1332 - var newFileInput = formEl.querySelector('input[name="editNewFiles"]');
1333 - if (newFileInput && newFileInput.files) {
1334 - for (var j = 0; j < newFileInput.files.length; j++) { fd.append('editNewFiles', newFileInput.files[j]); }
1335 - }
1336 -
1337 - btn.disabled = true;
1338 - btn.textContent = '保存中...';
1339 -
1340 1340   var xhr = new XMLHttpRequest();
1341 1341   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);
1342 1342   xhr.onload = function() {
1343 1343   try {
1344 1344   var res = JSON.parse(xhr.responseText);
... ... @@ -1346,13 +1346,12 @@
1346 1346   showToast('投稿を更新しました', 'success');
1347 1347   setTimeout(function() { location.reload(); }, 800);
1348 1348   } else {
1349 - btn.disabled = false; btn.textContent = '保存';
1350 1350   alert('編集に失敗しました: ' + (res.error || ''));
1351 1351   }
1352 - } catch(e) { btn.disabled = false; btn.textContent = '保存'; alert('編集に失敗しました'); }
1105 + } catch(e) { alert('編集に失敗しました'); }
1353 1353   };
1354 - xhr.onerror = function() { btn.disabled = false; btn.textContent = '保存'; alert('通信エラーが発生しました'); };
1355 - xhr.send(fd);
1107 + xhr.onerror = function() { alert('通信エラーが発生しました'); };
1108 + xhr.send(editPostData);
1356 1356  }
1357 1357  
1358 1358  // 投稿の削除（確認ダイアログ付き）
... ... @@ -1376,80 +1376,6 @@
1376 1376   xhr.onerror = function() { alert('通信エラーが発生しました'); };
1377 1377   xhr.send(deletePostData);
1378 1378  }
1379 -
1380 -/* --- 通報ダイアログ --- */
1381 -function openReportDialog(btn, targetPage, postObjNum, token) {
1382 - if (document.getElementById('report-dialog-overlay')) return;
1383 - var reasons = ['宣伝・スパム','不適切な内容','個人情報の露出','誹謗中傷','誤情報','その他'];
1384 - var overlay = document.createElement('div');
1385 - overlay.id = 'report-dialog-overlay';
1386 - 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;';
1387 - var dialog = document.createElement('div');
1388 - dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;max-height:80vh;overflow-y:auto;';
1389 - var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を通報</h3>';
1390 - html += '<p style="margin:0 0 12px;font-size:0.9em;color:#4b5563;">通報された投稿は管理者が確認するまで一時的に非表示になります。</p>';
1391 - html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">通報理由</label>';
1392 - html += '<select id="report-reason" style="width:100%;padding:8px;border:1px solid #d1d5db;border-radius:8px;margin-bottom:12px;font-size:0.9em;">';
1393 - for (var i=0; i<reasons.length; i++) html += '<option value="'+reasons[i]+'">'+reasons[i]+'</option>';
1394 - html += '</select>';
1395 - html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">補足コメント（任意）</label>';
1396 - 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>';
1397 - html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
1398 - html += '<button type="button" id="report-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
1399 - 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>';
1400 - html += '</div>';
1401 - dialog.innerHTML = html;
1402 - overlay.appendChild(dialog);
1403 - document.body.appendChild(overlay);
1404 - overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
1405 - document.getElementById('report-cancel-btn').addEventListener('click', function() { overlay.remove(); });
1406 - document.getElementById('report-submit-btn').addEventListener('click', function() {
1407 - var reason = document.getElementById('report-reason').value;
1408 - var detail = document.getElementById('report-detail').value;
1409 - var submitBtn = document.getElementById('report-submit-btn');
1410 - submitBtn.disabled = true; submitBtn.textContent = '送信中...';
1411 - var xhr = new XMLHttpRequest();
1412 - xhr.open('POST', '/bin/get/SeitokaiCode/ReportAction?outputSyntax=plain', true);
1413 - xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1414 - var data = 'targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&detail=' + encodeURIComponent(detail) + '&form_token=' + encodeURIComponent(token);
1415 - xhr.onload = function() {
1416 - overlay.remove();
1417 - showToast('通報を受け付けました', 'success');
1418 - setTimeout(function() { location.reload(); }, 1000);
1419 - };
1420 - xhr.onerror = function() { overlay.remove(); alert('通信エラーが発生しました'); };
1421 - xhr.send(data);
1422 - });
1423 -}
1424 -
1425 -/* --- 非表示ダイアログ（管理者用） --- */
1426 -function openHideDialog(btn, targetPage, postObjNum, token) {
1427 - if (document.getElementById('hide-dialog-overlay')) return;
1428 - var overlay = document.createElement('div');
1429 - overlay.id = 'hide-dialog-overlay';
1430 - 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;';
1431 - var dialog = document.createElement('div');
1432 - dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;';
1433 - var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を非表示にする</h3>';
1434 - html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">非表示の理由</label>';
1435 - 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="理由を入力" />';
1436 - html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
1437 - html += '<button type="button" id="hide-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
1438 - 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>';
1439 - 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>';
1440 - html += '</div>';
1441 - dialog.innerHTML = html;
1442 - overlay.appendChild(dialog);
1443 - document.body.appendChild(overlay);
1444 - overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
1445 - document.getElementById('hide-cancel-btn').addEventListener('click', function() { overlay.remove(); });
1446 - function doHide(action) {
1447 - var reason = document.getElementById('hide-reason').value || '管理者判断';
1448 - window.location.href = '/bin/view/SeitokaiCode/ModerationAction?action=' + action + '&targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&form_token=' + encodeURIComponent(token);
1449 - }
1450 - document.getElementById('hide-submit-btn').addEventListener('click', function() { doHide('hide'); });
1451 - document.getElementById('hide-warn-btn').addEventListener('click', function() { doHide('hide-warn'); });
1452 -}
1453 1453  </script>
1454 1454  {{/html}}
1455 1455  {{/velocity}}