Skip to Content
Last modified by Super Admin on 2026/04/05 18:59
From version Icon 65.1 Icon
edited by Super Admin
on 2026/03/18 08:56
Change comment: There is no comment for this version
To version Icon 89.1 Icon
edited by Super Admin
on 2026/03/20 02:19
Change comment: There is no comment for this version

Summary

Details

Icon Page properties
Content
... ... @@ -1,5 +1,11 @@
1 1  {{velocity}}
2 2  ## ===== 学校ページ テンプレート =====
3 +## ゲストが ?sheet= 付きURL（編集フォーム等）に直接アクセスした場合、ログインページへリダイレクト
4 +#if($xcontext.user == 'XWiki.XWikiGuest' && $request.sheet && $request.sheet != '')
5 + #set($currentUrl = $doc.getURL('view', "sheet=${request.sheet}"))
6 + $response.sendRedirect("/bin/login/XWiki/XWikiLogin?srid=$escapetool.url($currentUrl)")
7 + #stop
8 +#end
3 3  {{html clean="false"}}
4 4  ## メンテナンスバナー（{{include}}ではなくインラインで記述し、<p>タグ挿入を回避）
5 5  #set($bannerDoc = $xwiki.getDocument('SeitokaiAdmin.MaintenanceBanner'))
... ... @@ -28,8 +28,10 @@
28 28  #set($schoolLevel = $doc.getValue('schoolLevel'))
29 29  #set($schoolSystem = $doc.getValue('schoolSystem'))
30 30  #set($website = $doc.getValue('website'))
37 +#set($schoolPhoto = $doc.getValue('schoolPhoto'))
38 +#set($schoolDescription = $doc.getValue('schoolDescription'))
31 31  
32 -## --- 組織図 ---
40 +## --- 生徒会組織 ---
33 33  #set($orgChart = $doc.getValue('orgChart'))
34 34  #set($orgChartImage = $doc.getValue('orgChartImage'))
35 35  
... ... @@ -95,11 +95,42 @@
95 95   #set($viewerDoc = $xwiki.getDocument($viewerUser))
96 96   #set($viewerAccountType = $!viewerDoc.getValue('accountType'))
97 97   #set($viewerSchoolCode = $!viewerDoc.getValue('schoolCode'))
106 + #set($viewerSecondarySchoolCode = $!viewerDoc.getValue('secondarySchoolCode'))
107 + #set($viewerUserRole = $!viewerDoc.getValue('userRole'))
98 98   #if($viewerAccountType == 'admin')
99 99   #set($isViewerAdmin = true)
100 100   #end
101 101  #end
102 102  
113 +## --- 関連校（中高一貫校）情報 ---
114 +#set($affiliatedSchoolCode = $!doc.getValue('affiliatedSchoolCode'))
115 +#set($affiliatedSchoolName = $!doc.getValue('affiliatedSchoolName'))
116 +#set($isAffiliated = false)
117 +#if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
118 + #if($viewerSchoolCode == $affiliatedSchoolCode)
119 + #set($isAffiliated = true)
120 + #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode)
121 + #set($isAffiliated = true)
122 + #end
123 +#end
124 +
125 +## --- 校内判定（卒業生を除外、secondarySchoolCodeも含む） ---
126 +#set($isSchoolMember = false)
127 +#if(!$isGuest && $viewerUserRole != 'graduate')
128 + #if($viewerSchoolCode == $schoolCode || $isAffiliated)
129 + #set($isSchoolMember = true)
130 + #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode)
131 + #set($isSchoolMember = true)
132 + #end
133 +#end
134 +## 卒業生の母校判定（投稿バッジ用）
135 +#set($isAlumniOfSchool = false)
136 +#if(!$isGuest && $viewerUserRole == 'graduate')
137 + #if($viewerSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $viewerSchoolCode == $affiliatedSchoolCode))
138 + #set($isAlumniOfSchool = true)
139 + #end
140 +#end
141 +
103 103  ## --- 学校ページ非表示チェック ---
104 104  #set($schoolHidden = $doc.getValue('hidden'))
105 105  #if($schoolHidden == 1)
... ... @@ -133,7 +133,7 @@
133 133  
134 134  ## --- 投稿固定/解除処理 ---
135 135  #set($pinAction = $!request.action)
136 -#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token))
175 +#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $isSchoolMember)) && $services.csrf.isTokenValid($request.form_token))
137 137   #set($pinPostObjStr = $!request.postObj)
138 138   #if(!$pinPostObjStr.matches('^\d+$'))
139 139   ## 不正な値 → 無視
... ... @@ -163,7 +163,7 @@
163 163  
164 164  ## --- 特色ある活動 選定/解除処理 ---
165 165  #set($featAction = $!request.action)
166 -#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token))
205 +#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $isSchoolMember)) && $services.csrf.isTokenValid($request.form_token))
167 167   #set($featActObjStr = $!request.actObj)
168 168   #if($featActObjStr.matches('^\d+$'))
169 169   #set($actObjNum = $mathtool.toInteger($featActObjStr))
... ... @@ -265,7 +265,7 @@
265 265  
266 266  ## --- 編集ボタン（権限があるユーザーのみ表示） ---
267 267  #set($canEditSchool = false)
268 -#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode))
307 +#if(!$isGuest && ($isViewerAdmin || $isSchoolMember))
269 269   #set($canEditSchool = true)
270 270  #end
271 271  #if($canEditSchool)
... ... @@ -274,25 +274,51 @@
274 274  </div>
275 275  #end
276 276  
316 +## --- 関連校（中高一貫校）バナー ---
317 +#if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
318 + #set($affiliatedPageRef = "Schools.${affiliatedSchoolCode}.WebHome")
319 + #set($affiliatedPageExists = $xwiki.exists($affiliatedPageRef))
320 +<div class="affiliated-school-banner">
321 + <svg class="ico" viewBox="0 0 24 24" stroke-width="1.5"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg>
322 + <div>
323 + <strong>中高一貫校</strong>：
324 + #if($affiliatedPageExists)
325 + <a href="$xwiki.getURL($affiliatedPageRef, 'view')">$!escapetool.xml($affiliatedSchoolName)</a>
326 + #else
327 + $!escapetool.xml($affiliatedSchoolName)
328 + #end
329 + と連携しています
330 + </div>
331 +</div>
332 +#end
333 +
277 277  ## --- ① 学校基本情報 ---
278 278  <div class="school-info-card collapsed" id="card-basic-info">
279 279   <h2 role="button" tabindex="0" aria-expanded="false" onclick="toggleInfoCard('card-basic-info')" onkeydown="if(event.key==='Enter'||event.key===' '){event.preventDefault();toggleInfoCard('card-basic-info')}"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M4 19.5A2.5 2.5 0 016.5 17H20"/><path d="M6.5 2H20v20H6.5A2.5 2.5 0 014 19.5v-15A2.5 2.5 0 016.5 2z"/></svg> 学校基本情報</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2>
280 - <table class="wiki-table school-info-table">
281 - <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
282 - <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
283 - <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
284 - <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
285 - <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
286 - <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
287 - <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
288 - <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
289 - <tr><th>公式サイト</th><td>#if($website && $website != '')<a href="$!escapetool.xml($website)" target="_blank" rel="noopener">$!escapetool.xml($website)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
290 - </table>
291 - #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
292 - #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
293 - #if($infoEditDate && $infoEditDate != '')
294 - <div class="info-last-updated"><svg class="ico" viewBox="0 0 24 24"><path d="M11 4H4a2 2 0 00-2 2v14a2 2 0 002 2h14a2 2 0 002-2v-7"/><path d="M18.5 2.5a2.121 2.121 0 013 3L12 15l-4 1 1-4 9.5-9.5z"/></svg> 基本情報の最終更新: $!escapetool.xml($infoEditBy) — $!escapetool.xml($infoEditDate)</div>
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>
295 295   #end
360 +
296 296  </div>
297 297  
298 298  ## --- ② 生徒会基本情報（折りたたみカード） ---
... ... @@ -300,25 +300,25 @@
300 300   <h2 role="button" tabindex="0" aria-expanded="true" onclick="toggleInfoCard('card-seitokai-info')" onkeydown="if(event.key==='Enter'||event.key===' '){event.preventDefault();toggleInfoCard('card-seitokai-info')}"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/></svg> 生徒会基本情報</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2>
301 301   <div class="seitokai-info-body">
302 302  
303 - ## --- 組織図 ---
368 + ## --- 生徒会組織 ---
304 304   #set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
305 305   #if($hasOrgContent)
306 306   #set($canViewOrgChart = true)
307 - #if($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewOrgChart = false)
308 - #elseif($visibilityOrgChart == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ($viewerSchoolCode != $schoolCode || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewOrgChart = false)
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)
309 309   #end
310 310   #if($canViewOrgChart)
311 311   <div class="seitokai-subsection">
312 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/><line x1="9" y1="10" x2="9" y2="10.01"/><line x1="15" y1="10" x2="15" y2="10.01"/><line x1="9" y1="14" x2="9" y2="14.01"/><line x1="15" y1="14" x2="15" y2="14.01"/></svg> 組織図 #if($visibilityOrgChart != 'public')<span class="visibility-badge visibility-${visibilityOrgChart}">#if($visibilityOrgChart == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
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>
313 313   <div class="seitokai-subsection-content">
314 314   #if($orgChartImage && $orgChartImage != '')
315 315   <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
316 316   #end
317 - #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end
382 + #if($orgChart && $orgChart != '')<div class="free-note">$!escapetool.xml($orgChart)</div>#end
318 318   </div>
319 319   </div>
320 320   #else
321 - <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 組織図は #if($visibilityOrgChart == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
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>
322 322   #end
323 323   #end
324 324  
... ... @@ -327,12 +327,10 @@
327 327   <div class="seitokai-subsection">
328 328   <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z"/><polyline points="14 2 14 8 20 8"/><line x1="16" y1="13" x2="8" y2="13"/><line x1="16" y1="17" x2="8" y2="17"/></svg> 日常の活動</h3>
329 329   <div class="seitokai-subsection-content">
330 - <p class="activity-hint">活動時間の多い順に上位3つ</p>
395 + <p class="activity-hint">活動時間が多い3つ</p>
331 331   <div class="tag-container">
332 - #set($daIdx = 1)
333 333   #foreach($da in $dailyActivities)
334 - <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
335 - #set($daIdx = $daIdx + 1)
398 + <span class="tag tag-accent">$!escapetool.xml($da.trim())</span>
336 336   #end
337 337   </div>
338 338   #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
... ... @@ -384,12 +384,12 @@
384 384   #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
385 385   #if($hasBudget)
386 386   #set($canViewBudget = true)
387 - #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewBudget = false)
388 - #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ($viewerSchoolCode != $schoolCode || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false)
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)
389 389   #end
390 390   #if($canViewBudget)
391 391   <div class="seitokai-subsection">
392 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><line x1="12" y1="1" x2="12" y2="23"/><path d="M17 5H9.5a3.5 3.5 0 000 7h5a3.5 3.5 0 010 7H6"/></svg> 予算 #if($visibilityBudget != 'public')<span class="visibility-badge visibility-${visibilityBudget}">#if($visibilityBudget == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
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>
393 393   <div class="seitokai-subsection-content">
394 394   #if($budgetProcess && !$budgetProcess.isEmpty())
395 395   <div class="info-row">
... ... @@ -396,8 +396,13 @@
396 396   <span class="info-label">作成過程の生徒関与</span>
397 397   <span class="info-value">
398 398   <div class="selection-display">
399 - #foreach($bp in $budgetProcess)
400 - <span class="selection-item">$!escapetool.xml($bp.trim())</span>
462 + #set($allBpOpts = ["各部・委員会等への予算希望額調査","予算額調整（折衝等）","生徒会予算案の作成","生徒総会での議決","生徒関与なし","その他"])
463 + #foreach($bpOpt in $allBpOpts)
464 + #if($budgetProcess.contains($bpOpt))
465 + <span class="selection-item">$!escapetool.xml($bpOpt)</span>
466 + #else
467 + <span class="selection-item selection-item-off">$!escapetool.xml($bpOpt)</span>
468 + #end
401 401   #end
402 402   </div>
403 403   </span>
... ... @@ -440,12 +440,12 @@
440 440   ## --- 校則の見直し ---
441 441   #if($ruleReviewStatus && $ruleReviewStatus != '')
442 442   #set($canViewRuleReview = true)
443 - #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewRuleReview = false)
444 - #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ($viewerSchoolCode != $schoolCode || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false)
511 + #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewRuleReview = false)
512 + #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false)
445 445   #end
446 446   #if($canViewRuleReview)
447 447   <div class="seitokai-subsection">
448 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M16 4h2a2 2 0 012 2v12a2 2 0 01-2 2h-2"/><path d="M8 4H6a2 2 0 00-2 2v12a2 2 0 002 2h2"/><line x1="12" y1="4" x2="12" y2="8"/><line x1="12" y1="16" x2="12" y2="20"/><line x1="8" y1="8" x2="16" y2="8"/><line x1="8" y1="16" x2="16" y2="16"/></svg> 校則の見直し #if($visibilityRuleReview != 'public')<span class="visibility-badge visibility-${visibilityRuleReview}">#if($visibilityRuleReview == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
516 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M16 4h2a2 2 0 012 2v12a2 2 0 01-2 2h-2"/><path d="M8 4H6a2 2 0 00-2 2v12a2 2 0 002 2h2"/><line x1="12" y1="4" x2="12" y2="8"/><line x1="12" y1="16" x2="12" y2="20"/><line x1="8" y1="8" x2="16" y2="8"/><line x1="8" y1="16" x2="16" y2="16"/></svg> 校則の見直し #if($visibilityRuleReview != 'public')<span class="visibility-badge visibility-${visibilityRuleReview}">#if($visibilityRuleReview == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
449 449   <div class="seitokai-subsection-content">
450 450   <div class="info-row">
451 451   <span class="info-label">見直しの有無（3年以内）</span>
... ... @@ -503,12 +503,12 @@
503 503   ## --- 生徒会の課題意識 ---
504 504   #if($challenges && $challenges != '')
505 505   #set($canViewChallenges = true)
506 - #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewChallenges = false)
507 - #elseif($visibilityChallenges == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ($viewerSchoolCode != $schoolCode || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewChallenges = false)
574 + #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewChallenges = false)
575 + #elseif($visibilityChallenges == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewChallenges = false)
508 508   #end
509 509   #if($canViewChallenges)
510 510   <div class="seitokai-subsection">
511 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M12 16v-4"/><path d="M12 8h.01"/></svg> 生徒会の課題意識 #if($visibilityChallenges != 'public')<span class="visibility-badge visibility-${visibilityChallenges}">#if($visibilityChallenges == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
579 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M12 16v-4"/><path d="M12 8h.01"/></svg> 生徒会の課題意識 #if($visibilityChallenges != 'public')<span class="visibility-badge visibility-${visibilityChallenges}">#if($visibilityChallenges == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
512 512   <div class="seitokai-subsection-content">
513 513   <div class="challenge-text">$!escapetool.xml($challenges)</div>
514 514   </div>
... ... @@ -532,6 +532,11 @@
532 532   <tr><th>YouTube</th><td>#if($seitokaiYoutube && $seitokaiYoutube != '')<a href="$!escapetool.xml($seitokaiYoutube)" target="_blank" rel="noopener"><svg class="ico" viewBox="0 0 24 24"><polygon points="5 3 19 12 5 21 5 3"/></svg> YouTubeチャンネル</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
533 533   <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
534 534   </table>
603 + #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
604 + #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
605 + #if($infoEditDate && $infoEditDate != '')
606 + <div class="info-last-updated"><svg class="ico" viewBox="0 0 24 24"><path d="M11 4H4a2 2 0 00-2 2v14a2 2 0 002 2h14a2 2 0 002-2v-7"/><path d="M18.5 2.5a2.121 2.121 0 013 3L12 15l-4 1 1-4 9.5-9.5z"/></svg> 基本情報の最終更新: $!escapetool.xml($infoEditBy) — $!escapetool.xml($infoEditDate)</div>
607 + #end
535 535  </div>
536 536  
537 537  {{/html}}
... ... @@ -586,22 +586,23 @@
586 586   <div class="author-legend-body">
587 587   <div class="author-legend">
588 588   <span class="author-legend-title">投稿者の信頼度:</span>
589 - <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者</span>
590 - <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み</span>
591 - <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介</span>
592 - <span class="author-legend-item"><span class="bar bar-general"></span> 一般（未承認）</span>
662 + <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者 <span class="text-hint">— 運営スタッフ</span></span>
663 + <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み <span class="text-hint">— 本人確認済みのユーザー</span></span>
664 + <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介 <span class="text-hint">— 承認済みユーザーからの紹介</span></span>
665 + <span class="author-legend-item"><span class="bar bar-general"></span> 一般 <span class="text-hint">— 一般登録ユーザー</span></span>
593 593   </div>
594 594   <div class="author-legend">
595 595   <span class="author-legend-title">所属:</span>
596 - <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>
597 - <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>
598 - <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>
599 - <span class="author-legend-item text-hint">※一般アカウントは所属未確認のため非表示</span>
669 + <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>
670 + <span class="author-legend-item"><span class="badge badge-school-internal badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内</span> <span class="text-hint">この学校に所属登録しているユーザー</span></span>
671 + <span class="author-legend-item"><span class="badge badge-alumni badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M22 10l-10-5L2 10l10 5 10-5z"/><path d="M6 12v5c0 1.66 2.69 3 6 3s6-1.34 6-3v-5"/></svg> 卒業生</span> <span class="text-hint">この学校の卒業生</span></span>
672 + <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>
673 + <span class="author-legend-item text-hint">※一般アカウントは所属バッジが表示されません</span>
600 600   </div>
601 601   <div class="author-legend">
602 602   <span class="author-legend-title">役割:</span>
603 603   <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>
604 - <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>
678 + <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>
605 605   <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>
606 606   </div>
607 607   </div>
... ... @@ -670,16 +670,18 @@
670 670  <div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)">
671 671   <div class="activity-thread-header">
672 672   <div class="activity-thread-title">
673 - <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>
674 - <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
675 - #set($actTagsList = $activity.getValue('tags'))
676 - #if($actTagsList && !$actTagsList.isEmpty())
677 - #foreach($tagItem in $actTagsList)
678 - #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end
747 + <h3 #if($actFeatured == '1')class="featured-title"#end>#if($actFeatured == '1')<svg class="ico ico-fixed-14 ico-star-offset" viewBox="0 0 24 24" fill="currentColor" stroke="none"><polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"/></svg> #end$!escapetool.xml($!actTitle)</h3>
748 + <div class="activity-meta-line">
749 + <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
750 + #set($actTagsList = $activity.getValue('tags'))
751 + #if($actTagsList && !$actTagsList.isEmpty())
752 + #foreach($tagItem in $actTagsList)
753 + #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end
754 + #end
679 679   #end
680 - #end
756 + </div>
681 681   </div>
682 - <div class="thread-meta-row">
758 + <div class="thread-meta-right">
683 683   <span class="thread-post-count">${reportCount}件の報告 ・ ${commentCount}件のコメント</span>
684 684   #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred')
685 685   #if($actFeatured == '1')
... ... @@ -739,8 +739,8 @@
739 739   #set($postVis = $!post.getValue('visibility'))
740 740   #if(!$postVis || $postVis == '') #set($postVis = 'public') #end
741 741   #set($canViewPost = true)
742 - #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewPost = false)
743 - #elseif($postVis == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ($viewerSchoolCode != $schoolCode || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPost = false)
818 + #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewPost = false)
819 + #elseif($postVis == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPost = false)
744 744   #end
745 745   #if(!$canViewPost)
746 746   <div class="thread-post visibility-restricted-post">
... ... @@ -784,8 +784,11 @@
784 784   <span class="badge badge-general badge-sm">一般</span>
785 785   #end
786 786   ## 所属バッジ（投稿者の学校コードとページの学校コードを比較）
863 + #set($postIsSchoolMatch = ($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode)))
787 787   #if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general')
788 - #if($postSchoolCode == $schoolCode)
865 + #if($postUserRole == 'graduate' && $postIsSchoolMatch)
866 + <span class="badge badge-alumni badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M22 10l-10-5L2 10l10 5 10-5z"/><path d="M6 12v5c0 1.66 2.69 3 6 3s6-1.34 6-3v-5"/></svg> 卒業生</span>
867 + #elseif($postIsSchoolMatch && $postUserRole != 'graduate')
789 789   #if($postAccountType == 'verified' || $postAccountType == 'admin')
790 790   <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>
791 791   #else
... ... @@ -812,6 +812,13 @@
812 812   #if($postEdited == 1 || $postEdited == '1')
813 813   <span class="post-edited-label">（編集済み）</span>
814 814   #end
894 + #set($postAuthorRefH = $!post.getValue('authorRef'))
895 + #set($postObjNumH = $post.number)
896 + #if(!$isGuest && $xcontext.user != $postAuthorRefH)
897 + <button type="button" class="btn-post-report btn-post-report-header" onclick="openReportDialog(this, '${doc.fullName}', $postObjNumH, '${services.csrf.getToken()}')" title="この投稿を通報">
898 + <svg class="ico ico-fixed-14" viewBox="0 0 24 24"><path d="M4 15s1-1 4-1 5 2 8 2 4-1 4-1V3s-1 1-4 1-5-2-8-2-4 1-4 1z"/><line x1="4" y1="22" x2="4" y2="15"/></svg> 通報
899 + </button>
900 + #end
815 815   </div>
816 816   <div class="thread-post-body">
817 817   $!escapetool.xml($!postContent)
... ... @@ -876,12 +876,18 @@
876 876   #end
877 877   </div>
878 878   #if($postVis != 'public')
879 - <div class="visibility-badge visibility-${postVis} post-action-mt">#if($postVis == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</div>
965 + <div class="visibility-badge visibility-${postVis} post-action-mt">#if($postVis == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</div>
880 880   #end
881 - ## 固定/解除ボタン（承認済み・管理者のみ）
882 - #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
883 - #set($postObjNum = $post.number)
884 - <div class="post-pin-action post-action-mt">
967 + ## 固定/編集/削除/通報/非表示ボタン（横並び）
968 + #set($postAuthorRef = $!post.getValue('authorRef'))
969 + #set($postObjNumED = $post.number)
970 + #set($showPinBtn = ($viewerAccountType == 'admin' || $viewerAccountType == 'verified'))
971 + #set($showEditDeleteBtn = ($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin'))
972 + #set($showHideBtn = ($viewerAccountType == 'admin'))
973 + #if($showPinBtn || $showEditDeleteBtn || $showHideBtn)
974 + <div class="post-edit-actions post-action-mt">
975 + #if($showPinBtn)
976 + #set($postObjNum = $post.number)
885 885   #if($isPinned == '1')
886 886   <a href="$doc.getURL('view', "action=unpin&postObj=${postObjNum}&form_token=${services.csrf.getToken()}")" class="btn-pin-toggle btn-unpin" title="固定を解除">
887 887   <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> 固定を解除
... ... @@ -891,15 +891,12 @@
891 891   <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> 固定する
892 892   </a>
893 893   #end
894 - </div>
895 - #end
896 - ## 編集・削除ボタン（投稿者本人 or 管理者）
897 - #set($postAuthorRef = $!post.getValue('authorRef'))
898 - #set($postObjNumED = $post.number)
899 - #if($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin')
900 - <div class="post-edit-actions post-action-mt">
986 + #end
987 + #if($showEditDeleteBtn)
901 901   #if($xcontext.user == $postAuthorRef)
902 - <button type="button" class="btn-post-edit" onclick="openEditPost(this, '${doc.fullName}', $postObjNumED, '$!escapetool.javascript($!postContent)')" title="この投稿を編集">
989 + #set($editImages = $!post.getValue('images'))
990 + #set($editFiles = $!post.getValue('files'))
991 + <button type="button" class="btn-post-edit" data-school="${doc.fullName}" data-obj="$postObjNumED" data-content="$!escapetool.xml($!postContent)" data-images="$!escapetool.xml($!editImages)" data-files="$!escapetool.xml($!editFiles)" data-post-type="$!post.getValue('postType')" onclick="openEditPost(this)" title="この投稿を編集">
903 903   <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> 編集
904 904   </button>
905 905   #end
... ... @@ -906,6 +906,12 @@
906 906   <button type="button" class="btn-post-delete" onclick="confirmDeletePost('${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を削除">
907 907   <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> 削除
908 908   </button>
998 + #end
999 + #if($showHideBtn)
1000 + <button type="button" class="btn-post-hide" onclick="openHideDialog(this, '${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を非表示にする">
1001 + <svg class="ico ico-fixed-14" viewBox="0 0 24 24"><path d="M17.94 17.94A10.07 10.07 0 0112 20c-7 0-11-8-11-8a18.45 18.45 0 015.06-5.94M9.9 4.24A9.12 9.12 0 0112 4c7 0 11 8 11 8a18.5 18.5 0 01-2.16 3.19m-6.72-1.07a3 3 0 11-4.24-4.24"/><line x1="1" y1="1" x2="23" y2="23"/></svg> 非表示
1002 + </button>
1003 + #end
909 909   </div>
910 910   #end
911 911   </div>
... ... @@ -955,9 +955,11 @@
955 955  
956 956   #if($xcontext.user != "XWiki.XWikiGuest")
957 957   <div class="thread-add-post">
1053 + #if($isSchoolMember || $isViewerAdmin)
958 958   <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
959 959   ＋ 活動報告を追加
960 960   </a>
1057 + #end
961 961   <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
962 962   <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> コメントを書く
963 963   </a>
... ... @@ -1034,6 +1034,27 @@
1034 1034  }
1035 1035  // ページ読み込み時の初期化
1036 1036  document.addEventListener('DOMContentLoaded', function() {
1134 + // 年度タブを降順にソート（「全期間」タブは末尾に固定）
1135 + var tabContainer = document.querySelector('.activity-fy-tabs');
1136 + if (tabContainer) {
1137 + var tabs = Array.from(tabContainer.querySelectorAll('.activity-fy-tab'));
1138 + var allTab = null;
1139 + var fyTabs = [];
1140 + tabs.forEach(function(t) {
1141 + var onclickStr = t.getAttribute('onclick') || '';
1142 + if (onclickStr.indexOf("'all'") !== -1) { allTab = t; }
1143 + else { fyTabs.push(t); }
1144 + });
1145 + // 年度タブを数値の降順でソート
1146 + fyTabs.sort(function(a, b) {
1147 + var aYear = parseInt(a.textContent) || 0;
1148 + var bYear = parseInt(b.textContent) || 0;
1149 + return bYear - aYear;
1150 + });
1151 + // DOM再配置
1152 + fyTabs.forEach(function(t) { tabContainer.appendChild(t); });
1153 + if (allTab) { tabContainer.appendChild(allTab); }
1154 + }
1037 1037   // デフォルトで現在の年度を表示
1038 1038   var defaultTab = document.querySelector('.activity-fy-tab.active');
1039 1039   if (defaultTab) { defaultTab.click(); }
... ... @@ -1049,14 +1049,15 @@
1049 1049   document.querySelectorAll('.activity-thread-header').forEach(function(header) {
1050 1050   header.addEventListener('click', toggleThreadExpand);
1051 1051   });
1052 - // 長文投稿の折りたたみ初期化
1170 + // 長文投稿の折りたたみ初期化（max-height: 12em 超で省略）
1053 1053   document.querySelectorAll('.thread-post-body').forEach(function(body) {
1054 - // 先にtruncatedを仮適用してline-clampを有効にし、高さの差分で判定
1172 + // pre-wrapのまま高さを測定し、max-height(12em ≒ ~200px)を超える場合に折りたたむ
1055 1055   var fullH = body.scrollHeight;
1174 + // 12em を px に変換（font-size × line-height × 行数 の近似値ではなくCSSと同じ値を取得）
1056 1056   body.classList.add('truncated');
1057 - var clampedH = body.clientHeight;
1176 + var maxH = body.clientHeight; // max-height: 12em 適用後の高さ
1058 1058   body.classList.remove('truncated');
1059 - if (fullH > clampedH + 10) {
1178 + if (fullH > maxH + 30) {
1060 1060   body.classList.add('truncated');
1061 1061   var btn = document.createElement('button');
1062 1062   btn.className = 'btn-read-more';
... ... @@ -1102,37 +1102,130 @@
1102 1102  }
1103 1103  
1104 1104  // 投稿の編集（インライン編集フォームを開く）
1105 -function openEditPost(btn, schoolPage, postObjNum, currentContent) {
1224 +function openEditPost(btn) {
1106 1106   var postEl = btn.closest('.thread-post');
1107 1107   if (!postEl) return;
1108 - // 既存の編集フォームがあれば閉じる
1109 1109   var existing = postEl.querySelector('.post-edit-form');
1110 1110   if (existing) { existing.remove(); return; }
1111 1111   var bodyEl = postEl.querySelector('.thread-post-body');
1112 1112   if (!bodyEl) return;
1231 +
1232 + var schoolPage = btn.getAttribute('data-school');
1233 + var postObjNum = btn.getAttribute('data-obj');
1234 + var currentContent = btn.getAttribute('data-content') || '';
1235 + var currentImages = btn.getAttribute('data-images') || '';
1236 + var currentFiles = btn.getAttribute('data-files') || '';
1237 + var postType = btn.getAttribute('data-post-type') || 'report';
1238 +
1113 1113   var form = document.createElement('div');
1114 1114   form.className = 'post-edit-form';
1115 - form.innerHTML = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>' +
1116 - '<div class="post-edit-form-actions">' +
1241 + form.setAttribute('data-school', schoolPage);
1242 + form.setAttribute('data-obj', postObjNum);
1243 +
1244 + var html = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>';
1245 +
1246 + // コメント以外は添付ファイル編集を表示
1247 + if (postType !== 'comment') {
1248 + // 既存画像
1249 + html += '<div class="edit-attachments">';
1250 + if (currentImages.trim()) {
1251 + html += '<div class="edit-attach-section"><span class="edit-attach-label">画像</span>';
1252 + var imgs = currentImages.trim().split('\n');
1253 + for (var i = 0; i < imgs.length; i++) {
1254 + var img = imgs[i].trim();
1255 + if (!img) continue;
1256 + html += '<div class="edit-attach-item" data-name="' + img.replace(/"/g,'&quot;') + '">' +
1257 + '<img src="/xwiki/bin/download/' + schoolPage.replace(/\./g,'/') + '/' + encodeURIComponent(img) + '" class="edit-attach-thumb" />' +
1258 + '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1259 + '<input type="hidden" name="keepImages" value="' + img.replace(/"/g,'&quot;') + '" />' +
1260 + '</div>';
1261 + }
1262 + html += '</div>';
1263 + }
1264 + // 既存ファイル
1265 + if (currentFiles.trim()) {
1266 + html += '<div class="edit-attach-section"><span class="edit-attach-label">ファイル</span>';
1267 + var files = currentFiles.trim().split('\n');
1268 + for (var j = 0; j < files.length; j++) {
1269 + var f = files[j].trim();
1270 + if (!f) continue;
1271 + var displayName = f;
1272 + if (/^file_\d{14}_\d+_/.test(f)) displayName = f.replace(/^file_\d{14}_\d+_/, '');
1273 + html += '<div class="edit-attach-item" data-name="' + f.replace(/"/g,'&quot;') + '">' +
1274 + '<span class="edit-attach-fname">' + displayName.replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</span>' +
1275 + '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1276 + '<input type="hidden" name="keepFiles" value="' + f.replace(/"/g,'&quot;') + '" />' +
1277 + '</div>';
1278 + }
1279 + html += '</div>';
1280 + }
1281 + // 新規追加
1282 + html += '<div class="edit-attach-add">' +
1283 + '<label class="form-label-sm">画像を追加（最大4枚まで）</label>' +
1284 + '<input type="file" name="editNewImages" accept="image/*" multiple class="form-file-input-sm" />' +
1285 + '<div class="form-hint">JPEG / PNG / GIF / WebP、各5MBまで</div>' +
1286 + '<label class="form-label-sm" style="margin-top:8px;">ファイルを追加（最大2つまで）</label>' +
1287 + '<input type="file" name="editNewFiles" accept=".pdf,.docx,.xlsx,.pptx" multiple class="form-file-input-sm" />' +
1288 + '<div class="form-hint">PDF / Word / Excel / PowerPoint、各10MBまで</div>' +
1289 + '</div>';
1290 + html += '</div>';
1291 + }
1292 +
1293 + html += '<div class="post-edit-form-actions">' +
1117 1117   '<button type="button" class="btn-cancel-edit" onclick="this.closest(\'.post-edit-form\').remove()">キャンセル</button>' +
1118 - '<button type="button" class="btn-save" onclick="saveEditPost(\'' + schoolPage + '\', ' + postObjNum + ')">保存</button>' +
1295 + '<button type="button" class="btn-save" onclick="saveEditPost(this)">保存</button>' +
1119 1119   '</div>';
1297 +
1298 + form.innerHTML = html;
1120 1120   bodyEl.parentNode.insertBefore(form, bodyEl.nextSibling);
1121 1121   form.querySelector('textarea').focus();
1122 1122  }
1123 1123  
1303 +function removeEditAttach(btn) {
1304 + var item = btn.closest('.edit-attach-item');
1305 + if (item) item.remove();
1306 +}
1307 +
1124 1124  // 投稿の編集を保存
1125 -function saveEditPost(schoolPage, postObjNum) {
1126 - var textarea = document.getElementById('editContent_' + postObjNum);
1309 +function saveEditPost(btn) {
1310 + var formEl = btn.closest('.post-edit-form');
1311 + if (!formEl) return;
1312 + var schoolPage = formEl.getAttribute('data-school');
1313 + var postObjNum = formEl.getAttribute('data-obj');
1314 + var textarea = formEl.querySelector('textarea');
1127 1127   if (!textarea) return;
1128 1128   var newContent = textarea.value.trim();
1129 1129   if (!newContent) { alert('投稿内容を入力してください'); return; }
1318 +
1130 1130   var csrfEl = document.querySelector('input[name="form_token"]');
1131 1131   var csrfToken = csrfEl ? csrfEl.value : '';
1321 +
1322 + var fd = new FormData();
1323 + fd.append('schoolPage', schoolPage);
1324 + fd.append('postObj', postObjNum);
1325 + fd.append('newContent', newContent);
1326 + fd.append('form_token', csrfToken);
1327 +
1328 + // 残す画像・ファイル
1329 + formEl.querySelectorAll('input[name="keepImages"]').forEach(function(el) { fd.append('keepImages', el.value); });
1330 + formEl.querySelectorAll('input[name="keepFiles"]').forEach(function(el) { fd.append('keepFiles', el.value); });
1331 +
1332 + // 新規画像
1333 + var newImgInput = formEl.querySelector('input[name="editNewImages"]');
1334 + if (newImgInput && newImgInput.files) {
1335 + for (var i = 0; i < newImgInput.files.length; i++) { fd.append('editNewImages', newImgInput.files[i]); }
1336 + }
1337 + // 新規ファイル
1338 + var newFileInput = formEl.querySelector('input[name="editNewFiles"]');
1339 + if (newFileInput && newFileInput.files) {
1340 + for (var j = 0; j < newFileInput.files.length; j++) { fd.append('editNewFiles', newFileInput.files[j]); }
1341 + }
1342 +
1343 + btn.disabled = true;
1344 + btn.textContent = '保存中...';
1345 +
1132 1132   var xhr = new XMLHttpRequest();
1133 1133   xhr.open('POST', '/bin/get/SeitokaiCode/EditPost?outputSyntax=plain', true);
1134 - xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1135 - var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken);
1136 1136   xhr.onload = function() {
1137 1137   try {
1138 1138   var res = JSON.parse(xhr.responseText);
... ... @@ -1140,12 +1140,13 @@
1140 1140   showToast('投稿を更新しました', 'success');
1141 1141   setTimeout(function() { location.reload(); }, 800);
1142 1142   } else {
1355 + btn.disabled = false; btn.textContent = '保存';
1143 1143   alert('編集に失敗しました: ' + (res.error || ''));
1144 1144   }
1145 - } catch(e) { alert('編集に失敗しました'); }
1358 + } catch(e) { btn.disabled = false; btn.textContent = '保存'; alert('編集に失敗しました'); }
1146 1146   };
1147 - xhr.onerror = function() { alert('通信エラーが発生しました'); };
1148 - xhr.send(editPostData);
1360 + xhr.onerror = function() { btn.disabled = false; btn.textContent = '保存'; alert('通信エラーが発生しました'); };
1361 + xhr.send(fd);
1149 1149  }
1150 1150  
1151 1151  // 投稿の削除（確認ダイアログ付き）
... ... @@ -1169,6 +1169,80 @@
1169 1169   xhr.onerror = function() { alert('通信エラーが発生しました'); };
1170 1170   xhr.send(deletePostData);
1171 1171  }
1385 +
1386 +/* --- 通報ダイアログ --- */
1387 +function openReportDialog(btn, targetPage, postObjNum, token) {
1388 + if (document.getElementById('report-dialog-overlay')) return;
1389 + var reasons = ['宣伝・スパム','不適切な内容','個人情報の露出','誹謗中傷','誤情報','その他'];
1390 + var overlay = document.createElement('div');
1391 + overlay.id = 'report-dialog-overlay';
1392 + overlay.style.cssText = 'position:fixed;inset:0;background:rgba(0,0,0,0.5);z-index:9999;display:flex;align-items:center;justify-content:center;';
1393 + var dialog = document.createElement('div');
1394 + dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;max-height:80vh;overflow-y:auto;';
1395 + var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を通報</h3>';
1396 + html += '<p style="margin:0 0 12px;font-size:0.9em;color:#4b5563;">通報された投稿は管理者が確認するまで一時的に非表示になります。</p>';
1397 + html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">通報理由</label>';
1398 + html += '<select id="report-reason" style="width:100%;padding:8px;border:1px solid #d1d5db;border-radius:8px;margin-bottom:12px;font-size:0.9em;">';
1399 + for (var i=0; i<reasons.length; i++) html += '<option value="'+reasons[i]+'">'+reasons[i]+'</option>';
1400 + html += '</select>';
1401 + html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">補足コメント（任意）</label>';
1402 + html += '<textarea id="report-detail" rows="3" maxlength="500" style="width:100%;padding:8px;border:1px solid #d1d5db;border-radius:8px;resize:vertical;font-size:0.9em;box-sizing:border-box;" placeholder="具体的な内容があればご記入ください"></textarea>';
1403 + html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
1404 + html += '<button type="button" id="report-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
1405 + html += '<button type="button" id="report-submit-btn" style="padding:8px 16px;border:none;border-radius:8px;background:#dc2626;color:#fff;cursor:pointer;font-weight:600;">通報する</button>';
1406 + html += '</div>';
1407 + dialog.innerHTML = html;
1408 + overlay.appendChild(dialog);
1409 + document.body.appendChild(overlay);
1410 + overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
1411 + document.getElementById('report-cancel-btn').addEventListener('click', function() { overlay.remove(); });
1412 + document.getElementById('report-submit-btn').addEventListener('click', function() {
1413 + var reason = document.getElementById('report-reason').value;
1414 + var detail = document.getElementById('report-detail').value;
1415 + var submitBtn = document.getElementById('report-submit-btn');
1416 + submitBtn.disabled = true; submitBtn.textContent = '送信中...';
1417 + var xhr = new XMLHttpRequest();
1418 + xhr.open('POST', '/bin/get/SeitokaiCode/ReportAction?outputSyntax=plain', true);
1419 + xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1420 + var data = 'targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&detail=' + encodeURIComponent(detail) + '&form_token=' + encodeURIComponent(token);
1421 + xhr.onload = function() {
1422 + overlay.remove();
1423 + showToast('通報を受け付けました', 'success');
1424 + setTimeout(function() { location.reload(); }, 1000);
1425 + };
1426 + xhr.onerror = function() { overlay.remove(); alert('通信エラーが発生しました'); };
1427 + xhr.send(data);
1428 + });
1429 +}
1430 +
1431 +/* --- 非表示ダイアログ（管理者用） --- */
1432 +function openHideDialog(btn, targetPage, postObjNum, token) {
1433 + if (document.getElementById('hide-dialog-overlay')) return;
1434 + var overlay = document.createElement('div');
1435 + overlay.id = 'hide-dialog-overlay';
1436 + overlay.style.cssText = 'position:fixed;inset:0;background:rgba(0,0,0,0.5);z-index:9999;display:flex;align-items:center;justify-content:center;';
1437 + var dialog = document.createElement('div');
1438 + dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;';
1439 + var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を非表示にする</h3>';
1440 + html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">非表示の理由</label>';
1441 + html += '<input type="text" id="hide-reason" style="width:100%;padding:8px;border:1px solid #d1d5db;border-radius:8px;margin-bottom:12px;font-size:0.9em;box-sizing:border-box;" placeholder="理由を入力" />';
1442 + html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
1443 + html += '<button type="button" id="hide-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
1444 + html += '<button type="button" id="hide-submit-btn" style="padding:8px 16px;border:none;border-radius:8px;background:#d97706;color:#fff;cursor:pointer;font-weight:600;">非表示にする</button>';
1445 + html += '<button type="button" id="hide-warn-btn" style="padding:8px 16px;border:none;border-radius:8px;background:#dc2626;color:#fff;cursor:pointer;font-weight:600;">非表示+警告</button>';
1446 + html += '</div>';
1447 + dialog.innerHTML = html;
1448 + overlay.appendChild(dialog);
1449 + document.body.appendChild(overlay);
1450 + overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
1451 + document.getElementById('hide-cancel-btn').addEventListener('click', function() { overlay.remove(); });
1452 + function doHide(action) {
1453 + var reason = document.getElementById('hide-reason').value || '管理者判断';
1454 + window.location.href = '/bin/view/SeitokaiCode/ModerationAction?action=' + action + '&targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&form_token=' + encodeURIComponent(token);
1455 + }
1456 + document.getElementById('hide-submit-btn').addEventListener('click', function() { doHide('hide'); });
1457 + document.getElementById('hide-warn-btn').addEventListener('click', function() { doHide('hide-warn'); });
1458 +}
1172 1172  </script>
1173 1173  {{/html}}
1174 1174  {{/velocity}}