Last modified by Super Admin on 2026/04/05 18:59

From version Icon 42.1 Icon
edited by Super Admin
on 2026/03/12 12:20
Change comment: There is no comment for this version
To version Icon 109.1 Icon
edited by Super Admin
on 2026/03/24 19:08
Change comment: There is no comment for this version

Summary

Details

Icon Page properties
Content
... ... @@ -1,6 +1,25 @@
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"}}
10 +## --- OGP メタタグ(SNSシェア対応) ---
11 +#set($ogTitle = "$!{schoolName} — 生徒会Wiki")
12 +#set($ogDesc = "$!{schoolName}の生徒会活動情報。全国の高校の生徒会活動事例を集積・共有するプラットフォーム。")
13 +#set($ogUrl = "https://${request.serverName}${doc.getURL('view')}")
14 +<meta property="og:type" content="article" />
15 +<meta property="og:title" content="$escapetool.xml($ogTitle)" />
16 +<meta property="og:description" content="$escapetool.xml($ogDesc)" />
17 +<meta property="og:url" content="$escapetool.xml($ogUrl)" />
18 +<meta property="og:site_name" content="生徒会Wiki" />
19 +<meta property="og:locale" content="ja_JP" />
20 +<meta name="twitter:card" content="summary" />
21 +<meta name="twitter:title" content="$escapetool.xml($ogTitle)" />
22 +<meta name="twitter:description" content="$escapetool.xml($ogDesc)" />
4 4  ## メンテナンスバナー({{include}}ではなくインラインで記述し、<p>タグ挿入を回避)
5 5  #set($bannerDoc = $xwiki.getDocument('SeitokaiAdmin.MaintenanceBanner'))
6 6  #set($bannerObj = $bannerDoc.getObject('SeitokaiCode.MaintenanceBannerClass'))
... ... @@ -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'))
50 +#set($schoolPhoto = $doc.getValue('schoolPhoto'))
51 +#set($schoolDescription = $doc.getValue('schoolDescription'))
31 31  
32 -## --- 組織 ---
53 +## --- 生徒会組織 ---
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 -## --- 校則の見直し ---
73 +## --- 校則・生徒会会則の見直し ---
53 53  #set($ruleReviewStatus = $doc.getValue('ruleReviewStatus'))
54 54  #set($ruleReviewContent = $doc.getValue('ruleReviewContent'))
55 55  #set($ruleReviewProposer = $doc.getValue('ruleReviewProposer'))
... ... @@ -56,6 +56,44 @@
56 56  #set($ruleReviewImplementer = $doc.getValue('ruleReviewImplementer'))
57 57  #set($ruleReviewSystem = $doc.getValue('ruleReviewSystem'))
58 58  
80 +## --- 活動環境 ---
81 +#set($activityPlace = $doc.getValue('activityPlace'))
82 +#set($activityRoomEquipment = $doc.getValue('activityRoomEquipment'))
83 +#set($activityRoomImage = $doc.getValue('activityRoomImage'))
84 +#set($ictTools = $doc.getValue('ictTools'))
85 +#set($ictUsage = $doc.getValue('ictUsage'))
86 +
87 +## --- 生徒総会 ---
88 +#set($assemblyFormat = $doc.getValue('assemblyFormat'))
89 +#set($assemblyCount = $doc.getValue('assemblyCount'))
90 +#set($assemblyAgenda = $doc.getValue('assemblyAgenda'))
91 +#set($assemblyTopics = $doc.getValue('assemblyTopics'))
92 +#set($assemblyNote = $doc.getValue('assemblyNote'))
93 +
94 +## --- 広報 ---
95 +#set($publicityMethod = $doc.getValue('publicityMethod'))
96 +#set($publicityFrequency = $doc.getValue('publicityFrequency'))
97 +#set($publicityNote = $doc.getValue('publicityNote'))
98 +
99 +## --- 外部連携 ---
100 +#set($externalCooperation = $doc.getValue('externalCooperation'))
101 +#set($externalOrgName = $doc.getValue('externalOrgName'))
102 +#set($socialParticipation = $doc.getValue('socialParticipation'))
103 +
104 +## --- 年間主要行事 ---
105 +#set($eventApril = $doc.getValue('eventApril'))
106 +#set($eventMay = $doc.getValue('eventMay'))
107 +#set($eventJune = $doc.getValue('eventJune'))
108 +#set($eventJuly = $doc.getValue('eventJuly'))
109 +#set($eventAugust = $doc.getValue('eventAugust'))
110 +#set($eventSeptember = $doc.getValue('eventSeptember'))
111 +#set($eventOctober = $doc.getValue('eventOctober'))
112 +#set($eventNovember = $doc.getValue('eventNovember'))
113 +#set($eventDecember = $doc.getValue('eventDecember'))
114 +#set($eventJanuary = $doc.getValue('eventJanuary'))
115 +#set($eventFebruary = $doc.getValue('eventFebruary'))
116 +#set($eventMarch = $doc.getValue('eventMarch'))
117 +
59 59  ## --- 課題・連絡先 ---
60 60  #set($challenges = $doc.getValue('challenges'))
61 61  #set($contactInfo = $doc.getValue('contactInfo'))
... ... @@ -65,9 +65,7 @@
65 65  #set($seitokaiYoutube = $doc.getValue('seitokaiYoutube'))
66 66  #set($seitokaiOtherSns = $doc.getValue('seitokaiOtherSns'))
67 67  
68 -## --- 年度アーカイブ ---
69 -#set($pageFiscalYear = $!doc.getValue('fiscalYear'))
70 -## 現在の年度を計算(4月始まり)
127 +## --- 現在の年度を計算(4月始まり) ---
71 71  #set($nowFY = $datetool.date)
72 72  #set($currentFYMonth = $mathtool.toInteger($datetool.format('MM', $nowFY)))
73 73  #set($currentFYYear = $mathtool.toInteger($datetool.format('yyyy', $nowFY)))
... ... @@ -76,10 +76,6 @@
76 76  #else
77 77   #set($currentFiscalYear = $mathtool.sub($currentFYYear, 1))
78 78  #end
79 -## fiscalYear 未設定時はデフォルトとして現在の年度を使う
80 -#if(!$pageFiscalYear || $pageFiscalYear == '')
81 - #set($pageFiscalYear = $currentFiscalYear.toString())
82 -#end
83 83  
84 84  ## --- 公開範囲フィールド ---
85 85  #set($visibilityOrgChart = $!doc.getValue('visibilityOrgChart'))
... ... @@ -86,6 +86,14 @@
86 86  #set($visibilityBudget = $!doc.getValue('visibilityBudget'))
87 87  #set($visibilityRuleReview = $!doc.getValue('visibilityRuleReview'))
88 88  #set($visibilityChallenges = $!doc.getValue('visibilityChallenges'))
142 +#set($visibilityDailyActivities = $!doc.getValue('visibilityDailyActivities'))
143 +#set($visibilityElection = $!doc.getValue('visibilityElection'))
144 +#set($visibilityMeeting = $!doc.getValue('visibilityMeeting'))
145 +#set($visibilityActivityEnv = $!doc.getValue('visibilityActivityEnv'))
146 +#set($visibilityAssembly = $!doc.getValue('visibilityAssembly'))
147 +#set($visibilityPublicity = $!doc.getValue('visibilityPublicity'))
148 +#set($visibilityExternal = $!doc.getValue('visibilityExternal'))
149 +#set($visibilityAnnualEvents = $!doc.getValue('visibilityAnnualEvents'))
89 89  ## デフォルト値(未設定なら全体公開)
90 90  #if(!$visibilityOrgChart || $visibilityOrgChart == '') #set($visibilityOrgChart = 'public') #end
91 91  #if(!$visibilityBudget || $visibilityBudget == '') #set($visibilityBudget = 'public') #end
... ... @@ -97,19 +97,104 @@
97 97  #set($isGuest = $viewerUser == 'XWiki.XWikiGuest')
98 98  #set($isViewerAdmin = false)
99 99  #set($viewerSchoolCode = '')
161 +#set($viewerSecondaryGraduated = false)
100 100  #if(!$isGuest)
101 101   #set($viewerDoc = $xwiki.getDocument($viewerUser))
102 102   #set($viewerAccountType = $!viewerDoc.getValue('accountType'))
103 103   #set($viewerSchoolCode = $!viewerDoc.getValue('schoolCode'))
166 + #set($viewerSecondarySchoolCode = $!viewerDoc.getValue('secondarySchoolCode'))
167 + #set($viewerUserRole = $!viewerDoc.getValue('userRole'))
104 104   #if($viewerAccountType == 'admin')
105 105   #set($isViewerAdmin = true)
106 106   #end
171 + ## 第2所属校の在学年数超過チェック
172 + #set($viewerSecEnrollYear = $!viewerDoc.getValue('secondaryEnrollmentYear'))
173 + #if($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecEnrollYear && $viewerSecEnrollYear != '')
174 + #set($vNow = $datetool.date)
175 + #set($vCurYear = $mathtool.toInteger($datetool.format('yyyy', $vNow)))
176 + #set($vCurMonth = $mathtool.toInteger($datetool.format('MM', $vNow)))
177 + #if($vCurMonth >= 4)#set($vSchoolYear = $vCurYear)#else#set($vSchoolYear = $mathtool.sub($vCurYear, 1))#end
178 + #set($vSecEnroll = $mathtool.toInteger($viewerSecEnrollYear))
179 + #set($vSecMax = 3)
180 + #if($viewerSecondarySchoolCode.length() >= 2)
181 + #set($vSecType = $viewerSecondarySchoolCode.substring(0, 2))
182 + #if($vSecType == 'C2')#set($vSecMax = 9)#elseif($vSecType == 'D2')#set($vSecMax = 6)#end
183 + #end
184 + #set($vSecGrade = $mathtool.add($mathtool.sub($vSchoolYear, $vSecEnroll), 1))
185 + #if($vSecGrade > $vSecMax)
186 + #set($viewerSecondaryGraduated = true)
187 + #end
188 + #end
107 107  #end
108 108  
191 +## --- 関連校(中高一貫校)情報 ---
192 +#set($affiliatedSchoolCode = $!doc.getValue('affiliatedSchoolCode'))
193 +#set($affiliatedSchoolName = $!doc.getValue('affiliatedSchoolName'))
194 +#set($isAffiliated = false)
195 +#if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
196 + #if($viewerSchoolCode == $affiliatedSchoolCode)
197 + #set($isAffiliated = true)
198 + #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode && !$viewerSecondaryGraduated)
199 + #set($isAffiliated = true)
200 + #end
201 +#end
202 +
203 +## --- 校内判定(卒業生を除外、secondarySchoolCodeも含む) ---
204 +#set($isSchoolMember = false)
205 +#if(!$isGuest && $viewerUserRole != 'graduate')
206 + #if($viewerSchoolCode == $schoolCode || $isAffiliated)
207 + #set($isSchoolMember = true)
208 + #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode && !$viewerSecondaryGraduated)
209 + #set($isSchoolMember = true)
210 + #end
211 +#end
212 +## 卒業生の母校判定(投稿バッジ用)
213 +#set($isAlumniOfSchool = false)
214 +#if(!$isGuest && $viewerUserRole == 'graduate')
215 + #if($viewerSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $viewerSchoolCode == $affiliatedSchoolCode))
216 + #set($isAlumniOfSchool = true)
217 + #end
218 +#end
219 +
220 +## --- 学校ページ非表示チェック ---
221 +#set($schoolHidden = $doc.getValue('hidden'))
222 +#if($schoolHidden == 1)
223 + #if($isViewerAdmin)
224 + ## 管理者: 黄色バナー + ページ内容は通常表示(プレビュー)
225 +<div class="school-hidden-banner admin">
226 + <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>
227 + <div>
228 + <strong>このページは非表示になっています</strong>(管理者のみ閲覧可能)
229 + #set($hBy = $!doc.getValue('hiddenBy'))
230 + #set($hAt = $!doc.getValue('hiddenAt'))
231 + #set($hReason = $!doc.getValue('hiddenReason'))
232 + <div class="school-hidden-detail">
233 + 非表示: $!escapetool.xml($hAt) / $!escapetool.xml($hBy)
234 + #if($hReason && $hReason != '') ・ 理由: $!escapetool.xml($hReason)#end
235 + </div>
236 + <a href="$xwiki.getURL('SeitokaiAdmin.SchoolManagement', 'view')" style="color:#92400e;text-decoration:underline">学校ページ管理へ</a>
237 + </div>
238 +</div>
239 + #else
240 + ## 一般ユーザー・ゲスト: 非公開メッセージを表示して停止
241 +<div class="school-hidden-public">
242 + <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>
243 + <h2>このページは現在公開されていません</h2>
244 + <p>このページは管理者により非公開に設定されています。</p>
245 + <a href="$xwiki.getURL('Schools.WebHome', 'view')" class="btn-back-list">学校一覧に戻る</a>
246 +</div>
247 +#stop
248 + #end
249 +#end
250 +
109 109  ## --- 投稿固定/解除処理 ---
110 110  #set($pinAction = $!request.action)
111 -#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || $viewerAccountType == 'verified') && $services.csrf.isTokenValid($request.form_token))
112 - #set($postObjNum = $mathtool.toInteger($!request.postObj))
253 +#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $isSchoolMember)) && $services.csrf.isTokenValid($request.form_token))
254 + #set($pinPostObjStr = $!request.postObj)
255 + #if(!$pinPostObjStr.matches('^\d+$'))
256 + ## 不正な値 → 無視
257 + #else
258 + #set($postObjNum = $mathtool.toInteger($pinPostObjStr))
113 113   #set($postObj = $doc.getObject('SeitokaiCode.ActivityPostClass', $postObjNum))
114 114   #if($postObj)
115 115   #if($pinAction == 'pin')
... ... @@ -129,12 +129,15 @@
129 129   $response.sendRedirect($doc.getURL('view'))
130 130   #stop
131 131   #end
278 + #end## /matches
132 132  #end
133 133  
134 134  ## --- 特色ある活動 選定/解除処理 ---
135 135  #set($featAction = $!request.action)
136 -#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $services.csrf.isTokenValid($request.form_token))
137 - #set($actObjNum = $mathtool.toInteger($!request.actObj))
283 +#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $isSchoolMember)) && $services.csrf.isTokenValid($request.form_token))
284 + #set($featActObjStr = $!request.actObj)
285 + #if($featActObjStr.matches('^\d+$'))
286 + #set($actObjNum = $mathtool.toInteger($featActObjStr))
138 138   #set($actObj = $doc.getObject('SeitokaiCode.ActivityClass', $actObjNum))
139 139   #if($actObj)
140 140   #if($featAction == 'feature')
... ... @@ -166,6 +166,7 @@
166 166   $response.sendRedirect($doc.getURL('view'))
167 167   #stop
168 168   #end
318 + #end## /matches
169 169  #end
170 170  
171 171  ## --- ユーザー情報取得 ---
... ... @@ -232,7 +232,7 @@
232 232  
233 233  ## --- 編集ボタン(権限があるユーザーのみ表示) ---
234 234  #set($canEditSchool = false)
235 -#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode))
385 +#if(!$isGuest && ($isViewerAdmin || $isSchoolMember || $isAlumniOfSchool))
236 236   #set($canEditSchool = true)
237 237  #end
238 238  #if($canEditSchool)
... ... @@ -241,305 +241,617 @@
241 241  </div>
242 242  #end
243 243  
244 -## --- ① 学校基本情報 + 連絡先(左右グリッド・折りたたみ対応) ---
245 -<div class="school-info-grid">
246 - <div class="school-info-card collapsed" id="card-basic-info">
247 - <h2 onclick="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>
248 - <table class="wiki-table school-info-table">
249 - <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
250 - <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
251 - <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
252 - <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
253 - <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
254 - <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
255 - <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
256 - <tr><th>課程</th><td>#if($schoolSystem && $schoolSystem != '' && $schoolSystem != '[]')$!escapetool.xml($!schoolSystem)#end</td></tr>
257 - <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>
258 - </table>
259 - #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
260 - #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
261 - #if($infoEditDate && $infoEditDate != '')
262 - <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>
394 +## --- 関連校(中高一貫校)バナー ---
395 +#if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
396 + #set($affiliatedPageRef = "Schools.${affiliatedSchoolCode}.WebHome")
397 + #set($affiliatedPageExists = $xwiki.exists($affiliatedPageRef))
398 +<div class="affiliated-school-banner">
399 + <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>
400 + <div>
401 + <strong>中高一貫校</strong>:
402 + #if($affiliatedPageExists)
403 + <a href="$xwiki.getURL($affiliatedPageRef, 'view')">$!escapetool.xml($affiliatedSchoolName)</a>
404 + #else
405 + $!escapetool.xml($affiliatedSchoolName)
263 263   #end
407 + と連携しています
264 264   </div>
265 -
266 - <div class="school-info-card collapsed" id="card-contact">
267 - <h2 onclick="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>
268 - <table class="wiki-table school-info-table">
269 - <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr>
270 - <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>
271 - <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>
272 - <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>
273 - <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>
274 - <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
275 - </table>
276 - </div>
277 277  </div>
410 +#end
278 278  
279 -## --- 生徒会情報アコーディオン ---
280 -<div class="school-section-divider">
281 - <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')?'▲':'▼';">
282 - <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>
283 - 生徒会情報を見る <span class="shortcut-arrow">▼</span>
284 - </button>
285 -</div>
286 -
287 -<div id="seitokai-info-section" class="seitokai-info-accordion">
288 -
289 -## --- ② 組織図 ---
290 -#set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
291 -#if($hasOrgContent)
292 - ## 公開範囲チェック
293 - #set($canViewOrgChart = true)
294 - #if($visibilityOrgChart == 'members' && $isGuest) #set($canViewOrgChart = false)
295 - #elseif($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewOrgChart = false)
296 - #end
297 - #if($canViewOrgChart)
298 -<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>
299 -<div class="school-section-card">
300 - <div class="card-inner">
301 - #if($orgChartImage && $orgChartImage != '')
302 - <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
412 +## --- 未入力ガイド(自校ユーザー向け) ---
413 +#if(!$isGuest && $canEdit)
414 + #set($missingItems = [])
415 + #if(!$studentCount || $studentCount == '' || $studentCount == '0') #set($discard = $missingItems.add('生徒数')) #end
416 + #if(!$orgChart || $orgChart == '') #set($discard = $missingItems.add('生徒会組織')) #end
417 + #if(!$dailyActivities || $dailyActivities == '') #set($discard = $missingItems.add('日常の活動')) #end
418 + #if(!$ruleReviewStatus || $ruleReviewStatus == '') #set($discard = $missingItems.add('校則・生徒会会則の見直し')) #end
419 + #set($activityCount = $doc.getObjects('SeitokaiCode.ActivityClass').size())
420 + #if($activityCount == 0) #set($discard = $missingItems.add('活動報告(まだ投稿がありません)')) #end
421 + #if($missingItems.size() > 0)
422 +<div class="form-message-info" style="margin-bottom:var(--sp-4);">
423 + <strong>入力のお願い</strong> — 以下の項目がまだ入力されていません。<a href="$doc.getURL('view', 'sheet=SeitokaiCode.SchoolEditForm')">編集画面</a>から入力すると、他校の生徒会の参考になります。
424 + <ul style="margin:var(--sp-2) 0 0; padding-left:var(--sp-5);">
425 + #foreach($item in $missingItems)
426 + <li>$item</li>
303 303   #end
304 - #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end
305 - </div>
428 + </ul>
306 306  </div>
307 - #else
308 -<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>
309 309   #end
310 310  #end
311 311  
312 -## --- ③④⑤ 日常の活動・選挙・定例活動 ---
313 -<div class="school-section-grid">
314 - #if($dailyActivities && $dailyActivities != '')
315 - <div class="school-section-card">
316 - <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>
317 - <div class="card-inner">
318 - <p class="activity-hint">活動時間の多い順に上位3つ</p>
319 - <div class="tag-container">
320 - #set($daIdx = 1)
321 - #foreach($da in $dailyActivities.split(","))
322 - <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
323 - #set($daIdx = $daIdx + 1)
324 - #end
325 - </div>
326 - #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
327 - <div class="free-note">$!escapetool.xml($dailyActivitiesNote)</div>
328 - #end
433 +## --- ① 学校基本情報 ---
434 +<div class="school-info-card collapsed" id="card-basic-info">
435 + <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>
436 + <div class="school-basic-info-layout">
437 + <div class="school-basic-info-table">
438 + <table class="wiki-table school-info-table">
439 + <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
440 + <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
441 + <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
442 + <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
443 + <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
444 + <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
445 + <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
446 + <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
447 + <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>
448 + </table>
329 329   </div>
450 + #if($schoolPhoto && $schoolPhoto != '')
451 + <div class="school-photo-area">
452 + <img src="$doc.getAttachmentURL($schoolPhoto)" alt="$!escapetool.xml($schoolName)" class="school-photo" />
453 + </div>
454 + #end
330 330   </div>
456 + #if($schoolDescription && $schoolDescription.trim() != '')
457 + <div class="free-note" style="margin-top:var(--sp-4);">$!escapetool.xml($schoolDescription)</div>
331 331   #end
332 332  
333 - #if($electionExists && $electionExists != '')
334 - <div class="school-section-card">
335 - <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>
336 - <div class="card-inner">
337 - <div class="info-row">
338 - <span class="info-label">役員選挙</span>
339 - <span class="info-value">$!escapetool.xml($!electionExists)</span>
460 +</div>
461 +
462 +## --- ② 生徒会情報(折りたたみカード) ---
463 +<div class="school-info-card" id="card-seitokai-info">
464 + <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>
465 + <div class="seitokai-info-body">
466 +
467 + ## --- 生徒会組織 ---
468 + #set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
469 + #if($hasOrgContent)
470 + #set($canViewOrgChart = true)
471 + #if($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewOrgChart = false)
472 + #elseif($visibilityOrgChart == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewOrgChart = false)
473 + #end
474 + #if($canViewOrgChart)
475 + <div class="seitokai-subsection">
476 + <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>
477 + <div class="seitokai-subsection-content">
478 + #if($orgChartImage && $orgChartImage != '')
479 + <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
480 + #end
481 + #if($orgChart && $orgChart != '')<div class="free-note">$!escapetool.xml($orgChart)</div>#end
340 340   </div>
341 - #if($electionType && $electionType != '')
342 - <div class="info-row">
343 - <span class="info-label">直近の選挙方式</span>
344 - <span class="info-value">$!escapetool.xml($!electionType)</span>
345 - </div>
483 + </div>
484 + #else
485 + <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>
346 346   #end
347 - #if($electionNote && $electionNote.trim() != '')
348 - <div class="free-note">$!escapetool.xml($electionNote)</div>
487 + #end
488 +
489 + ## --- 日常の活動 ---
490 + #if($dailyActivities && !$dailyActivities.isEmpty())
491 + #set($canViewDA = true)
492 + #if($visibilityDailyActivities == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewDA = false)
493 + #elseif($visibilityDailyActivities == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewDA = false)
349 349   #end
495 + #if($canViewDA)
496 + <div class="seitokai-subsection">
497 + <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> 日常の活動 #if($visibilityDailyActivities != '' && $visibilityDailyActivities != 'public')<span class="visibility-badge visibility-${visibilityDailyActivities}">#if($visibilityDailyActivities == '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>
498 + <div class="seitokai-subsection-content">
499 + <p class="activity-hint">活動時間が多い3つ</p>
500 + <div class="tag-container">
501 + #foreach($da in $dailyActivities)
502 + <span class="tag tag-accent">$!escapetool.xml($da.trim())</span>
503 + #end
504 + </div>
505 + #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
506 + <div class="free-note">$!escapetool.xml($dailyActivitiesNote)</div>
507 + #end
508 + </div>
350 350   </div>
351 - </div>
352 - #end
353 -</div>
510 + #else
511 + <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($visibilityDailyActivities == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
512 + #end
513 + #end
354 354  
355 -<div class="school-section-grid">
356 - #if($meetingFrequency && $meetingFrequency != '')
357 - <div class="school-section-card">
358 - <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>
359 - <div class="card-inner">
360 - <div class="info-row">
361 - <span class="info-label">役員定例会の頻度</span>
362 - <span class="info-value">$!escapetool.xml($!meetingFrequency)</span>
363 - </div>
364 - #if($regularActivitiesNote && $regularActivitiesNote.trim() != '')
365 - <div class="free-note">$!escapetool.xml($regularActivitiesNote)</div>
515 + ## --- 選挙 ---
516 + #if($electionExists && $electionExists != '')
517 + #set($canViewEL = true)
518 + #if($visibilityElection == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewEL = false)
519 + #elseif($visibilityElection == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewEL = false)
366 366   #end
521 + #if($canViewEL)
522 + <div class="seitokai-subsection">
523 + <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> 選挙 #if($visibilityElection != '' && $visibilityElection != 'public')<span class="visibility-badge visibility-${visibilityElection}">#if($visibilityElection == '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>
524 + <div class="seitokai-subsection-content">
525 + <div class="info-row">
526 + <span class="info-label">役員選挙</span>
527 + <span class="info-value">$!escapetool.xml($!electionExists)</span>
528 + </div>
529 + #if($electionType && $electionType != '')
530 + <div class="info-row">
531 + <span class="info-label">直近の選挙方式</span>
532 + <span class="info-value">$!escapetool.xml($!electionType)</span>
533 + </div>
534 + #end
535 + #if($electionNote && $electionNote.trim() != '')
536 + <div class="free-note">$!escapetool.xml($electionNote)</div>
537 + #end
538 + </div>
367 367   </div>
368 - </div>
369 - #end
370 -
371 - ## --- ⑦ 予算 ---
372 - #set($hasBudget = ($budgetProcess && $budgetProcess != '') || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
373 - #if($hasBudget)
374 - ## 公開範囲チェック
375 - #set($canViewBudget = true)
376 - #if($visibilityBudget == 'members' && $isGuest) #set($canViewBudget = false)
377 - #elseif($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewBudget = false)
540 + #else
541 + <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($visibilityElection == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
542 + #end
378 378   #end
379 - #if($canViewBudget)
380 - <div class="school-section-card">
381 - <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>
382 - <div class="card-inner">
383 - #if($budgetProcess && $budgetProcess != '')
384 - <div class="info-row">
385 - <span class="info-label">作成過程の生徒関与</span>
386 - <span class="info-value">
387 - <div class="selection-display">
388 - #foreach($bp in $budgetProcess.split(","))
389 - <span class="selection-item">$!escapetool.xml($bp.trim())</span>
390 - #end
391 - </div>
392 - </span>
544 +
545 + ## --- 定例活動 ---
546 + #if($meetingFrequency && $meetingFrequency != '')
547 + #set($canViewMT = true)
548 + #if($visibilityMeeting == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewMT = false)
549 + #elseif($visibilityMeeting == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewMT = false)
550 + #end
551 + #if($canViewMT)
552 + <div class="seitokai-subsection">
553 + <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> 定例活動 #if($visibilityMeeting != '' && $visibilityMeeting != 'public')<span class="visibility-badge visibility-${visibilityMeeting}">#if($visibilityMeeting == '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>
554 + <div class="seitokai-subsection-content">
555 + <div class="info-row">
556 + <span class="info-label">役員定例会の頻度</span>
557 + <span class="info-value">$!escapetool.xml($!meetingFrequency)</span>
558 + </div>
559 + #if($regularActivitiesNote && $regularActivitiesNote.trim() != '')
560 + <div class="free-note">$!escapetool.xml($regularActivitiesNote)</div>
561 + #end
393 393   </div>
563 + </div>
564 + #else
565 + <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($visibilityMeeting == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
394 394   #end
395 - #if($studentFee && $studentFee != '')
396 - <div class="info-row">
397 - <span class="info-label">生徒会費(年額)</span>
398 - <span class="info-value">$!escapetool.xml($!studentFee)</span>
567 + #end
568 +
569 + ## --- 予算 ---
570 + #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
571 + #if($hasBudget)
572 + #set($canViewBudget = true)
573 + #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewBudget = false)
574 + #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false)
575 + #end
576 + #if($canViewBudget)
577 + <div class="seitokai-subsection">
578 + <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>
579 + <div class="seitokai-subsection-content">
580 + #if($budgetProcess && !$budgetProcess.isEmpty())
581 + <div class="info-row">
582 + <span class="info-label">作成過程の生徒関与</span>
583 + <span class="info-value">
584 + <div class="selection-display">
585 + #set($allBpOpts = ["各部・委員会等への予算希望額調査","予算額調整(折衝等)","生徒会予算案の作成","生徒総会での議決","生徒関与なし","その他"])
586 + #foreach($bpOpt in $allBpOpts)
587 + #if($budgetProcess.contains($bpOpt))
588 + <span class="selection-item">$!escapetool.xml($bpOpt)</span>
589 + #else
590 + <span class="selection-item selection-item-off">$!escapetool.xml($bpOpt)</span>
591 + #end
592 + #end
593 + </div>
594 + </span>
595 + </div>
596 + #end
597 + #if($studentFee && $studentFee != '')
598 + <div class="info-row">
599 + <span class="info-label">生徒会費(年額)</span>
600 + <span class="info-value">$!escapetool.xml($!studentFee)</span>
601 + </div>
602 + #end
603 + #if($budgetScale && $budgetScale != '')
604 + <div class="info-row">
605 + <span class="info-label">予算規模</span>
606 + <span class="info-value">$!escapetool.xml($!budgetScale)</span>
607 + </div>
608 + #end
609 + #if($budgetAllocation && !$budgetAllocation.isEmpty())
610 + <div class="info-row">
611 + <span class="info-label">主な予算配分</span>
612 + <span class="info-value">
613 + <div class="selection-display">
614 + #foreach($ba in $budgetAllocation)
615 + <span class="selection-item">$!escapetool.xml($ba.trim())</span>
616 + #end
617 + </div>
618 + </span>
619 + </div>
620 + #end
621 + #if($budgetNote && $budgetNote.trim() != '')
622 + <div class="free-note">$!escapetool.xml($budgetNote)</div>
623 + #end
399 399   </div>
625 + </div>
626 + #else
627 + <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>
400 400   #end
401 - #if($budgetScale && $budgetScale != '')
402 - <div class="info-row">
403 - <span class="info-label">予算規模</span>
404 - <span class="info-value">$!escapetool.xml($!budgetScale)</span>
629 + #end
630 +
631 + ## --- 校則・生徒会会則の見直し ---
632 + #if($ruleReviewStatus && $ruleReviewStatus != '')
633 + #set($canViewRuleReview = true)
634 + #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewRuleReview = false)
635 + #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false)
636 + #end
637 + #if($canViewRuleReview)
638 + <div class="seitokai-subsection">
639 + <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>
640 + <div class="seitokai-subsection-content">
641 + <div class="info-row">
642 + <span class="info-label">見直しの有無(3年以内)</span>
643 + <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
644 + </div>
645 + #if($ruleReviewStatus != '実施なし')
646 + #if($ruleReviewContent && !$ruleReviewContent.isEmpty())
647 + <div class="info-row">
648 + <span class="info-label">見直しの内容</span>
649 + <span class="info-value">
650 + <div class="selection-display">
651 + #foreach($rc in $ruleReviewContent)
652 + <span class="selection-item">$!escapetool.xml($rc.trim())</span>
653 + #end
654 + </div>
655 + </span>
656 + </div>
657 + #end
658 + #if($ruleReviewProposer && !$ruleReviewProposer.isEmpty())
659 + <div class="info-row">
660 + <span class="info-label">見直しの提案者</span>
661 + <span class="info-value">
662 + <div class="selection-display">
663 + #foreach($rp in $ruleReviewProposer)
664 + <span class="selection-item">$!escapetool.xml($rp.trim())</span>
665 + #end
666 + </div>
667 + </span>
668 + </div>
669 + #end
670 + #if($ruleReviewImplementer && !$ruleReviewImplementer.isEmpty())
671 + <div class="info-row">
672 + <span class="info-label">見直しの実施者</span>
673 + <span class="info-value">
674 + <div class="selection-display">
675 + #foreach($ri in $ruleReviewImplementer)
676 + <span class="selection-item">$!escapetool.xml($ri.trim())</span>
677 + #end
678 + </div>
679 + </span>
680 + </div>
681 + #end
682 + #end
683 + #if($ruleReviewSystem && $ruleReviewSystem != '')
684 + <div class="info-row">
685 + <span class="info-label">見直しの仕組み</span>
686 + <span class="info-value">$!escapetool.xml($!ruleReviewSystem)</span>
687 + </div>
688 + #end
405 405   </div>
690 + </div>
691 + #else
692 + <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>
406 406   #end
407 - #if($budgetAllocation && $budgetAllocation != '')
408 - <div class="info-row">
409 - <span class="info-label">主な予算配分</span>
410 - <span class="info-value">
411 - <div class="selection-display">
412 - #foreach($ba in $budgetAllocation.split(","))
413 - <span class="selection-item">$!escapetool.xml($ba.trim())</span>
694 + #end
695 +
696 + ## --- 活動環境 ---
697 + #set($hasActivityEnv = ($activityPlace && !$activityPlace.isEmpty()) || ($activityRoomEquipment && $activityRoomEquipment != '') || ($activityRoomImage && $activityRoomImage != '') || ($ictTools && !$ictTools.isEmpty()) || ($ictUsage && !$ictUsage.isEmpty()))
698 + #if($hasActivityEnv)
699 + #set($canViewAE = true)
700 + #if($visibilityActivityEnv == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAE = false)
701 + #elseif($visibilityActivityEnv == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAE = false)
702 + #end
703 + #if($canViewAE)
704 + <div class="seitokai-subsection">
705 + <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> 生徒会の活動環境 #if($visibilityActivityEnv != '' && $visibilityActivityEnv != 'public')<span class="visibility-badge visibility-${visibilityActivityEnv}">#if($visibilityActivityEnv == '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>
706 + <div class="seitokai-subsection-content">
707 + #if($activityPlace && !$activityPlace.isEmpty())
708 + <div class="info-row">
709 + <span class="info-label">普段の活動場所</span>
710 + <span class="info-value">
711 + <div class="selection-display">
712 + #foreach($ap in $activityPlace)
713 + <span class="selection-item">$!escapetool.xml($ap.trim())</span>
714 + #end
715 + </div>
716 + </span>
717 + </div>
718 + #end
719 + #if($activityRoomEquipment && $activityRoomEquipment != '')
720 + <div class="info-row">
721 + <span class="info-label">生徒会室の設備</span>
722 + <span class="info-value free-text-value">$!escapetool.xml($activityRoomEquipment)</span>
723 + </div>
724 + #end
725 + #if($activityRoomImage && $activityRoomImage != '')
726 + <div class="info-row">
727 + <span class="info-label">活動場所の写真</span>
728 + <span class="info-value"><div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($activityRoomImage)" alt="活動場所の写真" class="org-chart-img" /></div></span>
729 + </div>
730 + #end
731 + #if($ictTools && !$ictTools.isEmpty())
732 + <div class="info-row">
733 + <span class="info-label">利用しているICTツール</span>
734 + <span class="info-value">
735 + #set($ictCatDisplay = [
736 + ["連絡ツール", ["メール","LINE","LINE WORKS","Discord","Slack","Microsoft Teams","Google Chat","InstagramのDM","XのDM","その他(連絡)"]],
737 + ["ドキュメント作成・共有", ["Googleドキュメント","Googleスプレッドシート","Googleスライド","Googleドライブ","Word","Excel","PowerPoint","OneDrive","SharePoint","Notion","Pages","Numbers","Keynote","Dropbox","Box","その他(ドキュメント)"]],
738 + ["タスク管理", ["Googleカレンダー","Google ToDoリスト","Trello","Asana","Excel等スプレッドシート","その他(タスク管理)"]],
739 + ["ビデオ会議ツール", ["Zoom","Google Meet","その他(ビデオ会議)"]],
740 + ["アンケート", ["Googleフォーム","Microsoft Forms","その他(アンケート)"]],
741 + ["デザイン・クリエイティブ", ["Canva","各種Adobe","CapCut","LumaFusion","AviUtl","ibisPaint","その他(デザイン)"]],
742 + ["その他", ["独自のWebシステム・自作アプリ"]]
743 + ])
744 + #foreach($catD in $ictCatDisplay)
745 + #set($catHasItems = false)
746 + #foreach($t in $catD.get(1))
747 + #if($ictTools.contains($t)) #set($catHasItems = true) #end
748 + #end
749 + #if($catHasItems)
750 + <div style="margin-bottom:6px">
751 + <span style="font-size:0.8em;font-weight:600;color:var(--text-mid)">$catD.get(0):</span>
752 + <div class="selection-display" style="margin-top:2px">
753 + #foreach($t in $catD.get(1))
754 + #if($ictTools.contains($t))
755 + <span class="selection-item">$!escapetool.xml($t)</span>
756 + #end
757 + #end
758 + </div>
759 + </div>
760 + #end
414 414   #end
415 - </div>
416 - </span>
762 + </span>
763 + </div>
764 + #end
765 + #if($ictUsage && !$ictUsage.isEmpty())
766 + <div class="info-row">
767 + <span class="info-label">ICT活用している場面</span>
768 + <span class="info-value">
769 + <div class="selection-display">
770 + #foreach($iu in $ictUsage)
771 + <span class="selection-item">$!escapetool.xml($iu.trim())</span>
772 + #end
773 + </div>
774 + </span>
775 + </div>
776 + #end
417 417   </div>
778 + </div>
779 + #else
780 + <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($visibilityActivityEnv == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
418 418   #end
419 - #if($budgetNote && $budgetNote.trim() != '')
420 - <div class="free-note">$!escapetool.xml($budgetNote)</div>
782 + #end
783 +
784 + ## --- 生徒総会 ---
785 + #set($hasAssembly = ($assemblyFormat && $assemblyFormat != '') || ($assemblyCount && $assemblyCount > 0) || ($assemblyAgenda && !$assemblyAgenda.isEmpty()) || ($assemblyTopics && !$assemblyTopics.isEmpty()) || ($assemblyNote && $assemblyNote != ''))
786 + #if($hasAssembly)
787 + #set($canViewAS = true)
788 + #if($visibilityAssembly == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAS = false)
789 + #elseif($visibilityAssembly == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAS = false)
421 421   #end
791 + #if($canViewAS)
792 + <div class="seitokai-subsection">
793 + <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> 生徒総会 #if($visibilityAssembly != '' && $visibilityAssembly != 'public')<span class="visibility-badge visibility-${visibilityAssembly}">#if($visibilityAssembly == '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>
794 + <div class="seitokai-subsection-content">
795 + #if($assemblyFormat && $assemblyFormat != '')
796 + <div class="info-row">
797 + <span class="info-label">開催方式</span>
798 + <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($assemblyFormat)</span></span>
799 + </div>
800 + #end
801 + #if($assemblyCount && $assemblyCount > 0)
802 + <div class="info-row">
803 + <span class="info-label">開催回数(年)</span>
804 + <span class="info-value">$!escapetool.xml($assemblyCount)回</span>
805 + </div>
806 + #end
807 + #if($assemblyAgenda && !$assemblyAgenda.isEmpty())
808 + <div class="info-row">
809 + <span class="info-label">議案の集め方</span>
810 + <span class="info-value">
811 + <div class="selection-display">
812 + #foreach($aa in $assemblyAgenda)
813 + <span class="selection-item">$!escapetool.xml($aa.trim())</span>
814 + #end
815 + </div>
816 + </span>
817 + </div>
818 + #end
819 + #if($assemblyTopics && !$assemblyTopics.isEmpty())
820 + <div class="info-row">
821 + <span class="info-label">扱う内容</span>
822 + <span class="info-value">
823 + <div class="selection-display">
824 + #foreach($at in $assemblyTopics)
825 + <span class="selection-item">$!escapetool.xml($at.trim())</span>
826 + #end
827 + </div>
828 + </span>
829 + </div>
830 + #end
831 + #if($assemblyNote && $assemblyNote != '')
832 + <div class="info-row">
833 + <span class="info-label">自由記述</span>
834 + <span class="info-value free-text-value">$!escapetool.xml($assemblyNote)</span>
835 + </div>
836 + #end
837 + </div>
422 422   </div>
423 - </div>
424 - #else
425 - <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>
839 + #else
840 + <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($visibilityAssembly == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
841 + #end
426 426   #end
427 - #end
428 -</div>
429 429  
430 -## --- ⑧ 校則の見直し ---
431 -#if($ruleReviewStatus && $ruleReviewStatus != '')
432 - ## 公開範囲チェック
433 - #set($canViewRuleReview = true)
434 - #if($visibilityRuleReview == 'members' && $isGuest) #set($canViewRuleReview = false)
435 - #elseif($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewRuleReview = false)
436 - #end
437 - #if($canViewRuleReview)
438 -<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>
439 -<div class="school-section-card">
440 - <div class="card-inner">
441 - <div class="info-row">
442 - <span class="info-label">見直しの有無(3年以内)</span>
443 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
444 - </div>
445 - #if($ruleReviewContent && $ruleReviewContent != '')
446 - <div class="info-row">
447 - <span class="info-label">見直しの内容</span>
448 - <span class="info-value">
449 - <div class="selection-display">
450 - #foreach($rc in $ruleReviewContent.split(","))
451 - <span class="selection-item">$!escapetool.xml($rc.trim())</span>
452 - #end
844 + ## --- 広報 ---
845 + #set($hasPublicity = ($publicityMethod && !$publicityMethod.isEmpty()) || ($publicityFrequency && $publicityFrequency != '') || ($publicityNote && $publicityNote != ''))
846 + #if($hasPublicity)
847 + #set($canViewPB = true)
848 + #if($visibilityPublicity == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewPB = false)
849 + #elseif($visibilityPublicity == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPB = false)
850 + #end
851 + #if($canViewPB)
852 + <div class="seitokai-subsection">
853 + <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> 広報 #if($visibilityPublicity != '' && $visibilityPublicity != 'public')<span class="visibility-badge visibility-${visibilityPublicity}">#if($visibilityPublicity == '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>
854 + <div class="seitokai-subsection-content">
855 + #if($publicityMethod && !$publicityMethod.isEmpty())
856 + <div class="info-row">
857 + <span class="info-label">方法</span>
858 + <span class="info-value">
859 + <div class="selection-display">
860 + #foreach($pm in $publicityMethod)
861 + <span class="selection-item">$!escapetool.xml($pm.trim())</span>
862 + #end
863 + </div>
864 + </span>
453 453   </div>
454 - </span>
866 + #end
867 + #if($publicityFrequency && $publicityFrequency != '')
868 + <div class="info-row">
869 + <span class="info-label">頻度</span>
870 + <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($publicityFrequency)</span></span>
871 + </div>
872 + #end
873 + #if($publicityNote && $publicityNote != '')
874 + <div class="info-row">
875 + <span class="info-label">自由記述</span>
876 + <span class="info-value free-text-value">$!escapetool.xml($publicityNote)</span>
877 + </div>
878 + #end
879 + </div>
455 455   </div>
881 + #else
882 + <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($visibilityPublicity == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
883 + #end
456 456   #end
457 - #if($ruleReviewProposer && $ruleReviewProposer != '')
458 - <div class="info-row">
459 - <span class="info-label">見直しの提案者</span>
460 - <span class="info-value">
461 - <div class="selection-display">
462 - #foreach($rp in $ruleReviewProposer.split(","))
463 - <span class="selection-item">$!escapetool.xml($rp.trim())</span>
464 - #end
885 +
886 + ## --- 外部連携 ---
887 + #set($hasExternal = ($externalCooperation && $externalCooperation != '') || ($externalOrgName && $externalOrgName != '') || ($socialParticipation && !$socialParticipation.isEmpty()))
888 + #if($hasExternal)
889 + #set($canViewEX = true)
890 + #if($visibilityExternal == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewEX = false)
891 + #elseif($visibilityExternal == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewEX = false)
892 + #end
893 + #if($canViewEX)
894 + <div class="seitokai-subsection">
895 + <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> 外部連携 #if($visibilityExternal != '' && $visibilityExternal != 'public')<span class="visibility-badge visibility-${visibilityExternal}">#if($visibilityExternal == '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>
896 + <div class="seitokai-subsection-content">
897 + #if($externalCooperation && $externalCooperation != '')
898 + <div class="info-row">
899 + <span class="info-label">他校の生徒会との連携</span>
900 + <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($externalCooperation)</span></span>
465 465   </div>
466 - </span>
902 + #end
903 + #if($externalOrgName && $externalOrgName != '')
904 + <div class="info-row">
905 + <span class="info-label">参加している生徒会団体の名前</span>
906 + <span class="info-value">$!escapetool.xml($externalOrgName)</span>
907 + </div>
908 + #end
909 + #if($socialParticipation && !$socialParticipation.isEmpty())
910 + <div class="info-row">
911 + <span class="info-label">社会参加・地域連携・ボランティア</span>
912 + <span class="info-value">
913 + <div class="selection-display">
914 + #foreach($sp2 in $socialParticipation)
915 + <span class="selection-item">$!escapetool.xml($sp2.trim())</span>
916 + #end
917 + </div>
918 + </span>
919 + </div>
920 + #end
921 + </div>
467 467   </div>
923 + #else
924 + <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($visibilityExternal == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
925 + #end
468 468   #end
469 - #if($ruleReviewImplementer && $ruleReviewImplementer != '')
470 - <div class="info-row">
471 - <span class="info-label">見直しの実施者</span>
472 - <span class="info-value">
473 - <div class="selection-display">
474 - #foreach($ri in $ruleReviewImplementer.split(","))
475 - <span class="selection-item">$!escapetool.xml($ri.trim())</span>
927 +
928 + ## --- 年間主要行事 ---
929 + #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]])
930 + #set($hasAnyEvent = false)
931 + #foreach($m in $months)
932 + #if($m.get(1) && $m.get(1) != '') #set($hasAnyEvent = true) #end
933 + #end
934 + #if($hasAnyEvent)
935 + #set($canViewAN = true)
936 + #if($visibilityAnnualEvents == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAN = false)
937 + #elseif($visibilityAnnualEvents == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAN = false)
938 + #end
939 + #if($canViewAN)
940 + <div class="seitokai-subsection">
941 + <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> 年間主要行事 #if($visibilityAnnualEvents != '' && $visibilityAnnualEvents != 'public')<span class="visibility-badge visibility-${visibilityAnnualEvents}">#if($visibilityAnnualEvents == '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>
942 + <div class="seitokai-subsection-content">
943 + <table class="wiki-table school-info-table" style="margin:0">
944 + #foreach($m in $months)
945 + #if($m.get(1) && $m.get(1) != '')
946 + <tr><td style="width:60px;font-weight:600;white-space:nowrap">$m.get(0)</td><td>$!escapetool.xml($m.get(1))</td></tr>
476 476   #end
477 - </div>
478 - </span>
948 + #end
949 + </table>
950 + </div>
479 479   </div>
952 + #else
953 + <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($visibilityAnnualEvents == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
954 + #end
480 480   #end
481 - #if($ruleReviewSystem && $ruleReviewSystem != '')
482 - <div class="info-row">
483 - <span class="info-label">見直しの仕組み</span>
484 - <span class="info-value">$!escapetool.xml($!ruleReviewSystem)</span>
956 +
957 + ## --- 生徒会の課題意識 ---
958 + #if($challenges && $challenges != '')
959 + #set($canViewChallenges = true)
960 + #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewChallenges = false)
961 + #elseif($visibilityChallenges == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewChallenges = false)
962 + #end
963 + #if($canViewChallenges)
964 + <div class="seitokai-subsection">
965 + <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>
966 + <div class="seitokai-subsection-content">
967 + <div class="challenge-text">$!escapetool.xml($challenges)</div>
968 + </div>
485 485   </div>
970 + #else
971 + <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>
972 + #end
486 486   #end
487 - </div>
488 -</div>
489 - #else
490 -<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>
491 - #end
492 -#end
493 493  
494 -## --- ⑨ 課題 ---
495 -#if($challenges && $challenges != '')
496 - ## 公開範囲チェック
497 - #set($canViewChallenges = true)
498 - #if($visibilityChallenges == 'members' && $isGuest) #set($canViewChallenges = false)
499 - #elseif($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewChallenges = false)
975 + </div>## seitokai-info-body 終了
976 +</div>## card-seitokai-info 終了
977 +
978 +## --- ③ SNS・連絡先 ---
979 +<div class="school-info-card collapsed" id="card-contact">
980 + <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>
981 + <table class="wiki-table school-info-table">
982 + <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr>
983 + <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>
984 + <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>
985 + <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>
986 + <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>
987 + <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
988 + </table>
989 + #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
990 + #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
991 + #if($infoEditDate && $infoEditDate != '')
992 + <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>
500 500   #end
501 - #if($canViewChallenges)
502 -<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>
503 -<div class="challenge-text">$!escapetool.xml($challenges)</div>
504 - #else
505 -<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>
506 - #end
507 -#end
994 +</div>
508 508  
509 -</div>## seitokai-info-accordion 終了
510 -
511 511  {{/html}}
512 512  
998 +----
999 +
513 513  ## --- ⑩ 活動報告一覧(スレッド型・年度タブ付き) ---
514 514  = 活動報告 =
515 515  
516 -## --- 投稿者ステータス凡例(折りたたみ) ---
1003 +## --- 年度タブ + 投稿者ステータス凡例 ---
517 517  {{html clean="false"}}
518 -<div class="author-legend-wrapper">
519 - <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>
520 - <div class="author-legend-body">
521 - <div class="author-legend">
522 - <span class="author-legend-title">投稿者の信頼度:</span>
523 - <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者</span>
524 - <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み</span>
525 - <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介</span>
526 - <span class="author-legend-item"><span class="bar bar-general"></span> 一般(未承認)</span>
527 - </div>
528 - <div class="author-legend">
529 - <span class="author-legend-title">所属:</span>
530 - <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>
531 - <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>
532 - <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>
533 - <span class="author-legend-item text-hint">※一般アカウントは所属未確認のため非表示</span>
534 - </div>
535 - <div class="author-legend">
536 - <span class="author-legend-title">役割:</span>
537 - <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>
538 - <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>
539 - <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>
540 - </div>
541 - </div>
542 -</div>
543 543  
544 544  ## --- 年度タブ ---
545 545  ## 全活動から年度一覧を収集
... ... @@ -561,14 +561,49 @@
561 561  #end
562 562  ## ソート(降順にしたいが Velocity にはないので JS で制御)
563 563  
564 -<div class="activity-fy-tabs">
565 - <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
566 - #foreach($fy in $fySet)
567 - #if($fy != $currentFYStr)
568 - <button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button>
1026 +<div class="activity-toolbar">
1027 + <div class="activity-fy-tabs">
1028 + <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button>
1029 + #foreach($fy in $fySet)
1030 + #if($fy != $currentFYStr)
1031 + <button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button>
1032 + #end
569 569   #end
570 - #end
571 - <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
1034 + <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button>
1035 + </div>
1036 + <div class="activity-toolbar-right">
1037 + <button class="btn-view-toggle" id="btnViewToggle" onclick="toggleCompactView()" title="タイトルのみ表示">
1038 + <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>
1039 + <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>
1040 + <span class="toggle-label">一覧表示</span>
1041 + </button>
1042 + </div>
1043 + <div class="author-legend-wrapper">
1044 + <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>
1045 + <div class="author-legend-body">
1046 + <div class="author-legend">
1047 + <span class="author-legend-title">投稿者の信頼度:</span>
1048 + <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者 <span class="text-hint">— 運営スタッフ</span></span>
1049 + <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み <span class="text-hint">— 本人確認済みのユーザー</span></span>
1050 + <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介 <span class="text-hint">— 承認済みユーザーからの紹介</span></span>
1051 + <span class="author-legend-item"><span class="bar bar-general"></span> 一般 <span class="text-hint">— 一般登録ユーザー</span></span>
1052 + </div>
1053 + <div class="author-legend">
1054 + <span class="author-legend-title">所属:</span>
1055 + <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>
1056 + <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>
1057 + <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>
1058 + <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>
1059 + <span class="author-legend-item text-hint">※一般アカウントは所属バッジが表示されません</span>
1060 + </div>
1061 + <div class="author-legend">
1062 + <span class="author-legend-title">役割:</span>
1063 + <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>
1064 + <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>
1065 + <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>
1066 + </div>
1067 + </div>
1068 + </div>
572 572  </div>
573 573  
574 574  {{/html}}
... ... @@ -633,10 +633,18 @@
633 633  <div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)">
634 634   <div class="activity-thread-header">
635 635   <div class="activity-thread-title">
636 - <h3 #if($actFeatured == '1')class="featured-title"#end>$!escapetool.xml($!actTitle) #if($actFeatured == '1')<svg class="ico ico-fixed-14" viewBox="0 0 24 24" fill="currentColor" stroke="none" class="ico-star-offset"><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>
637 - <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
1133 + <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>
1134 + <div class="activity-meta-line">
1135 + <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
1136 + #set($actTagsList = $activity.getValue('tags'))
1137 + #if($actTagsList && !$actTagsList.isEmpty())
1138 + #foreach($tagItem in $actTagsList)
1139 + #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end
1140 + #end
1141 + #end
1142 + </div>
638 638   </div>
639 - <div class="thread-meta-row">
1144 + <div class="thread-meta-right">
640 640   <span class="thread-post-count">${reportCount}件の報告 ・ ${commentCount}件のコメント</span>
641 641   #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred')
642 642   #if($actFeatured == '1')
... ... @@ -696,12 +696,12 @@
696 696   #set($postVis = $!post.getValue('visibility'))
697 697   #if(!$postVis || $postVis == '') #set($postVis = 'public') #end
698 698   #set($canViewPost = true)
699 - #if($postVis == 'members' && $isGuest) #set($canViewPost = false)
700 - #elseif($postVis == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewPost = false)
1204 + #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewPost = false)
1205 + #elseif($postVis == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPost = false)
701 701   #end
702 702   #if(!$canViewPost)
703 703   <div class="thread-post visibility-restricted-post">
704 - <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>
1209 + <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>
705 705   </div>
706 706   #else
707 707   ## 投稿者のアカウント種別に基づいたCSSクラス
... ... @@ -741,8 +741,11 @@
741 741   <span class="badge badge-general badge-sm">一般</span>
742 742   #end
743 743   ## 所属バッジ(投稿者の学校コードとページの学校コードを比較)
1249 + #set($postIsSchoolMatch = ($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode)))
744 744   #if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general')
745 - #if($postSchoolCode == $schoolCode)
1251 + #if($postUserRole == 'graduate' && $postIsSchoolMatch)
1252 + <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>
1253 + #elseif($postIsSchoolMatch && $postUserRole != 'graduate')
746 746   #if($postAccountType == 'verified' || $postAccountType == 'admin')
747 747   <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>
748 748   #else
... ... @@ -763,9 +763,6 @@
763 763   #elseif($postUserRole == 'graduate')
764 764   <span class="badge badge-role-graduate 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>
765 765   #end
766 - #if($postGrade && $postGrade != '')
767 - <span class="badge badge-grade badge-sm">$postGrade</span>
768 - #end
769 769   </span>
770 770   <span class="thread-post-date">$!postDate</span>
771 771   #set($postEdited = $!post.getValue('edited'))
... ... @@ -772,6 +772,13 @@
772 772   #if($postEdited == 1 || $postEdited == '1')
773 773   <span class="post-edited-label">(編集済み)</span>
774 774   #end
1280 + #set($postAuthorRefH = $!post.getValue('authorRef'))
1281 + #set($postObjNumH = $post.number)
1282 + #if(!$isGuest && $xcontext.user != $postAuthorRefH)
1283 + <button type="button" class="btn-post-report btn-post-report-header" onclick="openReportDialog(this, '${doc.fullName}', $postObjNumH, '${services.csrf.getToken()}')" title="この投稿を通報">
1284 + <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> 通報
1285 + </button>
1286 + #end
775 775   </div>
776 776   <div class="thread-post-body">
777 777   $!escapetool.xml($!postContent)
... ... @@ -836,12 +836,37 @@
836 836   #end
837 837   </div>
838 838   #if($postVis != 'public')
839 - <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>
1351 + <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>
840 840   #end
841 - ## 固定/解除ボタン(承認済み・管理者のみ)
842 - #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
843 - #set($postObjNum = $post.number)
844 - <div class="post-pin-action post-action-mt">
1353 + ## いいねボタン
1354 + #set($postLikeCount = $!post.getValue('likeCount'))
1355 + #if(!$postLikeCount || $postLikeCount == '') #set($postLikeCount = 0) #end
1356 + #set($postLikedBy = $!post.getValue('likedBy'))
1357 + #set($isLikedByMe = false)
1358 + #if($postLikedBy && $postLikedBy.contains($xcontext.user)) #set($isLikedByMe = true) #end
1359 + <div class="post-like-row post-action-mt">
1360 + #if($xcontext.user != 'XWiki.XWikiGuest')
1361 + <button type="button" class="btn-like #if($isLikedByMe)liked#end" data-page="$escapetool.xml($doc.fullName)" data-obj="$post.number" data-csrf="$services.csrf.getToken()" onclick="toggleLike(this)">
1362 + <svg class="ico ico-fixed-14" viewBox="0 0 24 24" #if($isLikedByMe)fill="currentColor" stroke="none"#end><path d="M20.84 4.61a5.5 5.5 0 00-7.78 0L12 5.67l-1.06-1.06a5.5 5.5 0 00-7.78 7.78l1.06 1.06L12 21.23l7.78-7.78 1.06-1.06a5.5 5.5 0 000-7.78z"/></svg>
1363 + <span class="like-count">$postLikeCount</span>
1364 + </button>
1365 + #else
1366 + <span class="btn-like disabled">
1367 + <svg class="ico ico-fixed-14" viewBox="0 0 24 24"><path d="M20.84 4.61a5.5 5.5 0 00-7.78 0L12 5.67l-1.06-1.06a5.5 5.5 0 00-7.78 7.78l1.06 1.06L12 21.23l7.78-7.78 1.06-1.06a5.5 5.5 0 000-7.78z"/></svg>
1368 + <span class="like-count">$postLikeCount</span>
1369 + </span>
1370 + #end
1371 + </div>
1372 + ## 固定/編集/削除/通報/非表示ボタン(横並び)
1373 + #set($postAuthorRef = $!post.getValue('authorRef'))
1374 + #set($postObjNumED = $post.number)
1375 + #set($showPinBtn = ($viewerAccountType == 'admin' || $viewerAccountType == 'verified'))
1376 + #set($showEditDeleteBtn = ($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin'))
1377 + #set($showHideBtn = ($viewerAccountType == 'admin'))
1378 + #if($showPinBtn || $showEditDeleteBtn || $showHideBtn)
1379 + <div class="post-edit-actions post-action-mt">
1380 + #if($showPinBtn)
1381 + #set($postObjNum = $post.number)
845 845   #if($isPinned == '1')
846 846   <a href="$doc.getURL('view', "action=unpin&postObj=${postObjNum}&form_token=${services.csrf.getToken()}")" class="btn-pin-toggle btn-unpin" title="固定を解除">
847 847   <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> 固定を解除
... ... @@ -851,15 +851,12 @@
851 851   <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> 固定する
852 852   </a>
853 853   #end
854 - </div>
855 - #end
856 - ## 編集・削除ボタン(投稿者本人 or 管理者)
857 - #set($postAuthorRef = $!post.getValue('authorRef'))
858 - #set($postObjNumED = $post.number)
859 - #if($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin')
860 - <div class="post-edit-actions post-action-mt">
1391 + #end
1392 + #if($showEditDeleteBtn)
861 861   #if($xcontext.user == $postAuthorRef)
862 - <button type="button" class="btn-post-edit" onclick="openEditPost(this, '${doc.fullName}', $postObjNumED, '$!escapetool.javascript($!postContent)')" title="この投稿を編集">
1394 + #set($editImages = $!post.getValue('images'))
1395 + #set($editFiles = $!post.getValue('files'))
1396 + <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="この投稿を編集">
863 863   <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> 編集
864 864   </button>
865 865   #end
... ... @@ -866,6 +866,12 @@
866 866   <button type="button" class="btn-post-delete" onclick="confirmDeletePost('${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を削除">
867 867   <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> 削除
868 868   </button>
1403 + #end
1404 + #if($showHideBtn)
1405 + <button type="button" class="btn-post-hide" onclick="openHideDialog(this, '${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を非表示にする">
1406 + <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> 非表示
1407 + </button>
1408 + #end
869 869   </div>
870 870   #end
871 871   </div>
... ... @@ -915,9 +915,11 @@
915 915  
916 916   #if($xcontext.user != "XWiki.XWikiGuest")
917 917   <div class="thread-add-post">
1458 + #if($isSchoolMember || $isAlumniOfSchool || $isViewerAdmin)
918 918   <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
919 919   + 活動報告を追加
920 920   </a>
1462 + #end
921 921   <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
922 922   <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> コメントを書く
923 923   </a>
... ... @@ -947,62 +947,96 @@
947 947  {{/html}}
948 948  #end
949 949  
950 -## --- 年度アーカイブ セクション ---
951 -{{html clean="false"}}
952 -<div class="school-section-card school-archive-card">
953 - <h2 class="archive-section-title">
954 - <svg class="ico ico-md" viewBox="0 0 24 24"><path d="M19 21H5a2 2 0 01-2-2V5a2 2 0 012-2h11l5 5v11a2 2 0 01-2 2z"/><polyline points="17 21 17 13 7 13 7 21"/><polyline points="7 3 7 8 15 8"/></svg>
955 - 年度アーカイブ
956 - </h2>
957 - <div class="archive-meta">
958 - 現在のページ: <strong>${pageFiscalYear}年度</strong>
959 - #set($lyud = $!doc.getValue('lastYearUpdateDate'))
960 - #if($lyud && $lyud != '')
961 - | 最終年度更新: $!escapetool.xml($lyud) ($!escapetool.xml($!doc.getValue('lastYearUpdateBy')))
962 - #end
963 - </div>
1492 +## --- OGP / SNSシェア対応 ---
1493 +#set($ogpTitle = "${schoolName} — 生徒会Wiki")
1494 +#set($ogpDesc = "${schoolName}の生徒会活動情報。")
1495 +#if($prefecture && $prefecture != '') #set($ogpDesc = "${ogpDesc}${prefecture}") #end
1496 +#if($city && $city != '') #set($ogpDesc = "${ogpDesc}${city}。") #end
1497 +#if($dailyActivities && $dailyActivities != '') #set($ogpDesc = "${ogpDesc} 主な活動: ${dailyActivities}") #end
1498 +#set($ogpUrl = "https://${request.serverName}${doc.getURL()}")
964 964  
965 - ## 過去アーカイブの検索
966 - #set($archiveQuery = $services.query.hql("where doc.fullName like :pattern and doc.fullName like '%Archive_%' order by doc.fullName desc").bindValue("pattern", "${doc.fullName}.Archive_%").setLimit(20))
967 - #set($archivePages = $archiveQuery.execute())
968 -
969 - #if($archivePages && $archivePages.size() > 0)
970 - <div class="archive-card-field-lg">
971 - <div class="archive-list-label">過去の年度アーカイブ</div>
972 - <div class="archive-list">
973 - #foreach($archPage in $archivePages)
974 - #set($archPageDoc = $xwiki.getDocument($archPage))
975 - #set($archPageObj = $archPageDoc.getObject('SeitokaiCode.SchoolClass'))
976 - #if($archPageObj)
977 - #set($archPageFY = $!archPageObj.getValue('fiscalYear'))
978 - <a href="$archPageDoc.getURL('view')" class="archive-link">
979 - <svg class="ico" viewBox="0 0 24 24"><path d="M19 21H5a2 2 0 01-2-2V5a2 2 0 012-2h11l5 5v11a2 2 0 01-2 2z"/><polyline points="17 21 17 13 7 13 7 21"/><polyline points="7 3 7 8 15 8"/></svg>
980 - ${archPageFY}年度
981 - </a>
982 - #end
983 - #end
984 - </div>
985 - </div>
986 - #else
987 - <div class="archive-empty">過去のアーカイブはまだありません</div>
988 - #end
989 -
990 - ## 新年度に移行ボタン(承認済み・管理者のみ)
991 - #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
992 - <div class="archive-action">
993 - <a href="/bin/SeitokaiCode/YearArchiveAction?schoolPage=${doc.fullName}" class="btn-accent">
994 - <svg class="ico" viewBox="0 0 24 24" stroke-width="2.5"><path d="M19 21H5a2 2 0 01-2-2V5a2 2 0 012-2h11l5 5v11a2 2 0 01-2 2z"/><polyline points="17 21 17 13 7 13 7 21"/><polyline points="7 3 7 8 15 8"/></svg>
995 - ${pageFiscalYear}年度をアーカイブして新年度に移行
996 - </a>
997 - <div class="archive-action-hint">現在の学校情報を${pageFiscalYear}年度として保存し、新しい年度に移行します。</div>
998 - </div>
999 - #end
1000 -</div>
1001 -{{/html}}
1002 -
1003 1003  ## --- 年度タブ切り替え JavaScript ---
1004 1004  {{html clean="false"}}
1005 1005  <script>
1503 +// OGPメタタグ挿入
1504 +(function() {
1505 + var ogp = {
1506 + 'og:title': '$escapetool.javascript($ogpTitle)',
1507 + 'og:description': '$escapetool.javascript($ogpDesc)',
1508 + 'og:type': 'article',
1509 + 'og:url': '$escapetool.javascript($ogpUrl)',
1510 + 'og:site_name': '生徒会Wiki',
1511 + 'twitter:card': 'summary'
1512 + };
1513 + for (var p in ogp) {
1514 + var meta = document.createElement('meta');
1515 + meta.setAttribute('property', p);
1516 + meta.setAttribute('content', ogp[p]);
1517 + document.head.appendChild(meta);
1518 + }
1519 + // twitter用
1520 + var tw = document.createElement('meta');
1521 + tw.setAttribute('name', 'twitter:card');
1522 + tw.setAttribute('content', 'summary');
1523 + document.head.appendChild(tw);
1524 +})();
1525 +// コンパクト表示(タイトルのみ)トグル
1526 +// いいねトグル
1527 +function toggleLike(btn) {
1528 + var page = btn.getAttribute('data-page');
1529 + var obj = btn.getAttribute('data-obj');
1530 + var csrf = btn.getAttribute('data-csrf');
1531 + btn.disabled = true;
1532 + var fd = new FormData();
1533 + fd.append('page', page);
1534 + fd.append('obj', obj);
1535 + fd.append('form_token', csrf);
1536 + fetch('/bin/SeitokaiCode/LikePost', { method: 'POST', body: fd })
1537 + .then(function(r) { return r.json(); })
1538 + .then(function(data) {
1539 + btn.querySelector('.like-count').textContent = data.count;
1540 + if (data.action === 'liked') {
1541 + btn.classList.add('liked');
1542 + btn.querySelector('svg').setAttribute('fill', 'currentColor');
1543 + btn.querySelector('svg').setAttribute('stroke', 'none');
1544 + } else {
1545 + btn.classList.remove('liked');
1546 + btn.querySelector('svg').removeAttribute('fill');
1547 + btn.querySelector('svg').setAttribute('stroke', 'currentColor');
1548 + }
1549 + })
1550 + .catch(function() { alert('エラーが発生しました'); })
1551 + .finally(function() { btn.disabled = false; });
1552 +}
1553 +
1554 +function toggleCompactView() {
1555 + var container = document.querySelector('.xwiki-content') || document.body;
1556 + var isCompact = container.classList.toggle('activity-compact-view');
1557 + var btn = document.getElementById('btnViewToggle');
1558 + if (btn) {
1559 + btn.querySelector('.toggle-label').textContent = isCompact ? '詳細表示' : '一覧表示';
1560 + btn.title = isCompact ? '詳細表示に戻す' : 'タイトルのみ表示';
1561 + }
1562 + // コンパクトモードでは各スレッドヘッダーをクリックで個別展開可能にする
1563 + document.querySelectorAll('.activity-thread').forEach(function(thread) {
1564 + if (isCompact) {
1565 + thread.classList.remove('compact-expanded');
1566 + }
1567 + });
1568 +}
1569 +
1570 +// コンパクトモードで個別スレッドを展開/折りたたみ
1571 +function toggleThreadExpand(e) {
1572 + var container = document.querySelector('.xwiki-content') || document.body;
1573 + if (!container.classList.contains('activity-compact-view')) return;
1574 + // リンクやボタンのクリックはスルー
1575 + if (e.target.closest('a, button, .btn-featured-toggle')) return;
1576 + var thread = e.target.closest('.activity-thread');
1577 + if (thread) {
1578 + thread.classList.toggle('compact-expanded');
1579 + }
1580 +}
1581 +
1006 1006  function switchActivityFY(fy, btn) {
1007 1007   // タブのアクティブ状態を切り替え
1008 1008   document.querySelectorAll('.activity-fy-tab').forEach(function(t) { t.classList.remove('active'); });
... ... @@ -1018,13 +1018,31 @@
1018 1018  }
1019 1019  // ページ読み込み時の初期化
1020 1020  document.addEventListener('DOMContentLoaded', function() {
1597 + // 年度タブを降順にソート(「全期間」タブは末尾に固定)
1598 + var tabContainer = document.querySelector('.activity-fy-tabs');
1599 + if (tabContainer) {
1600 + var tabs = Array.from(tabContainer.querySelectorAll('.activity-fy-tab'));
1601 + var allTab = null;
1602 + var fyTabs = [];
1603 + tabs.forEach(function(t) {
1604 + var onclickStr = t.getAttribute('onclick') || '';
1605 + if (onclickStr.indexOf("'all'") !== -1) { allTab = t; }
1606 + else { fyTabs.push(t); }
1607 + });
1608 + // 年度タブを数値の降順でソート
1609 + fyTabs.sort(function(a, b) {
1610 + var aYear = parseInt(a.textContent) || 0;
1611 + var bYear = parseInt(b.textContent) || 0;
1612 + return bYear - aYear;
1613 + });
1614 + // DOM再配置
1615 + fyTabs.forEach(function(t) { tabContainer.appendChild(t); });
1616 + if (allTab) { tabContainer.appendChild(allTab); }
1617 + }
1021 1021   // デフォルトで現在の年度を表示
1022 1022   var defaultTab = document.querySelector('.activity-fy-tab.active');
1023 1023   if (defaultTab) { defaultTab.click(); }
1024 1024   // 保存成功時のトースト通知
1025 - if (window.location.search.indexOf('archived=1') !== -1) {
1026 - showToast('年度アーカイブを作成しました', 'success');
1027 - }
1028 1028   if (window.location.search.indexOf('saved=1') !== -1) {
1029 1029   showToast('学校情報を保存しました', 'success');
1030 1030   // URLパラメータをクリーンアップ(リロード時に再表示されないよう)
... ... @@ -1032,6 +1032,30 @@
1032 1032   window.history.replaceState({}, document.title, window.location.pathname);
1033 1033   }
1034 1034   }
1629 + // コンパクトモード: スレッドヘッダークリックで個別展開
1630 + document.querySelectorAll('.activity-thread-header').forEach(function(header) {
1631 + header.addEventListener('click', toggleThreadExpand);
1632 + });
1633 + // 長文投稿の折りたたみ初期化(max-height: 12em 超で省略)
1634 + document.querySelectorAll('.thread-post-body').forEach(function(body) {
1635 + // pre-wrapのまま高さを測定し、max-height(12em ≒ ~200px)を超える場合に折りたたむ
1636 + var fullH = body.scrollHeight;
1637 + // 12em を px に変換(font-size × line-height × 行数 の近似値ではなくCSSと同じ値を取得)
1638 + body.classList.add('truncated');
1639 + var maxH = body.clientHeight; // max-height: 12em 適用後の高さ
1640 + body.classList.remove('truncated');
1641 + if (fullH > maxH + 30) {
1642 + body.classList.add('truncated');
1643 + var btn = document.createElement('button');
1644 + btn.className = 'btn-read-more';
1645 + btn.textContent = '広げて読む ▼';
1646 + btn.addEventListener('click', function() {
1647 + var isExpanded = body.classList.toggle('expanded');
1648 + btn.textContent = isExpanded ? '折りたたむ ▲' : '広げて読む ▼';
1649 + });
1650 + body.parentNode.insertBefore(btn, body.nextSibling);
1651 + }
1652 + });
1035 1035  });
1036 1036  
1037 1037  // トースト通知表示
... ... @@ -1050,7 +1050,15 @@
1050 1050   };
1051 1051   var toast = document.createElement('div');
1052 1052   toast.className = 'toast toast-' + type;
1053 - toast.innerHTML = (icons[type] || '') + '<span>' + message + '</span>';
1671 + var iconSvg = icons[type] || '';
1672 + if (iconSvg) {
1673 + var iconSpan = document.createElement('span');
1674 + iconSpan.innerHTML = iconSvg;
1675 + toast.appendChild(iconSpan);
1676 + }
1677 + var msgSpan = document.createElement('span');
1678 + msgSpan.textContent = message;
1679 + toast.appendChild(msgSpan);
1054 1054   container.appendChild(toast);
1055 1055   setTimeout(function() { toast.remove(); }, 3200);
1056 1056  }
... ... @@ -1060,40 +1060,137 @@
1060 1060   var card = document.getElementById(cardId);
1061 1061   if (!card) return;
1062 1062   card.classList.toggle('collapsed');
1689 + var isCollapsed = card.classList.contains('collapsed');
1690 + var h2 = card.querySelector('h2[role="button"]');
1691 + if (h2) h2.setAttribute('aria-expanded', !isCollapsed);
1063 1063  }
1064 1064  
1065 1065  // 投稿の編集(インライン編集フォームを開く)
1066 -function openEditPost(btn, schoolPage, postObjNum, currentContent) {
1695 +function openEditPost(btn) {
1067 1067   var postEl = btn.closest('.thread-post');
1068 1068   if (!postEl) return;
1069 - // 既存の編集フォームがあれば閉じる
1070 1070   var existing = postEl.querySelector('.post-edit-form');
1071 1071   if (existing) { existing.remove(); return; }
1072 1072   var bodyEl = postEl.querySelector('.thread-post-body');
1073 1073   if (!bodyEl) return;
1702 +
1703 + var schoolPage = btn.getAttribute('data-school');
1704 + var postObjNum = btn.getAttribute('data-obj');
1705 + var currentContent = btn.getAttribute('data-content') || '';
1706 + var currentImages = btn.getAttribute('data-images') || '';
1707 + var currentFiles = btn.getAttribute('data-files') || '';
1708 + var postType = btn.getAttribute('data-post-type') || 'report';
1709 +
1074 1074   var form = document.createElement('div');
1075 1075   form.className = 'post-edit-form';
1076 - form.innerHTML = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>' +
1077 - '<div class="post-edit-form-actions">' +
1712 + form.setAttribute('data-school', schoolPage);
1713 + form.setAttribute('data-obj', postObjNum);
1714 +
1715 + var html = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>';
1716 +
1717 + // コメント以外は添付ファイル編集を表示
1718 + function escAttr(s) { return s.replace(/&/g,'&amp;').replace(/"/g,'&quot;').replace(/'/g,'&#39;').replace(/</g,'&lt;').replace(/>/g,'&gt;'); }
1719 + if (postType !== 'comment') {
1720 + // 既存画像
1721 + html += '<div class="edit-attachments">';
1722 + if (currentImages.trim()) {
1723 + html += '<div class="edit-attach-section"><span class="edit-attach-label">画像</span>';
1724 + var imgs = currentImages.trim().split('\n');
1725 + for (var i = 0; i < imgs.length; i++) {
1726 + var img = imgs[i].trim();
1727 + if (!img) continue;
1728 + html += '<div class="edit-attach-item" data-name="' + escAttr(img) + '">' +
1729 + '<img src="/xwiki/bin/download/' + schoolPage.replace(/\./g,'/') + '/' + encodeURIComponent(img) + '" class="edit-attach-thumb" />' +
1730 + '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1731 + '<input type="hidden" name="keepImages" value="' + escAttr(img) + '" />' +
1732 + '</div>';
1733 + }
1734 + html += '</div>';
1735 + }
1736 + // 既存ファイル
1737 + if (currentFiles.trim()) {
1738 + html += '<div class="edit-attach-section"><span class="edit-attach-label">ファイル</span>';
1739 + var files = currentFiles.trim().split('\n');
1740 + for (var j = 0; j < files.length; j++) {
1741 + var f = files[j].trim();
1742 + if (!f) continue;
1743 + var displayName = f;
1744 + if (/^file_\d{14}_\d+_/.test(f)) displayName = f.replace(/^file_\d{14}_\d+_/, '');
1745 + html += '<div class="edit-attach-item" data-name="' + escAttr(f) + '">' +
1746 + '<span class="edit-attach-fname">' + escAttr(displayName) + '</span>' +
1747 + '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1748 + '<input type="hidden" name="keepFiles" value="' + escAttr(f) + '" />' +
1749 + '</div>';
1750 + }
1751 + html += '</div>';
1752 + }
1753 + // 新規追加
1754 + html += '<div class="edit-attach-add">' +
1755 + '<label class="form-label-sm">画像を追加(最大4枚まで)</label>' +
1756 + '<input type="file" name="editNewImages" accept="image/*" multiple class="form-file-input-sm" />' +
1757 + '<div class="form-hint">JPEG / PNG / GIF / WebP、各5MBまで</div>' +
1758 + '<label class="form-label-sm" style="margin-top:8px;">ファイルを追加(最大2つまで)</label>' +
1759 + '<input type="file" name="editNewFiles" accept=".pdf,.docx,.xlsx,.pptx" multiple class="form-file-input-sm" />' +
1760 + '<div class="form-hint">PDF / Word / Excel / PowerPoint、各10MBまで</div>' +
1761 + '</div>';
1762 + html += '</div>';
1763 + }
1764 +
1765 + html += '<div class="post-edit-form-actions">' +
1078 1078   '<button type="button" class="btn-cancel-edit" onclick="this.closest(\'.post-edit-form\').remove()">キャンセル</button>' +
1079 - '<button type="button" class="btn-save" onclick="saveEditPost(\'' + schoolPage + '\', ' + postObjNum + ')">保存</button>' +
1767 + '<button type="button" class="btn-save" onclick="saveEditPost(this)">保存</button>' +
1080 1080   '</div>';
1769 +
1770 + form.innerHTML = html;
1081 1081   bodyEl.parentNode.insertBefore(form, bodyEl.nextSibling);
1082 1082   form.querySelector('textarea').focus();
1083 1083  }
1084 1084  
1775 +function removeEditAttach(btn) {
1776 + var item = btn.closest('.edit-attach-item');
1777 + if (item) item.remove();
1778 +}
1779 +
1085 1085  // 投稿の編集を保存
1086 -function saveEditPost(schoolPage, postObjNum) {
1087 - var textarea = document.getElementById('editContent_' + postObjNum);
1781 +function saveEditPost(btn) {
1782 + var formEl = btn.closest('.post-edit-form');
1783 + if (!formEl) return;
1784 + var schoolPage = formEl.getAttribute('data-school');
1785 + var postObjNum = formEl.getAttribute('data-obj');
1786 + var textarea = formEl.querySelector('textarea');
1088 1088   if (!textarea) return;
1089 1089   var newContent = textarea.value.trim();
1090 1090   if (!newContent) { alert('投稿内容を入力してください'); return; }
1790 +
1091 1091   var csrfEl = document.querySelector('input[name="form_token"]');
1092 1092   var csrfToken = csrfEl ? csrfEl.value : '';
1793 +
1794 + var fd = new FormData();
1795 + fd.append('schoolPage', schoolPage);
1796 + fd.append('postObj', postObjNum);
1797 + fd.append('newContent', newContent);
1798 + fd.append('form_token', csrfToken);
1799 +
1800 + // 残す画像・ファイル
1801 + formEl.querySelectorAll('input[name="keepImages"]').forEach(function(el) { fd.append('keepImages', el.value); });
1802 + formEl.querySelectorAll('input[name="keepFiles"]').forEach(function(el) { fd.append('keepFiles', el.value); });
1803 +
1804 + // 新規画像
1805 + var newImgInput = formEl.querySelector('input[name="editNewImages"]');
1806 + if (newImgInput && newImgInput.files) {
1807 + for (var i = 0; i < newImgInput.files.length; i++) { fd.append('editNewImages', newImgInput.files[i]); }
1808 + }
1809 + // 新規ファイル
1810 + var newFileInput = formEl.querySelector('input[name="editNewFiles"]');
1811 + if (newFileInput && newFileInput.files) {
1812 + for (var j = 0; j < newFileInput.files.length; j++) { fd.append('editNewFiles', newFileInput.files[j]); }
1813 + }
1814 +
1815 + btn.disabled = true;
1816 + btn.textContent = '保存中...';
1817 +
1093 1093   var xhr = new XMLHttpRequest();
1094 - xhr.open('POST', '/bin/SeitokaiCode/EditPost?outputSyntax=plain', true);
1095 - xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1096 - var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken);
1819 + xhr.open('POST', '/bin/get/SeitokaiCode/EditPost?outputSyntax=plain', true);
1097 1097   xhr.onload = function() {
1098 1098   try {
1099 1099   var res = JSON.parse(xhr.responseText);
... ... @@ -1101,12 +1101,13 @@
1101 1101   showToast('投稿を更新しました', 'success');
1102 1102   setTimeout(function() { location.reload(); }, 800);
1103 1103   } else {
1827 + btn.disabled = false; btn.textContent = '保存';
1104 1104   alert('編集に失敗しました: ' + (res.error || ''));
1105 1105   }
1106 - } catch(e) { alert('編集に失敗しました'); }
1830 + } catch(e) { btn.disabled = false; btn.textContent = '保存'; alert('編集に失敗しました'); }
1107 1107   };
1108 - xhr.onerror = function() { alert('通信エラーが発生しました'); };
1109 - xhr.send(editPostData);
1832 + xhr.onerror = function() { btn.disabled = false; btn.textContent = '保存'; alert('通信エラーが発生しました'); };
1833 + xhr.send(fd);
1110 1110  }
1111 1111  
1112 1112  // 投稿の削除(確認ダイアログ付き)
... ... @@ -1113,7 +1113,7 @@
1113 1113  function confirmDeletePost(schoolPage, postObjNum, token) {
1114 1114   if (!confirm('この投稿を削除しますか?\\n削除後は「この投稿は削除されました」と表示されます。')) return;
1115 1115   var xhr = new XMLHttpRequest();
1116 - xhr.open('POST', '/bin/SeitokaiCode/DeletePost?outputSyntax=plain', true);
1840 + xhr.open('POST', '/bin/get/SeitokaiCode/DeletePost?outputSyntax=plain', true);
1117 1117   xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1118 1118   var deletePostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token);
1119 1119   xhr.onload = function() {
... ... @@ -1130,6 +1130,80 @@
1130 1130   xhr.onerror = function() { alert('通信エラーが発生しました'); };
1131 1131   xhr.send(deletePostData);
1132 1132  }
1857 +
1858 +/* --- 通報ダイアログ --- */
1859 +function openReportDialog(btn, targetPage, postObjNum, token) {
1860 + if (document.getElementById('report-dialog-overlay')) return;
1861 + var reasons = ['宣伝・スパム','不適切な内容','個人情報の露出','誹謗中傷','誤情報','その他'];
1862 + var overlay = document.createElement('div');
1863 + overlay.id = 'report-dialog-overlay';
1864 + 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;';
1865 + var dialog = document.createElement('div');
1866 + dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;max-height:80vh;overflow-y:auto;';
1867 + var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を通報</h3>';
1868 + html += '<p style="margin:0 0 12px;font-size:0.9em;color:#4b5563;">通報された投稿は管理者が確認するまで一時的に非表示になります。</p>';
1869 + html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">通報理由</label>';
1870 + html += '<select id="report-reason" style="width:100%;padding:8px;border:1px solid #d1d5db;border-radius:8px;margin-bottom:12px;font-size:0.9em;">';
1871 + for (var i=0; i<reasons.length; i++) html += '<option value="'+reasons[i]+'">'+reasons[i]+'</option>';
1872 + html += '</select>';
1873 + html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">補足コメント(任意)</label>';
1874 + 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>';
1875 + html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
1876 + html += '<button type="button" id="report-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
1877 + 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>';
1878 + html += '</div>';
1879 + dialog.innerHTML = html;
1880 + overlay.appendChild(dialog);
1881 + document.body.appendChild(overlay);
1882 + overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
1883 + document.getElementById('report-cancel-btn').addEventListener('click', function() { overlay.remove(); });
1884 + document.getElementById('report-submit-btn').addEventListener('click', function() {
1885 + var reason = document.getElementById('report-reason').value;
1886 + var detail = document.getElementById('report-detail').value;
1887 + var submitBtn = document.getElementById('report-submit-btn');
1888 + submitBtn.disabled = true; submitBtn.textContent = '送信中...';
1889 + var xhr = new XMLHttpRequest();
1890 + xhr.open('POST', '/bin/get/SeitokaiCode/ReportAction?outputSyntax=plain', true);
1891 + xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1892 + var data = 'targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&detail=' + encodeURIComponent(detail) + '&form_token=' + encodeURIComponent(token);
1893 + xhr.onload = function() {
1894 + overlay.remove();
1895 + showToast('通報を受け付けました', 'success');
1896 + setTimeout(function() { location.reload(); }, 1000);
1897 + };
1898 + xhr.onerror = function() { overlay.remove(); alert('通信エラーが発生しました'); };
1899 + xhr.send(data);
1900 + });
1901 +}
1902 +
1903 +/* --- 非表示ダイアログ(管理者用) --- */
1904 +function openHideDialog(btn, targetPage, postObjNum, token) {
1905 + if (document.getElementById('hide-dialog-overlay')) return;
1906 + var overlay = document.createElement('div');
1907 + overlay.id = 'hide-dialog-overlay';
1908 + 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;';
1909 + var dialog = document.createElement('div');
1910 + dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;';
1911 + var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を非表示にする</h3>';
1912 + html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">非表示の理由</label>';
1913 + 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="理由を入力" />';
1914 + html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
1915 + html += '<button type="button" id="hide-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
1916 + 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>';
1917 + 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>';
1918 + html += '</div>';
1919 + dialog.innerHTML = html;
1920 + overlay.appendChild(dialog);
1921 + document.body.appendChild(overlay);
1922 + overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
1923 + document.getElementById('hide-cancel-btn').addEventListener('click', function() { overlay.remove(); });
1924 + function doHide(action) {
1925 + var reason = document.getElementById('hide-reason').value || '管理者判断';
1926 + window.location.href = '/bin/view/SeitokaiCode/ModerationAction?action=' + action + '&targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&form_token=' + encodeURIComponent(token);
1927 + }
1928 + document.getElementById('hide-submit-btn').addEventListener('click', function() { doHide('hide'); });
1929 + document.getElementById('hide-warn-btn').addEventListener('click', function() { doHide('hide-warn'); });
1930 +}
1133 1133  </script>
1134 1134  {{/html}}
1135 1135  {{/velocity}}