Skip to Content
Last modified by Super Admin on 2026/04/05 18:59
From version Icon 47.1 Icon
edited by Super Admin
on 2026/03/13 16:19
Change comment: There is no comment for this version
To version Icon 96.1 Icon
edited by Super Admin
on 2026/03/20 18:06
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  
... ... @@ -49,7 +49,7 @@
49 49  #set($budgetAllocation = $doc.getValue('budgetAllocation'))
50 50  #set($budgetNote = $doc.getValue('budgetNote'))
51 51  
52 -## --- 校則の見直し ---
60 +## --- 校則・生徒会会則の見直し ---
53 53  #set($ruleReviewStatus = $doc.getValue('ruleReviewStatus'))
54 54  #set($ruleReviewContent = $doc.getValue('ruleReviewContent'))
55 55  #set($ruleReviewProposer = $doc.getValue('ruleReviewProposer'))
... ... @@ -56,6 +56,43 @@
56 56  #set($ruleReviewImplementer = $doc.getValue('ruleReviewImplementer'))
57 57  #set($ruleReviewSystem = $doc.getValue('ruleReviewSystem'))
58 58  
67 +## --- 活動環境 ---
68 +#set($activityPlace = $doc.getValue('activityPlace'))
69 +#set($activityRoomEquipment = $doc.getValue('activityRoomEquipment'))
70 +#set($activityRoomImage = $doc.getValue('activityRoomImage'))
71 +#set($ictUsage = $doc.getValue('ictUsage'))
72 +
73 +## --- 生徒総会 ---
74 +#set($assemblyFormat = $doc.getValue('assemblyFormat'))
75 +#set($assemblyCount = $doc.getValue('assemblyCount'))
76 +#set($assemblyAgenda = $doc.getValue('assemblyAgenda'))
77 +#set($assemblyTopics = $doc.getValue('assemblyTopics'))
78 +#set($assemblyNote = $doc.getValue('assemblyNote'))
79 +
80 +## --- 広報 ---
81 +#set($publicityMethod = $doc.getValue('publicityMethod'))
82 +#set($publicityFrequency = $doc.getValue('publicityFrequency'))
83 +#set($publicityNote = $doc.getValue('publicityNote'))
84 +
85 +## --- 外部連携 ---
86 +#set($externalCooperation = $doc.getValue('externalCooperation'))
87 +#set($externalOrgName = $doc.getValue('externalOrgName'))
88 +#set($socialParticipation = $doc.getValue('socialParticipation'))
89 +
90 +## --- 年間主要行事 ---
91 +#set($eventApril = $doc.getValue('eventApril'))
92 +#set($eventMay = $doc.getValue('eventMay'))
93 +#set($eventJune = $doc.getValue('eventJune'))
94 +#set($eventJuly = $doc.getValue('eventJuly'))
95 +#set($eventAugust = $doc.getValue('eventAugust'))
96 +#set($eventSeptember = $doc.getValue('eventSeptember'))
97 +#set($eventOctober = $doc.getValue('eventOctober'))
98 +#set($eventNovember = $doc.getValue('eventNovember'))
99 +#set($eventDecember = $doc.getValue('eventDecember'))
100 +#set($eventJanuary = $doc.getValue('eventJanuary'))
101 +#set($eventFebruary = $doc.getValue('eventFebruary'))
102 +#set($eventMarch = $doc.getValue('eventMarch'))
103 +
59 59  ## --- 課題・連絡先 ---
60 60  #set($challenges = $doc.getValue('challenges'))
61 61  #set($contactInfo = $doc.getValue('contactInfo'))
... ... @@ -80,6 +80,14 @@
80 80  #set($visibilityBudget = $!doc.getValue('visibilityBudget'))
81 81  #set($visibilityRuleReview = $!doc.getValue('visibilityRuleReview'))
82 82  #set($visibilityChallenges = $!doc.getValue('visibilityChallenges'))
128 +#set($visibilityDailyActivities = $!doc.getValue('visibilityDailyActivities'))
129 +#set($visibilityElection = $!doc.getValue('visibilityElection'))
130 +#set($visibilityMeeting = $!doc.getValue('visibilityMeeting'))
131 +#set($visibilityActivityEnv = $!doc.getValue('visibilityActivityEnv'))
132 +#set($visibilityAssembly = $!doc.getValue('visibilityAssembly'))
133 +#set($visibilityPublicity = $!doc.getValue('visibilityPublicity'))
134 +#set($visibilityExternal = $!doc.getValue('visibilityExternal'))
135 +#set($visibilityAnnualEvents = $!doc.getValue('visibilityAnnualEvents'))
83 83  ## デフォルト値（未設定なら全体公開）
84 84  #if(!$visibilityOrgChart || $visibilityOrgChart == '') #set($visibilityOrgChart = 'public') #end
85 85  #if(!$visibilityBudget || $visibilityBudget == '') #set($visibilityBudget = 'public') #end
... ... @@ -95,14 +95,76 @@
95 95   #set($viewerDoc = $xwiki.getDocument($viewerUser))
96 96   #set($viewerAccountType = $!viewerDoc.getValue('accountType'))
97 97   #set($viewerSchoolCode = $!viewerDoc.getValue('schoolCode'))
151 + #set($viewerSecondarySchoolCode = $!viewerDoc.getValue('secondarySchoolCode'))
152 + #set($viewerUserRole = $!viewerDoc.getValue('userRole'))
98 98   #if($viewerAccountType == 'admin')
99 99   #set($isViewerAdmin = true)
100 100   #end
101 101  #end
102 102  
158 +## --- 関連校（中高一貫校）情報 ---
159 +#set($affiliatedSchoolCode = $!doc.getValue('affiliatedSchoolCode'))
160 +#set($affiliatedSchoolName = $!doc.getValue('affiliatedSchoolName'))
161 +#set($isAffiliated = false)
162 +#if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
163 + #if($viewerSchoolCode == $affiliatedSchoolCode)
164 + #set($isAffiliated = true)
165 + #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode)
166 + #set($isAffiliated = true)
167 + #end
168 +#end
169 +
170 +## --- 校内判定（卒業生を除外、secondarySchoolCodeも含む） ---
171 +#set($isSchoolMember = false)
172 +#if(!$isGuest && $viewerUserRole != 'graduate')
173 + #if($viewerSchoolCode == $schoolCode || $isAffiliated)
174 + #set($isSchoolMember = true)
175 + #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode)
176 + #set($isSchoolMember = true)
177 + #end
178 +#end
179 +## 卒業生の母校判定（投稿バッジ用）
180 +#set($isAlumniOfSchool = false)
181 +#if(!$isGuest && $viewerUserRole == 'graduate')
182 + #if($viewerSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $viewerSchoolCode == $affiliatedSchoolCode))
183 + #set($isAlumniOfSchool = true)
184 + #end
185 +#end
186 +
187 +## --- 学校ページ非表示チェック ---
188 +#set($schoolHidden = $doc.getValue('hidden'))
189 +#if($schoolHidden == 1)
190 + #if($isViewerAdmin)
191 + ## 管理者: 黄色バナー + ページ内容は通常表示（プレビュー）
192 +<div class="school-hidden-banner admin">
193 + <svg class="ico" 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 01-4.24-4.24"/><line x1="1" y1="1" x2="23" y2="23"/></svg>
194 + <div>
195 + <strong>このページは非表示になっています</strong>（管理者のみ閲覧可能）
196 + #set($hBy = $!doc.getValue('hiddenBy'))
197 + #set($hAt = $!doc.getValue('hiddenAt'))
198 + #set($hReason = $!doc.getValue('hiddenReason'))
199 + <div class="school-hidden-detail">
200 + 非表示: $!escapetool.xml($hAt) / $!escapetool.xml($hBy)
201 + #if($hReason && $hReason != '') ・ 理由: $!escapetool.xml($hReason)#end
202 + </div>
203 + <a href="$xwiki.getURL('SeitokaiAdmin.SchoolManagement', 'view')" style="color:#92400e;text-decoration:underline">学校ページ管理へ</a>
204 + </div>
205 +</div>
206 + #else
207 + ## 一般ユーザー・ゲスト: 非公開メッセージを表示して停止
208 +<div class="school-hidden-public">
209 + <svg class="ico" viewBox="0 0 24 24" style="width:2.5em;height:2.5em"><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 01-4.24-4.24"/><line x1="1" y1="1" x2="23" y2="23"/></svg>
210 + <h2>このページは現在公開されていません</h2>
211 + <p>このページは管理者により非公開に設定されています。</p>
212 + <a href="$xwiki.getURL('Schools.WebHome', 'view')" class="btn-back-list">学校一覧に戻る</a>
213 +</div>
214 +#stop
215 + #end
216 +#end
217 +
103 103  ## --- 投稿固定/解除処理 ---
104 104  #set($pinAction = $!request.action)
105 -#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token))
220 +#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $isSchoolMember)) && $services.csrf.isTokenValid($request.form_token))
106 106   #set($pinPostObjStr = $!request.postObj)
107 107   #if(!$pinPostObjStr.matches('^\d+$'))
108 108   ## 不正な値 → 無視
... ... @@ -132,7 +132,7 @@
132 132  
133 133  ## --- 特色ある活動 選定/解除処理 ---
134 134  #set($featAction = $!request.action)
135 -#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token))
250 +#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $isSchoolMember)) && $services.csrf.isTokenValid($request.form_token))
136 136   #set($featActObjStr = $!request.actObj)
137 137   #if($featActObjStr.matches('^\d+$'))
138 138   #set($actObjNum = $mathtool.toInteger($featActObjStr))
... ... @@ -234,7 +234,7 @@
234 234  
235 235  ## --- 編集ボタン（権限があるユーザーのみ表示） ---
236 236  #set($canEditSchool = false)
237 -#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode))
352 +#if(!$isGuest && ($isViewerAdmin || $isSchoolMember || $isAlumniOfSchool))
238 238   #set($canEditSchool = true)
239 239  #end
240 240  #if($canEditSchool)
... ... @@ -243,305 +243,498 @@
243 243  </div>
244 244  #end
245 245  
246 -## --- ① 学校基本情報 + 連絡先（左右グリッド・折りたたみ対応） ---
247 -<div class="school-info-grid">
248 - <div class="school-info-card collapsed" id="card-basic-info">
249 - <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>
250 - <table class="wiki-table school-info-table">
251 - <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
252 - <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
253 - <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
254 - <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
255 - <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
256 - <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
257 - <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
258 - <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
259 - <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>
260 - </table>
261 - #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
262 - #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
263 - #if($infoEditDate && $infoEditDate != '')
264 - <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>
361 +## --- 関連校（中高一貫校）バナー ---
362 +#if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
363 + #set($affiliatedPageRef = "Schools.${affiliatedSchoolCode}.WebHome")
364 + #set($affiliatedPageExists = $xwiki.exists($affiliatedPageRef))
365 +<div class="affiliated-school-banner">
366 + <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>
367 + <div>
368 + <strong>中高一貫校</strong>：
369 + #if($affiliatedPageExists)
370 + <a href="$xwiki.getURL($affiliatedPageRef, 'view')">$!escapetool.xml($affiliatedSchoolName)</a>
371 + #else
372 + $!escapetool.xml($affiliatedSchoolName)
265 265   #end
374 + と連携しています
266 266   </div>
376 +</div>
377 +#end
267 267  
268 - <div class="school-info-card collapsed" id="card-contact">
269 - <h2 role="button" tabindex="0" aria-expanded="false" onclick="toggleInfoCard('card-contact')" onkeydown="if(event.key==='Enter'||event.key===' '){event.preventDefault();toggleInfoCard('card-contact')}"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M22 16.92v3a2 2 0 01-2.18 2 19.79 19.79 0 01-8.63-3.07 19.5 19.5 0 01-6-6 19.79 19.79 0 01-3.07-8.67A2 2 0 014.11 2h3a2 2 0 012 1.72c.127.96.361 1.903.7 2.81a2 2 0 01-.45 2.11L8.09 9.91a16 16 0 006 6l1.27-1.27a2 2 0 012.11-.45c.907.339 1.85.573 2.81.7A2 2 0 0122 16.92z"/></svg> 連絡先・SNS</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2>
270 - <table class="wiki-table school-info-table">
271 - <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr>
272 - <tr><th>生徒会Web</th><td>#if($seitokaiWebsite && $seitokaiWebsite != '')<a href="$!escapetool.xml($seitokaiWebsite)" target="_blank" rel="noopener"><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> $!escapetool.xml($seitokaiWebsite)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
273 - <tr><th>X (Twitter)</th><td>#if($seitokaiTwitter && $seitokaiTwitter != '')<a href="https://x.com/$!escapetool.url($seitokaiTwitter)" target="_blank" rel="noopener">𝕏 @$!escapetool.xml($seitokaiTwitter)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
274 - <tr><th>Instagram</th><td>#if($seitokaiInstagram && $seitokaiInstagram != '')<a href="https://instagram.com/$!escapetool.url($seitokaiInstagram)" target="_blank" rel="noopener"><svg class="ico" viewBox="0 0 24 24"><path d="M23 19a2 2 0 01-2 2H3a2 2 0 01-2-2V8a2 2 0 012-2h4l2-3h6l2 3h4a2 2 0 012 2z"/><circle cx="12" cy="13" r="4"/></svg> @$!escapetool.xml($seitokaiInstagram)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
275 - <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>
276 - <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
277 - </table>
379 +## --- ① 学校基本情報 ---
380 +<div class="school-info-card collapsed" id="card-basic-info">
381 + <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>
382 + <div class="school-basic-info-layout">
383 + <div class="school-basic-info-table">
384 + <table class="wiki-table school-info-table">
385 + <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
386 + <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
387 + <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
388 + <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
389 + <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
390 + <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
391 + <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
392 + <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
393 + <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>
394 + </table>
395 + </div>
396 + #if($schoolPhoto && $schoolPhoto != '')
397 + <div class="school-photo-area">
398 + <img src="$doc.getAttachmentURL($schoolPhoto)" alt="$!escapetool.xml($schoolName)" class="school-photo" />
399 + </div>
400 + #end
278 278   </div>
279 -</div>
402 + #if($schoolDescription && $schoolDescription.trim() != '')
403 + <div class="free-note" style="margin-top:var(--sp-4);">$!escapetool.xml($schoolDescription)</div>
404 + #end
280 280  
281 -## --- 生徒会情報アコーディオン ---
282 -<div class="school-section-divider">
283 - <button class="shortcut-btn shortcut-btn-secondary" onclick="var sec=document.getElementById('seitokai-info-section');sec.classList.toggle('open');this.querySelector('.shortcut-arrow').textContent=sec.classList.contains('open')?'▲':'▼';">
284 - <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>
285 - 生徒会情報を見る <span class="shortcut-arrow">▼</span>
286 - </button>
287 287  </div>
288 288  
289 -<div id="seitokai-info-section" class="seitokai-info-accordion">
408 +## --- ② 生徒会情報（折りたたみカード） ---
409 +<div class="school-info-card" id="card-seitokai-info">
410 + <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>
411 + <div class="seitokai-info-body">
290 290  
291 -## --- ② 組織図 ---
292 -#set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
293 -#if($hasOrgContent)
294 - ## 公開範囲チェック
295 - #set($canViewOrgChart = true)
296 - #if($visibilityOrgChart == 'members' && $isGuest) #set($canViewOrgChart = false)
297 - #elseif($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewOrgChart = false)
298 - #end
299 - #if($canViewOrgChart)
300 -<h2 class="section-title"><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"/><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 == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></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</h2>
301 -<div class="school-section-card">
302 - <div class="card-inner">
303 - #if($orgChartImage && $orgChartImage != '')
304 - <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
413 + ## --- 生徒会組織 ---
414 + #set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
415 + #if($hasOrgContent)
416 + #set($canViewOrgChart = true)
417 + #if($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewOrgChart = false)
418 + #elseif($visibilityOrgChart == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewOrgChart = false)
419 + #end
420 + #if($canViewOrgChart)
421 + <div class="seitokai-subsection">
422 + <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>
423 + <div class="seitokai-subsection-content">
424 + #if($orgChartImage && $orgChartImage != '')
425 + <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
426 + #end
427 + #if($orgChart && $orgChart != '')<div class="free-note">$!escapetool.xml($orgChart)</div>#end
428 + </div>
429 + </div>
430 + #else
431 + <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>
432 + #end
305 305   #end
306 - #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end
307 - </div>
308 -</div>
309 - #else
310 -<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 == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
311 - #end
312 -#end
313 313  
314 -## --- ③④⑤ 日常の活動・選挙・定例活動 ---
315 -<div class="school-section-grid">
316 - #if($dailyActivities && !$dailyActivities.isEmpty())
317 - <div class="school-section-card">
318 - <h3><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>
319 - <div class="card-inner">
320 - <p class="activity-hint">活動時間の多い順に上位3つ</p>
321 - <div class="tag-container">
322 - #set($daIdx = 1)
323 - #foreach($da in $dailyActivities)
324 - <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
325 - #set($daIdx = $daIdx + 1)
435 + ## --- 日常の活動 ---
436 + #if($dailyActivities && !$dailyActivities.isEmpty())
437 + <div class="seitokai-subsection">
438 + <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>
439 + <div class="seitokai-subsection-content">
440 + <p class="activity-hint">活動時間が多い3つ</p>
441 + <div class="tag-container">
442 + #foreach($da in $dailyActivities)
443 + <span class="tag tag-accent">$!escapetool.xml($da.trim())</span>
444 + #end
445 + </div>
446 + #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
447 + <div class="free-note">$!escapetool.xml($dailyActivitiesNote)</div>
326 326   #end
327 327   </div>
328 - #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
329 - <div class="free-note">$!escapetool.xml($dailyActivitiesNote)</div>
330 - #end
331 331   </div>
332 - </div>
333 - #end
451 + #end
334 334  
335 - #if($electionExists && $electionExists != '')
336 - <div class="school-section-card">
337 - <h3><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="3" width="18" height="18" rx="2"/><path d="M7 13l3 3 7-7"/></svg> 選挙</h3>
338 - <div class="card-inner">
339 - <div class="info-row">
340 - <span class="info-label">役員選挙</span>
341 - <span class="info-value">$!escapetool.xml($!electionExists)</span>
453 + ## --- 選挙 ---
454 + #if($electionExists && $electionExists != '')
455 + <div class="seitokai-subsection">
456 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="3" width="18" height="18" rx="2"/><path d="M7 13l3 3 7-7"/></svg> 選挙</h3>
457 + <div class="seitokai-subsection-content">
458 + <div class="info-row">
459 + <span class="info-label">役員選挙</span>
460 + <span class="info-value">$!escapetool.xml($!electionExists)</span>
461 + </div>
462 + #if($electionType && $electionType != '')
463 + <div class="info-row">
464 + <span class="info-label">直近の選挙方式</span>
465 + <span class="info-value">$!escapetool.xml($!electionType)</span>
466 + </div>
467 + #end
468 + #if($electionNote && $electionNote.trim() != '')
469 + <div class="free-note">$!escapetool.xml($electionNote)</div>
470 + #end
342 342   </div>
343 - #if($electionType && $electionType != '')
344 - <div class="info-row">
345 - <span class="info-label">直近の選挙方式</span>
346 - <span class="info-value">$!escapetool.xml($!electionType)</span>
347 - </div>
348 - #end
349 - #if($electionNote && $electionNote.trim() != '')
350 - <div class="free-note">$!escapetool.xml($electionNote)</div>
351 - #end
352 352   </div>
353 - </div>
354 - #end
355 -</div>
473 + #end
356 356  
357 -<div class="school-section-grid">
358 - #if($meetingFrequency && $meetingFrequency != '')
359 - <div class="school-section-card">
360 - <h3><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="4" width="18" height="18" rx="2"/><line x1="16" y1="2" x2="16" y2="6"/><line x1="8" y1="2" x2="8" y2="6"/><line x1="3" y1="10" x2="21" y2="10"/></svg> 定例活動</h3>
361 - <div class="card-inner">
362 - <div class="info-row">
363 - <span class="info-label">役員定例会の頻度</span>
364 - <span class="info-value">$!escapetool.xml($!meetingFrequency)</span>
475 + ## --- 定例活動 ---
476 + #if($meetingFrequency && $meetingFrequency != '')
477 + <div class="seitokai-subsection">
478 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="4" width="18" height="18" rx="2"/><line x1="16" y1="2" x2="16" y2="6"/><line x1="8" y1="2" x2="8" y2="6"/><line x1="3" y1="10" x2="21" y2="10"/></svg> 定例活動</h3>
479 + <div class="seitokai-subsection-content">
480 + <div class="info-row">
481 + <span class="info-label">役員定例会の頻度</span>
482 + <span class="info-value">$!escapetool.xml($!meetingFrequency)</span>
483 + </div>
484 + #if($regularActivitiesNote && $regularActivitiesNote.trim() != '')
485 + <div class="free-note">$!escapetool.xml($regularActivitiesNote)</div>
486 + #end
365 365   </div>
366 - #if($regularActivitiesNote && $regularActivitiesNote.trim() != '')
367 - <div class="free-note">$!escapetool.xml($regularActivitiesNote)</div>
368 - #end
369 369   </div>
370 - </div>
371 - #end
372 -
373 - ## --- ⑦ 予算 ---
374 - #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
375 - #if($hasBudget)
376 - ## 公開範囲チェック
377 - #set($canViewBudget = true)
378 - #if($visibilityBudget == 'members' && $isGuest) #set($canViewBudget = false)
379 - #elseif($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewBudget = false)
380 380   #end
381 - #if($canViewBudget)
382 - <div class="school-section-card">
383 - <h3><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 == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></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>
384 - <div class="card-inner">
385 - #if($budgetProcess && !$budgetProcess.isEmpty())
386 - <div class="info-row">
387 - <span class="info-label">作成過程の生徒関与</span>
388 - <span class="info-value">
389 - <div class="selection-display">
390 - #foreach($bp in $budgetProcess)
391 - <span class="selection-item">$!escapetool.xml($bp.trim())</span>
392 - #end
393 - </div>
394 - </span>
395 - </div>
490 +
491 + ## --- 予算 ---
492 + #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
493 + #if($hasBudget)
494 + #set($canViewBudget = true)
495 + #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewBudget = false)
496 + #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false)
396 396   #end
397 - #if($studentFee && $studentFee != '')
398 - <div class="info-row">
399 - <span class="info-label">生徒会費（年額）</span>
400 - <span class="info-value">$!escapetool.xml($!studentFee)</span>
498 + #if($canViewBudget)
499 + <div class="seitokai-subsection">
500 + <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>
501 + <div class="seitokai-subsection-content">
502 + #if($budgetProcess && !$budgetProcess.isEmpty())
503 + <div class="info-row">
504 + <span class="info-label">作成過程の生徒関与</span>
505 + <span class="info-value">
506 + <div class="selection-display">
507 + #set($allBpOpts = ["各部・委員会等への予算希望額調査","予算額調整（折衝等）","生徒会予算案の作成","生徒総会での議決","生徒関与なし","その他"])
508 + #foreach($bpOpt in $allBpOpts)
509 + #if($budgetProcess.contains($bpOpt))
510 + <span class="selection-item">$!escapetool.xml($bpOpt)</span>
511 + #else
512 + <span class="selection-item selection-item-off">$!escapetool.xml($bpOpt)</span>
513 + #end
514 + #end
515 + </div>
516 + </span>
517 + </div>
518 + #end
519 + #if($studentFee && $studentFee != '')
520 + <div class="info-row">
521 + <span class="info-label">生徒会費（年額）</span>
522 + <span class="info-value">$!escapetool.xml($!studentFee)</span>
523 + </div>
524 + #end
525 + #if($budgetScale && $budgetScale != '')
526 + <div class="info-row">
527 + <span class="info-label">予算規模</span>
528 + <span class="info-value">$!escapetool.xml($!budgetScale)</span>
529 + </div>
530 + #end
531 + #if($budgetAllocation && !$budgetAllocation.isEmpty())
532 + <div class="info-row">
533 + <span class="info-label">主な予算配分</span>
534 + <span class="info-value">
535 + <div class="selection-display">
536 + #foreach($ba in $budgetAllocation)
537 + <span class="selection-item">$!escapetool.xml($ba.trim())</span>
538 + #end
539 + </div>
540 + </span>
541 + </div>
542 + #end
543 + #if($budgetNote && $budgetNote.trim() != '')
544 + <div class="free-note">$!escapetool.xml($budgetNote)</div>
545 + #end
401 401   </div>
547 + </div>
548 + #else
549 + <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($visibilityBudget == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
402 402   #end
403 - #if($budgetScale && $budgetScale != '')
404 - <div class="info-row">
405 - <span class="info-label">予算規模</span>
406 - <span class="info-value">$!escapetool.xml($!budgetScale)</span>
407 - </div>
551 + #end
552 +
553 + ## --- 校則・生徒会会則の見直し ---
554 + #if($ruleReviewStatus && $ruleReviewStatus != '')
555 + #set($canViewRuleReview = true)
556 + #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewRuleReview = false)
557 + #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false)
408 408   #end
409 - #if($budgetAllocation && !$budgetAllocation.isEmpty())
410 - <div class="info-row">
411 - <span class="info-label">主な予算配分</span>
412 - <span class="info-value">
413 - <div class="selection-display">
414 - #foreach($ba in $budgetAllocation)
415 - <span class="selection-item">$!escapetool.xml($ba.trim())</span>
416 - #end
417 - </div>
418 - </span>
559 + #if($canViewRuleReview)
560 + <div class="seitokai-subsection">
561 + <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>
562 + <div class="seitokai-subsection-content">
563 + <div class="info-row">
564 + <span class="info-label">見直しの有無（3年以内）</span>
565 + <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
566 + </div>
567 + #if($ruleReviewStatus != '実施なし')
568 + #if($ruleReviewContent && !$ruleReviewContent.isEmpty())
569 + <div class="info-row">
570 + <span class="info-label">見直しの内容</span>
571 + <span class="info-value">
572 + <div class="selection-display">
573 + #foreach($rc in $ruleReviewContent)
574 + <span class="selection-item">$!escapetool.xml($rc.trim())</span>
575 + #end
576 + </div>
577 + </span>
578 + </div>
579 + #end
580 + #if($ruleReviewProposer && !$ruleReviewProposer.isEmpty())
581 + <div class="info-row">
582 + <span class="info-label">見直しの提案者</span>
583 + <span class="info-value">
584 + <div class="selection-display">
585 + #foreach($rp in $ruleReviewProposer)
586 + <span class="selection-item">$!escapetool.xml($rp.trim())</span>
587 + #end
588 + </div>
589 + </span>
590 + </div>
591 + #end
592 + #if($ruleReviewImplementer && !$ruleReviewImplementer.isEmpty())
593 + <div class="info-row">
594 + <span class="info-label">見直しの実施者</span>
595 + <span class="info-value">
596 + <div class="selection-display">
597 + #foreach($ri in $ruleReviewImplementer)
598 + <span class="selection-item">$!escapetool.xml($ri.trim())</span>
599 + #end
600 + </div>
601 + </span>
602 + </div>
603 + #end
604 + #end
605 + #if($ruleReviewSystem && $ruleReviewSystem != '')
606 + <div class="info-row">
607 + <span class="info-label">見直しの仕組み</span>
608 + <span class="info-value">$!escapetool.xml($!ruleReviewSystem)</span>
609 + </div>
610 + #end
419 419   </div>
612 + </div>
613 + #else
614 + <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($visibilityRuleReview == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
420 420   #end
421 - #if($budgetNote && $budgetNote.trim() != '')
422 - <div class="free-note">$!escapetool.xml($budgetNote)</div>
423 - #end
616 + #end
617 +
618 + ## --- 活動環境 ---
619 + #set($hasActivityEnv = ($activityPlace && !$activityPlace.isEmpty()) || ($activityRoomEquipment && $activityRoomEquipment != '') || ($activityRoomImage && $activityRoomImage != '') || ($ictUsage && !$ictUsage.isEmpty()))
620 + #if($hasActivityEnv)
621 + <div class="seitokai-subsection">
622 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M3 9l9-7 9 7v11a2 2 0 01-2 2H5a2 2 0 01-2-2z"/><polyline points="9 22 9 12 15 12 15 22"/></svg> 生徒会の活動環境</h3>
623 + <div class="seitokai-subsection-content">
624 + #if($activityPlace && !$activityPlace.isEmpty())
625 + <div class="info-row">
626 + <span class="info-label">普段の活動場所</span>
627 + <span class="info-value">
628 + <div class="selection-display">
629 + #foreach($ap in $activityPlace)
630 + <span class="selection-item">$!escapetool.xml($ap.trim())</span>
631 + #end
632 + </div>
633 + </span>
634 + </div>
635 + #end
636 + #if($activityRoomEquipment && $activityRoomEquipment != '')
637 + <div class="info-row">
638 + <span class="info-label">生徒会室の設備</span>
639 + <span class="info-value free-text-value">$!escapetool.xml($activityRoomEquipment)</span>
640 + </div>
641 + #end
642 + #if($activityRoomImage && $activityRoomImage != '')
643 + <div class="info-row">
644 + <span class="info-label">活動場所の写真</span>
645 + <span class="info-value"><div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($activityRoomImage)" alt="活動場所の写真" class="org-chart-img" /></div></span>
646 + </div>
647 + #end
648 + #if($ictUsage && !$ictUsage.isEmpty())
649 + <div class="info-row">
650 + <span class="info-label">ICT活用している場面</span>
651 + <span class="info-value">
652 + <div class="selection-display">
653 + #foreach($iu in $ictUsage)
654 + <span class="selection-item">$!escapetool.xml($iu.trim())</span>
655 + #end
656 + </div>
657 + </span>
658 + </div>
659 + #end
660 + </div>
424 424   </div>
425 - </div>
426 - #else
427 - <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($visibilityBudget == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
428 428   #end
429 - #end
430 -</div>
431 431  
432 -## --- ⑧ 校則の見直し ---
433 -#if($ruleReviewStatus && $ruleReviewStatus != '')
434 - ## 公開範囲チェック
435 - #set($canViewRuleReview = true)
436 - #if($visibilityRuleReview == 'members' && $isGuest) #set($canViewRuleReview = false)
437 - #elseif($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewRuleReview = false)
438 - #end
439 - #if($canViewRuleReview)
440 -<h2 class="section-title"><svg class="ico ico-md" 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 == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></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</h2>
441 -<div class="school-section-card">
442 - <div class="card-inner">
443 - <div class="info-row">
444 - <span class="info-label">見直しの有無（3年以内）</span>
445 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
664 + ## --- 生徒総会 ---
665 + #set($hasAssembly = ($assemblyFormat && $assemblyFormat != '') || ($assemblyCount && $assemblyCount > 0) || ($assemblyAgenda && !$assemblyAgenda.isEmpty()) || ($assemblyTopics && !$assemblyTopics.isEmpty()) || ($assemblyNote && $assemblyNote != ''))
666 + #if($hasAssembly)
667 + <div class="seitokai-subsection">
668 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 生徒総会</h3>
669 + <div class="seitokai-subsection-content">
670 + #if($assemblyFormat && $assemblyFormat != '')
671 + <div class="info-row">
672 + <span class="info-label">開催方式</span>
673 + <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($assemblyFormat)</span></span>
674 + </div>
675 + #end
676 + #if($assemblyCount && $assemblyCount > 0)
677 + <div class="info-row">
678 + <span class="info-label">開催回数（年）</span>
679 + <span class="info-value">$!escapetool.xml($assemblyCount)回</span>
680 + </div>
681 + #end
682 + #if($assemblyAgenda && !$assemblyAgenda.isEmpty())
683 + <div class="info-row">
684 + <span class="info-label">議案の集め方</span>
685 + <span class="info-value">
686 + <div class="selection-display">
687 + #foreach($aa in $assemblyAgenda)
688 + <span class="selection-item">$!escapetool.xml($aa.trim())</span>
689 + #end
690 + </div>
691 + </span>
692 + </div>
693 + #end
694 + #if($assemblyTopics && !$assemblyTopics.isEmpty())
695 + <div class="info-row">
696 + <span class="info-label">扱う内容</span>
697 + <span class="info-value">
698 + <div class="selection-display">
699 + #foreach($at in $assemblyTopics)
700 + <span class="selection-item">$!escapetool.xml($at.trim())</span>
701 + #end
702 + </div>
703 + </span>
704 + </div>
705 + #end
706 + #if($assemblyNote && $assemblyNote != '')
707 + <div class="info-row">
708 + <span class="info-label">自由記述</span>
709 + <span class="info-value free-text-value">$!escapetool.xml($assemblyNote)</span>
710 + </div>
711 + #end
712 + </div>
446 446   </div>
447 - #if($ruleReviewContent && !$ruleReviewContent.isEmpty())
448 - <div class="info-row">
449 - <span class="info-label">見直しの内容</span>
450 - <span class="info-value">
451 - <div class="selection-display">
452 - #foreach($rc in $ruleReviewContent)
453 - <span class="selection-item">$!escapetool.xml($rc.trim())</span>
454 - #end
714 + #end
715 +
716 + ## --- 広報 ---
717 + #set($hasPublicity = ($publicityMethod && !$publicityMethod.isEmpty()) || ($publicityFrequency && $publicityFrequency != '') || ($publicityNote && $publicityNote != ''))
718 + #if($hasPublicity)
719 + <div class="seitokai-subsection">
720 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M1 12s4-8 11-8 11 8 11 8-4 8-11 8-11-8-11-8z"/><circle cx="12" cy="12" r="3"/></svg> 広報</h3>
721 + <div class="seitokai-subsection-content">
722 + #if($publicityMethod && !$publicityMethod.isEmpty())
723 + <div class="info-row">
724 + <span class="info-label">方法</span>
725 + <span class="info-value">
726 + <div class="selection-display">
727 + #foreach($pm in $publicityMethod)
728 + <span class="selection-item">$!escapetool.xml($pm.trim())</span>
729 + #end
730 + </div>
731 + </span>
455 455   </div>
456 - </span>
733 + #end
734 + #if($publicityFrequency && $publicityFrequency != '')
735 + <div class="info-row">
736 + <span class="info-label">頻度</span>
737 + <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($publicityFrequency)</span></span>
738 + </div>
739 + #end
740 + #if($publicityNote && $publicityNote != '')
741 + <div class="info-row">
742 + <span class="info-label">自由記述</span>
743 + <span class="info-value free-text-value">$!escapetool.xml($publicityNote)</span>
744 + </div>
745 + #end
746 + </div>
457 457   </div>
458 458   #end
459 - #if($ruleReviewProposer && !$ruleReviewProposer.isEmpty())
460 - <div class="info-row">
461 - <span class="info-label">見直しの提案者</span>
462 - <span class="info-value">
463 - <div class="selection-display">
464 - #foreach($rp in $ruleReviewProposer)
465 - <span class="selection-item">$!escapetool.xml($rp.trim())</span>
466 - #end
749 +
750 + ## --- 外部連携 ---
751 + #set($hasExternal = ($externalCooperation && $externalCooperation != '') || ($externalOrgName && $externalOrgName != '') || ($socialParticipation && !$socialParticipation.isEmpty()))
752 + #if($hasExternal)
753 + <div class="seitokai-subsection">
754 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><circle cx="18" cy="5" r="3"/><circle cx="6" cy="12" r="3"/><circle cx="18" cy="19" r="3"/><line x1="8.59" y1="13.51" x2="15.42" y2="17.49"/><line x1="15.41" y1="6.51" x2="8.59" y2="10.49"/></svg> 外部連携</h3>
755 + <div class="seitokai-subsection-content">
756 + #if($externalCooperation && $externalCooperation != '')
757 + <div class="info-row">
758 + <span class="info-label">他校の生徒会との連携</span>
759 + <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($externalCooperation)</span></span>
467 467   </div>
468 - </span>
761 + #end
762 + #if($externalOrgName && $externalOrgName != '')
763 + <div class="info-row">
764 + <span class="info-label">参加している生徒会団体の名前</span>
765 + <span class="info-value">$!escapetool.xml($externalOrgName)</span>
766 + </div>
767 + #end
768 + #if($socialParticipation && !$socialParticipation.isEmpty())
769 + <div class="info-row">
770 + <span class="info-label">社会参加・地域連携・ボランティア</span>
771 + <span class="info-value">
772 + <div class="selection-display">
773 + #foreach($sp2 in $socialParticipation)
774 + <span class="selection-item">$!escapetool.xml($sp2.trim())</span>
775 + #end
776 + </div>
777 + </span>
778 + </div>
779 + #end
780 + </div>
469 469   </div>
470 470   #end
471 - #if($ruleReviewImplementer && !$ruleReviewImplementer.isEmpty())
472 - <div class="info-row">
473 - <span class="info-label">見直しの実施者</span>
474 - <span class="info-value">
475 - <div class="selection-display">
476 - #foreach($ri in $ruleReviewImplementer)
477 - <span class="selection-item">$!escapetool.xml($ri.trim())</span>
783 +
784 + ## --- 年間主要行事 ---
785 + #set($months = [["4月", $eventApril], ["5月", $eventMay], ["6月", $eventJune], ["7月", $eventJuly], ["8月", $eventAugust], ["9月", $eventSeptember], ["10月", $eventOctober], ["11月", $eventNovember], ["12月", $eventDecember], ["1月", $eventJanuary], ["2月", $eventFebruary], ["3月", $eventMarch]])
786 + #set($hasAnyEvent = false)
787 + #foreach($m in $months)
788 + #if($m.get(1) && $m.get(1) != '') #set($hasAnyEvent = true) #end
789 + #end
790 + #if($hasAnyEvent)
791 + <div class="seitokai-subsection">
792 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="4" width="18" height="18" rx="2" ry="2"/><line x1="16" y1="2" x2="16" y2="6"/><line x1="8" y1="2" x2="8" y2="6"/><line x1="3" y1="10" x2="21" y2="10"/></svg> 年間主要行事</h3>
793 + <div class="seitokai-subsection-content">
794 + <table class="wiki-table school-info-table" style="margin:0">
795 + #foreach($m in $months)
796 + #if($m.get(1) && $m.get(1) != '')
797 + <tr><td style="width:60px;font-weight:600;white-space:nowrap">$m.get(0)</td><td>$!escapetool.xml($m.get(1))</td></tr>
478 478   #end
479 - </div>
480 - </span>
799 + #end
800 + </table>
801 + </div>
481 481   </div>
482 482   #end
483 - #if($ruleReviewSystem && $ruleReviewSystem != '')
484 - <div class="info-row">
485 - <span class="info-label">見直しの仕組み</span>
486 - <span class="info-value">$!escapetool.xml($!ruleReviewSystem)</span>
804 +
805 + ## --- 生徒会の課題意識 ---
806 + #if($challenges && $challenges != '')
807 + #set($canViewChallenges = true)
808 + #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewChallenges = false)
809 + #elseif($visibilityChallenges == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewChallenges = false)
810 + #end
811 + #if($canViewChallenges)
812 + <div class="seitokai-subsection">
813 + <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>
814 + <div class="seitokai-subsection-content">
815 + <div class="challenge-text">$!escapetool.xml($challenges)</div>
816 + </div>
487 487   </div>
818 + #else
819 + <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($visibilityChallenges == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
820 + #end
488 488   #end
489 - </div>
490 -</div>
491 - #else
492 -<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($visibilityRuleReview == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
493 - #end
494 -#end
495 495  
496 -## --- ⑨ 課題 ---
497 -#if($challenges && $challenges != '')
498 - ## 公開範囲チェック
499 - #set($canViewChallenges = true)
500 - #if($visibilityChallenges == 'members' && $isGuest) #set($canViewChallenges = false)
501 - #elseif($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewChallenges = false)
823 + </div>## seitokai-info-body 終了
824 +</div>## card-seitokai-info 終了
825 +
826 +## --- ③ SNS・連絡先 ---
827 +<div class="school-info-card collapsed" id="card-contact">
828 + <h2 role="button" tabindex="0" aria-expanded="false" onclick="toggleInfoCard('card-contact')" onkeydown="if(event.key==='Enter'||event.key===' '){event.preventDefault();toggleInfoCard('card-contact')}"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M22 16.92v3a2 2 0 01-2.18 2 19.79 19.79 0 01-8.63-3.07 19.5 19.5 0 01-6-6 19.79 19.79 0 01-3.07-8.67A2 2 0 014.11 2h3a2 2 0 012 1.72c.127.96.361 1.903.7 2.81a2 2 0 01-.45 2.11L8.09 9.91a16 16 0 006 6l1.27-1.27a2 2 0 012.11-.45c.907.339 1.85.573 2.81.7A2 2 0 0122 16.92z"/></svg> SNS・連絡先</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2>
829 + <table class="wiki-table school-info-table">
830 + <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr>
831 + <tr><th>生徒会Web</th><td>#if($seitokaiWebsite && $seitokaiWebsite != '')<a href="$!escapetool.xml($seitokaiWebsite)" target="_blank" rel="noopener"><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> $!escapetool.xml($seitokaiWebsite)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
832 + <tr><th>X (Twitter)</th><td>#if($seitokaiTwitter && $seitokaiTwitter != '')<a href="https://x.com/$!escapetool.url($seitokaiTwitter)" target="_blank" rel="noopener">𝕏 @$!escapetool.xml($seitokaiTwitter)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
833 + <tr><th>Instagram</th><td>#if($seitokaiInstagram && $seitokaiInstagram != '')<a href="https://instagram.com/$!escapetool.url($seitokaiInstagram)" target="_blank" rel="noopener"><svg class="ico" viewBox="0 0 24 24"><path d="M23 19a2 2 0 01-2 2H3a2 2 0 01-2-2V8a2 2 0 012-2h4l2-3h6l2 3h4a2 2 0 012 2z"/><circle cx="12" cy="13" r="4"/></svg> @$!escapetool.xml($seitokaiInstagram)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
834 + <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>
835 + <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
836 + </table>
837 + #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
838 + #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
839 + #if($infoEditDate && $infoEditDate != '')
840 + <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>
502 502   #end
503 - #if($canViewChallenges)
504 -<h2 class="section-title">生徒会の課題意識 #if($visibilityChallenges != 'public')<span class="visibility-badge visibility-${visibilityChallenges}">#if($visibilityChallenges == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></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</h2>
505 -<div class="challenge-text">$!escapetool.xml($challenges)</div>
506 - #else
507 -<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($visibilityChallenges == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
508 - #end
509 -#end
842 +</div>
510 510  
511 -</div>## seitokai-info-accordion 終了
512 -
513 513  {{/html}}
514 514  
846 +----
847 +
515 515  ## --- ⑩ 活動報告一覧（スレッド型・年度タブ付き） ---
516 516  = 活動報告 =
517 517  
518 -## --- 投稿者ステータス凡例（折りたたみ） ---
851 +## --- 年度タブ + 投稿者ステータス凡例 ---
519 519  {{html clean="false"}}
520 -<div class="author-legend-wrapper">
521 - <button class="author-legend-toggle" onclick="this.classList.toggle('open');this.nextElementSibling.classList.toggle('open')"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M12 16v-4"/><path d="M12 8h.01"/></svg> バッジの見方 <span class="chevron">▼</span></button>
522 - <div class="author-legend-body">
523 - <div class="author-legend">
524 - <span class="author-legend-title">投稿者の信頼度:</span>
525 - <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者</span>
526 - <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み</span>
527 - <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介</span>
528 - <span class="author-legend-item"><span class="bar bar-general"></span> 一般（未承認）</span>
529 - </div>
530 - <div class="author-legend">
531 - <span class="author-legend-title">所属:</span>
532 - <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>
533 - <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>
534 - <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>
535 - <span class="author-legend-item text-hint">※一般アカウントは所属未確認のため非表示</span>
536 - </div>
537 - <div class="author-legend">
538 - <span class="author-legend-title">役割:</span>
539 - <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>
540 - <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>
541 - <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>
542 - </div>
543 - </div>
544 -</div>
545 545  
546 546  ## --- 年度タブ ---
547 547  ## 全活動から年度一覧を収集
... ... @@ -563,14 +563,49 @@
563 563  #end
564 564  ## ソート（降順にしたいが Velocity にはないので JS で制御）
565 565  
566 -<div class="activity-fy-tabs">
567 - <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
568 - #foreach($fy in $fySet)
569 - #if($fy != $currentFYStr)
570 - <button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button>
874 +<div class="activity-toolbar">
875 + <div class="activity-fy-tabs">
876 + <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
877 + #foreach($fy in $fySet)
878 + #if($fy != $currentFYStr)
879 + <button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button>
880 + #end
571 571   #end
572 - #end
573 - <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
882 + <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
883 + </div>
884 + <div class="activity-toolbar-right">
885 + <button class="btn-view-toggle" id="btnViewToggle" onclick="toggleCompactView()" title="タイトルのみ表示">
886 + <svg class="ico-list" viewBox="0 0 24 24" stroke="currentColor" fill="none" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><line x1="8" y1="6" x2="21" y2="6"/><line x1="8" y1="12" x2="21" y2="12"/><line x1="8" y1="18" x2="21" y2="18"/><line x1="3" y1="6" x2="3.01" y2="6"/><line x1="3" y1="12" x2="3.01" y2="12"/><line x1="3" y1="18" x2="3.01" y2="18"/></svg>
887 + <svg class="ico-detail" viewBox="0 0 24 24" stroke="currentColor" fill="none" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="3" width="7" height="7"/><rect x="14" y="3" width="7" height="7"/><rect x="3" y="14" width="7" height="7"/><rect x="14" y="14" width="7" height="7"/></svg>
888 + <span class="toggle-label">一覧表示</span>
889 + </button>
890 + </div>
891 + <div class="author-legend-wrapper">
892 + <button class="author-legend-toggle" onclick="this.classList.toggle('open');this.nextElementSibling.classList.toggle('open')"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M12 16v-4"/><path d="M12 8h.01"/></svg> バッジの見方 <span class="chevron">▼</span></button>
893 + <div class="author-legend-body">
894 + <div class="author-legend">
895 + <span class="author-legend-title">投稿者の信頼度:</span>
896 + <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者 <span class="text-hint">— 運営スタッフ</span></span>
897 + <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み <span class="text-hint">— 本人確認済みのユーザー</span></span>
898 + <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介 <span class="text-hint">— 承認済みユーザーからの紹介</span></span>
899 + <span class="author-legend-item"><span class="bar bar-general"></span> 一般 <span class="text-hint">— 一般登録ユーザー</span></span>
900 + </div>
901 + <div class="author-legend">
902 + <span class="author-legend-title">所属:</span>
903 + <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>
904 + <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>
905 + <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>
906 + <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>
907 + <span class="author-legend-item text-hint">※一般アカウントは所属バッジが表示されません</span>
908 + </div>
909 + <div class="author-legend">
910 + <span class="author-legend-title">役割:</span>
911 + <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>
912 + <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>
913 + <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>
914 + </div>
915 + </div>
916 + </div>
574 574  </div>
575 575  
576 576  {{/html}}
... ... @@ -635,10 +635,18 @@
635 635  <div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)">
636 636   <div class="activity-thread-header">
637 637   <div class="activity-thread-title">
638 - <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>
639 - <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
981 + <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>
982 + <div class="activity-meta-line">
983 + <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
984 + #set($actTagsList = $activity.getValue('tags'))
985 + #if($actTagsList && !$actTagsList.isEmpty())
986 + #foreach($tagItem in $actTagsList)
987 + #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end
988 + #end
989 + #end
990 + </div>
640 640   </div>
641 - <div class="thread-meta-row">
992 + <div class="thread-meta-right">
642 642   <span class="thread-post-count">${reportCount}件の報告 ・ ${commentCount}件のコメント</span>
643 643   #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred')
644 644   #if($actFeatured == '1')
... ... @@ -698,12 +698,12 @@
698 698   #set($postVis = $!post.getValue('visibility'))
699 699   #if(!$postVis || $postVis == '') #set($postVis = 'public') #end
700 700   #set($canViewPost = true)
701 - #if($postVis == 'members' && $isGuest) #set($canViewPost = false)
702 - #elseif($postVis == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewPost = false)
1052 + #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewPost = false)
1053 + #elseif($postVis == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPost = false)
703 703   #end
704 704   #if(!$canViewPost)
705 705   <div class="thread-post visibility-restricted-post">
706 - <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($postVis == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div>
1057 + <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($postVis == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
707 707   </div>
708 708   #else
709 709   ## 投稿者のアカウント種別に基づいたCSSクラス
... ... @@ -743,8 +743,11 @@
743 743   <span class="badge badge-general badge-sm">一般</span>
744 744   #end
745 745   ## 所属バッジ（投稿者の学校コードとページの学校コードを比較）
1097 + #set($postIsSchoolMatch = ($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode)))
746 746   #if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general')
747 - #if($postSchoolCode == $schoolCode)
1099 + #if($postUserRole == 'graduate' && $postIsSchoolMatch)
1100 + <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>
1101 + #elseif($postIsSchoolMatch && $postUserRole != 'graduate')
748 748   #if($postAccountType == 'verified' || $postAccountType == 'admin')
749 749   <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>
750 750   #else
... ... @@ -771,6 +771,13 @@
771 771   #if($postEdited == 1 || $postEdited == '1')
772 772   <span class="post-edited-label">（編集済み）</span>
773 773   #end
1128 + #set($postAuthorRefH = $!post.getValue('authorRef'))
1129 + #set($postObjNumH = $post.number)
1130 + #if(!$isGuest && $xcontext.user != $postAuthorRefH)
1131 + <button type="button" class="btn-post-report btn-post-report-header" onclick="openReportDialog(this, '${doc.fullName}', $postObjNumH, '${services.csrf.getToken()}')" title="この投稿を通報">
1132 + <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> 通報
1133 + </button>
1134 + #end
774 774   </div>
775 775   <div class="thread-post-body">
776 776   $!escapetool.xml($!postContent)
... ... @@ -835,12 +835,18 @@
835 835   #end
836 836   </div>
837 837   #if($postVis != 'public')
838 - <div class="visibility-badge visibility-${postVis} post-action-mt">#if($postVis == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></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>
1199 + <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>
839 839   #end
840 - ## 固定/解除ボタン（承認済み・管理者のみ）
841 - #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
842 - #set($postObjNum = $post.number)
843 - <div class="post-pin-action post-action-mt">
1201 + ## 固定/編集/削除/通報/非表示ボタン（横並び）
1202 + #set($postAuthorRef = $!post.getValue('authorRef'))
1203 + #set($postObjNumED = $post.number)
1204 + #set($showPinBtn = ($viewerAccountType == 'admin' || $viewerAccountType == 'verified'))
1205 + #set($showEditDeleteBtn = ($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin'))
1206 + #set($showHideBtn = ($viewerAccountType == 'admin'))
1207 + #if($showPinBtn || $showEditDeleteBtn || $showHideBtn)
1208 + <div class="post-edit-actions post-action-mt">
1209 + #if($showPinBtn)
1210 + #set($postObjNum = $post.number)
844 844   #if($isPinned == '1')
845 845   <a href="$doc.getURL('view', "action=unpin&postObj=${postObjNum}&form_token=${services.csrf.getToken()}")" class="btn-pin-toggle btn-unpin" title="固定を解除">
846 846   <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> 固定を解除
... ... @@ -850,15 +850,12 @@
850 850   <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> 固定する
851 851   </a>
852 852   #end
853 - </div>
854 - #end
855 - ## 編集・削除ボタン（投稿者本人 or 管理者）
856 - #set($postAuthorRef = $!post.getValue('authorRef'))
857 - #set($postObjNumED = $post.number)
858 - #if($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin')
859 - <div class="post-edit-actions post-action-mt">
1220 + #end
1221 + #if($showEditDeleteBtn)
860 860   #if($xcontext.user == $postAuthorRef)
861 - <button type="button" class="btn-post-edit" onclick="openEditPost(this, '${doc.fullName}', $postObjNumED, '$!escapetool.javascript($!postContent)')" title="この投稿を編集">
1223 + #set($editImages = $!post.getValue('images'))
1224 + #set($editFiles = $!post.getValue('files'))
1225 + <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="この投稿を編集">
862 862   <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> 編集
863 863   </button>
864 864   #end
... ... @@ -865,6 +865,12 @@
865 865   <button type="button" class="btn-post-delete" onclick="confirmDeletePost('${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を削除">
866 866   <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> 削除
867 867   </button>
1232 + #end
1233 + #if($showHideBtn)
1234 + <button type="button" class="btn-post-hide" onclick="openHideDialog(this, '${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を非表示にする">
1235 + <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> 非表示
1236 + </button>
1237 + #end
868 868   </div>
869 869   #end
870 870   </div>
... ... @@ -914,9 +914,11 @@
914 914  
915 915   #if($xcontext.user != "XWiki.XWikiGuest")
916 916   <div class="thread-add-post">
1287 + #if($isSchoolMember || $isAlumniOfSchool || $isViewerAdmin)
917 917   <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
918 918   ＋ 活動報告を追加
919 919   </a>
1291 + #end
920 920   <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
921 921   <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> コメントを書く
922 922   </a>
... ... @@ -949,6 +949,35 @@
949 949  ## --- 年度タブ切り替え JavaScript ---
950 950  {{html clean="false"}}
951 951  <script>
1324 +// コンパクト表示（タイトルのみ）トグル
1325 +function toggleCompactView() {
1326 + var container = document.querySelector('.xwiki-content') || document.body;
1327 + var isCompact = container.classList.toggle('activity-compact-view');
1328 + var btn = document.getElementById('btnViewToggle');
1329 + if (btn) {
1330 + btn.querySelector('.toggle-label').textContent = isCompact ? '詳細表示' : '一覧表示';
1331 + btn.title = isCompact ? '詳細表示に戻す' : 'タイトルのみ表示';
1332 + }
1333 + // コンパクトモードでは各スレッドヘッダーをクリックで個別展開可能にする
1334 + document.querySelectorAll('.activity-thread').forEach(function(thread) {
1335 + if (isCompact) {
1336 + thread.classList.remove('compact-expanded');
1337 + }
1338 + });
1339 +}
1340 +
1341 +// コンパクトモードで個別スレッドを展開/折りたたみ
1342 +function toggleThreadExpand(e) {
1343 + var container = document.querySelector('.xwiki-content') || document.body;
1344 + if (!container.classList.contains('activity-compact-view')) return;
1345 + // リンクやボタンのクリックはスルー
1346 + if (e.target.closest('a, button, .btn-featured-toggle')) return;
1347 + var thread = e.target.closest('.activity-thread');
1348 + if (thread) {
1349 + thread.classList.toggle('compact-expanded');
1350 + }
1351 +}
1352 +
952 952  function switchActivityFY(fy, btn) {
953 953   // タブのアクティブ状態を切り替え
954 954   document.querySelectorAll('.activity-fy-tab').forEach(function(t) { t.classList.remove('active'); });
... ... @@ -964,6 +964,27 @@
964 964  }
965 965  // ページ読み込み時の初期化
966 966  document.addEventListener('DOMContentLoaded', function() {
1368 + // 年度タブを降順にソート（「全期間」タブは末尾に固定）
1369 + var tabContainer = document.querySelector('.activity-fy-tabs');
1370 + if (tabContainer) {
1371 + var tabs = Array.from(tabContainer.querySelectorAll('.activity-fy-tab'));
1372 + var allTab = null;
1373 + var fyTabs = [];
1374 + tabs.forEach(function(t) {
1375 + var onclickStr = t.getAttribute('onclick') || '';
1376 + if (onclickStr.indexOf("'all'") !== -1) { allTab = t; }
1377 + else { fyTabs.push(t); }
1378 + });
1379 + // 年度タブを数値の降順でソート
1380 + fyTabs.sort(function(a, b) {
1381 + var aYear = parseInt(a.textContent) || 0;
1382 + var bYear = parseInt(b.textContent) || 0;
1383 + return bYear - aYear;
1384 + });
1385 + // DOM再配置
1386 + fyTabs.forEach(function(t) { tabContainer.appendChild(t); });
1387 + if (allTab) { tabContainer.appendChild(allTab); }
1388 + }
967 967   // デフォルトで現在の年度を表示
968 968   var defaultTab = document.querySelector('.activity-fy-tab.active');
969 969   if (defaultTab) { defaultTab.click(); }
... ... @@ -975,6 +975,30 @@
975 975   window.history.replaceState({}, document.title, window.location.pathname);
976 976   }
977 977   }
1400 + // コンパクトモード: スレッドヘッダークリックで個別展開
1401 + document.querySelectorAll('.activity-thread-header').forEach(function(header) {
1402 + header.addEventListener('click', toggleThreadExpand);
1403 + });
1404 + // 長文投稿の折りたたみ初期化（max-height: 12em 超で省略）
1405 + document.querySelectorAll('.thread-post-body').forEach(function(body) {
1406 + // pre-wrapのまま高さを測定し、max-height(12em ≒ ~200px)を超える場合に折りたたむ
1407 + var fullH = body.scrollHeight;
1408 + // 12em を px に変換（font-size × line-height × 行数 の近似値ではなくCSSと同じ値を取得）
1409 + body.classList.add('truncated');
1410 + var maxH = body.clientHeight; // max-height: 12em 適用後の高さ
1411 + body.classList.remove('truncated');
1412 + if (fullH > maxH + 30) {
1413 + body.classList.add('truncated');
1414 + var btn = document.createElement('button');
1415 + btn.className = 'btn-read-more';
1416 + btn.textContent = '広げて読む ▼';
1417 + btn.addEventListener('click', function() {
1418 + var isExpanded = body.classList.toggle('expanded');
1419 + btn.textContent = isExpanded ? '折りたたむ ▲' : '広げて読む ▼';
1420 + });
1421 + body.parentNode.insertBefore(btn, body.nextSibling);
1422 + }
1423 + });
978 978  });
979 979  
980 980  // トースト通知表示
... ... @@ -1009,37 +1009,130 @@
1009 1009  }
1010 1010  
1011 1011  // 投稿の編集（インライン編集フォームを開く）
1012 -function openEditPost(btn, schoolPage, postObjNum, currentContent) {
1458 +function openEditPost(btn) {
1013 1013   var postEl = btn.closest('.thread-post');
1014 1014   if (!postEl) return;
1015 - // 既存の編集フォームがあれば閉じる
1016 1016   var existing = postEl.querySelector('.post-edit-form');
1017 1017   if (existing) { existing.remove(); return; }
1018 1018   var bodyEl = postEl.querySelector('.thread-post-body');
1019 1019   if (!bodyEl) return;
1465 +
1466 + var schoolPage = btn.getAttribute('data-school');
1467 + var postObjNum = btn.getAttribute('data-obj');
1468 + var currentContent = btn.getAttribute('data-content') || '';
1469 + var currentImages = btn.getAttribute('data-images') || '';
1470 + var currentFiles = btn.getAttribute('data-files') || '';
1471 + var postType = btn.getAttribute('data-post-type') || 'report';
1472 +
1020 1020   var form = document.createElement('div');
1021 1021   form.className = 'post-edit-form';
1022 - form.innerHTML = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>' +
1023 - '<div class="post-edit-form-actions">' +
1475 + form.setAttribute('data-school', schoolPage);
1476 + form.setAttribute('data-obj', postObjNum);
1477 +
1478 + var html = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>';
1479 +
1480 + // コメント以外は添付ファイル編集を表示
1481 + if (postType !== 'comment') {
1482 + // 既存画像
1483 + html += '<div class="edit-attachments">';
1484 + if (currentImages.trim()) {
1485 + html += '<div class="edit-attach-section"><span class="edit-attach-label">画像</span>';
1486 + var imgs = currentImages.trim().split('\n');
1487 + for (var i = 0; i < imgs.length; i++) {
1488 + var img = imgs[i].trim();
1489 + if (!img) continue;
1490 + html += '<div class="edit-attach-item" data-name="' + img.replace(/"/g,'&quot;') + '">' +
1491 + '<img src="/xwiki/bin/download/' + schoolPage.replace(/\./g,'/') + '/' + encodeURIComponent(img) + '" class="edit-attach-thumb" />' +
1492 + '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1493 + '<input type="hidden" name="keepImages" value="' + img.replace(/"/g,'&quot;') + '" />' +
1494 + '</div>';
1495 + }
1496 + html += '</div>';
1497 + }
1498 + // 既存ファイル
1499 + if (currentFiles.trim()) {
1500 + html += '<div class="edit-attach-section"><span class="edit-attach-label">ファイル</span>';
1501 + var files = currentFiles.trim().split('\n');
1502 + for (var j = 0; j < files.length; j++) {
1503 + var f = files[j].trim();
1504 + if (!f) continue;
1505 + var displayName = f;
1506 + if (/^file_\d{14}_\d+_/.test(f)) displayName = f.replace(/^file_\d{14}_\d+_/, '');
1507 + html += '<div class="edit-attach-item" data-name="' + f.replace(/"/g,'&quot;') + '">' +
1508 + '<span class="edit-attach-fname">' + displayName.replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</span>' +
1509 + '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1510 + '<input type="hidden" name="keepFiles" value="' + f.replace(/"/g,'&quot;') + '" />' +
1511 + '</div>';
1512 + }
1513 + html += '</div>';
1514 + }
1515 + // 新規追加
1516 + html += '<div class="edit-attach-add">' +
1517 + '<label class="form-label-sm">画像を追加（最大4枚まで）</label>' +
1518 + '<input type="file" name="editNewImages" accept="image/*" multiple class="form-file-input-sm" />' +
1519 + '<div class="form-hint">JPEG / PNG / GIF / WebP、各5MBまで</div>' +
1520 + '<label class="form-label-sm" style="margin-top:8px;">ファイルを追加（最大2つまで）</label>' +
1521 + '<input type="file" name="editNewFiles" accept=".pdf,.docx,.xlsx,.pptx" multiple class="form-file-input-sm" />' +
1522 + '<div class="form-hint">PDF / Word / Excel / PowerPoint、各10MBまで</div>' +
1523 + '</div>';
1524 + html += '</div>';
1525 + }
1526 +
1527 + html += '<div class="post-edit-form-actions">' +
1024 1024   '<button type="button" class="btn-cancel-edit" onclick="this.closest(\'.post-edit-form\').remove()">キャンセル</button>' +
1025 - '<button type="button" class="btn-save" onclick="saveEditPost(\'' + schoolPage + '\', ' + postObjNum + ')">保存</button>' +
1529 + '<button type="button" class="btn-save" onclick="saveEditPost(this)">保存</button>' +
1026 1026   '</div>';
1531 +
1532 + form.innerHTML = html;
1027 1027   bodyEl.parentNode.insertBefore(form, bodyEl.nextSibling);
1028 1028   form.querySelector('textarea').focus();
1029 1029  }
1030 1030  
1537 +function removeEditAttach(btn) {
1538 + var item = btn.closest('.edit-attach-item');
1539 + if (item) item.remove();
1540 +}
1541 +
1031 1031  // 投稿の編集を保存
1032 -function saveEditPost(schoolPage, postObjNum) {
1033 - var textarea = document.getElementById('editContent_' + postObjNum);
1543 +function saveEditPost(btn) {
1544 + var formEl = btn.closest('.post-edit-form');
1545 + if (!formEl) return;
1546 + var schoolPage = formEl.getAttribute('data-school');
1547 + var postObjNum = formEl.getAttribute('data-obj');
1548 + var textarea = formEl.querySelector('textarea');
1034 1034   if (!textarea) return;
1035 1035   var newContent = textarea.value.trim();
1036 1036   if (!newContent) { alert('投稿内容を入力してください'); return; }
1552 +
1037 1037   var csrfEl = document.querySelector('input[name="form_token"]');
1038 1038   var csrfToken = csrfEl ? csrfEl.value : '';
1555 +
1556 + var fd = new FormData();
1557 + fd.append('schoolPage', schoolPage);
1558 + fd.append('postObj', postObjNum);
1559 + fd.append('newContent', newContent);
1560 + fd.append('form_token', csrfToken);
1561 +
1562 + // 残す画像・ファイル
1563 + formEl.querySelectorAll('input[name="keepImages"]').forEach(function(el) { fd.append('keepImages', el.value); });
1564 + formEl.querySelectorAll('input[name="keepFiles"]').forEach(function(el) { fd.append('keepFiles', el.value); });
1565 +
1566 + // 新規画像
1567 + var newImgInput = formEl.querySelector('input[name="editNewImages"]');
1568 + if (newImgInput && newImgInput.files) {
1569 + for (var i = 0; i < newImgInput.files.length; i++) { fd.append('editNewImages', newImgInput.files[i]); }
1570 + }
1571 + // 新規ファイル
1572 + var newFileInput = formEl.querySelector('input[name="editNewFiles"]');
1573 + if (newFileInput && newFileInput.files) {
1574 + for (var j = 0; j < newFileInput.files.length; j++) { fd.append('editNewFiles', newFileInput.files[j]); }
1575 + }
1576 +
1577 + btn.disabled = true;
1578 + btn.textContent = '保存中...';
1579 +
1039 1039   var xhr = new XMLHttpRequest();
1040 - xhr.open('POST', '/bin/SeitokaiCode/EditPost?outputSyntax=plain', true);
1041 - xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1042 - var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken);
1581 + xhr.open('POST', '/bin/get/SeitokaiCode/EditPost?outputSyntax=plain', true);
1043 1043   xhr.onload = function() {
1044 1044   try {
1045 1045   var res = JSON.parse(xhr.responseText);
... ... @@ -1047,12 +1047,13 @@
1047 1047   showToast('投稿を更新しました', 'success');
1048 1048   setTimeout(function() { location.reload(); }, 800);
1049 1049   } else {
1589 + btn.disabled = false; btn.textContent = '保存';
1050 1050   alert('編集に失敗しました: ' + (res.error || ''));
1051 1051   }
1052 - } catch(e) { alert('編集に失敗しました'); }
1592 + } catch(e) { btn.disabled = false; btn.textContent = '保存'; alert('編集に失敗しました'); }
1053 1053   };
1054 - xhr.onerror = function() { alert('通信エラーが発生しました'); };
1055 - xhr.send(editPostData);
1594 + xhr.onerror = function() { btn.disabled = false; btn.textContent = '保存'; alert('通信エラーが発生しました'); };
1595 + xhr.send(fd);
1056 1056  }
1057 1057  
1058 1058  // 投稿の削除（確認ダイアログ付き）
... ... @@ -1059,7 +1059,7 @@
1059 1059  function confirmDeletePost(schoolPage, postObjNum, token) {
1060 1060   if (!confirm('この投稿を削除しますか？\\n削除後は「この投稿は削除されました」と表示されます。')) return;
1061 1061   var xhr = new XMLHttpRequest();
1062 - xhr.open('POST', '/bin/SeitokaiCode/DeletePost?outputSyntax=plain', true);
1602 + xhr.open('POST', '/bin/get/SeitokaiCode/DeletePost?outputSyntax=plain', true);
1063 1063   xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1064 1064   var deletePostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token);
1065 1065   xhr.onload = function() {
... ... @@ -1076,6 +1076,80 @@
1076 1076   xhr.onerror = function() { alert('通信エラーが発生しました'); };
1077 1077   xhr.send(deletePostData);
1078 1078  }
1619 +
1620 +/* --- 通報ダイアログ --- */
1621 +function openReportDialog(btn, targetPage, postObjNum, token) {
1622 + if (document.getElementById('report-dialog-overlay')) return;
1623 + var reasons = ['宣伝・スパム','不適切な内容','個人情報の露出','誹謗中傷','誤情報','その他'];
1624 + var overlay = document.createElement('div');
1625 + overlay.id = 'report-dialog-overlay';
1626 + 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;';
1627 + var dialog = document.createElement('div');
1628 + dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;max-height:80vh;overflow-y:auto;';
1629 + var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を通報</h3>';
1630 + html += '<p style="margin:0 0 12px;font-size:0.9em;color:#4b5563;">通報された投稿は管理者が確認するまで一時的に非表示になります。</p>';
1631 + html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">通報理由</label>';
1632 + html += '<select id="report-reason" style="width:100%;padding:8px;border:1px solid #d1d5db;border-radius:8px;margin-bottom:12px;font-size:0.9em;">';
1633 + for (var i=0; i<reasons.length; i++) html += '<option value="'+reasons[i]+'">'+reasons[i]+'</option>';
1634 + html += '</select>';
1635 + html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">補足コメント（任意）</label>';
1636 + 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>';
1637 + html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
1638 + html += '<button type="button" id="report-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
1639 + 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>';
1640 + html += '</div>';
1641 + dialog.innerHTML = html;
1642 + overlay.appendChild(dialog);
1643 + document.body.appendChild(overlay);
1644 + overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
1645 + document.getElementById('report-cancel-btn').addEventListener('click', function() { overlay.remove(); });
1646 + document.getElementById('report-submit-btn').addEventListener('click', function() {
1647 + var reason = document.getElementById('report-reason').value;
1648 + var detail = document.getElementById('report-detail').value;
1649 + var submitBtn = document.getElementById('report-submit-btn');
1650 + submitBtn.disabled = true; submitBtn.textContent = '送信中...';
1651 + var xhr = new XMLHttpRequest();
1652 + xhr.open('POST', '/bin/get/SeitokaiCode/ReportAction?outputSyntax=plain', true);
1653 + xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1654 + var data = 'targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&detail=' + encodeURIComponent(detail) + '&form_token=' + encodeURIComponent(token);
1655 + xhr.onload = function() {
1656 + overlay.remove();
1657 + showToast('通報を受け付けました', 'success');
1658 + setTimeout(function() { location.reload(); }, 1000);
1659 + };
1660 + xhr.onerror = function() { overlay.remove(); alert('通信エラーが発生しました'); };
1661 + xhr.send(data);
1662 + });
1663 +}
1664 +
1665 +/* --- 非表示ダイアログ（管理者用） --- */
1666 +function openHideDialog(btn, targetPage, postObjNum, token) {
1667 + if (document.getElementById('hide-dialog-overlay')) return;
1668 + var overlay = document.createElement('div');
1669 + overlay.id = 'hide-dialog-overlay';
1670 + 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;';
1671 + var dialog = document.createElement('div');
1672 + dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;';
1673 + var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を非表示にする</h3>';
1674 + html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">非表示の理由</label>';
1675 + 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="理由を入力" />';
1676 + html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
1677 + html += '<button type="button" id="hide-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
1678 + 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>';
1679 + 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>';
1680 + html += '</div>';
1681 + dialog.innerHTML = html;
1682 + overlay.appendChild(dialog);
1683 + document.body.appendChild(overlay);
1684 + overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
1685 + document.getElementById('hide-cancel-btn').addEventListener('click', function() { overlay.remove(); });
1686 + function doHide(action) {
1687 + var reason = document.getElementById('hide-reason').value || '管理者判断';
1688 + window.location.href = '/bin/view/SeitokaiCode/ModerationAction?action=' + action + '&targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&form_token=' + encodeURIComponent(token);
1689 + }
1690 + document.getElementById('hide-submit-btn').addEventListener('click', function() { doHide('hide'); });
1691 + document.getElementById('hide-warn-btn').addEventListener('click', function() { doHide('hide-warn'); });
1692 +}
1079 1079  </script>
1080 1080  {{/html}}
1081 1081  {{/velocity}}