Skip to Content
Last modified by Super Admin on 2026/04/05 18:59
From version Icon 71.1 Icon
edited by Super Admin
on 2026/03/18 20:48
Change comment: There is no comment for this version
To version Icon 78.1 Icon
edited by Super Admin
on 2026/03/19 15:40
Change comment: There is no comment for this version

Summary

Details

Icon Page properties
Content
... ... @@ -34,6 +34,7 @@
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'))
37 37  
38 38  ## --- 組織図 ---
39 39  #set($orgChart = $doc.getValue('orgChart'))
... ... @@ -101,6 +101,8 @@
101 101   #set($viewerDoc = $xwiki.getDocument($viewerUser))
102 102   #set($viewerAccountType = $!viewerDoc.getValue('accountType'))
103 103   #set($viewerSchoolCode = $!viewerDoc.getValue('schoolCode'))
105 + #set($viewerSecondarySchoolCode = $!viewerDoc.getValue('secondarySchoolCode'))
106 + #set($viewerUserRole = $!viewerDoc.getValue('userRole'))
104 104   #if($viewerAccountType == 'admin')
105 105   #set($isViewerAdmin = true)
106 106   #end
... ... @@ -110,10 +110,31 @@
110 110  #set($affiliatedSchoolCode = $!doc.getValue('affiliatedSchoolCode'))
111 111  #set($affiliatedSchoolName = $!doc.getValue('affiliatedSchoolName'))
112 112  #set($isAffiliated = false)
113 -#if($affiliatedSchoolCode && $affiliatedSchoolCode != '' && $viewerSchoolCode == $affiliatedSchoolCode)
114 - #set($isAffiliated = true)
116 +#if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
117 + #if($viewerSchoolCode == $affiliatedSchoolCode)
118 + #set($isAffiliated = true)
119 + #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode)
120 + #set($isAffiliated = true)
121 + #end
115 115  #end
116 116  
124 +## --- 校内判定（卒業生を除外、secondarySchoolCodeも含む） ---
125 +#set($isSchoolMember = false)
126 +#if(!$isGuest && $viewerUserRole != 'graduate')
127 + #if($viewerSchoolCode == $schoolCode || $isAffiliated)
128 + #set($isSchoolMember = true)
129 + #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode)
130 + #set($isSchoolMember = true)
131 + #end
132 +#end
133 +## 卒業生の母校判定（投稿バッジ用）
134 +#set($isAlumniOfSchool = false)
135 +#if(!$isGuest && $viewerUserRole == 'graduate')
136 + #if($viewerSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $viewerSchoolCode == $affiliatedSchoolCode))
137 + #set($isAlumniOfSchool = true)
138 + #end
139 +#end
140 +
117 117  ## --- 学校ページ非表示チェック ---
118 118  #set($schoolHidden = $doc.getValue('hidden'))
119 119  #if($schoolHidden == 1)
... ... @@ -147,7 +147,7 @@
147 147  
148 148  ## --- 投稿固定/解除処理 ---
149 149  #set($pinAction = $!request.action)
150 -#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && ($viewerSchoolCode == $schoolCode || $isAffiliated))) && $services.csrf.isTokenValid($request.form_token))
174 +#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $isSchoolMember)) && $services.csrf.isTokenValid($request.form_token))
151 151   #set($pinPostObjStr = $!request.postObj)
152 152   #if(!$pinPostObjStr.matches('^\d+$'))
153 153   ## 不正な値 → 無視
... ... @@ -177,7 +177,7 @@
177 177  
178 178  ## --- 特色ある活動 選定/解除処理 ---
179 179  #set($featAction = $!request.action)
180 -#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token))
204 +#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $isSchoolMember)) && $services.csrf.isTokenValid($request.form_token))
181 181   #set($featActObjStr = $!request.actObj)
182 182   #if($featActObjStr.matches('^\d+$'))
183 183   #set($actObjNum = $mathtool.toInteger($featActObjStr))
... ... @@ -279,7 +279,7 @@
279 279  
280 280  ## --- 編集ボタン（権限があるユーザーのみ表示） ---
281 281  #set($canEditSchool = false)
282 -#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode || $isAffiliated))
306 +#if(!$isGuest && ($isViewerAdmin || $isSchoolMember))
283 283   #set($canEditSchool = true)
284 284  #end
285 285  #if($canEditSchool)
... ... @@ -309,17 +309,26 @@
309 309  ## --- ① 学校基本情報 ---
310 310  <div class="school-info-card collapsed" id="card-basic-info">
311 311   <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>
312 - <table class="wiki-table school-info-table">
313 - <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
314 - <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
315 - <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
316 - <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
317 - <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
318 - <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
319 - <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
320 - <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
321 - <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>
322 - </table>
336 + <div class="school-basic-info-layout">
337 + <div class="school-basic-info-table">
338 + <table class="wiki-table school-info-table">
339 + <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
340 + <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
341 + <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
342 + <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
343 + <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
344 + <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
345 + <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
346 + <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
347 + <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>
348 + </table>
349 + </div>
350 + #if($schoolPhoto && $schoolPhoto != '')
351 + <div class="school-photo-area">
352 + <img src="$doc.getAttachmentURL($schoolPhoto)" alt="$!escapetool.xml($schoolName)" class="school-photo" />
353 + </div>
354 + #end
355 + </div>
323 323   #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
324 324   #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
325 325   #if($infoEditDate && $infoEditDate != '')
... ... @@ -336,8 +336,8 @@
336 336   #set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
337 337   #if($hasOrgContent)
338 338   #set($canViewOrgChart = true)
339 - #if($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewOrgChart = false)
340 - #elseif($visibilityOrgChart == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($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)
341 341   #end
342 342   #if($canViewOrgChart)
343 343   <div class="seitokai-subsection">
... ... @@ -416,8 +416,8 @@
416 416   #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
417 417   #if($hasBudget)
418 418   #set($canViewBudget = true)
419 - #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewBudget = false)
420 - #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false)
452 + #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewBudget = false)
453 + #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false)
421 421   #end
422 422   #if($canViewBudget)
423 423   <div class="seitokai-subsection">
... ... @@ -472,8 +472,8 @@
472 472   ## --- 校則の見直し ---
473 473   #if($ruleReviewStatus && $ruleReviewStatus != '')
474 474   #set($canViewRuleReview = true)
475 - #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewRuleReview = false)
476 - #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false)
508 + #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewRuleReview = false)
509 + #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false)
477 477   #end
478 478   #if($canViewRuleReview)
479 479   <div class="seitokai-subsection">
... ... @@ -535,8 +535,8 @@
535 535   ## --- 生徒会の課題意識 ---
536 536   #if($challenges && $challenges != '')
537 537   #set($canViewChallenges = true)
538 - #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewChallenges = false)
539 - #elseif($visibilityChallenges == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewChallenges = false)
571 + #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewChallenges = false)
572 + #elseif($visibilityChallenges == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewChallenges = false)
540 540   #end
541 541   #if($canViewChallenges)
542 542   <div class="seitokai-subsection">
... ... @@ -627,6 +627,7 @@
627 627   <span class="author-legend-title">所属:</span>
628 628   <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>
629 629   <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>
663 + <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>
630 630   <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>
631 631   <span class="author-legend-item text-hint">※一般アカウントは所属バッジが表示されません</span>
632 632   </div>
... ... @@ -703,13 +703,15 @@
703 703   <div class="activity-thread-header">
704 704   <div class="activity-thread-title">
705 705   <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>
706 - <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
707 - #set($actTagsList = $activity.getValue('tags'))
708 - #if($actTagsList && !$actTagsList.isEmpty())
709 - #foreach($tagItem in $actTagsList)
710 - #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end
740 + <div class="activity-meta-line">
741 + <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
742 + #set($actTagsList = $activity.getValue('tags'))
743 + #if($actTagsList && !$actTagsList.isEmpty())
744 + #foreach($tagItem in $actTagsList)
745 + #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end
746 + #end
711 711   #end
712 - #end
748 + </div>
713 713   </div>
714 714   <div class="thread-meta-row">
715 715   <span class="thread-post-count">${reportCount}件の報告 ・ ${commentCount}件のコメント</span>
... ... @@ -771,8 +771,8 @@
771 771   #set($postVis = $!post.getValue('visibility'))
772 772   #if(!$postVis || $postVis == '') #set($postVis = 'public') #end
773 773   #set($canViewPost = true)
774 - #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewPost = false)
775 - #elseif($postVis == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPost = false)
810 + #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewPost = false)
811 + #elseif($postVis == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPost = false)
776 776   #end
777 777   #if(!$canViewPost)
778 778   <div class="thread-post visibility-restricted-post">
... ... @@ -816,8 +816,11 @@
816 816   <span class="badge badge-general badge-sm">一般</span>
817 817   #end
818 818   ## 所属バッジ（投稿者の学校コードとページの学校コードを比較）
855 + #set($postIsSchoolMatch = ($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode)))
819 819   #if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general')
820 - #if($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode))
857 + #if($postUserRole == 'graduate' && $postIsSchoolMatch)
858 + <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>
859 + #elseif($postIsSchoolMatch && $postUserRole != 'graduate')
821 821   #if($postAccountType == 'verified' || $postAccountType == 'admin')
822 822   <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>
823 823   #else
... ... @@ -844,6 +844,13 @@
844 844   #if($postEdited == 1 || $postEdited == '1')
845 845   <span class="post-edited-label">（編集済み）</span>
846 846   #end
886 + #set($postAuthorRefH = $!post.getValue('authorRef'))
887 + #set($postObjNumH = $post.number)
888 + #if(!$isGuest && $xcontext.user != $postAuthorRefH)
889 + <button type="button" class="btn-post-report btn-post-report-header" onclick="openReportDialog(this, '${doc.fullName}', $postObjNumH, '${services.csrf.getToken()}')" title="この投稿を通報">
890 + <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> 通報
891 + </button>
892 + #end
847 847   </div>
848 848   <div class="thread-post-body">
849 849   $!escapetool.xml($!postContent)
... ... @@ -910,10 +910,16 @@
910 910   #if($postVis != 'public')
911 911   <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>
912 912   #end
913 - ## 固定/解除ボタン（承認済み・管理者のみ）
914 - #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
915 - #set($postObjNum = $post.number)
916 - <div class="post-pin-action post-action-mt">
959 + ## 固定/編集/削除/通報/非表示ボタン（横並び）
960 + #set($postAuthorRef = $!post.getValue('authorRef'))
961 + #set($postObjNumED = $post.number)
962 + #set($showPinBtn = ($viewerAccountType == 'admin' || $viewerAccountType == 'verified'))
963 + #set($showEditDeleteBtn = ($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin'))
964 + #set($showHideBtn = ($viewerAccountType == 'admin'))
965 + #if($showPinBtn || $showEditDeleteBtn || $showHideBtn)
966 + <div class="post-edit-actions post-action-mt">
967 + #if($showPinBtn)
968 + #set($postObjNum = $post.number)
917 917   #if($isPinned == '1')
918 918   <a href="$doc.getURL('view', "action=unpin&postObj=${postObjNum}&form_token=${services.csrf.getToken()}")" class="btn-pin-toggle btn-unpin" title="固定を解除">
919 919   <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> 固定を解除
... ... @@ -923,13 +923,8 @@
923 923   <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> 固定する
924 924   </a>
925 925   #end
926 - </div>
927 - #end
928 - ## 編集・削除ボタン（投稿者本人 or 管理者）
929 - #set($postAuthorRef = $!post.getValue('authorRef'))
930 - #set($postObjNumED = $post.number)
931 - #if($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin')
932 - <div class="post-edit-actions post-action-mt">
978 + #end
979 + #if($showEditDeleteBtn)
933 933   #if($xcontext.user == $postAuthorRef)
934 934   <button type="button" class="btn-post-edit" onclick="openEditPost(this, '${doc.fullName}', $postObjNumED, '$!escapetool.javascript($!postContent)')" title="この投稿を編集">
935 935   <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> 編集
... ... @@ -938,6 +938,12 @@
938 938   <button type="button" class="btn-post-delete" onclick="confirmDeletePost('${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を削除">
939 939   <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> 削除
940 940   </button>
988 + #end
989 + #if($showHideBtn)
990 + <button type="button" class="btn-post-hide" onclick="openHideDialog(this, '${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を非表示にする">
991 + <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> 非表示
992 + </button>
993 + #end
941 941   </div>
942 942   #end
943 943   </div>
... ... @@ -987,9 +987,11 @@
987 987  
988 988   #if($xcontext.user != "XWiki.XWikiGuest")
989 989   <div class="thread-add-post">
1043 + #if($isSchoolMember || $isViewerAdmin)
990 990   <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
991 991   ＋ 活動報告を追加
992 992   </a>
1047 + #end
993 993   <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
994 994   <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> コメントを書く
995 995   </a>
... ... @@ -1223,6 +1223,80 @@
1223 1223   xhr.onerror = function() { alert('通信エラーが発生しました'); };
1224 1224   xhr.send(deletePostData);
1225 1225  }
1281 +
1282 +/* --- 通報ダイアログ --- */
1283 +function openReportDialog(btn, targetPage, postObjNum, token) {
1284 + if (document.getElementById('report-dialog-overlay')) return;
1285 + var reasons = ['宣伝・スパム','不適切な内容','個人情報の露出','誹謗中傷','誤情報','その他'];
1286 + var overlay = document.createElement('div');
1287 + overlay.id = 'report-dialog-overlay';
1288 + 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;';
1289 + var dialog = document.createElement('div');
1290 + dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;max-height:80vh;overflow-y:auto;';
1291 + var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を通報</h3>';
1292 + html += '<p style="margin:0 0 12px;font-size:0.9em;color:#4b5563;">通報された投稿は管理者が確認するまで一時的に非表示になります。</p>';
1293 + html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">通報理由</label>';
1294 + html += '<select id="report-reason" style="width:100%;padding:8px;border:1px solid #d1d5db;border-radius:8px;margin-bottom:12px;font-size:0.9em;">';
1295 + for (var i=0; i<reasons.length; i++) html += '<option value="'+reasons[i]+'">'+reasons[i]+'</option>';
1296 + html += '</select>';
1297 + html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">補足コメント（任意）</label>';
1298 + 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>';
1299 + html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
1300 + html += '<button type="button" id="report-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
1301 + 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>';
1302 + html += '</div>';
1303 + dialog.innerHTML = html;
1304 + overlay.appendChild(dialog);
1305 + document.body.appendChild(overlay);
1306 + overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
1307 + document.getElementById('report-cancel-btn').addEventListener('click', function() { overlay.remove(); });
1308 + document.getElementById('report-submit-btn').addEventListener('click', function() {
1309 + var reason = document.getElementById('report-reason').value;
1310 + var detail = document.getElementById('report-detail').value;
1311 + var submitBtn = document.getElementById('report-submit-btn');
1312 + submitBtn.disabled = true; submitBtn.textContent = '送信中...';
1313 + var xhr = new XMLHttpRequest();
1314 + xhr.open('POST', '/bin/get/SeitokaiCode/ReportAction?outputSyntax=plain', true);
1315 + xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1316 + var data = 'targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&detail=' + encodeURIComponent(detail) + '&form_token=' + encodeURIComponent(token);
1317 + xhr.onload = function() {
1318 + overlay.remove();
1319 + showToast('通報を受け付けました', 'success');
1320 + setTimeout(function() { location.reload(); }, 1000);
1321 + };
1322 + xhr.onerror = function() { overlay.remove(); alert('通信エラーが発生しました'); };
1323 + xhr.send(data);
1324 + });
1325 +}
1326 +
1327 +/* --- 非表示ダイアログ（管理者用） --- */
1328 +function openHideDialog(btn, targetPage, postObjNum, token) {
1329 + if (document.getElementById('hide-dialog-overlay')) return;
1330 + var overlay = document.createElement('div');
1331 + overlay.id = 'hide-dialog-overlay';
1332 + 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;';
1333 + var dialog = document.createElement('div');
1334 + dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;';
1335 + var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を非表示にする</h3>';
1336 + html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">非表示の理由</label>';
1337 + 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="理由を入力" />';
1338 + html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
1339 + html += '<button type="button" id="hide-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
1340 + 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>';
1341 + 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>';
1342 + html += '</div>';
1343 + dialog.innerHTML = html;
1344 + overlay.appendChild(dialog);
1345 + document.body.appendChild(overlay);
1346 + overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
1347 + document.getElementById('hide-cancel-btn').addEventListener('click', function() { overlay.remove(); });
1348 + function doHide(action) {
1349 + var reason = document.getElementById('hide-reason').value || '管理者判断';
1350 + window.location.href = '/bin/view/SeitokaiCode/ModerationAction?action=' + action + '&targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&form_token=' + encodeURIComponent(token);
1351 + }
1352 + document.getElementById('hide-submit-btn').addEventListener('click', function() { doHide('hide'); });
1353 + document.getElementById('hide-warn-btn').addEventListener('click', function() { doHide('hide-warn'); });
1354 +}
1226 1226  </script>
1227 1227  {{/html}}
1228 1228  {{/velocity}}