Skip to Content
Last modified by Super Admin on 2026/04/05 18:59
From version Icon 87.1 Icon
edited by Super Admin
on 2026/03/20 02:07
Change comment: There is no comment for this version
To version Icon 67.1 Icon
edited by Super Admin
on 2026/03/18 11:26
Change comment: There is no comment for this version

Summary

Details

Icon Page properties
Content
... ... @@ -1,11 +1,5 @@
1 1  {{velocity}}
2 2  ## ===== 学校ページ テンプレート =====
3 -## ゲストが ?sheet= 付きURL（編集フォーム等）に直接アクセスした場合、ログインページへリダイレクト
4 -#if($xcontext.user == 'XWiki.XWikiGuest' && $request.sheet && $request.sheet != '')
5 - #set($currentUrl = $doc.getURL('view', "sheet=${request.sheet}"))
6 - $response.sendRedirect("/bin/login/XWiki/XWikiLogin?srid=$escapetool.url($currentUrl)")
7 - #stop
8 -#end
9 9  {{html clean="false"}}
10 10  ## メンテナンスバナー（{{include}}ではなくインラインで記述し、<p>タグ挿入を回避）
11 11  #set($bannerDoc = $xwiki.getDocument('SeitokaiAdmin.MaintenanceBanner'))
... ... @@ -34,10 +34,8 @@
34 34  #set($schoolLevel = $doc.getValue('schoolLevel'))
35 35  #set($schoolSystem = $doc.getValue('schoolSystem'))
36 36  #set($website = $doc.getValue('website'))
37 -#set($schoolPhoto = $doc.getValue('schoolPhoto'))
38 -#set($schoolDescription = $doc.getValue('schoolDescription'))
39 39  
40 -## --- 生徒会組織 ---
32 +## --- 組織図 ---
41 41  #set($orgChart = $doc.getValue('orgChart'))
42 42  #set($orgChartImage = $doc.getValue('orgChartImage'))
43 43  
... ... @@ -103,8 +103,6 @@
103 103   #set($viewerDoc = $xwiki.getDocument($viewerUser))
104 104   #set($viewerAccountType = $!viewerDoc.getValue('accountType'))
105 105   #set($viewerSchoolCode = $!viewerDoc.getValue('schoolCode'))
106 - #set($viewerSecondarySchoolCode = $!viewerDoc.getValue('secondarySchoolCode'))
107 - #set($viewerUserRole = $!viewerDoc.getValue('userRole'))
108 108   #if($viewerAccountType == 'admin')
109 109   #set($isViewerAdmin = true)
110 110   #end
... ... @@ -114,31 +114,10 @@
114 114  #set($affiliatedSchoolCode = $!doc.getValue('affiliatedSchoolCode'))
115 115  #set($affiliatedSchoolName = $!doc.getValue('affiliatedSchoolName'))
116 116  #set($isAffiliated = false)
117 -#if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
118 - #if($viewerSchoolCode == $affiliatedSchoolCode)
119 - #set($isAffiliated = true)
120 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode)
121 - #set($isAffiliated = true)
122 - #end
107 +#if($affiliatedSchoolCode && $affiliatedSchoolCode != '' && $viewerSchoolCode == $affiliatedSchoolCode)
108 + #set($isAffiliated = true)
123 123  #end
124 124  
125 -## --- 校内判定（卒業生を除外、secondarySchoolCodeも含む） ---
126 -#set($isSchoolMember = false)
127 -#if(!$isGuest && $viewerUserRole != 'graduate')
128 - #if($viewerSchoolCode == $schoolCode || $isAffiliated)
129 - #set($isSchoolMember = true)
130 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode)
131 - #set($isSchoolMember = true)
132 - #end
133 -#end
134 -## 卒業生の母校判定（投稿バッジ用）
135 -#set($isAlumniOfSchool = false)
136 -#if(!$isGuest && $viewerUserRole == 'graduate')
137 - #if($viewerSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $viewerSchoolCode == $affiliatedSchoolCode))
138 - #set($isAlumniOfSchool = true)
139 - #end
140 -#end
141 -
142 142  ## --- 学校ページ非表示チェック ---
143 143  #set($schoolHidden = $doc.getValue('hidden'))
144 144  #if($schoolHidden == 1)
... ... @@ -172,7 +172,7 @@
172 172  
173 173  ## --- 投稿固定/解除処理 ---
174 174  #set($pinAction = $!request.action)
175 -#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $isSchoolMember)) && $services.csrf.isTokenValid($request.form_token))
144 +#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && ($viewerSchoolCode == $schoolCode || $isAffiliated))) && $services.csrf.isTokenValid($request.form_token))
176 176   #set($pinPostObjStr = $!request.postObj)
177 177   #if(!$pinPostObjStr.matches('^\d+$'))
178 178   ## 不正な値 → 無視
... ... @@ -202,7 +202,7 @@
202 202  
203 203  ## --- 特色ある活動 選定/解除処理 ---
204 204  #set($featAction = $!request.action)
205 -#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $isSchoolMember)) && $services.csrf.isTokenValid($request.form_token))
174 +#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token))
206 206   #set($featActObjStr = $!request.actObj)
207 207   #if($featActObjStr.matches('^\d+$'))
208 208   #set($actObjNum = $mathtool.toInteger($featActObjStr))
... ... @@ -304,7 +304,7 @@
304 304  
305 305  ## --- 編集ボタン（権限があるユーザーのみ表示） ---
306 306  #set($canEditSchool = false)
307 -#if(!$isGuest && ($isViewerAdmin || $isSchoolMember))
276 +#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode || $isAffiliated))
308 308   #set($canEditSchool = true)
309 309  #end
310 310  #if($canEditSchool)
... ... @@ -334,30 +334,22 @@
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>
306 + <table class="wiki-table school-info-table">
307 + <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
308 + <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
309 + <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
310 + <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
311 + <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
312 + <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
313 + <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
314 + <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
315 + <tr><th>公式サイト</th><td>#if($website && $website != '')<a href="$!escapetool.xml($website)" target="_blank" rel="noopener">$!escapetool.xml($website)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
316 + </table>
317 + #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
318 + #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
319 + #if($infoEditDate && $infoEditDate != '')
320 + <div class="info-last-updated"><svg class="ico" viewBox="0 0 24 24"><path d="M11 4H4a2 2 0 00-2 2v14a2 2 0 002 2h14a2 2 0 002-2v-7"/><path d="M18.5 2.5a2.121 2.121 0 013 3L12 15l-4 1 1-4 9.5-9.5z"/></svg> 基本情報の最終更新: $!escapetool.xml($infoEditBy) — $!escapetool.xml($infoEditDate)</div>
359 359   #end
360 -
361 361  </div>
362 362  
363 363  ## --- ② 生徒会基本情報（折りたたみカード） ---
... ... @@ -365,25 +365,25 @@
365 365   <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>
366 366   <div class="seitokai-info-body">
367 367  
368 - ## --- 生徒会組織 ---
329 + ## --- 組織図 ---
369 369   #set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
370 370   #if($hasOrgContent)
371 371   #set($canViewOrgChart = true)
372 - #if($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewOrgChart = false)
373 - #elseif($visibilityOrgChart == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewOrgChart = false)
333 + #if($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewOrgChart = false)
334 + #elseif($visibilityOrgChart == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewOrgChart = false)
374 374   #end
375 375   #if($canViewOrgChart)
376 376   <div class="seitokai-subsection">
377 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/><line x1="9" y1="10" x2="9" y2="10.01"/><line x1="15" y1="10" x2="15" y2="10.01"/><line x1="9" y1="14" x2="9" y2="14.01"/><line x1="15" y1="14" x2="15" y2="14.01"/></svg> 生徒会組織 #if($visibilityOrgChart != 'public')<span class="visibility-badge visibility-${visibilityOrgChart}">#if($visibilityOrgChart == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
338 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/><line x1="9" y1="10" x2="9" y2="10.01"/><line x1="15" y1="10" x2="15" y2="10.01"/><line x1="9" y1="14" x2="9" y2="14.01"/><line x1="15" y1="14" x2="15" y2="14.01"/></svg> 組織図 #if($visibilityOrgChart != 'public')<span class="visibility-badge visibility-${visibilityOrgChart}">#if($visibilityOrgChart == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
378 378   <div class="seitokai-subsection-content">
379 379   #if($orgChartImage && $orgChartImage != '')
380 380   <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
381 381   #end
382 - #if($orgChart && $orgChart != '')<div class="free-note">$!escapetool.xml($orgChart)</div>#end
343 + #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end
383 383   </div>
384 384   </div>
385 385   #else
386 - <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 生徒会組織は #if($visibilityOrgChart == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
347 + <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 組織図は #if($visibilityOrgChart == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
387 387   #end
388 388   #end
389 389  
... ... @@ -392,10 +392,12 @@
392 392   <div class="seitokai-subsection">
393 393   <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>
394 394   <div class="seitokai-subsection-content">
395 - <p class="activity-hint">活動時間が多い3つ</p>
356 + <p class="activity-hint">活動時間の多い順に上位3つ</p>
396 396   <div class="tag-container">
358 + #set($daIdx = 1)
397 397   #foreach($da in $dailyActivities)
398 - <span class="tag tag-accent">$!escapetool.xml($da.trim())</span>
360 + <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
361 + #set($daIdx = $daIdx + 1)
399 399   #end
400 400   </div>
401 401   #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
... ... @@ -447,12 +447,12 @@
447 447   #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
448 448   #if($hasBudget)
449 449   #set($canViewBudget = true)
450 - #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewBudget = false)
451 - #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false)
413 + #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewBudget = false)
414 + #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false)
452 452   #end
453 453   #if($canViewBudget)
454 454   <div class="seitokai-subsection">
455 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><line x1="12" y1="1" x2="12" y2="23"/><path d="M17 5H9.5a3.5 3.5 0 000 7h5a3.5 3.5 0 010 7H6"/></svg> 予算 #if($visibilityBudget != 'public')<span class="visibility-badge visibility-${visibilityBudget}">#if($visibilityBudget == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
418 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><line x1="12" y1="1" x2="12" y2="23"/><path d="M17 5H9.5a3.5 3.5 0 000 7h5a3.5 3.5 0 010 7H6"/></svg> 予算 #if($visibilityBudget != 'public')<span class="visibility-badge visibility-${visibilityBudget}">#if($visibilityBudget == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
456 456   <div class="seitokai-subsection-content">
457 457   #if($budgetProcess && !$budgetProcess.isEmpty())
458 458   <div class="info-row">
... ... @@ -503,12 +503,12 @@
503 503   ## --- 校則の見直し ---
504 504   #if($ruleReviewStatus && $ruleReviewStatus != '')
505 505   #set($canViewRuleReview = true)
506 - #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewRuleReview = false)
507 - #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false)
469 + #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewRuleReview = false)
470 + #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false)
508 508   #end
509 509   #if($canViewRuleReview)
510 510   <div class="seitokai-subsection">
511 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M16 4h2a2 2 0 012 2v12a2 2 0 01-2 2h-2"/><path d="M8 4H6a2 2 0 00-2 2v12a2 2 0 002 2h2"/><line x1="12" y1="4" x2="12" y2="8"/><line x1="12" y1="16" x2="12" y2="20"/><line x1="8" y1="8" x2="16" y2="8"/><line x1="8" y1="16" x2="16" y2="16"/></svg> 校則の見直し #if($visibilityRuleReview != 'public')<span class="visibility-badge visibility-${visibilityRuleReview}">#if($visibilityRuleReview == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
474 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M16 4h2a2 2 0 012 2v12a2 2 0 01-2 2h-2"/><path d="M8 4H6a2 2 0 00-2 2v12a2 2 0 002 2h2"/><line x1="12" y1="4" x2="12" y2="8"/><line x1="12" y1="16" x2="12" y2="20"/><line x1="8" y1="8" x2="16" y2="8"/><line x1="8" y1="16" x2="16" y2="16"/></svg> 校則の見直し #if($visibilityRuleReview != 'public')<span class="visibility-badge visibility-${visibilityRuleReview}">#if($visibilityRuleReview == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
512 512   <div class="seitokai-subsection-content">
513 513   <div class="info-row">
514 514   <span class="info-label">見直しの有無（3年以内）</span>
... ... @@ -566,12 +566,12 @@
566 566   ## --- 生徒会の課題意識 ---
567 567   #if($challenges && $challenges != '')
568 568   #set($canViewChallenges = true)
569 - #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewChallenges = false)
570 - #elseif($visibilityChallenges == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewChallenges = false)
532 + #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewChallenges = false)
533 + #elseif($visibilityChallenges == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewChallenges = false)
571 571   #end
572 572   #if($canViewChallenges)
573 573   <div class="seitokai-subsection">
574 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M12 16v-4"/><path d="M12 8h.01"/></svg> 生徒会の課題意識 #if($visibilityChallenges != 'public')<span class="visibility-badge visibility-${visibilityChallenges}">#if($visibilityChallenges == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
537 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M12 16v-4"/><path d="M12 8h.01"/></svg> 生徒会の課題意識 #if($visibilityChallenges != 'public')<span class="visibility-badge visibility-${visibilityChallenges}">#if($visibilityChallenges == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
575 575   <div class="seitokai-subsection-content">
576 576   <div class="challenge-text">$!escapetool.xml($challenges)</div>
577 577   </div>
... ... @@ -595,11 +595,6 @@
595 595   <tr><th>YouTube</th><td>#if($seitokaiYoutube && $seitokaiYoutube != '')<a href="$!escapetool.xml($seitokaiYoutube)" target="_blank" rel="noopener"><svg class="ico" viewBox="0 0 24 24"><polygon points="5 3 19 12 5 21 5 3"/></svg> YouTubeチャンネル</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
596 596   <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
597 597   </table>
598 - #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
599 - #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
600 - #if($infoEditDate && $infoEditDate != '')
601 - <div class="info-last-updated"><svg class="ico" viewBox="0 0 24 24"><path d="M11 4H4a2 2 0 00-2 2v14a2 2 0 002 2h14a2 2 0 002-2v-7"/><path d="M18.5 2.5a2.121 2.121 0 013 3L12 15l-4 1 1-4 9.5-9.5z"/></svg> 基本情報の最終更新: $!escapetool.xml($infoEditBy) — $!escapetool.xml($infoEditDate)</div>
602 - #end
603 603  </div>
604 604  
605 605  {{/html}}
... ... @@ -654,23 +654,22 @@
654 654   <div class="author-legend-body">
655 655   <div class="author-legend">
656 656   <span class="author-legend-title">投稿者の信頼度:</span>
657 - <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者 <span class="text-hint">— 運営スタッフ</span></span>
658 - <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み <span class="text-hint">— 本人確認済みのユーザー</span></span>
659 - <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介 <span class="text-hint">— 承認済みユーザーからの紹介</span></span>
660 - <span class="author-legend-item"><span class="bar bar-general"></span> 一般 <span class="text-hint">— 一般登録ユーザー</span></span>
615 + <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者</span>
616 + <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み</span>
617 + <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介</span>
618 + <span class="author-legend-item"><span class="bar bar-general"></span> 一般（未承認）</span>
661 661   </div>
662 662   <div class="author-legend">
663 663   <span class="author-legend-title">所属:</span>
664 - <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>
665 - <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>
666 - <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>
667 - <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>
668 - <span class="author-legend-item text-hint">※一般アカウントは所属バッジが表示されません</span>
622 + <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>
623 + <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>
624 + <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>
625 + <span class="author-legend-item text-hint">※一般アカウントは所属未確認のため非表示</span>
669 669   </div>
670 670   <div class="author-legend">
671 671   <span class="author-legend-title">役割:</span>
672 672   <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>
673 - <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>
630 + <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 674   <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>
675 675   </div>
676 676   </div>
... ... @@ -739,18 +739,16 @@
739 739  <div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)">
740 740   <div class="activity-thread-header">
741 741   <div class="activity-thread-title">
742 - <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>
743 - <div class="activity-meta-line">
744 - <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
745 - #set($actTagsList = $activity.getValue('tags'))
746 - #if($actTagsList && !$actTagsList.isEmpty())
747 - #foreach($tagItem in $actTagsList)
748 - #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end
749 - #end
699 + <h3 #if($actFeatured == '1')class="featured-title"#end>$!escapetool.xml($!actTitle) #if($actFeatured == '1')<svg class="ico ico-fixed-14 ico-star-offset" viewBox="0 0 24 24" fill="currentColor" stroke="none"><polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"/></svg>#end</h3>
700 + <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
701 + #set($actTagsList = $activity.getValue('tags'))
702 + #if($actTagsList && !$actTagsList.isEmpty())
703 + #foreach($tagItem in $actTagsList)
704 + #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end
750 750   #end
751 - </div>
706 + #end
752 752   </div>
753 - <div class="thread-meta-right">
708 + <div class="thread-meta-row">
754 754   <span class="thread-post-count">${reportCount}件の報告 ・ ${commentCount}件のコメント</span>
755 755   #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred')
756 756   #if($actFeatured == '1')
... ... @@ -810,8 +810,8 @@
810 810   #set($postVis = $!post.getValue('visibility'))
811 811   #if(!$postVis || $postVis == '') #set($postVis = 'public') #end
812 812   #set($canViewPost = true)
813 - #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewPost = false)
814 - #elseif($postVis == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPost = false)
768 + #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewPost = false)
769 + #elseif($postVis == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPost = false)
815 815   #end
816 816   #if(!$canViewPost)
817 817   <div class="thread-post visibility-restricted-post">
... ... @@ -855,11 +855,8 @@
855 855   <span class="badge badge-general badge-sm">一般</span>
856 856   #end
857 857   ## 所属バッジ（投稿者の学校コードとページの学校コードを比較）
858 - #set($postIsSchoolMatch = ($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode)))
859 859   #if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general')
860 - #if($postUserRole == 'graduate' && $postIsSchoolMatch)
861 - <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>
862 - #elseif($postIsSchoolMatch && $postUserRole != 'graduate')
814 + #if($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode))
863 863   #if($postAccountType == 'verified' || $postAccountType == 'admin')
864 864   <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>
865 865   #else
... ... @@ -886,13 +886,6 @@
886 886   #if($postEdited == 1 || $postEdited == '1')
887 887   <span class="post-edited-label">（編集済み）</span>
888 888   #end
889 - #set($postAuthorRefH = $!post.getValue('authorRef'))
890 - #set($postObjNumH = $post.number)
891 - #if(!$isGuest && $xcontext.user != $postAuthorRefH)
892 - <button type="button" class="btn-post-report btn-post-report-header" onclick="openReportDialog(this, '${doc.fullName}', $postObjNumH, '${services.csrf.getToken()}')" title="この投稿を通報">
893 - <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> 通報
894 - </button>
895 - #end
896 896   </div>
897 897   <div class="thread-post-body">
898 898   $!escapetool.xml($!postContent)
... ... @@ -957,18 +957,12 @@
957 957   #end
958 958   </div>
959 959   #if($postVis != 'public')
960 - <div class="visibility-badge visibility-${postVis} post-action-mt">#if($postVis == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</div>
905 + <div class="visibility-badge visibility-${postVis} post-action-mt">#if($postVis == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</div>
961 961   #end
962 - ## 固定/編集/削除/通報/非表示ボタン（横並び）
963 - #set($postAuthorRef = $!post.getValue('authorRef'))
964 - #set($postObjNumED = $post.number)
965 - #set($showPinBtn = ($viewerAccountType == 'admin' || $viewerAccountType == 'verified'))
966 - #set($showEditDeleteBtn = ($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin'))
967 - #set($showHideBtn = ($viewerAccountType == 'admin'))
968 - #if($showPinBtn || $showEditDeleteBtn || $showHideBtn)
969 - <div class="post-edit-actions post-action-mt">
970 - #if($showPinBtn)
971 - #set($postObjNum = $post.number)
907 + ## 固定/解除ボタン（承認済み・管理者のみ）
908 + #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
909 + #set($postObjNum = $post.number)
910 + <div class="post-pin-action post-action-mt">
972 972   #if($isPinned == '1')
973 973   <a href="$doc.getURL('view', "action=unpin&postObj=${postObjNum}&form_token=${services.csrf.getToken()}")" class="btn-pin-toggle btn-unpin" title="固定を解除">
974 974   <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> 固定を解除
... ... @@ -978,12 +978,15 @@
978 978   <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> 固定する
979 979   </a>
980 980   #end
981 - #end
982 - #if($showEditDeleteBtn)
920 + </div>
921 + #end
922 + ## 編集・削除ボタン（投稿者本人 or 管理者）
923 + #set($postAuthorRef = $!post.getValue('authorRef'))
924 + #set($postObjNumED = $post.number)
925 + #if($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin')
926 + <div class="post-edit-actions post-action-mt">
983 983   #if($xcontext.user == $postAuthorRef)
984 - #set($editImages = $!post.getValue('images'))
985 - #set($editFiles = $!post.getValue('files'))
986 - <button type="button" class="btn-post-edit" data-school="${doc.fullName}" data-obj="$postObjNumED" data-content="$!escapetool.xml($!postContent)" data-images="$!escapetool.xml($!editImages)" data-files="$!escapetool.xml($!editFiles)" data-post-type="$!post.getValue('postType')" onclick="openEditPost(this)" title="この投稿を編集">
928 + <button type="button" class="btn-post-edit" onclick="openEditPost(this, '${doc.fullName}', $postObjNumED, '$!escapetool.javascript($!postContent)')" title="この投稿を編集">
987 987   <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> 編集
988 988   </button>
989 989   #end
... ... @@ -990,12 +990,6 @@
990 990   <button type="button" class="btn-post-delete" onclick="confirmDeletePost('${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を削除">
991 991   <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> 削除
992 992   </button>
993 - #end
994 - #if($showHideBtn)
995 - <button type="button" class="btn-post-hide" onclick="openHideDialog(this, '${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を非表示にする">
996 - <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> 非表示
997 - </button>
998 - #end
999 999   </div>
1000 1000   #end
1001 1001   </div>
... ... @@ -1045,11 +1045,9 @@
1045 1045  
1046 1046   #if($xcontext.user != "XWiki.XWikiGuest")
1047 1047   <div class="thread-add-post">
1048 - #if($isSchoolMember || $isViewerAdmin)
1049 1049   <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
1050 1050   ＋ 活動報告を追加
1051 1051   </a>
1052 - #end
1053 1053   <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
1054 1054   <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> コメントを書く
1055 1055   </a>
... ... @@ -1126,27 +1126,6 @@
1126 1126  }
1127 1127  // ページ読み込み時の初期化
1128 1128  document.addEventListener('DOMContentLoaded', function() {
1129 - // 年度タブを降順にソート（「全期間」タブは末尾に固定）
1130 - var tabContainer = document.querySelector('.activity-fy-tabs');
1131 - if (tabContainer) {
1132 - var tabs = Array.from(tabContainer.querySelectorAll('.activity-fy-tab'));
1133 - var allTab = null;
1134 - var fyTabs = [];
1135 - tabs.forEach(function(t) {
1136 - var onclickStr = t.getAttribute('onclick') || '';
1137 - if (onclickStr.indexOf("'all'") !== -1) { allTab = t; }
1138 - else { fyTabs.push(t); }
1139 - });
1140 - // 年度タブを数値の降順でソート
1141 - fyTabs.sort(function(a, b) {
1142 - var aYear = parseInt(a.textContent) || 0;
1143 - var bYear = parseInt(b.textContent) || 0;
1144 - return bYear - aYear;
1145 - });
1146 - // DOM再配置
1147 - fyTabs.forEach(function(t) { tabContainer.appendChild(t); });
1148 - if (allTab) { tabContainer.appendChild(allTab); }
1149 - }
1150 1150   // デフォルトで現在の年度を表示
1151 1151   var defaultTab = document.querySelector('.activity-fy-tab.active');
1152 1152   if (defaultTab) { defaultTab.click(); }
... ... @@ -1162,15 +1162,14 @@
1162 1162   document.querySelectorAll('.activity-thread-header').forEach(function(header) {
1163 1163   header.addEventListener('click', toggleThreadExpand);
1164 1164   });
1165 - // 長文投稿の折りたたみ初期化（max-height: 12em 超で省略）
1078 + // 長文投稿の折りたたみ初期化
1166 1166   document.querySelectorAll('.thread-post-body').forEach(function(body) {
1167 - // pre-wrapのまま高さを測定し、max-height(12em ≒ ~200px)を超える場合に折りたたむ
1080 + // 先にtruncatedを仮適用してline-clampを有効にし、高さの差分で判定
1168 1168   var fullH = body.scrollHeight;
1169 - // 12em を px に変換（font-size × line-height × 行数 の近似値ではなくCSSと同じ値を取得）
1170 1170   body.classList.add('truncated');
1171 - var maxH = body.clientHeight; // max-height: 12em 適用後の高さ
1083 + var clampedH = body.clientHeight;
1172 1172   body.classList.remove('truncated');
1173 - if (fullH > maxH + 30) {
1085 + if (fullH > clampedH * 1.3 + 20) {
1174 1174   body.classList.add('truncated');
1175 1175   var btn = document.createElement('button');
1176 1176   btn.className = 'btn-read-more';
... ... @@ -1216,130 +1216,37 @@
1216 1216  }
1217 1217  
1218 1218  // 投稿の編集（インライン編集フォームを開く）
1219 -function openEditPost(btn) {
1131 +function openEditPost(btn, schoolPage, postObjNum, currentContent) {
1220 1220   var postEl = btn.closest('.thread-post');
1221 1221   if (!postEl) return;
1134 + // 既存の編集フォームがあれば閉じる
1222 1222   var existing = postEl.querySelector('.post-edit-form');
1223 1223   if (existing) { existing.remove(); return; }
1224 1224   var bodyEl = postEl.querySelector('.thread-post-body');
1225 1225   if (!bodyEl) return;
1226 -
1227 - var schoolPage = btn.getAttribute('data-school');
1228 - var postObjNum = btn.getAttribute('data-obj');
1229 - var currentContent = btn.getAttribute('data-content') || '';
1230 - var currentImages = btn.getAttribute('data-images') || '';
1231 - var currentFiles = btn.getAttribute('data-files') || '';
1232 - var postType = btn.getAttribute('data-post-type') || 'report';
1233 -
1234 1234   var form = document.createElement('div');
1235 1235   form.className = 'post-edit-form';
1236 - form.setAttribute('data-school', schoolPage);
1237 - form.setAttribute('data-obj', postObjNum);
1238 -
1239 - var html = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>';
1240 -
1241 - // コメント以外は添付ファイル編集を表示
1242 - if (postType !== 'comment') {
1243 - // 既存画像
1244 - html += '<div class="edit-attachments">';
1245 - if (currentImages.trim()) {
1246 - html += '<div class="edit-attach-section"><span class="edit-attach-label">画像</span>';
1247 - var imgs = currentImages.trim().split('\n');
1248 - for (var i = 0; i < imgs.length; i++) {
1249 - var img = imgs[i].trim();
1250 - if (!img) continue;
1251 - html += '<div class="edit-attach-item" data-name="' + img.replace(/"/g,'&quot;') + '">' +
1252 - '<img src="/xwiki/bin/download/' + schoolPage.replace(/\./g,'/') + '/' + encodeURIComponent(img) + '" class="edit-attach-thumb" />' +
1253 - '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1254 - '<input type="hidden" name="keepImages" value="' + img.replace(/"/g,'&quot;') + '" />' +
1255 - '</div>';
1256 - }
1257 - html += '</div>';
1258 - }
1259 - // 既存ファイル
1260 - if (currentFiles.trim()) {
1261 - html += '<div class="edit-attach-section"><span class="edit-attach-label">ファイル</span>';
1262 - var files = currentFiles.trim().split('\n');
1263 - for (var j = 0; j < files.length; j++) {
1264 - var f = files[j].trim();
1265 - if (!f) continue;
1266 - var displayName = f;
1267 - if (/^file_\d{14}_\d+_/.test(f)) displayName = f.replace(/^file_\d{14}_\d+_/, '');
1268 - html += '<div class="edit-attach-item" data-name="' + f.replace(/"/g,'&quot;') + '">' +
1269 - '<span class="edit-attach-fname">' + displayName.replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</span>' +
1270 - '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1271 - '<input type="hidden" name="keepFiles" value="' + f.replace(/"/g,'&quot;') + '" />' +
1272 - '</div>';
1273 - }
1274 - html += '</div>';
1275 - }
1276 - // 新規追加
1277 - html += '<div class="edit-attach-add">' +
1278 - '<label class="form-label-sm">画像を追加（最大4枚まで）</label>' +
1279 - '<input type="file" name="editNewImages" accept="image/*" multiple class="form-file-input-sm" />' +
1280 - '<div class="form-hint">JPEG / PNG / GIF / WebP、各5MBまで</div>' +
1281 - '<label class="form-label-sm" style="margin-top:8px;">ファイルを追加（最大2つまで）</label>' +
1282 - '<input type="file" name="editNewFiles" accept=".pdf,.docx,.xlsx,.pptx" multiple class="form-file-input-sm" />' +
1283 - '<div class="form-hint">PDF / Word / Excel / PowerPoint、各10MBまで</div>' +
1284 - '</div>';
1285 - html += '</div>';
1286 - }
1287 -
1288 - html += '<div class="post-edit-form-actions">' +
1141 + form.innerHTML = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>' +
1142 + '<div class="post-edit-form-actions">' +
1289 1289   '<button type="button" class="btn-cancel-edit" onclick="this.closest(\'.post-edit-form\').remove()">キャンセル</button>' +
1290 - '<button type="button" class="btn-save" onclick="saveEditPost(this)">保存</button>' +
1144 + '<button type="button" class="btn-save" onclick="saveEditPost(\'' + schoolPage + '\', ' + postObjNum + ')">保存</button>' +
1291 1291   '</div>';
1292 -
1293 - form.innerHTML = html;
1294 1294   bodyEl.parentNode.insertBefore(form, bodyEl.nextSibling);
1295 1295   form.querySelector('textarea').focus();
1296 1296  }
1297 1297  
1298 -function removeEditAttach(btn) {
1299 - var item = btn.closest('.edit-attach-item');
1300 - if (item) item.remove();
1301 -}
1302 -
1303 1303  // 投稿の編集を保存
1304 -function saveEditPost(btn) {
1305 - var formEl = btn.closest('.post-edit-form');
1306 - if (!formEl) return;
1307 - var schoolPage = formEl.getAttribute('data-school');
1308 - var postObjNum = formEl.getAttribute('data-obj');
1309 - var textarea = formEl.querySelector('textarea');
1151 +function saveEditPost(schoolPage, postObjNum) {
1152 + var textarea = document.getElementById('editContent_' + postObjNum);
1310 1310   if (!textarea) return;
1311 1311   var newContent = textarea.value.trim();
1312 1312   if (!newContent) { alert('投稿内容を入力してください'); return; }
1313 -
1314 1314   var csrfEl = document.querySelector('input[name="form_token"]');
1315 1315   var csrfToken = csrfEl ? csrfEl.value : '';
1316 -
1317 - var fd = new FormData();
1318 - fd.append('schoolPage', schoolPage);
1319 - fd.append('postObj', postObjNum);
1320 - fd.append('newContent', newContent);
1321 - fd.append('form_token', csrfToken);
1322 -
1323 - // 残す画像・ファイル
1324 - formEl.querySelectorAll('input[name="keepImages"]').forEach(function(el) { fd.append('keepImages', el.value); });
1325 - formEl.querySelectorAll('input[name="keepFiles"]').forEach(function(el) { fd.append('keepFiles', el.value); });
1326 -
1327 - // 新規画像
1328 - var newImgInput = formEl.querySelector('input[name="editNewImages"]');
1329 - if (newImgInput && newImgInput.files) {
1330 - for (var i = 0; i < newImgInput.files.length; i++) { fd.append('editNewImages', newImgInput.files[i]); }
1331 - }
1332 - // 新規ファイル
1333 - var newFileInput = formEl.querySelector('input[name="editNewFiles"]');
1334 - if (newFileInput && newFileInput.files) {
1335 - for (var j = 0; j < newFileInput.files.length; j++) { fd.append('editNewFiles', newFileInput.files[j]); }
1336 - }
1337 -
1338 - btn.disabled = true;
1339 - btn.textContent = '保存中...';
1340 -
1341 1341   var xhr = new XMLHttpRequest();
1342 1342   xhr.open('POST', '/bin/get/SeitokaiCode/EditPost?outputSyntax=plain', true);
1160 + xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1161 + var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken);
1343 1343   xhr.onload = function() {
1344 1344   try {
1345 1345   var res = JSON.parse(xhr.responseText);
... ... @@ -1347,13 +1347,12 @@
1347 1347   showToast('投稿を更新しました', 'success');
1348 1348   setTimeout(function() { location.reload(); }, 800);
1349 1349   } else {
1350 - btn.disabled = false; btn.textContent = '保存';
1351 1351   alert('編集に失敗しました: ' + (res.error || ''));
1352 1352   }
1353 - } catch(e) { btn.disabled = false; btn.textContent = '保存'; alert('編集に失敗しました'); }
1171 + } catch(e) { alert('編集に失敗しました'); }
1354 1354   };
1355 - xhr.onerror = function() { btn.disabled = false; btn.textContent = '保存'; alert('通信エラーが発生しました'); };
1356 - xhr.send(fd);
1173 + xhr.onerror = function() { alert('通信エラーが発生しました'); };
1174 + xhr.send(editPostData);
1357 1357  }
1358 1358  
1359 1359  // 投稿の削除（確認ダイアログ付き）
... ... @@ -1377,80 +1377,6 @@
1377 1377   xhr.onerror = function() { alert('通信エラーが発生しました'); };
1378 1378   xhr.send(deletePostData);
1379 1379  }
1380 -
1381 -/* --- 通報ダイアログ --- */
1382 -function openReportDialog(btn, targetPage, postObjNum, token) {
1383 - if (document.getElementById('report-dialog-overlay')) return;
1384 - var reasons = ['宣伝・スパム','不適切な内容','個人情報の露出','誹謗中傷','誤情報','その他'];
1385 - var overlay = document.createElement('div');
1386 - overlay.id = 'report-dialog-overlay';
1387 - 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;';
1388 - var dialog = document.createElement('div');
1389 - dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;max-height:80vh;overflow-y:auto;';
1390 - var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を通報</h3>';
1391 - html += '<p style="margin:0 0 12px;font-size:0.9em;color:#4b5563;">通報された投稿は管理者が確認するまで一時的に非表示になります。</p>';
1392 - html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">通報理由</label>';
1393 - html += '<select id="report-reason" style="width:100%;padding:8px;border:1px solid #d1d5db;border-radius:8px;margin-bottom:12px;font-size:0.9em;">';
1394 - for (var i=0; i<reasons.length; i++) html += '<option value="'+reasons[i]+'">'+reasons[i]+'</option>';
1395 - html += '</select>';
1396 - html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">補足コメント（任意）</label>';
1397 - 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>';
1398 - html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
1399 - html += '<button type="button" id="report-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
1400 - 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>';
1401 - html += '</div>';
1402 - dialog.innerHTML = html;
1403 - overlay.appendChild(dialog);
1404 - document.body.appendChild(overlay);
1405 - overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
1406 - document.getElementById('report-cancel-btn').addEventListener('click', function() { overlay.remove(); });
1407 - document.getElementById('report-submit-btn').addEventListener('click', function() {
1408 - var reason = document.getElementById('report-reason').value;
1409 - var detail = document.getElementById('report-detail').value;
1410 - var submitBtn = document.getElementById('report-submit-btn');
1411 - submitBtn.disabled = true; submitBtn.textContent = '送信中...';
1412 - var xhr = new XMLHttpRequest();
1413 - xhr.open('POST', '/bin/get/SeitokaiCode/ReportAction?outputSyntax=plain', true);
1414 - xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1415 - var data = 'targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&detail=' + encodeURIComponent(detail) + '&form_token=' + encodeURIComponent(token);
1416 - xhr.onload = function() {
1417 - overlay.remove();
1418 - showToast('通報を受け付けました', 'success');
1419 - setTimeout(function() { location.reload(); }, 1000);
1420 - };
1421 - xhr.onerror = function() { overlay.remove(); alert('通信エラーが発生しました'); };
1422 - xhr.send(data);
1423 - });
1424 -}
1425 -
1426 -/* --- 非表示ダイアログ（管理者用） --- */
1427 -function openHideDialog(btn, targetPage, postObjNum, token) {
1428 - if (document.getElementById('hide-dialog-overlay')) return;
1429 - var overlay = document.createElement('div');
1430 - overlay.id = 'hide-dialog-overlay';
1431 - 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;';
1432 - var dialog = document.createElement('div');
1433 - dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;';
1434 - var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を非表示にする</h3>';
1435 - html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">非表示の理由</label>';
1436 - 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="理由を入力" />';
1437 - html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
1438 - html += '<button type="button" id="hide-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
1439 - 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>';
1440 - 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>';
1441 - html += '</div>';
1442 - dialog.innerHTML = html;
1443 - overlay.appendChild(dialog);
1444 - document.body.appendChild(overlay);
1445 - overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
1446 - document.getElementById('hide-cancel-btn').addEventListener('click', function() { overlay.remove(); });
1447 - function doHide(action) {
1448 - var reason = document.getElementById('hide-reason').value || '管理者判断';
1449 - window.location.href = '/bin/view/SeitokaiCode/ModerationAction?action=' + action + '&targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&form_token=' + encodeURIComponent(token);
1450 - }
1451 - document.getElementById('hide-submit-btn').addEventListener('click', function() { doHide('hide'); });
1452 - document.getElementById('hide-warn-btn').addEventListener('click', function() { doHide('hide-warn'); });
1453 -}
1454 1454  </script>
1455 1455  {{/html}}
1456 1456  {{/velocity}}