Skip to Content
Last modified by Super Admin on 2026/04/05 18:59
From version Icon 34.1 Icon
edited by Super Admin
on 2026/03/10 14:35
Change comment: There is no comment for this version
To version Icon 9.1 Icon
edited by XWikiGuest
on 2026/03/06 16:47
Change comment: There is no comment for this version

Summary

Details

Icon Page properties
Author
... ... @@ -1,1 +1,1 @@
1 -XWiki.superadmin
1 +XWiki.XWikiGuest
Content
... ... @@ -1,28 +1,13 @@
1 1  {{velocity}}
2 2  ## ===== 学校ページ テンプレート =====
3 -{{html clean="false"}}
4 -## メンテナンスバナー（{{include}}ではなくインラインで記述し、<p>タグ挿入を回避）
5 -#set($bannerDoc = $xwiki.getDocument('SeitokaiAdmin.MaintenanceBanner'))
6 -#set($bannerObj = $bannerDoc.getObject('SeitokaiCode.MaintenanceBannerClass'))
7 -#if($bannerObj && $bannerObj.getValue('enabled') == 1)
8 -#set($bannerMsg = $bannerObj.getValue('message'))
9 -#set($bannerLevel = $bannerObj.getValue('level'))
10 -#if(!$bannerLevel || $bannerLevel == '')#set($bannerLevel = 'warning')#end
11 -<div class="maintenance-banner active maintenance-${bannerLevel}" id="maintenance-banner">
12 - <div class="maintenance-banner-inner">
13 - <span class="maintenance-icon">#if($bannerLevel == 'urgent')<svg class="ico-banner" viewBox="0 0 24 24"><path d="M10.29 3.86L1.82 18a2 2 0 001.71 3h16.94a2 2 0 001.71-3L13.71 3.86a2 2 0 00-3.42 0z"/><line x1="12" y1="9" x2="12" y2="13"/><line x1="12" y1="17" x2="12.01" y2="17"/></svg>#elseif($bannerLevel == 'info')<svg class="ico-banner" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><line x1="12" y1="16" x2="12" y2="12"/><line x1="12" y1="8" x2="12.01" y2="8"/></svg>#else<svg class="ico-banner" viewBox="0 0 24 24"><path d="M14.7 6.3a1 1 0 000 1.4l1.6 1.6a1 1 0 001.4 0l3.77-3.77a6 6 0 01-7.94 7.94l-6.91 6.91a2.12 2.12 0 01-3-3l6.91-6.91a6 6 0 017.94-7.94l-3.76 3.76z"/></svg>#end</span>
14 - <span class="maintenance-text">$!escapetool.xml($bannerMsg)</span>
15 - <button class="maintenance-close" onclick="document.getElementById('maintenance-banner').style.display='none'">&times;</button>
16 - </div>
17 -</div>
18 -#end
3 +## このテンプレートは学校ページの表示と入力フォームを制御します。
4 +
5 +## メンテナンスバナー
6 +{{include reference="SeitokaiCode.MaintenanceBannerInclude" /}}
7 +
19 19  ## --- 学校基本情報フィールド ---
20 20  #set($schoolCode = $doc.getValue('schoolCode'))
21 21  #set($schoolName = $doc.getValue('schoolName'))
22 -## ページタイトルを学校名に設定（デフォルトでは学校コードが表示されるため）
23 -#if($schoolName && $schoolName != '')
24 -$!doc.setTitle($schoolName)
25 -#end
26 26  #set($prefecture = $doc.getValue('prefecture'))
27 27  #set($city = $doc.getValue('city'))
28 28  #set($classCount = $doc.getValue('classCount'))
... ... @@ -175,7 +175,7 @@
175 175  ## --- ユーザー情報取得 ---
176 176  ## displayName: Wiki上の表示名（ニックネーム）。本名(firstName/lastName)は管理者のみ閲覧可能。
177 177  #set($lastAuthor = $doc.author)
178 -#set($lastAuthorDoc = $xwiki.getDocument($lastAuthor))
163 +#set($lastAuthorDoc = $xwiki.getDocument("XWiki.${lastAuthor}"))
179 179  #set($authorAccountType = '')
180 180  #set($authorUserRole = '')
181 181  #set($authorUserStatus = '')
... ... @@ -189,8 +189,7 @@
189 189   #set($authorEnrollmentYear = $!lastAuthorDoc.getValue('enrollmentYear'))
190 190   #set($authorDisplayName = $!lastAuthorDoc.getValue('displayName'))
191 191   #if(!$authorDisplayName || $authorDisplayName == '')
192 - ## false引数でプレーンテキスト（HTMLリンクなし）を取得
193 - #set($authorDisplayName = $xwiki.getUserName($doc.author, false))
177 + #set($authorDisplayName = $xwiki.getUserName($doc.author))
194 194   #end
195 195   ## --- 学年の動的計算（学校種別対応） ---
196 196   ## 日本の学校年度: 4月始まり。currentSchoolYear = (月>=4) ? 今年 : 去年
... ... @@ -228,20 +228,52 @@
228 228   #end
229 229  #end
230 230  
231 -## --- 編集ボタン（権限があるユーザーのみ表示） ---
232 -#set($canEditSchool = false)
233 -#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode))
234 - #set($canEditSchool = true)
235 -#end
236 -#if($canEditSchool)
237 -<div style="text-align:right; margin-bottom:12px;">
238 - <a href="$doc.getURL('view', 'sheet=SeitokaiCode.SchoolEditForm')" class="btn-school-edit"><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> 基本情報を編集</a>
215 +## --- 信頼性バッジ + ユーザー情報 ---
216 +{{html clean="false"}}
217 +<div class="seitokai-badge-container">
218 + ## 承認バッジ
219 + #if($authorAccountType == 'admin')
220 + <span class="badge badge-admin"><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> 管理者</span>
221 + #elseif($authorAccountType == 'verified')
222 + <span class="badge badge-verified"><svg class="ico" viewBox="0 0 24 24" stroke-width="2.5"><path d="M20 6L9 17l-5-5"/></svg> 承認済み</span>
223 + #elseif($authorAccountType == 'referred')
224 + <span class="badge badge-referred"><svg class="ico" viewBox="0 0 24 24"><path d="M10 13a5 5 0 007.54.54l3-3a5 5 0 00-7.07-7.07l-1.72 1.71"/><path d="M14 11a5 5 0 00-7.54-.54l-3 3a5 5 0 007.07 7.07l1.71-1.71"/></svg> 紹介</span>
225 + #else
226 + <span class="badge badge-general">一般</span>
227 + #end
228 + ## 役割バッジ
229 + #if($authorUserRole == 'student')
230 + <span class="badge badge-role-student"><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>
231 + #set($authorIsOfficer = $!lastAuthorDoc.getValue('isOfficer'))
232 + #if($authorIsOfficer == 'true')
233 + <span class="badge badge-role-officer"><svg class="ico" viewBox="0 0 24 24"><path d="M12 2l3.09 6.26L22 9.27l-5 4.87 1.18 6.88L12 17.77l-6.18 3.25L7 14.14 2 9.27l6.91-1.01L12 2z"/></svg> 役員</span>
234 + #end
235 + #elseif($authorUserRole == 'teacher')
236 + <span class="badge badge-role-teacher"><svg class="ico" 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>
237 + #elseif($authorUserRole == 'graduate')
238 + <span class="badge badge-role-graduate"><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>
239 + #end
240 + ## 学年（生徒のみ公開）
241 + #if($authorGrade && $authorGrade != '')
242 + <span class="badge badge-grade">$authorGrade</span>
243 + #end
244 + ## 在籍状態（卒業・休学等の場合のみ表示）
245 + #if($authorUserStatus == 'graduated')
246 + <span class="badge badge-status-graduated"><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>
247 + #elseif($authorUserStatus == 'on_leave')
248 + <span class="badge badge-status-onleave"><svg class="ico" viewBox="0 0 24 24" fill="currentColor"><rect x="6" y="4" width="4" height="16" rx="1"/><rect x="14" y="4" width="4" height="16" rx="1"/></svg> 休学中</span>
249 + #elseif($authorUserStatus == 'transferred')
250 + <span class="badge badge-status-transferred"><svg class="ico" viewBox="0 0 24 24"><polyline points="23 4 23 10 17 10"/><polyline points="1 20 1 14 7 14"/><path d="M3.51 9a9 9 0 0114.85-3.36L23 10M1 14l4.64 4.36A9 9 0 0020.49 15"/></svg> 転校済み</span>
251 + #end
252 + <span class="badge-info">最終編集: $!escapetool.xml($authorDisplayName) ($xwiki.formatDate($doc.date, "yyyy/MM/dd"))</span>
239 239  </div>
240 -#end
254 +{{/html}}
241 241  
256 +{{html clean="false"}}
257 +
242 242  ## --- ① 学校基本情報 + 連絡先（左右グリッド・折りたたみ対応） ---
243 243  <div class="school-info-grid">
244 - <div class="school-info-card collapsed" id="card-basic-info">
260 + <div class="school-info-card mobile-collapse" id="card-basic-info">
245 245   <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>
246 246   <table class="wiki-table school-info-table">
247 247   <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
... ... @@ -251,8 +251,8 @@
251 251   <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
252 252   <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
253 253   <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
254 - <tr><th>課程</th><td>#if($schoolSystem && $schoolSystem != '' && $schoolSystem != '[]')$!escapetool.xml($!schoolSystem)#end</td></tr>
255 - <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>
270 + <tr><th>課程</th><td>$!escapetool.xml($!schoolSystem)</td></tr>
271 + <tr><th>公式サイト</th><td>#if($website && $website != '')<a href="$!escapetool.xml($website)" target="_blank" rel="noopener">$!escapetool.xml($website)</a>#else<span style="color:#9ca3af;">未登録</span>#end</td></tr>
256 256   </table>
257 257   #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
258 258   #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
... ... @@ -261,21 +261,21 @@
261 261   #end
262 262   </div>
263 263  
264 - <div class="school-info-card collapsed" id="card-contact">
280 + <div class="school-info-card mobile-collapse" id="card-contact">
265 265   <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>
266 266   <table class="wiki-table school-info-table">
267 - <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr>
268 - <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>
269 - <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>
270 - <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>
271 - <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>
272 - <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
283 + <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span style="color:#9ca3af;">未登録</span>#end</td></tr>
284 + <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 style="color:#9ca3af;">未登録</span>#end</td></tr>
285 + <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 style="color:#9ca3af;">未登録</span>#end</td></tr>
286 + <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 style="color:#9ca3af;">未登録</span>#end</td></tr>
287 + <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 style="color:#9ca3af;">未登録</span>#end</td></tr>
288 + <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span style="color:#9ca3af;">未登録</span>#end</td></tr>
273 273   </table>
274 274   </div>
275 275  </div>
276 276  
277 277  ## --- 生徒会情報アコーディオン ---
278 -<div class="school-section-divider">
294 +<div style="margin:20px 0 16px;">
279 279   <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')?'▲':'▼';">
280 280   <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>
281 281   生徒会情報を見る <span class="shortcut-arrow">▼</span>
... ... @@ -297,7 +297,7 @@
297 297  <div class="school-section-card">
298 298   <div class="card-inner">
299 299   #if($orgChartImage && $orgChartImage != '')
300 - <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
316 + <div style="margin-bottom:12px;"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" style="max-width:100%; border-radius:8px;" /></div>
301 301   #end
302 302   #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end
303 303   </div>
... ... @@ -313,7 +313,7 @@
313 313   <div class="school-section-card">
314 314   <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>
315 315   <div class="card-inner">
316 - <p class="activity-hint">活動時間の多い順に上位3つ</p>
332 + <p style="font-size:0.88em; color:#9ca3af; margin-bottom:12px;">活動時間の多い順に上位3つ</p>
317 317   <div class="tag-container">
318 318   #set($daIdx = 1)
319 319   #foreach($da in $dailyActivities.split(","))
... ... @@ -438,7 +438,7 @@
438 438   <div class="card-inner">
439 439   <div class="info-row">
440 440   <span class="info-label">見直しの有無（3年以内）</span>
441 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
457 + <span class="info-value"><span class="tag tag-primary" style="font-size:0.9em;">$!escapetool.xml($!ruleReviewStatus)</span></span>
442 442   </div>
443 443   #if($ruleReviewContent && $ruleReviewContent != '')
444 444   <div class="info-row">
... ... @@ -525,17 +525,11 @@
525 525   </div>
526 526   <div class="author-legend">
527 527   <span class="author-legend-title">所属:</span>
528 - <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>
529 - <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>
530 - <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>
531 - <span class="author-legend-item text-hint">※一般アカウントは所属未確認のため非表示</span>
544 + <span class="author-legend-item"><span class="badge badge-school-internal-confirmed" style="font-size:0.72em; padding: 1px 7px;"><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>
545 + <span class="author-legend-item"><span class="badge badge-school-internal" style="font-size:0.72em; padding: 1px 7px;"><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>
546 + <span class="author-legend-item"><span class="badge badge-school-external" style="font-size:0.72em; padding: 1px 7px;"><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>
547 + <span class="author-legend-item" style="color:var(--text-light);font-size:0.85em;">※一般アカウントは所属未確認のため非表示</span>
532 532   </div>
533 - <div class="author-legend">
534 - <span class="author-legend-title">役割:</span>
535 - <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>
536 - <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>
537 - <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>
538 - </div>
539 539   </div>
540 540  </div>
541 541  
... ... @@ -615,27 +615,16 @@
615 615   #set($threadPosts = [])
616 616   #set($discard = $threadPosts.addAll($pinnedPosts))
617 617   #set($discard = $threadPosts.addAll($normalPosts))
618 - ## report/comment カウント
619 - #set($reportCount = 0)
620 - #set($commentCount = 0)
621 - #foreach($tp in $threadPosts)
622 - #set($tpType = $!tp.getValue('postType'))
623 - #if($tpType == 'comment')
624 - #set($commentCount = $commentCount + 1)
625 - #else
626 - #set($reportCount = $reportCount + 1)
627 - #end
628 - #end
629 629  
630 630  {{html clean="false"}}
631 631  <div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)">
632 632   <div class="activity-thread-header">
633 633   <div class="activity-thread-title">
634 - <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>
633 + <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" style="vertical-align:-1px;margin-left:4px;"><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>
635 635   <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
636 636   </div>
637 - <div class="thread-meta-row">
638 - <span class="thread-post-count">${reportCount}件の報告 ・ ${commentCount}件のコメント</span>
636 + <div style="display:flex;align-items:center;gap:8px;">
637 + <span class="thread-post-count">${threadPosts.size()}件の投稿</span>
639 639   #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred')
640 640   #if($actFeatured == '1')
641 641   <a href="$doc.getURL('view', "action=unfeature&actObj=${actIdx}&form_token=${services.csrf.getToken()}")" class="btn-featured-toggle btn-unfeature" title="特色ある活動の選定を解除"><svg class="ico ico-fixed-14" 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> 特色解除</a>
... ... @@ -646,10 +646,7 @@
646 646   </div>
647 647   </div>
648 648  
649 - ## --- 活動報告セクション ---
650 650   #foreach($post in $threadPosts)
651 - #set($thisPostType = $!post.getValue('postType'))
652 - #if($thisPostType != 'comment')
653 653   #set($postContent = $post.getValue('content'))
654 654   #set($postAuthor = $post.getValue('author'))
655 655   #set($postAccountType = $!post.getValue('authorAccountType'))
... ... @@ -661,16 +661,16 @@
661 661   #set($postDeleted = $!post.getValue('deleted'))
662 662   #if($postDeleted == 1 || $postDeleted == '1')
663 663   #if($viewerAccountType == 'admin')
664 - <div class="thread-post thread-post-deleted thread-post-admin-deleted">
665 - <div class="thread-post-admin-deleted-content">
660 + <div class="thread-post thread-post-deleted" style="opacity:0.5;border:2px dashed #9ca3af;">
661 + <div style="padding:10px 16px;font-size:0.85em;color:var(--text-light);">
666 666   <svg class="ico" 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>
667 667   <strong>投稿者により削除済み</strong>（$!post.getValue('deletedAt')）
668 - <div class="thread-post-restored-content">$!escapetool.xml($!postContent)</div>
664 + <div style="margin-top:4px;font-size:0.92em;color:var(--text-mid);">$!escapetool.xml($!postContent)</div>
669 669   </div>
670 670   </div>
671 671   #else
672 - <div class="thread-post thread-post-deleted thread-post-user-deleted">
673 - <div class="thread-post-user-deleted-content">
668 + <div class="thread-post thread-post-deleted" style="opacity:0.6;">
669 + <div style="padding:12px 16px;font-size:0.88em;color:var(--text-light);font-style:italic;">
674 674   <svg class="ico" 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>
675 675   この投稿は削除されました
676 676   </div>
... ... @@ -681,11 +681,11 @@
681 681   #set($postHidden = $!post.getValue('hidden'))
682 682   #if($postHidden == 1 || $postHidden == '1')
683 683   #if($viewerAccountType == 'admin')
684 - <div class="thread-post thread-post-admin-hidden">
685 - <div class="thread-post-admin-hidden-content">
680 + <div class="thread-post" style="opacity:0.5;border:2px dashed #dc2626;">
681 + <div style="padding:10px 16px;font-size:0.85em;color:#dc2626;">
686 686   <svg class="ico" viewBox="0 0 24 24"><path d="M10.29 3.86L1.82 18a2 2 0 001.71 3h16.94a2 2 0 001.71-3L13.71 3.86a2 2 0 00-3.42 0z"/><line x1="12" y1="9" x2="12" y2="13"/><line x1="12" y1="17" x2="12.01" y2="17"/></svg>
687 687   <strong>通報により非表示中</strong>（理由: $!escapetool.xml($!post.getValue('hiddenReason'))）
688 - <div class="thread-post-restored-content">$!escapetool.xml($!postContent)</div>
684 + <div style="margin-top:4px;font-size:0.92em;color:var(--text-mid);">$!escapetool.xml($!postContent)</div>
689 689   </div>
690 690   </div>
691 691   #end
... ... @@ -699,7 +699,7 @@
699 699   #end
700 700   #if(!$canViewPost)
701 701   <div class="thread-post visibility-restricted-post">
702 - <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>
698 + <div class="visibility-restricted-notice" style="margin:8px 0;"><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>
703 703   </div>
704 704   #else
705 705   ## 投稿者のアカウント種別に基づいたCSSクラス
... ... @@ -818,11 +818,11 @@
818 818   #end
819 819   <div class="post-file-item">
820 820   <a href="$doc.getAttachmentURL($fName)" target="_blank" download="$!escapetool.xml($displayName)">
821 - #if($fIcon == 'pdf')<svg class="ico ico-md" style="color:${fColor};" 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"/><path d="M9 15v-2h1.5a1.5 1.5 0 010 3H9"/></svg>
822 - #elseif($fIcon == 'word')<svg class="ico ico-md" style="color:${fColor};" 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"/><path d="M8 15l1.5-5 1.5 5 1.5-5 1.5 5"/></svg>
823 - #elseif($fIcon == 'excel')<svg class="ico ico-md" style="color:${fColor};" 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="8" y1="13" x2="16" y2="13"/><line x1="8" y1="17" x2="16" y2="17"/><line x1="12" y1="13" x2="12" y2="17"/></svg>
824 - #elseif($fIcon == 'ppt')<svg class="ico ico-md" style="color:${fColor};" 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"/><rect x="8" y="12" width="8" height="6" rx="1"/></svg>
825 - #else<svg class="ico ico-md" style="color:${fColor};" 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"/></svg>
817 + #if($fIcon == 'pdf')<svg class="ico" style="width:1.1em;height:1.1em;vertical-align:-0.15em;color:${fColor};" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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"/><path d="M9 15v-2h1.5a1.5 1.5 0 010 3H9"/></svg>
818 + #elseif($fIcon == 'word')<svg class="ico" style="width:1.1em;height:1.1em;vertical-align:-0.15em;color:${fColor};" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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"/><path d="M8 15l1.5-5 1.5 5 1.5-5 1.5 5"/></svg>
819 + #elseif($fIcon == 'excel')<svg class="ico" style="width:1.1em;height:1.1em;vertical-align:-0.15em;color:${fColor};" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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="8" y1="13" x2="16" y2="13"/><line x1="8" y1="17" x2="16" y2="17"/><line x1="12" y1="13" x2="12" y2="17"/></svg>
820 + #elseif($fIcon == 'ppt')<svg class="ico" style="width:1.1em;height:1.1em;vertical-align:-0.15em;color:${fColor};" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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"/><rect x="8" y="12" width="8" height="6" rx="1"/></svg>
821 + #else<svg class="ico" style="width:1.1em;height:1.1em;vertical-align:-0.15em;color:${fColor};" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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"/></svg>
826 826   #end
827 827   <span class="post-file-name">$!escapetool.xml($displayName)</span>
828 828   </a>
... ... @@ -834,12 +834,12 @@
834 834   #end
835 835   </div>
836 836   #if($postVis != 'public')
837 - <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>
833 + <div class="visibility-badge visibility-${postVis}" style="margin-top:6px;font-size:0.75em;">#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>
838 838   #end
839 839   ## 固定/解除ボタン（承認済み・管理者のみ）
840 840   #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
841 841   #set($postObjNum = $post.number)
842 - <div class="post-pin-action post-action-mt">
838 + <div class="post-pin-action" style="margin-top:6px;">
843 843   #if($isPinned == '1')
844 844   <a href="$doc.getURL('view', "action=unpin&postObj=${postObjNum}&form_token=${services.csrf.getToken()}")" class="btn-pin-toggle btn-unpin" title="固定を解除">
845 845   <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> 固定を解除
... ... @@ -855,7 +855,7 @@
855 855   #set($postAuthorRef = $!post.getValue('authorRef'))
856 856   #set($postObjNumED = $post.number)
857 857   #if($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin')
858 - <div class="post-edit-actions post-action-mt">
854 + <div class="post-edit-actions" style="margin-top:6px;display:flex;gap:8px;">
859 859   #if($xcontext.user == $postAuthorRef)
860 860   <button type="button" class="btn-post-edit" onclick="openEditPost(this, '${doc.fullName}', $postObjNumED, '$!escapetool.javascript($!postContent)')" title="この投稿を編集">
861 861   <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> 編集
... ... @@ -871,52 +871,14 @@
871 871   #end## /canViewPost
872 872   #end## /postHidden
873 873   #end## /postDeleted
874 - #end## /postType != comment
875 - #end## /foreach reports
876 -
877 - ## --- コメントセクション（折りたたみ） ---
878 - #if($commentCount > 0)
879 - <details class="thread-comments-section">
880 - <summary class="thread-comments-toggle">
881 - <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> ${commentCount}件のコメント
882 - </summary>
883 - #foreach($post in $threadPosts)
884 - #set($thisPostType = $!post.getValue('postType'))
885 - #if($thisPostType == 'comment')
886 - #set($postContent = $post.getValue('content'))
887 - #set($postAuthor = $post.getValue('author'))
888 - #set($postAccountType = $!post.getValue('authorAccountType'))
889 - #set($postDate = $post.getValue('createdDate'))
890 - #set($postDeleted = $!post.getValue('deleted'))
891 - #if($postDeleted == 1 || $postDeleted == '1')
892 - <div class="thread-comment thread-comment-deleted">
893 - <span class="thread-comment-meta">このコメントは削除されました</span>
894 - </div>
895 - #else
896 - #set($postHidden = $!post.getValue('hidden'))
897 - #if($postHidden == 1 || $postHidden == '1')
898 - <div class="thread-comment thread-comment-hidden">
899 - <span class="thread-comment-meta">このコメントは非表示にされました</span>
900 - </div>
901 - #else
902 - <div class="thread-comment">
903 - <span class="thread-comment-author">$!escapetool.xml($postAuthor)</span>
904 - <span class="thread-comment-date">$!postDate</span>
905 - <div class="thread-comment-body">$!escapetool.xml($postContent)</div>
906 - </div>
907 - #end
908 - #end
909 - #end
910 - #end
911 - </details>
912 912   #end
913 913  
914 914   #if($xcontext.user != "XWiki.XWikiGuest")
915 915   <div class="thread-add-post">
916 - <a href="/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
874 + <a href="/xwiki/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
917 917   ＋ 活動報告を追加
918 918   </a>
919 - <a href="/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
877 + <a href="/xwiki/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
920 920   <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> コメントを書く
921 921   </a>
922 922   </div>
... ... @@ -927,7 +927,7 @@
927 927  #else
928 928  {{html clean="false"}}
929 929  <div class="empty-state">
930 - <div class="empty-state-icon"><svg class="ico" viewBox="0 0 24 24" stroke-width="1.5"><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></div>
888 + <div class="empty-state-icon"><svg style="width:1em;height:1em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><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></div>
931 931   <div class="empty-state-title">活動報告はまだありません</div>
932 932   <div class="empty-state-desc">この学校の活動を記録して、他校と共有しましょう。<br>「活動を追加」ボタンから最初の活動を作成できます。</div>
933 933  </div>
... ... @@ -938,7 +938,7 @@
938 938  #if($xcontext.user != "XWiki.XWikiGuest")
939 939  {{html clean="false"}}
940 940  <div class="activity-add-section">
941 - <a href="/bin/view/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$!escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity">
899 + <a href="/xwiki/bin/view/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$!escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity">
942 942   <svg class="ico" viewBox="0 0 24 24" stroke-width="2.5"><line x1="12" y1="5" x2="12" y2="19"/><line x1="5" y1="12" x2="19" y2="12"/></svg> 活動を追加
943 943   </a>
944 944  </div>
... ... @@ -947,12 +947,12 @@
947 947  
948 948  ## --- 年度アーカイブ セクション ---
949 949  {{html clean="false"}}
950 -<div class="school-section-card school-archive-card">
951 - <h2 class="archive-section-title">
952 - <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>
908 +<div class="school-section-card" style="margin-top:24px;">
909 + <h2 style="font-size:1.05em;font-weight:700;margin:0 0 12px;display:flex;align-items:center;gap:6px;">
910 + <svg style="width:1.1em;height:1.1em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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>
953 953   年度アーカイブ
954 954   </h2>
955 - <div class="archive-meta">
913 + <div style="font-size:0.88em;color:var(--text-mid);margin-bottom:12px;">
956 956   現在のページ: <strong>${pageFiscalYear}年度</strong>
957 957   #set($lyud = $!doc.getValue('lastYearUpdateDate'))
958 958   #if($lyud && $lyud != '')
... ... @@ -965,16 +965,16 @@
965 965   #set($archivePages = $archiveQuery.execute())
966 966  
967 967   #if($archivePages && $archivePages.size() > 0)
968 - <div class="archive-card-field-lg">
969 - <div class="archive-list-label">過去の年度アーカイブ</div>
970 - <div class="archive-list">
926 + <div style="margin-bottom:12px;">
927 + <div style="font-weight:600;font-size:0.9em;margin-bottom:8px;">過去の年度アーカイブ</div>
928 + <div style="display:flex;flex-wrap:wrap;gap:8px;">
971 971   #foreach($archPage in $archivePages)
972 972   #set($archPageDoc = $xwiki.getDocument($archPage))
973 973   #set($archPageObj = $archPageDoc.getObject('SeitokaiCode.SchoolClass'))
974 974   #if($archPageObj)
975 975   #set($archPageFY = $!archPageObj.getValue('fiscalYear'))
976 - <a href="$archPageDoc.getURL('view')" class="archive-link">
977 - <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>
934 + <a href="$archPageDoc.getURL('view')" style="display:inline-flex;align-items:center;gap:5px;padding:8px 14px;background:#e0e7ff;border:1px solid #c7d2fe;border-radius:8px;color:#4338ca;text-decoration:none;font-size:0.9em;font-weight:600;transition:all 0.15s;">
935 + <svg style="width:1em;height:1em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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>
978 978   ${archPageFY}年度
979 979   </a>
980 980   #end
... ... @@ -982,17 +982,17 @@
982 982   </div>
983 983   </div>
984 984   #else
985 - <div class="archive-empty">過去のアーカイブはまだありません</div>
943 + <div style="font-size:0.88em;color:var(--text-light);margin-bottom:12px;">過去のアーカイブはまだありません</div>
986 986   #end
987 987  
988 988   ## 新年度に移行ボタン（承認済み・管理者のみ）
989 989   #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
990 - <div class="archive-action">
991 - <a href="/bin/view/SeitokaiCode/YearArchiveAction?schoolPage=${doc.fullName}" class="btn-accent">
992 - <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>
948 + <div style="margin-top:12px;padding-top:12px;border-top:1px solid #e2e8f0;">
949 + <a href="/xwiki/bin/view/SeitokaiCode/YearArchiveAction?schoolPage=${doc.fullName}" style="display:inline-flex;align-items:center;gap:6px;padding:8px 18px;background:#4f46e5;color:white;border-radius:8px;text-decoration:none;font-size:0.9em;font-weight:600;">
950 + <svg style="width:1em;height:1em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"><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>
993 993   ${pageFiscalYear}年度をアーカイブして新年度に移行
994 994   </a>
995 - <div class="archive-action-hint">現在の学校情報を${pageFiscalYear}年度として保存し、新しい年度に移行します。</div>
953 + <div style="font-size:0.8em;color:var(--text-light);margin-top:6px;">現在の学校情報を${pageFiscalYear}年度として保存し、新しい年度に移行します。</div>
996 996   </div>
997 997   #end
998 998  </div>
... ... @@ -1007,10 +1007,12 @@
1007 1007   btn.classList.add('active');
1008 1008   // 活動スレッドの表示切り替え
1009 1009   document.querySelectorAll('.activity-thread[data-fiscal-year]').forEach(function(thread) {
1010 - if (fy === 'all' || thread.getAttribute('data-fiscal-year') === fy) {
1011 - thread.classList.remove('fy-hidden');
968 + if (fy === 'all') {
969 + thread.style.display = '';
970 + } else if (thread.getAttribute('data-fiscal-year') === fy) {
971 + thread.style.display = '';
1012 1012   } else {
1013 - thread.classList.add('fy-hidden');
973 + thread.style.display = 'none';
1014 1014   }
1015 1015   });
1016 1016  }
... ... @@ -1018,6 +1018,12 @@
1018 1018  document.addEventListener('DOMContentLoaded', function() {
1019 1019   var defaultTab = document.querySelector('.activity-fy-tab.active');
1020 1020   if (defaultTab) { defaultTab.click(); }
981 + // モバイルでは基本情報・連絡先をデフォルト折りたたみ
982 + if (window.innerWidth <= 768) {
983 + document.querySelectorAll('.school-info-card.mobile-collapse').forEach(function(card) {
984 + card.classList.add('collapsed');
985 + });
986 + }
1021 1021   // 保存成功時のトースト通知
1022 1022   if (window.location.search.indexOf('archived=1') !== -1) {
1023 1023   showToast('年度アーカイブを作成しました', 'success');
... ... @@ -1042,8 +1042,8 @@
1042 1042   document.body.appendChild(container);
1043 1043   }
1044 1044   var icons = {
1045 - success: '<svg class="ico ico-md" viewBox="0 0 24 24" stroke-width="2.5"><path d="M20 6L9 17l-5-5"/></svg>',
1046 - error: '<svg class="ico ico-md" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><line x1="15" y1="9" x2="9" y2="15"/><line x1="9" y1="9" x2="15" y2="15"/></svg>'
1011 + success: '<svg style="width:1.1em;height:1.1em;flex-shrink:0;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"><path d="M20 6L9 17l-5-5"/></svg>',
1012 + error: '<svg style="width:1.1em;height:1.1em;flex-shrink:0;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="10"/><line x1="15" y1="9" x2="9" y2="15"/><line x1="9" y1="9" x2="15" y2="15"/></svg>'
1047 1047   };
1048 1048   var toast = document.createElement('div');
1049 1049   toast.className = 'toast toast-' + type;
... ... @@ -1057,6 +1057,7 @@
1057 1057   var card = document.getElementById(cardId);
1058 1058   if (!card) return;
1059 1059   card.classList.toggle('collapsed');
1026 + card.classList.remove('mobile-collapse');
1060 1060  }
1061 1061  
1062 1062  // 投稿の編集（インライン編集フォームを開く）
... ... @@ -1088,7 +1088,7 @@
1088 1088   var csrfEl = document.querySelector('input[name="form_token"]');
1089 1089   var csrfToken = csrfEl ? csrfEl.value : '';
1090 1090   var xhr = new XMLHttpRequest();
1091 - xhr.open('GET', '/bin/view/SeitokaiCode/EditPost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken), true);
1058 + xhr.open('GET', '/xwiki/bin/view/SeitokaiCode/EditPost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken), true);
1092 1092   xhr.onload = function() {
1093 1093   try {
1094 1094   var res = JSON.parse(xhr.responseText);
... ... @@ -1108,7 +1108,7 @@
1108 1108  function confirmDeletePost(schoolPage, postObjNum, token) {
1109 1109   if (!confirm('この投稿を削除しますか？\\n削除後は「この投稿は削除されました」と表示されます。')) return;
1110 1110   var xhr = new XMLHttpRequest();
1111 - xhr.open('GET', '/bin/view/SeitokaiCode/DeletePost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token), true);
1078 + xhr.open('GET', '/xwiki/bin/view/SeitokaiCode/DeletePost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token), true);
1112 1112   xhr.onload = function() {
1113 1113   try {
1114 1114   var res = JSON.parse(xhr.responseText);