Skip to Content
Last modified by Super Admin on 2026/04/05 18:59
From version Icon 69.1 Icon
edited by Super Admin
on 2026/03/18 11:44
Change comment: There is no comment for this version
To version Icon 83.1 Icon
edited by Super Admin
on 2026/03/19 23:49
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,6 +95,8 @@
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
... ... @@ -104,10 +104,31 @@
104 104  #set($affiliatedSchoolCode = $!doc.getValue('affiliatedSchoolCode'))
105 105  #set($affiliatedSchoolName = $!doc.getValue('affiliatedSchoolName'))
106 106  #set($isAffiliated = false)
107 -#if($affiliatedSchoolCode && $affiliatedSchoolCode != '' && $viewerSchoolCode == $affiliatedSchoolCode)
108 - #set($isAffiliated = true)
117 +#if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
118 + #if($viewerSchoolCode == $affiliatedSchoolCode)
119 + #set($isAffiliated = true)
120 + #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode)
121 + #set($isAffiliated = true)
122 + #end
109 109  #end
110 110  
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 +
111 111  ## --- 学校ページ非表示チェック ---
112 112  #set($schoolHidden = $doc.getValue('hidden'))
113 113  #if($schoolHidden == 1)
... ... @@ -141,7 +141,7 @@
141 141  
142 142  ## --- 投稿固定/解除処理 ---
143 143  #set($pinAction = $!request.action)
144 -#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && ($viewerSchoolCode == $schoolCode || $isAffiliated))) && $services.csrf.isTokenValid($request.form_token))
175 +#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $isSchoolMember)) && $services.csrf.isTokenValid($request.form_token))
145 145   #set($pinPostObjStr = $!request.postObj)
146 146   #if(!$pinPostObjStr.matches('^\d+$'))
147 147   ## 不正な値 → 無視
... ... @@ -171,7 +171,7 @@
171 171  
172 172  ## --- 特色ある活動 選定/解除処理 ---
173 173  #set($featAction = $!request.action)
174 -#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))
175 175   #set($featActObjStr = $!request.actObj)
176 176   #if($featActObjStr.matches('^\d+$'))
177 177   #set($actObjNum = $mathtool.toInteger($featActObjStr))
... ... @@ -273,7 +273,7 @@
273 273  
274 274  ## --- 編集ボタン（権限があるユーザーのみ表示） ---
275 275  #set($canEditSchool = false)
276 -#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode || $isAffiliated))
307 +#if(!$isGuest && ($isViewerAdmin || $isSchoolMember))
277 277   #set($canEditSchool = true)
278 278  #end
279 279  #if($canEditSchool)
... ... @@ -303,17 +303,29 @@
303 303  ## --- ① 学校基本情報 ---
304 304  <div class="school-info-card collapsed" id="card-basic-info">
305 305   <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>
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>
337 + <div class="school-basic-info-layout">
338 + <div class="school-basic-info-table">
339 + <table class="wiki-table school-info-table">
340 + <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
341 + <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
342 + <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
343 + <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
344 + <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
345 + <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
346 + <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
347 + <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
348 + <tr><th>公式サイト</th><td>#if($website && $website != '')<a href="$!escapetool.xml($website)" target="_blank" rel="noopener">$!escapetool.xml($website)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
349 + </table>
350 + </div>
351 + #if($schoolPhoto && $schoolPhoto != '')
352 + <div class="school-photo-area">
353 + <img src="$doc.getAttachmentURL($schoolPhoto)" alt="$!escapetool.xml($schoolName)" class="school-photo" />
354 + </div>
355 + #end
356 + </div>
357 + #if($schoolDescription && $schoolDescription.trim() != '')
358 + <div class="free-note" style="margin-top:var(--sp-4);">$!escapetool.xml($schoolDescription)</div>
359 + #end
317 317   #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
318 318   #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
319 319   #if($infoEditDate && $infoEditDate != '')
... ... @@ -326,25 +326,25 @@
326 326   <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>
327 327   <div class="seitokai-info-body">
328 328  
329 - ## --- 組織図 ---
372 + ## --- 生徒会組織 ---
330 330   #set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
331 331   #if($hasOrgContent)
332 332   #set($canViewOrgChart = true)
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)
376 + #if($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewOrgChart = false)
377 + #elseif($visibilityOrgChart == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewOrgChart = false)
335 335   #end
336 336   #if($canViewOrgChart)
337 337   <div class="seitokai-subsection">
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>
381 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/><line x1="9" y1="10" x2="9" y2="10.01"/><line x1="15" y1="10" x2="15" y2="10.01"/><line x1="9" y1="14" x2="9" y2="14.01"/><line x1="15" y1="14" x2="15" y2="14.01"/></svg> 生徒会組織 #if($visibilityOrgChart != 'public')<span class="visibility-badge visibility-${visibilityOrgChart}">#if($visibilityOrgChart == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
339 339   <div class="seitokai-subsection-content">
340 340   #if($orgChartImage && $orgChartImage != '')
341 341   <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
342 342   #end
343 - #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end
386 + #if($orgChart && $orgChart != '')<div class="free-note">$!escapetool.xml($orgChart)</div>#end
344 344   </div>
345 345   </div>
346 346   #else
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>
390 + <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 生徒会組織は #if($visibilityOrgChart == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
348 348   #end
349 349   #end
350 350  
... ... @@ -410,8 +410,8 @@
410 410   #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
411 411   #if($hasBudget)
412 412   #set($canViewBudget = true)
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)
456 + #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewBudget = false)
457 + #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false)
415 415   #end
416 416   #if($canViewBudget)
417 417   <div class="seitokai-subsection">
... ... @@ -466,8 +466,8 @@
466 466   ## --- 校則の見直し ---
467 467   #if($ruleReviewStatus && $ruleReviewStatus != '')
468 468   #set($canViewRuleReview = true)
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)
512 + #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewRuleReview = false)
513 + #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false)
471 471   #end
472 472   #if($canViewRuleReview)
473 473   <div class="seitokai-subsection">
... ... @@ -529,8 +529,8 @@
529 529   ## --- 生徒会の課題意識 ---
530 530   #if($challenges && $challenges != '')
531 531   #set($canViewChallenges = true)
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)
575 + #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewChallenges = false)
576 + #elseif($visibilityChallenges == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewChallenges = false)
534 534   #end
535 535   #if($canViewChallenges)
536 536   <div class="seitokai-subsection">
... ... @@ -621,6 +621,7 @@
621 621   <span class="author-legend-title">所属:</span>
622 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 class="text-hint">所属が確認されたこの学校のユーザー</span></span>
623 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 class="text-hint">この学校に所属登録しているユーザー</span></span>
667 + <span class="author-legend-item"><span class="badge badge-alumni badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M22 10l-10-5L2 10l10 5 10-5z"/><path d="M6 12v5c0 1.66 2.69 3 6 3s6-1.34 6-3v-5"/></svg> 卒業生</span> <span class="text-hint">この学校の卒業生</span></span>
624 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 class="text-hint">別の学校に所属しているユーザー</span></span>
625 625   <span class="author-legend-item text-hint">※一般アカウントは所属バッジが表示されません</span>
626 626   </div>
... ... @@ -696,16 +696,18 @@
696 696  <div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)">
697 697   <div class="activity-thread-header">
698 698   <div class="activity-thread-title">
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
743 + <h3 #if($actFeatured == '1')class="featured-title"#end>#if($actFeatured == '1')<svg class="ico ico-fixed-14 ico-star-offset" viewBox="0 0 24 24" fill="currentColor" stroke="none"><polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"/></svg> #end$!escapetool.xml($!actTitle)</h3>
744 + <div class="activity-meta-line">
745 + <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
746 + #set($actTagsList = $activity.getValue('tags'))
747 + #if($actTagsList && !$actTagsList.isEmpty())
748 + #foreach($tagItem in $actTagsList)
749 + #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end
750 + #end
705 705   #end
706 - #end
752 + </div>
707 707   </div>
708 - <div class="thread-meta-row">
754 + <div class="thread-meta-right">
709 709   <span class="thread-post-count">${reportCount}件の報告 ・ ${commentCount}件のコメント</span>
710 710   #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred')
711 711   #if($actFeatured == '1')
... ... @@ -765,8 +765,8 @@
765 765   #set($postVis = $!post.getValue('visibility'))
766 766   #if(!$postVis || $postVis == '') #set($postVis = 'public') #end
767 767   #set($canViewPost = true)
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)
814 + #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewPost = false)
815 + #elseif($postVis == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPost = false)
770 770   #end
771 771   #if(!$canViewPost)
772 772   <div class="thread-post visibility-restricted-post">
... ... @@ -810,8 +810,11 @@
810 810   <span class="badge badge-general badge-sm">一般</span>
811 811   #end
812 812   ## 所属バッジ（投稿者の学校コードとページの学校コードを比較）
859 + #set($postIsSchoolMatch = ($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode)))
813 813   #if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general')
814 - #if($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode))
861 + #if($postUserRole == 'graduate' && $postIsSchoolMatch)
862 + <span class="badge badge-alumni badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M22 10l-10-5L2 10l10 5 10-5z"/><path d="M6 12v5c0 1.66 2.69 3 6 3s6-1.34 6-3v-5"/></svg> 卒業生</span>
863 + #elseif($postIsSchoolMatch && $postUserRole != 'graduate')
815 815   #if($postAccountType == 'verified' || $postAccountType == 'admin')
816 816   <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>
817 817   #else
... ... @@ -838,6 +838,13 @@
838 838   #if($postEdited == 1 || $postEdited == '1')
839 839   <span class="post-edited-label">（編集済み）</span>
840 840   #end
890 + #set($postAuthorRefH = $!post.getValue('authorRef'))
891 + #set($postObjNumH = $post.number)
892 + #if(!$isGuest && $xcontext.user != $postAuthorRefH)
893 + <button type="button" class="btn-post-report btn-post-report-header" onclick="openReportDialog(this, '${doc.fullName}', $postObjNumH, '${services.csrf.getToken()}')" title="この投稿を通報">
894 + <svg class="ico ico-fixed-14" viewBox="0 0 24 24"><path d="M4 15s1-1 4-1 5 2 8 2 4-1 4-1V3s-1 1-4 1-5-2-8-2-4 1-4 1z"/><line x1="4" y1="22" x2="4" y2="15"/></svg> 通報
895 + </button>
896 + #end
841 841   </div>
842 842   <div class="thread-post-body">
843 843   $!escapetool.xml($!postContent)
... ... @@ -904,10 +904,16 @@
904 904   #if($postVis != 'public')
905 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>
906 906   #end
907 - ## 固定/解除ボタン（承認済み・管理者のみ）
908 - #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
909 - #set($postObjNum = $post.number)
910 - <div class="post-pin-action post-action-mt">
963 + ## 固定/編集/削除/通報/非表示ボタン（横並び）
964 + #set($postAuthorRef = $!post.getValue('authorRef'))
965 + #set($postObjNumED = $post.number)
966 + #set($showPinBtn = ($viewerAccountType == 'admin' || $viewerAccountType == 'verified'))
967 + #set($showEditDeleteBtn = ($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin'))
968 + #set($showHideBtn = ($viewerAccountType == 'admin'))
969 + #if($showPinBtn || $showEditDeleteBtn || $showHideBtn)
970 + <div class="post-edit-actions post-action-mt">
971 + #if($showPinBtn)
972 + #set($postObjNum = $post.number)
911 911   #if($isPinned == '1')
912 912   <a href="$doc.getURL('view', "action=unpin&postObj=${postObjNum}&form_token=${services.csrf.getToken()}")" class="btn-pin-toggle btn-unpin" title="固定を解除">
913 913   <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> 固定を解除
... ... @@ -917,13 +917,8 @@
917 917   <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> 固定する
918 918   </a>
919 919   #end
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">
982 + #end
983 + #if($showEditDeleteBtn)
927 927   #if($xcontext.user == $postAuthorRef)
928 928   <button type="button" class="btn-post-edit" onclick="openEditPost(this, '${doc.fullName}', $postObjNumED, '$!escapetool.javascript($!postContent)')" title="この投稿を編集">
929 929   <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> 編集
... ... @@ -932,6 +932,12 @@
932 932   <button type="button" class="btn-post-delete" onclick="confirmDeletePost('${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を削除">
933 933   <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> 削除
934 934   </button>
992 + #end
993 + #if($showHideBtn)
994 + <button type="button" class="btn-post-hide" onclick="openHideDialog(this, '${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を非表示にする">
995 + <svg class="ico ico-fixed-14" viewBox="0 0 24 24"><path d="M17.94 17.94A10.07 10.07 0 0112 20c-7 0-11-8-11-8a18.45 18.45 0 015.06-5.94M9.9 4.24A9.12 9.12 0 0112 4c7 0 11 8 11 8a18.5 18.5 0 01-2.16 3.19m-6.72-1.07a3 3 0 11-4.24-4.24"/><line x1="1" y1="1" x2="23" y2="23"/></svg> 非表示
996 + </button>
997 + #end
935 935   </div>
936 936   #end
937 937   </div>
... ... @@ -981,9 +981,11 @@
981 981  
982 982   #if($xcontext.user != "XWiki.XWikiGuest")
983 983   <div class="thread-add-post">
1047 + #if($isSchoolMember || $isViewerAdmin)
984 984   <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
985 985   ＋ 活動報告を追加
986 986   </a>
1051 + #end
987 987   <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
988 988   <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> コメントを書く
989 989   </a>
... ... @@ -1060,6 +1060,27 @@
1060 1060  }
1061 1061  // ページ読み込み時の初期化
1062 1062  document.addEventListener('DOMContentLoaded', function() {
1128 + // 年度タブを降順にソート（「全期間」タブは末尾に固定）
1129 + var tabContainer = document.querySelector('.activity-fy-tabs');
1130 + if (tabContainer) {
1131 + var tabs = Array.from(tabContainer.querySelectorAll('.activity-fy-tab'));
1132 + var allTab = null;
1133 + var fyTabs = [];
1134 + tabs.forEach(function(t) {
1135 + var onclickStr = t.getAttribute('onclick') || '';
1136 + if (onclickStr.indexOf("'all'") !== -1) { allTab = t; }
1137 + else { fyTabs.push(t); }
1138 + });
1139 + // 年度タブを数値の降順でソート
1140 + fyTabs.sort(function(a, b) {
1141 + var aYear = parseInt(a.textContent) || 0;
1142 + var bYear = parseInt(b.textContent) || 0;
1143 + return bYear - aYear;
1144 + });
1145 + // DOM再配置
1146 + fyTabs.forEach(function(t) { tabContainer.appendChild(t); });
1147 + if (allTab) { tabContainer.appendChild(allTab); }
1148 + }
1063 1063   // デフォルトで現在の年度を表示
1064 1064   var defaultTab = document.querySelector('.activity-fy-tab.active');
1065 1065   if (defaultTab) { defaultTab.click(); }
... ... @@ -1196,6 +1196,80 @@
1196 1196   xhr.onerror = function() { alert('通信エラーが発生しました'); };
1197 1197   xhr.send(deletePostData);
1198 1198  }
1285 +
1286 +/* --- 通報ダイアログ --- */
1287 +function openReportDialog(btn, targetPage, postObjNum, token) {
1288 + if (document.getElementById('report-dialog-overlay')) return;
1289 + var reasons = ['宣伝・スパム','不適切な内容','個人情報の露出','誹謗中傷','誤情報','その他'];
1290 + var overlay = document.createElement('div');
1291 + overlay.id = 'report-dialog-overlay';
1292 + 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;';
1293 + var dialog = document.createElement('div');
1294 + dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;max-height:80vh;overflow-y:auto;';
1295 + var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を通報</h3>';
1296 + html += '<p style="margin:0 0 12px;font-size:0.9em;color:#4b5563;">通報された投稿は管理者が確認するまで一時的に非表示になります。</p>';
1297 + html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">通報理由</label>';
1298 + html += '<select id="report-reason" style="width:100%;padding:8px;border:1px solid #d1d5db;border-radius:8px;margin-bottom:12px;font-size:0.9em;">';
1299 + for (var i=0; i<reasons.length; i++) html += '<option value="'+reasons[i]+'">'+reasons[i]+'</option>';
1300 + html += '</select>';
1301 + html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">補足コメント（任意）</label>';
1302 + 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>';
1303 + html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
1304 + html += '<button type="button" id="report-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
1305 + 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>';
1306 + html += '</div>';
1307 + dialog.innerHTML = html;
1308 + overlay.appendChild(dialog);
1309 + document.body.appendChild(overlay);
1310 + overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
1311 + document.getElementById('report-cancel-btn').addEventListener('click', function() { overlay.remove(); });
1312 + document.getElementById('report-submit-btn').addEventListener('click', function() {
1313 + var reason = document.getElementById('report-reason').value;
1314 + var detail = document.getElementById('report-detail').value;
1315 + var submitBtn = document.getElementById('report-submit-btn');
1316 + submitBtn.disabled = true; submitBtn.textContent = '送信中...';
1317 + var xhr = new XMLHttpRequest();
1318 + xhr.open('POST', '/bin/get/SeitokaiCode/ReportAction?outputSyntax=plain', true);
1319 + xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1320 + var data = 'targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&detail=' + encodeURIComponent(detail) + '&form_token=' + encodeURIComponent(token);
1321 + xhr.onload = function() {
1322 + overlay.remove();
1323 + showToast('通報を受け付けました', 'success');
1324 + setTimeout(function() { location.reload(); }, 1000);
1325 + };
1326 + xhr.onerror = function() { overlay.remove(); alert('通信エラーが発生しました'); };
1327 + xhr.send(data);
1328 + });
1329 +}
1330 +
1331 +/* --- 非表示ダイアログ（管理者用） --- */
1332 +function openHideDialog(btn, targetPage, postObjNum, token) {
1333 + if (document.getElementById('hide-dialog-overlay')) return;
1334 + var overlay = document.createElement('div');
1335 + overlay.id = 'hide-dialog-overlay';
1336 + 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;';
1337 + var dialog = document.createElement('div');
1338 + dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;';
1339 + var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を非表示にする</h3>';
1340 + html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">非表示の理由</label>';
1341 + 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="理由を入力" />';
1342 + html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
1343 + html += '<button type="button" id="hide-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
1344 + 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>';
1345 + 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>';
1346 + html += '</div>';
1347 + dialog.innerHTML = html;
1348 + overlay.appendChild(dialog);
1349 + document.body.appendChild(overlay);
1350 + overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
1351 + document.getElementById('hide-cancel-btn').addEventListener('click', function() { overlay.remove(); });
1352 + function doHide(action) {
1353 + var reason = document.getElementById('hide-reason').value || '管理者判断';
1354 + window.location.href = '/bin/view/SeitokaiCode/ModerationAction?action=' + action + '&targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&form_token=' + encodeURIComponent(token);
1355 + }
1356 + document.getElementById('hide-submit-btn').addEventListener('click', function() { doHide('hide'); });
1357 + document.getElementById('hide-warn-btn').addEventListener('click', function() { doHide('hide-warn'); });
1358 +}
1199 1199  </script>
1200 1200  {{/html}}
1201 1201  {{/velocity}}