Skip to Content
Last modified by Super Admin on 2026/04/05 18:59
From version Icon 32.1 Icon
edited by Super Admin
on 2026/03/10 13:45
Change comment: There is no comment for this version
To version Icon 13.1 Icon
edited by Super Admin
on 2026/03/06 22:08
Change comment: There is no comment for this version

Summary

Details

Icon Page properties
Content
... ... @@ -1,21 +1,10 @@
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'))
... ... @@ -171,7 +171,7 @@
171 171  ## --- ユーザー情報取得 ---
172 172  ## displayName: Wiki上の表示名（ニックネーム）。本名(firstName/lastName)は管理者のみ閲覧可能。
173 173  #set($lastAuthor = $doc.author)
174 -#set($lastAuthorDoc = $xwiki.getDocument($lastAuthor))
163 +#set($lastAuthorDoc = $xwiki.getDocument("XWiki.${lastAuthor}"))
175 175  #set($authorAccountType = '')
176 176  #set($authorUserRole = '')
177 177  #set($authorUserStatus = '')
... ... @@ -185,8 +185,7 @@
185 185   #set($authorEnrollmentYear = $!lastAuthorDoc.getValue('enrollmentYear'))
186 186   #set($authorDisplayName = $!lastAuthorDoc.getValue('displayName'))
187 187   #if(!$authorDisplayName || $authorDisplayName == '')
188 - ## false引数でプレーンテキスト（HTMLリンクなし）を取得
189 - #set($authorDisplayName = $xwiki.getUserName($doc.author, false))
177 + #set($authorDisplayName = $xwiki.getUserName($doc.author))
190 190   #end
191 191   ## --- 学年の動的計算（学校種別対応） ---
192 192   ## 日本の学校年度: 4月始まり。currentSchoolYear = (月>=4) ? 今年 : 去年
... ... @@ -225,6 +225,7 @@
225 225  #end
226 226  
227 227  ## --- 信頼性バッジ + ユーザー情報 ---
216 +{{html clean="false"}}
228 228  <div class="seitokai-badge-container">
229 229   ## 承認バッジ
230 230   #if($authorAccountType == 'admin')
... ... @@ -260,19 +260,15 @@
260 260   #elseif($authorUserStatus == 'transferred')
261 261   <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>
262 262   #end
263 - ## 編集ボタン（権限があるユーザーのみ表示）
264 - #set($canEditSchool = false)
265 - #if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode))
266 - #set($canEditSchool = true)
267 - #end
268 - #if($canEditSchool)
269 - <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>
270 - #end
252 + <span class="badge-info">最終編集: $!escapetool.xml($authorDisplayName) ($xwiki.formatDate($doc.date, "yyyy/MM/dd"))</span>
271 271  </div>
254 +{{/html}}
272 272  
256 +{{html clean="false"}}
257 +
273 273  ## --- ① 学校基本情報 + 連絡先（左右グリッド・折りたたみ対応） ---
274 274  <div class="school-info-grid">
275 - <div class="school-info-card collapsed" id="card-basic-info">
260 + <div class="school-info-card mobile-collapse" id="card-basic-info">
276 276   <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>
277 277   <table class="wiki-table school-info-table">
278 278   <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
... ... @@ -282,26 +282,31 @@
282 282   <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
283 283   <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
284 284   <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
285 - <tr><th>課程</th><td>#if($schoolSystem && $schoolSystem != '' && $schoolSystem != '[]')$!escapetool.xml($!schoolSystem)#end</td></tr>
286 - <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>
287 287   </table>
273 + #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
274 + #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
275 + #if($infoEditDate && $infoEditDate != '')
276 + <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>
277 + #end
288 288   </div>
289 289  
290 - <div class="school-info-card collapsed" id="card-contact">
280 + <div class="school-info-card mobile-collapse" id="card-contact">
291 291   <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>
292 292   <table class="wiki-table school-info-table">
293 - <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr>
294 - <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>
295 - <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>
296 - <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>
297 - <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>
298 - <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>
299 299   </table>
300 300   </div>
301 301  </div>
302 302  
303 303  ## --- 生徒会情報アコーディオン ---
304 -<div class="school-section-divider">
294 +<div style="margin:20px 0 16px;">
305 305   <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')?'▲':'▼';">
306 306   <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>
307 307   生徒会情報を見る <span class="shortcut-arrow">▼</span>
... ... @@ -323,7 +323,7 @@
323 323  <div class="school-section-card">
324 324   <div class="card-inner">
325 325   #if($orgChartImage && $orgChartImage != '')
326 - <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>
327 327   #end
328 328   #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end
329 329   </div>
... ... @@ -339,7 +339,7 @@
339 339   <div class="school-section-card">
340 340   <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>
341 341   <div class="card-inner">
342 - <p class="activity-hint">活動時間の多い順に上位3つ</p>
332 + <p style="font-size:0.88em; color:#9ca3af; margin-bottom:12px;">活動時間の多い順に上位3つ</p>
343 343   <div class="tag-container">
344 344   #set($daIdx = 1)
345 345   #foreach($da in $dailyActivities.split(","))
... ... @@ -464,7 +464,7 @@
464 464   <div class="card-inner">
465 465   <div class="info-row">
466 466   <span class="info-label">見直しの有無（3年以内）</span>
467 - <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>
468 468   </div>
469 469   #if($ruleReviewContent && $ruleReviewContent != '')
470 470   <div class="info-row">
... ... @@ -551,17 +551,11 @@
551 551   </div>
552 552   <div class="author-legend">
553 553   <span class="author-legend-title">所属:</span>
554 - <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>
555 - <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>
556 - <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>
557 - <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>
558 558   </div>
559 - <div class="author-legend">
560 - <span class="author-legend-title">役割:</span>
561 - <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>
562 - <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>
563 - <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>
564 - </div>
565 565   </div>
566 566  </div>
567 567  
... ... @@ -641,27 +641,16 @@
641 641   #set($threadPosts = [])
642 642   #set($discard = $threadPosts.addAll($pinnedPosts))
643 643   #set($discard = $threadPosts.addAll($normalPosts))
644 - ## report/comment カウント
645 - #set($reportCount = 0)
646 - #set($commentCount = 0)
647 - #foreach($tp in $threadPosts)
648 - #set($tpType = $!tp.getValue('postType'))
649 - #if($tpType == 'comment')
650 - #set($commentCount = $commentCount + 1)
651 - #else
652 - #set($reportCount = $reportCount + 1)
653 - #end
654 - #end
655 655  
656 656  {{html clean="false"}}
657 657  <div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)">
658 658   <div class="activity-thread-header">
659 659   <div class="activity-thread-title">
660 - <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>
661 661   <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
662 662   </div>
663 - <div class="thread-meta-row">
664 - <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>
665 665   #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred')
666 666   #if($actFeatured == '1')
667 667   <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>
... ... @@ -672,10 +672,7 @@
672 672   </div>
673 673   </div>
674 674  
675 - ## --- 活動報告セクション ---
676 676   #foreach($post in $threadPosts)
677 - #set($thisPostType = $!post.getValue('postType'))
678 - #if($thisPostType != 'comment')
679 679   #set($postContent = $post.getValue('content'))
680 680   #set($postAuthor = $post.getValue('author'))
681 681   #set($postAccountType = $!post.getValue('authorAccountType'))
... ... @@ -687,16 +687,16 @@
687 687   #set($postDeleted = $!post.getValue('deleted'))
688 688   #if($postDeleted == 1 || $postDeleted == '1')
689 689   #if($viewerAccountType == 'admin')
690 - <div class="thread-post thread-post-deleted thread-post-admin-deleted">
691 - <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);">
692 692   <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>
693 693   <strong>投稿者により削除済み</strong>（$!post.getValue('deletedAt')）
694 - <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>
695 695   </div>
696 696   </div>
697 697   #else
698 - <div class="thread-post thread-post-deleted thread-post-user-deleted">
699 - <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;">
700 700   <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>
701 701   この投稿は削除されました
702 702   </div>
... ... @@ -707,11 +707,11 @@
707 707   #set($postHidden = $!post.getValue('hidden'))
708 708   #if($postHidden == 1 || $postHidden == '1')
709 709   #if($viewerAccountType == 'admin')
710 - <div class="thread-post thread-post-admin-hidden">
711 - <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;">
712 712   <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>
713 713   <strong>通報により非表示中</strong>（理由: $!escapetool.xml($!post.getValue('hiddenReason'))）
714 - <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>
715 715   </div>
716 716   </div>
717 717   #end
... ... @@ -725,7 +725,7 @@
725 725   #end
726 726   #if(!$canViewPost)
727 727   <div class="thread-post visibility-restricted-post">
728 - <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>
729 729   </div>
730 730   #else
731 731   ## 投稿者のアカウント種別に基づいたCSSクラス
... ... @@ -756,39 +756,39 @@
756 756   </span>
757 757   <span class="author-badge">
758 758   #if($postAccountType == 'admin')
759 - <span class="badge badge-admin badge-sm"><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>
729 + <span class="badge badge-admin" style="font-size:0.75em;padding:1px 7px;"><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>
760 760   #elseif($postAccountType == 'verified')
761 - <span class="badge badge-verified badge-sm"><svg class="ico" viewBox="0 0 24 24" stroke-width="2.5"><path d="M20 6L9 17l-5-5"/></svg> 承認済み</span>
731 + <span class="badge badge-verified" style="font-size:0.75em;padding:1px 7px;"><svg class="ico" viewBox="0 0 24 24" stroke-width="2.5"><path d="M20 6L9 17l-5-5"/></svg> 承認済み</span>
762 762   #elseif($postAccountType == 'referred')
763 - <span class="badge badge-referred badge-sm"><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>
733 + <span class="badge badge-referred" style="font-size:0.75em;padding:1px 7px;"><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>
764 764   #else
765 - <span class="badge badge-general badge-sm">一般</span>
735 + <span class="badge badge-general" style="font-size:0.75em;padding:1px 7px;">一般</span>
766 766   #end
767 767   ## 所属バッジ（投稿者の学校コードとページの学校コードを比較）
768 768   #if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general')
769 769   #if($postSchoolCode == $schoolCode)
770 770   #if($postAccountType == 'verified' || $postAccountType == 'admin')
771 - <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>
741 + <span class="badge badge-school-internal-confirmed" style="font-size:0.75em;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>
772 772   #else
773 - <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>
743 + <span class="badge badge-school-internal" style="font-size:0.75em;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>
774 774   #end
775 775   #else
776 - <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>
746 + <span class="badge badge-school-external" style="font-size:0.75em;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>
777 777   #end
778 778   #end
779 779   #if($postUserRole == 'student')
780 - <span class="badge badge-role-student 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>
750 + <span class="badge badge-role-student" style="font-size:0.75em;padding:1px 7px;"><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>
781 781   #set($postIsOfficer = $!post.getValue('authorIsOfficer'))
782 782   #if($postIsOfficer == 'true')
783 - <span class="badge badge-role-officer badge-sm"><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>
753 + <span class="badge badge-role-officer" style="font-size:0.75em;padding:1px 7px;"><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>
784 784   #end
785 785   #elseif($postUserRole == 'teacher')
786 - <span class="badge badge-role-teacher badge-sm"><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>
756 + <span class="badge badge-role-teacher" style="font-size:0.75em;padding:1px 7px;"><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>
787 787   #elseif($postUserRole == 'graduate')
788 - <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>
758 + <span class="badge badge-role-graduate" style="font-size:0.75em;padding:1px 7px;"><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>
789 789   #end
790 790   #if($postGrade && $postGrade != '')
791 - <span class="badge badge-grade badge-sm">$postGrade</span>
761 + <span class="badge badge-grade" style="font-size:0.75em;padding:1px 7px;">$postGrade</span>
792 792   #end
793 793   </span>
794 794   <span class="thread-post-date">$!postDate</span>
... ... @@ -844,11 +844,11 @@
844 844   #end
845 845   <div class="post-file-item">
846 846   <a href="$doc.getAttachmentURL($fName)" target="_blank" download="$!escapetool.xml($displayName)">
847 - #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>
848 - #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>
849 - #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>
850 - #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>
851 - #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>
852 852   #end
853 853   <span class="post-file-name">$!escapetool.xml($displayName)</span>
854 854   </a>
... ... @@ -860,12 +860,12 @@
860 860   #end
861 861   </div>
862 862   #if($postVis != 'public')
863 - <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>
864 864   #end
865 865   ## 固定/解除ボタン（承認済み・管理者のみ）
866 866   #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
867 867   #set($postObjNum = $post.number)
868 - <div class="post-pin-action post-action-mt">
838 + <div class="post-pin-action" style="margin-top:6px;">
869 869   #if($isPinned == '1')
870 870   <a href="$doc.getURL('view', "action=unpin&postObj=${postObjNum}&form_token=${services.csrf.getToken()}")" class="btn-pin-toggle btn-unpin" title="固定を解除">
871 871   <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> 固定を解除
... ... @@ -881,7 +881,7 @@
881 881   #set($postAuthorRef = $!post.getValue('authorRef'))
882 882   #set($postObjNumED = $post.number)
883 883   #if($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin')
884 - <div class="post-edit-actions post-action-mt">
854 + <div class="post-edit-actions" style="margin-top:6px;display:flex;gap:8px;">
885 885   #if($xcontext.user == $postAuthorRef)
886 886   <button type="button" class="btn-post-edit" onclick="openEditPost(this, '${doc.fullName}', $postObjNumED, '$!escapetool.javascript($!postContent)')" title="この投稿を編集">
887 887   <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> 編集
... ... @@ -897,52 +897,14 @@
897 897   #end## /canViewPost
898 898   #end## /postHidden
899 899   #end## /postDeleted
900 - #end## /postType != comment
901 - #end## /foreach reports
902 -
903 - ## --- コメントセクション（折りたたみ） ---
904 - #if($commentCount > 0)
905 - <details class="thread-comments-section">
906 - <summary class="thread-comments-toggle">
907 - <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}件のコメント
908 - </summary>
909 - #foreach($post in $threadPosts)
910 - #set($thisPostType = $!post.getValue('postType'))
911 - #if($thisPostType == 'comment')
912 - #set($postContent = $post.getValue('content'))
913 - #set($postAuthor = $post.getValue('author'))
914 - #set($postAccountType = $!post.getValue('authorAccountType'))
915 - #set($postDate = $post.getValue('createdDate'))
916 - #set($postDeleted = $!post.getValue('deleted'))
917 - #if($postDeleted == 1 || $postDeleted == '1')
918 - <div class="thread-comment thread-comment-deleted">
919 - <span class="thread-comment-meta">このコメントは削除されました</span>
920 - </div>
921 - #else
922 - #set($postHidden = $!post.getValue('hidden'))
923 - #if($postHidden == 1 || $postHidden == '1')
924 - <div class="thread-comment thread-comment-hidden">
925 - <span class="thread-comment-meta">このコメントは非表示にされました</span>
926 - </div>
927 - #else
928 - <div class="thread-comment">
929 - <span class="thread-comment-author">$!escapetool.xml($postAuthor)</span>
930 - <span class="thread-comment-date">$!postDate</span>
931 - <div class="thread-comment-body">$!escapetool.xml($postContent)</div>
932 - </div>
933 - #end
934 - #end
935 - #end
936 - #end
937 - </details>
938 938   #end
939 939  
940 940   #if($xcontext.user != "XWiki.XWikiGuest")
941 941   <div class="thread-add-post">
942 - <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">
943 943   ＋ 活動報告を追加
944 944   </a>
945 - <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">
946 946   <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> コメントを書く
947 947   </a>
948 948   </div>
... ... @@ -953,7 +953,7 @@
953 953  #else
954 954  {{html clean="false"}}
955 955  <div class="empty-state">
956 - <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>
957 957   <div class="empty-state-title">活動報告はまだありません</div>
958 958   <div class="empty-state-desc">この学校の活動を記録して、他校と共有しましょう。<br>「活動を追加」ボタンから最初の活動を作成できます。</div>
959 959  </div>
... ... @@ -964,7 +964,7 @@
964 964  #if($xcontext.user != "XWiki.XWikiGuest")
965 965  {{html clean="false"}}
966 966  <div class="activity-add-section">
967 - <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">
968 968   <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> 活動を追加
969 969   </a>
970 970  </div>
... ... @@ -973,12 +973,12 @@
973 973  
974 974  ## --- 年度アーカイブ セクション ---
975 975  {{html clean="false"}}
976 -<div class="school-section-card school-archive-card">
977 - <h2 class="archive-section-title">
978 - <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>
979 979   年度アーカイブ
980 980   </h2>
981 - <div class="archive-meta">
913 + <div style="font-size:0.88em;color:var(--text-mid);margin-bottom:12px;">
982 982   現在のページ: <strong>${pageFiscalYear}年度</strong>
983 983   #set($lyud = $!doc.getValue('lastYearUpdateDate'))
984 984   #if($lyud && $lyud != '')
... ... @@ -991,16 +991,16 @@
991 991   #set($archivePages = $archiveQuery.execute())
992 992  
993 993   #if($archivePages && $archivePages.size() > 0)
994 - <div class="archive-card-field-lg">
995 - <div class="archive-list-label">過去の年度アーカイブ</div>
996 - <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;">
997 997   #foreach($archPage in $archivePages)
998 998   #set($archPageDoc = $xwiki.getDocument($archPage))
999 999   #set($archPageObj = $archPageDoc.getObject('SeitokaiCode.SchoolClass'))
1000 1000   #if($archPageObj)
1001 1001   #set($archPageFY = $!archPageObj.getValue('fiscalYear'))
1002 - <a href="$archPageDoc.getURL('view')" class="archive-link">
1003 - <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>
1004 1004   ${archPageFY}年度
1005 1005   </a>
1006 1006   #end
... ... @@ -1008,17 +1008,17 @@
1008 1008   </div>
1009 1009   </div>
1010 1010   #else
1011 - <div class="archive-empty">過去のアーカイブはまだありません</div>
943 + <div style="font-size:0.88em;color:var(--text-light);margin-bottom:12px;">過去のアーカイブはまだありません</div>
1012 1012   #end
1013 1013  
1014 1014   ## 新年度に移行ボタン（承認済み・管理者のみ）
1015 1015   #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
1016 - <div class="archive-action">
1017 - <a href="/bin/view/SeitokaiCode/YearArchiveAction?schoolPage=${doc.fullName}" class="btn-accent">
1018 - <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>
1019 1019   ${pageFiscalYear}年度をアーカイブして新年度に移行
1020 1020   </a>
1021 - <div class="archive-action-hint">現在の学校情報を${pageFiscalYear}年度として保存し、新しい年度に移行します。</div>
953 + <div style="font-size:0.8em;color:var(--text-light);margin-top:6px;">現在の学校情報を${pageFiscalYear}年度として保存し、新しい年度に移行します。</div>
1022 1022   </div>
1023 1023   #end
1024 1024  </div>
... ... @@ -1033,10 +1033,12 @@
1033 1033   btn.classList.add('active');
1034 1034   // 活動スレッドの表示切り替え
1035 1035   document.querySelectorAll('.activity-thread[data-fiscal-year]').forEach(function(thread) {
1036 - if (fy === 'all' || thread.getAttribute('data-fiscal-year') === fy) {
1037 - 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 = '';
1038 1038   } else {
1039 - thread.classList.add('fy-hidden');
973 + thread.style.display = 'none';
1040 1040   }
1041 1041   });
1042 1042  }
... ... @@ -1044,6 +1044,12 @@
1044 1044  document.addEventListener('DOMContentLoaded', function() {
1045 1045   var defaultTab = document.querySelector('.activity-fy-tab.active');
1046 1046   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 + }
1047 1047   // 保存成功時のトースト通知
1048 1048   if (window.location.search.indexOf('archived=1') !== -1) {
1049 1049   showToast('年度アーカイブを作成しました', 'success');
... ... @@ -1068,8 +1068,8 @@
1068 1068   document.body.appendChild(container);
1069 1069   }
1070 1070   var icons = {
1071 - success: '<svg class="ico ico-md" viewBox="0 0 24 24" stroke-width="2.5"><path d="M20 6L9 17l-5-5"/></svg>',
1072 - 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>'
1073 1073   };
1074 1074   var toast = document.createElement('div');
1075 1075   toast.className = 'toast toast-' + type;
... ... @@ -1083,6 +1083,7 @@
1083 1083   var card = document.getElementById(cardId);
1084 1084   if (!card) return;
1085 1085   card.classList.toggle('collapsed');
1026 + card.classList.remove('mobile-collapse');
1086 1086  }
1087 1087  
1088 1088  // 投稿の編集（インライン編集フォームを開く）
... ... @@ -1114,7 +1114,7 @@
1114 1114   var csrfEl = document.querySelector('input[name="form_token"]');
1115 1115   var csrfToken = csrfEl ? csrfEl.value : '';
1116 1116   var xhr = new XMLHttpRequest();
1117 - 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);
1118 1118   xhr.onload = function() {
1119 1119   try {
1120 1120   var res = JSON.parse(xhr.responseText);
... ... @@ -1134,7 +1134,7 @@
1134 1134  function confirmDeletePost(schoolPage, postObjNum, token) {
1135 1135   if (!confirm('この投稿を削除しますか？\\n削除後は「この投稿は削除されました」と表示されます。')) return;
1136 1136   var xhr = new XMLHttpRequest();
1137 - 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);
1138 1138   xhr.onload = function() {
1139 1139   try {
1140 1140   var res = JSON.parse(xhr.responseText);