Changes for page 学校ページ テンプレート
Last modified by Super Admin on 2026/04/05 18:59
From version 
36.1 
36.1
edited by Super Admin
on 2026/03/10 14:40
on 2026/03/10 14:40
Change comment:
There is no comment for this version
To version 2.1
2.1
edited by Super Admin
on 2026/03/06 00:08
on 2026/03/06 00:08
Change comment:
There is no comment for this version
Summary
Details
-
Page properties
-
- Content
-
... ... @@ -1,29 +1,10 @@ 1 1 {{velocity}} 2 2 ## ===== 学校ページ テンプレート ===== 3 -## ページタイトルを学校名に設定（{{html}}ブロックの前で実行する必要あり） 4 -#set($__titleObj = $doc.getObject('SeitokaiCode.SchoolClass')) 5 -#if($__titleObj) 6 - #set($__titleName = $__titleObj.getValue('schoolName')) 7 - #if($__titleName && $__titleName != '') 8 - $doc.setTitle($__titleName) 9 - #end 10 -#end 11 -{{html clean="false"}} 12 -## メンテナンスバナー（{{include}}ではなくインラインで記述し、<p>タグ挿入を回避） 13 -#set($bannerDoc = $xwiki.getDocument('SeitokaiAdmin.MaintenanceBanner')) 14 -#set($bannerObj = $bannerDoc.getObject('SeitokaiCode.MaintenanceBannerClass')) 15 -#if($bannerObj && $bannerObj.getValue('enabled') == 1) 16 -#set($bannerMsg = $bannerObj.getValue('message')) 17 -#set($bannerLevel = $bannerObj.getValue('level')) 18 -#if(!$bannerLevel || $bannerLevel == '')#set($bannerLevel = 'warning')#end 19 -<div class="maintenance-banner active maintenance-${bannerLevel}" id="maintenance-banner"> 20 - <div class="maintenance-banner-inner"> 21 - <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> 22 - <span class="maintenance-text">$!escapetool.xml($bannerMsg)</span> 23 - <button class="maintenance-close" onclick="document.getElementById('maintenance-banner').style.display='none'">×</button> 24 - </div> 25 -</div> 26 -#end 3 +## このテンプレートは学校ページの表示と入力フォームを制御します。 4 + 5 +## メンテナンスバナー 6 +{{include reference="SeitokaiCode.MaintenanceBannerInclude" /}} 7 + 27 27 ## --- 学校基本情報フィールド --- 28 28 #set($schoolCode = $doc.getValue('schoolCode')) 29 29 #set($schoolName = $doc.getValue('schoolName')) ... ... @@ -179,7 +179,7 @@ 179 179 ## --- ユーザー情報取得 --- 180 180 ## displayName: Wiki上の表示名（ニックネーム）。本名(firstName/lastName)は管理者のみ閲覧可能。 181 181 #set($lastAuthor = $doc.author) 182 -#set($lastAuthorDoc = $xwiki.getDocument($lastAuthor)) 163 +#set($lastAuthorDoc = $xwiki.getDocument("XWiki.${lastAuthor}")) 183 183 #set($authorAccountType = '') 184 184 #set($authorUserRole = '') 185 185 #set($authorUserStatus = '') ... ... @@ -193,8 +193,7 @@ 193 193 #set($authorEnrollmentYear = $!lastAuthorDoc.getValue('enrollmentYear')) 194 194 #set($authorDisplayName = $!lastAuthorDoc.getValue('displayName')) 195 195 #if(!$authorDisplayName || $authorDisplayName == '') 196 - ## false引数でプレーンテキスト（HTMLリンクなし）を取得 197 - #set($authorDisplayName = $xwiki.getUserName($doc.author, false)) 177 + #set($authorDisplayName = $xwiki.getUserName($doc.author)) 198 198 #end 199 199 ## --- 学年の動的計算（学校種別対応） --- 200 200 ## 日本の学校年度: 4月始まり。currentSchoolYear = (月>=4) ? 今年 : 去年 ... ... @@ -232,56 +232,88 @@ 232 232 #end 233 233 #end 234 234 235 -## --- 編集ボタン（権限があるユーザーのみ表示） --- 236 -#set($canEditSchool = false) 237 -#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode)) 238 - #set($canEditSchool = true) 239 -#end 240 -#if($canEditSchool) 241 -<div style="text-align:right; margin-bottom:12px;"> 242 - <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" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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" style="width:1em;height:1em;vertical-align:-0.125em;" 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> 承認済み</span> 223 + #elseif($authorAccountType == 'referred') 224 + <span class="badge badge-referred"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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" style="width:1em;height:1em;vertical-align:-0.125em;" 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" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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> 243 243 </div> 244 - #end254 +{{/html}} 245 245 256 +{{html clean="false"}} 257 + 246 246 ## --- ① 学校基本情報 + 連絡先（左右グリッド・折りたたみ対応） --- 247 247 <div class="school-info-grid"> 248 - <div class="school-info-card collapse d" id="card-basic-info">249 - <h2 onclick="toggleInfoCard('card-basic-info')"><span><svg class="ico ic o-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>260 + <div class="school-info-card mobile-collapse" id="card-basic-info"> 261 + <h2 onclick="toggleInfoCard('card-basic-info')"><span><svg class="ico" style="width:1.1em;height:1.1em;vertical-align:-0.15em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M4 19.5A2.5 2.5 0 016.5 17H20"/><path d="M6.5 2H20v20H6.5A2.5 2.5 0 014 19.5v-15A2.5 2.5 0 016.5 2z"/></svg> 学校基本情報</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2> 250 250 <table class="wiki-table school-info-table"> 251 - <tr><th>学校コード</th><td>$ !escapetool.xml($!schoolCode)</td></tr>252 - <tr><th>学校名</th><td>$ !escapetool.xml($!schoolName)</td></tr>253 - <tr><th>所在地</th><td>$ !escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>263 + <tr><th>学校コード</th><td>$escapetool.xml($!schoolCode)</td></tr> 264 + <tr><th>学校名</th><td>$escapetool.xml($!schoolName)</td></tr> 265 + <tr><th>所在地</th><td>$escapetool.xml($!prefecture) #if($city && $city != '')$escapetool.xml($city)#end</td></tr> 254 254 <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr> 255 - <tr><th>共学・別学</th><td>$ !escapetool.xml($!coeducation)</td></tr>256 - <tr><th>設置者</th><td>$ !escapetool.xml($!establishment)</td></tr>257 - <tr><th>学校種</th><td>$ !escapetool.xml($!schoolLevel)</td></tr>258 - <tr><th>課程</th><td> #if($schoolSystem && $schoolSystem != '' && $schoolSystem != '[]')$!escapetool.xml($!schoolSystem)#end</td></tr>259 - <tr><th>公式サイト</th><td>#if($website && $website != '')<a href="$ !escapetool.xml($website)" target="_blank" rel="noopener">$!escapetool.xml($website)</a>#else<spanclass="text-placeholder">未登録</span>#end</td></tr>267 + <tr><th>共学・別学</th><td>$escapetool.xml($!coeducation)</td></tr> 268 + <tr><th>設置者</th><td>$escapetool.xml($!establishment)</td></tr> 269 + <tr><th>学校種</th><td>$escapetool.xml($!schoolLevel)</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> 260 260 </table> 261 261 #set($infoEditDate = $!doc.getValue('lastInfoEditedDate')) 262 262 #set($infoEditBy = $!doc.getValue('lastInfoEditedBy')) 263 263 #if($infoEditDate && $infoEditDate != '') 264 - <div class="info-last-updated"><svg class="ico" viewBox="0 0 24 24"><path d="M11 4H4a2 2 0 00-2 2v14a2 2 0 002 2h14a2 2 0 002-2v-7"/><path d="M18.5 2.5a2.121 2.121 0 013 3L12 15l-4 1 1-4 9.5-9.5z"/></svg> 基本情報の最終更新: $ !escapetool.xml($infoEditBy) — $!escapetool.xml($infoEditDate)</div>276 + <div class="info-last-updated"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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> 265 265 #end 266 266 </div> 267 267 268 - <div class="school-info-card collapse d" id="card-contact">269 - <h2 onclick="toggleInfoCard('card-contact')"><span><svg class="ico ic o-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>280 + <div class="school-info-card mobile-collapse" id="card-contact"> 281 + <h2 onclick="toggleInfoCard('card-contact')"><span><svg class="ico" style="width:1.1em;height:1.1em;vertical-align:-0.15em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M22 16.92v3a2 2 0 01-2.18 2 19.79 19.79 0 01-8.63-3.07 19.5 19.5 0 01-6-6 19.79 19.79 0 01-3.07-8.67A2 2 0 014.11 2h3a2 2 0 012 1.72c.127.96.361 1.903.7 2.81a2 2 0 01-.45 2.11L8.09 9.91a16 16 0 006 6l1.27-1.27a2 2 0 012.11-.45c.907.339 1.85.573 2.81.7A2 2 0 0122 16.92z"/></svg> 連絡先・SNS</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2> 270 270 <table class="wiki-table school-info-table"> 271 - <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$ !escapetool.xml($contactInfo)#else<spanclass="text-placeholder">未登録</span>#end</td></tr>272 - <tr><th>生徒会Web</th><td>#if($seitokaiWebsite && $seitokaiWebsite != '')<a href="$ !escapetool.xml($seitokaiWebsite)" target="_blank" rel="noopener"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M2 12h20"/><path d="M12 2a15.3 15.3 0 014 10 15.3 15.3 0 01-4 10 15.3 15.3 0 01-4-10 15.3 15.3 0 014-10z"/></svg> $!escapetool.xml($seitokaiWebsite)</a>#else<spanclass="text-placeholder">未登録</span>#end</td></tr>273 - <tr><th>X (Twitter)</th><td>#if($seitokaiTwitter && $seitokaiTwitter != '')<a href="https://x.com/$ !escapetool.url($seitokaiTwitter)" target="_blank" rel="noopener">𝕏 @$!escapetool.xml($seitokaiTwitter)</a>#else<spanclass="text-placeholder">未登録</span>#end</td></tr>274 - <tr><th>Instagram</th><td>#if($seitokaiInstagram && $seitokaiInstagram != '')<a href="https://instagram.com/$ !escapetool.url($seitokaiInstagram)" target="_blank" rel="noopener"><svg class="ico" viewBox="0 0 24 24"><path d="M23 19a2 2 0 01-2 2H3a2 2 0 01-2-2V8a2 2 0 012-2h4l2-3h6l2 3h4a2 2 0 012 2z"/><circle cx="12" cy="13" r="4"/></svg> @$!escapetool.xml($seitokaiInstagram)</a>#else<spanclass="text-placeholder">未登録</span>#end</td></tr>275 - <tr><th>YouTube</th><td>#if($seitokaiYoutube && $seitokaiYoutube != '')<a href="$ !escapetool.xml($seitokaiYoutube)" target="_blank" rel="noopener"><svg class="ico" viewBox="0 0 24 24"><polygon points="5 3 19 12 5 21 5 3"/></svg> YouTubeチャンネル</a>#else<spanclass="text-placeholder">未登録</span>#end</td></tr>276 - <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$ !escapetool.xml($seitokaiOtherSns)#else<spanclass="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" style="width:1em;height:1em;vertical-align:-0.125em;" 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"/><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" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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> 277 277 </table> 278 278 </div> 279 279 </div> 280 280 281 281 ## --- 生徒会情報アコーディオン --- 282 -<div class="school-section-divider">294 +<div style="margin:20px 0 16px;"> 283 283 <button class="shortcut-btn shortcut-btn-secondary" onclick="var sec=document.getElementById('seitokai-info-section');sec.classList.toggle('open');this.querySelector('.shortcut-arrow').textContent=sec.classList.contains('open')?'▲':'▼';"> 284 - <svg class="ico ic o-md" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/></svg>296 + <svg class="ico" style="width:1.1em;height:1.1em;vertical-align:-0.15em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/></svg> 285 285 生徒会情報を見る <span class="shortcut-arrow">▼</span> 286 286 </button> 287 287 </div> ... ... @@ -297,17 +297,17 @@ 297 297 #elseif($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewOrgChart = false) 298 298 #end 299 299 #if($canViewOrgChart) 300 -<h2 class="section-title"><svg class="ico ic o-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>312 +<h2 class="section-title"><svg class="ico" style="width:1.1em;height:1.1em;vertical-align:-0.15em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h2> 301 301 <div class="school-section-card"> 302 302 <div class="card-inner"> 303 303 #if($orgChartImage && $orgChartImage != '') 304 - <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> 305 305 #end 306 - #if($orgChart && $orgChart != '')$ !escapetool.xml($orgChart)#end318 + #if($orgChart && $orgChart != '')$escapetool.xml($orgChart)#end 307 307 </div> 308 308 </div> 309 309 #else 310 -<div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 組織図は #if($visibilityOrgChart == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div> 322 +<div class="visibility-restricted-notice"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 組織図は #if($visibilityOrgChart == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div> 311 311 #end 312 312 #end 313 313 ... ... @@ -315,18 +315,18 @@ 315 315 <div class="school-section-grid"> 316 316 #if($dailyActivities && $dailyActivities != '') 317 317 <div class="school-section-card"> 318 - <h3><svg class="ico" viewBox="0 0 24 24"><path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z"/><polyline points="14 2 14 8 20 8"/><line x1="16" y1="13" x2="8" y2="13"/><line x1="16" y1="17" x2="8" y2="17"/></svg> 日常の活動</h3> 330 + <h3><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" 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="16" y1="13" x2="8" y2="13"/><line x1="16" y1="17" x2="8" y2="17"/></svg> 日常の活動</h3> 319 319 <div class="card-inner"> 320 - <p class="activity-hint">活動時間の多い順に上位3つ</p>332 + <p style="font-size:0.88em; color:#9ca3af; margin-bottom:12px;">活動時間の多い順に上位3つ</p> 321 321 <div class="tag-container"> 322 322 #set($daIdx = 1) 323 323 #foreach($da in $dailyActivities.split(",")) 324 - <span class="tag tag-accent">${daIdx}. $ !escapetool.xml($da.trim())</span>336 + <span class="tag tag-accent">${daIdx}. $escapetool.xml($da.trim())</span> 325 325 #set($daIdx = $daIdx + 1) 326 326 #end 327 327 </div> 328 328 #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '') 329 - <div class="free-note">$ !escapetool.xml($dailyActivitiesNote)</div>341 + <div class="free-note">$escapetool.xml($dailyActivitiesNote)</div> 330 330 #end 331 331 </div> 332 332 </div> ... ... @@ -334,20 +334,20 @@ 334 334 335 335 #if($electionExists && $electionExists != '') 336 336 <div class="school-section-card"> 337 - <h3><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="3" width="18" height="18" rx="2"/><path d="M7 13l3 3 7-7"/></svg> 選挙</h3> 349 + <h3><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="3" width="18" height="18" rx="2"/><path d="M7 13l3 3 7-7"/></svg> 選挙</h3> 338 338 <div class="card-inner"> 339 339 <div class="info-row"> 340 340 <span class="info-label">役員選挙</span> 341 - <span class="info-value">$ !escapetool.xml($!electionExists)</span>353 + <span class="info-value">$escapetool.xml($!electionExists)</span> 342 342 </div> 343 343 #if($electionType && $electionType != '') 344 344 <div class="info-row"> 345 345 <span class="info-label">直近の選挙方式</span> 346 - <span class="info-value">$ !escapetool.xml($!electionType)</span>358 + <span class="info-value">$escapetool.xml($!electionType)</span> 347 347 </div> 348 348 #end 349 349 #if($electionNote && $electionNote.trim() != '') 350 - <div class="free-note">$ !escapetool.xml($electionNote)</div>362 + <div class="free-note">$escapetool.xml($electionNote)</div> 351 351 #end 352 352 </div> 353 353 </div> ... ... @@ -357,14 +357,14 @@ 357 357 <div class="school-section-grid"> 358 358 #if($meetingFrequency && $meetingFrequency != '') 359 359 <div class="school-section-card"> 360 - <h3><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="4" width="18" height="18" rx="2"/><line x1="16" y1="2" x2="16" y2="6"/><line x1="8" y1="2" x2="8" y2="6"/><line x1="3" y1="10" x2="21" y2="10"/></svg> 定例活動</h3> 372 + <h3><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="4" width="18" height="18" rx="2"/><line x1="16" y1="2" x2="16" y2="6"/><line x1="8" y1="2" x2="8" y2="6"/><line x1="3" y1="10" x2="21" y2="10"/></svg> 定例活動</h3> 361 361 <div class="card-inner"> 362 362 <div class="info-row"> 363 363 <span class="info-label">役員定例会の頻度</span> 364 - <span class="info-value">$ !escapetool.xml($!meetingFrequency)</span>376 + <span class="info-value">$escapetool.xml($!meetingFrequency)</span> 365 365 </div> 366 366 #if($regularActivitiesNote && $regularActivitiesNote.trim() != '') 367 - <div class="free-note">$ !escapetool.xml($regularActivitiesNote)</div>379 + <div class="free-note">$escapetool.xml($regularActivitiesNote)</div> 368 368 #end 369 369 </div> 370 370 </div> ... ... @@ -380,7 +380,7 @@ 380 380 #end 381 381 #if($canViewBudget) 382 382 <div class="school-section-card"> 383 - <h3><svg class="ico" viewBox="0 0 24 24"><line x1="12" y1="1" x2="12" y2="23"/><path d="M17 5H9.5a3.5 3.5 0 000 7h5a3.5 3.5 0 010 7H6"/></svg> 予算 #if($visibilityBudget != 'public')<span class="visibility-badge visibility-${visibilityBudget}">#if($visibilityBudget == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3> 395 + <h3><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3> 384 384 <div class="card-inner"> 385 385 #if($budgetProcess && $budgetProcess != '') 386 386 <div class="info-row"> ... ... @@ -388,7 +388,7 @@ 388 388 <span class="info-value"> 389 389 <div class="selection-display"> 390 390 #foreach($bp in $budgetProcess.split(",")) 391 - <span class="selection-item">$ !escapetool.xml($bp.trim())</span>403 + <span class="selection-item">$escapetool.xml($bp.trim())</span> 392 392 #end 393 393 </div> 394 394 </span> ... ... @@ -397,13 +397,13 @@ 397 397 #if($studentFee && $studentFee != '') 398 398 <div class="info-row"> 399 399 <span class="info-label">生徒会費（年額）</span> 400 - <span class="info-value">$ !escapetool.xml($!studentFee)</span>412 + <span class="info-value">$escapetool.xml($!studentFee)</span> 401 401 </div> 402 402 #end 403 403 #if($budgetScale && $budgetScale != '') 404 404 <div class="info-row"> 405 405 <span class="info-label">予算規模</span> 406 - <span class="info-value">$ !escapetool.xml($!budgetScale)</span>418 + <span class="info-value">$escapetool.xml($!budgetScale)</span> 407 407 </div> 408 408 #end 409 409 #if($budgetAllocation && $budgetAllocation != '') ... ... @@ -412,7 +412,7 @@ 412 412 <span class="info-value"> 413 413 <div class="selection-display"> 414 414 #foreach($ba in $budgetAllocation.split(",")) 415 - <span class="selection-item">$ !escapetool.xml($ba.trim())</span>427 + <span class="selection-item">$escapetool.xml($ba.trim())</span> 416 416 #end 417 417 </div> 418 418 </span> ... ... @@ -419,12 +419,12 @@ 419 419 </div> 420 420 #end 421 421 #if($budgetNote && $budgetNote.trim() != '') 422 - <div class="free-note">$ !escapetool.xml($budgetNote)</div>434 + <div class="free-note">$escapetool.xml($budgetNote)</div> 423 423 #end 424 424 </div> 425 425 </div> 426 426 #else 427 - <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 予算情報は #if($visibilityBudget == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div> 439 + <div class="visibility-restricted-notice"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 予算情報は #if($visibilityBudget == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div> 428 428 #end 429 429 #end 430 430 </div> ... ... @@ -437,12 +437,12 @@ 437 437 #elseif($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewRuleReview = false) 438 438 #end 439 439 #if($canViewRuleReview) 440 -<h2 class="section-title"><svg class="ico ic o-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>452 +<h2 class="section-title"><svg class="ico" style="width:1.1em;height:1.1em;vertical-align:-0.15em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h2> 441 441 <div class="school-section-card"> 442 442 <div class="card-inner"> 443 443 <div class="info-row"> 444 444 <span class="info-label">見直しの有無（3年以内）</span> 445 - <span class="info-value"><span class="tag tag-primary t ag-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> 446 446 </div> 447 447 #if($ruleReviewContent && $ruleReviewContent != '') 448 448 <div class="info-row"> ... ... @@ -450,7 +450,7 @@ 450 450 <span class="info-value"> 451 451 <div class="selection-display"> 452 452 #foreach($rc in $ruleReviewContent.split(",")) 453 - <span class="selection-item">$ !escapetool.xml($rc.trim())</span>465 + <span class="selection-item">$escapetool.xml($rc.trim())</span> 454 454 #end 455 455 </div> 456 456 </span> ... ... @@ -462,7 +462,7 @@ 462 462 <span class="info-value"> 463 463 <div class="selection-display"> 464 464 #foreach($rp in $ruleReviewProposer.split(",")) 465 - <span class="selection-item">$ !escapetool.xml($rp.trim())</span>477 + <span class="selection-item">$escapetool.xml($rp.trim())</span> 466 466 #end 467 467 </div> 468 468 </span> ... ... @@ -474,7 +474,7 @@ 474 474 <span class="info-value"> 475 475 <div class="selection-display"> 476 476 #foreach($ri in $ruleReviewImplementer.split(",")) 477 - <span class="selection-item">$ !escapetool.xml($ri.trim())</span>489 + <span class="selection-item">$escapetool.xml($ri.trim())</span> 478 478 #end 479 479 </div> 480 480 </span> ... ... @@ -483,13 +483,13 @@ 483 483 #if($ruleReviewSystem && $ruleReviewSystem != '') 484 484 <div class="info-row"> 485 485 <span class="info-label">見直しの仕組み</span> 486 - <span class="info-value">$ !escapetool.xml($!ruleReviewSystem)</span>498 + <span class="info-value">$escapetool.xml($!ruleReviewSystem)</span> 487 487 </div> 488 488 #end 489 489 </div> 490 490 </div> 491 491 #else 492 -<div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 校則の見直し情報は #if($visibilityRuleReview == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div> 504 +<div class="visibility-restricted-notice"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 校則の見直し情報は #if($visibilityRuleReview == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div> 493 493 #end 494 494 #end 495 495 ... ... @@ -501,10 +501,10 @@ 501 501 #elseif($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewChallenges = false) 502 502 #end 503 503 #if($canViewChallenges) 504 -<h2 class="section-title">生徒会の課題意識 #if($visibilityChallenges != 'public')<span class="visibility-badge visibility-${visibilityChallenges}">#if($visibilityChallenges == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h2> 505 -<div class="challenge-text">$ !escapetool.xml($challenges)</div>516 +<h2 class="section-title">生徒会の課題意識 #if($visibilityChallenges != 'public')<span class="visibility-badge visibility-${visibilityChallenges}">#if($visibilityChallenges == 'members')<svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h2> 517 +<div class="challenge-text">$escapetool.xml($challenges)</div> 506 506 #else 507 -<div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 課題情報は #if($visibilityChallenges == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div> 519 +<div class="visibility-restricted-notice"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 課題情報は #if($visibilityChallenges == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div> 508 508 #end 509 509 #end 510 510 ... ... @@ -513,12 +513,12 @@ 513 513 {{/html}} 514 514 515 515 ## --- ⑩ 活動報告一覧（スレッド型・年度タブ付き） --- 516 -= 活動報告 = 528 += <svg class="ico" style="width:1.1em;height:1.1em;vertical-align:-0.15em;" 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="16" y1="13" x2="8" y2="13"/><line x1="16" y1="17" x2="8" y2="17"/></svg> 活動報告 = 517 517 518 518 ## --- 投稿者ステータス凡例（折りたたみ） --- 519 519 {{html clean="false"}} 520 520 <div class="author-legend-wrapper"> 521 - <button class="author-legend-toggle" onclick="this.classList.toggle('open');this.nextElementSibling.classList.toggle('open')"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M12 16v-4"/><path d="M12 8h.01"/></svg> バッジの見方 <span class="chevron">▼</span></button> 533 + <button class="author-legend-toggle" onclick="this.classList.toggle('open');this.nextElementSibling.classList.toggle('open')"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" 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"/><path d="M12 16v-4"/><path d="M12 8h.01"/></svg> バッジの見方 <span class="chevron">▼</span></button> 522 522 <div class="author-legend-body"> 523 523 <div class="author-legend"> 524 524 <span class="author-legend-title">投稿者の信頼度:</span> ... ... @@ -529,17 +529,11 @@ 529 529 </div> 530 530 <div class="author-legend"> 531 531 <span class="author-legend-title">所属:</span> 532 - <span class="author-legend-item"><span class="badge badge-school-internal-confirmed badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内（確認済）</span> 承認済み＋同校</span>533 - <span class="author-legend-item"><span class="badge badge-school-internal badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内</span> 紹介＋同校</span>534 - <span class="author-legend-item"><span class="badge badge-school-external badge-sm"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M2 12h20"/><path d="M12 2a15.3 15.3 0 014 10 15.3 15.3 0 01-4 10 15.3 15.3 0 01-4-10 15.3 15.3 0 014-10z"/></svg> 他校</span> 他校所属</span>535 - <span class="author-legend-item text- hint">※一般アカウントは所属未確認のため非表示</span>544 + <span class="author-legend-item"><span class="badge badge-school-internal-confirmed" style="font-size:0.72em; padding: 1px 7px;"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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" style="width:1em;height:1em;vertical-align:-0.125em;" 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"/><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> 536 536 </div> 537 - <div class="author-legend"> 538 - <span class="author-legend-title">役割:</span> 539 - <span class="author-legend-item"><span class="badge badge-role-student badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M22 10v6M2 10l10-5 10 5-10 5z"/><path d="M6 12v5c0 2 4 3 6 3s6-1 6-3v-5"/></svg> 生徒</span></span> 540 - <span class="author-legend-item"><span class="badge badge-role-officer badge-sm"><svg class="ico" viewBox="0 0 24 24"><polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"/></svg> 役員</span></span> 541 - <span class="author-legend-item"><span class="badge badge-role-teacher badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M20 21v-2a4 4 0 00-4-4H8a4 4 0 00-4 4v2"/><circle cx="12" cy="7" r="4"/></svg> 教員</span></span> 542 - </div> 543 543 </div> 544 544 </div> 545 545 ... ... @@ -619,41 +619,27 @@ 619 619 #set($threadPosts = []) 620 620 #set($discard = $threadPosts.addAll($pinnedPosts)) 621 621 #set($discard = $threadPosts.addAll($normalPosts)) 622 - ## report/comment カウント 623 - #set($reportCount = 0) 624 - #set($commentCount = 0) 625 - #foreach($tp in $threadPosts) 626 - #set($tpType = $!tp.getValue('postType')) 627 - #if($tpType == 'comment') 628 - #set($commentCount = $commentCount + 1) 629 - #else 630 - #set($reportCount = $reportCount + 1) 631 - #end 632 - #end 633 633 634 634 {{html clean="false"}} 635 -<div class="activity-thread" data-fiscal-year="$ !escapetool.xml($actFY)">630 +<div class="activity-thread" data-fiscal-year="$escapetool.xml($actFY)"> 636 636 <div class="activity-thread-header"> 637 637 <div class="activity-thread-title"> 638 - <h3 #if($actFeatured == '1')class="featured-title"#end>$ !escapetool.xml($!actTitle) #if($actFeatured == '1')<svgclass="icoico-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>639 - <span class="activity-meta">$ !escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>633 + <h3 #if($actFeatured == '1')class="featured-title"#end>$escapetool.xml($!actTitle) #if($actFeatured == '1')<svg style="width:14px;height:14px;vertical-align:-1px;margin-left:4px;" viewBox="0 0 24 24" fill="currentColor" stroke="none"><polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"/></svg>#end</h3> 634 + <span class="activity-meta">$escapetool.xml($!actCommittee) | $escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $escapetool.xml($actFY)年度#end</span> 640 640 </div> 641 - <div class="thread-meta-row">642 - <span class="thread-post-count">${re portCount}件の報告 ・ ${commentCount}件のコメント</span>636 + <div style="display:flex;align-items:center;gap:8px;"> 637 + <span class="thread-post-count">${threadPosts.size()}件の投稿</span> 643 643 #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred') 644 644 #if($actFeatured == '1') 645 - <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>640 + <a href="$doc.getURL('view', "action=unfeature&actObj=${actIdx}&form_token=${services.csrf.getToken()}")" class="btn-featured-toggle btn-unfeature" title="特色ある活動の選定を解除"><svg style="width:14px;height:14px;" 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 646 #else 647 - <a href="$doc.getURL('view', "action=feature&actObj=${actIdx}&form_token=${services.csrf.getToken()}")" class="btn-featured-toggle btn-feature" title="特色ある活動に選定（最大3件）"><svg class="ico ico-fixed-14" 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> 特色設定</a>642 + <a href="$doc.getURL('view', "action=feature&actObj=${actIdx}&form_token=${services.csrf.getToken()}")" class="btn-featured-toggle btn-feature" title="特色ある活動に選定（最大3件）"><svg style="width:14px;height:14px;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><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> 648 648 #end 649 649 #end 650 650 </div> 651 651 </div> 652 652 653 - ## --- 活動報告セクション --- 654 654 #foreach($post in $threadPosts) 655 - #set($thisPostType = $!post.getValue('postType')) 656 - #if($thisPostType != 'comment') 657 657 #set($postContent = $post.getValue('content')) 658 658 #set($postAuthor = $post.getValue('author')) 659 659 #set($postAccountType = $!post.getValue('authorAccountType')) ... ... @@ -665,17 +665,17 @@ 665 665 #set($postDeleted = $!post.getValue('deleted')) 666 666 #if($postDeleted == 1 || $postDeleted == '1') 667 667 #if($viewerAccountType == 'admin') 668 - <div class="thread-post thread-post-deleted t hread-post-admin-deleted">669 - <div class="thread-post-admin-deleted-content">670 - <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> 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);"> 662 + <svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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> 671 671 <strong>投稿者により削除済み</strong>（$!post.getValue('deletedAt')） 672 - <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> 673 673 </div> 674 674 </div> 675 675 #else 676 - <div class="thread-post thread-post-deleted thread-post-user-deleted">677 - <div class="thread-post-user-deleted-content">678 - <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> 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;"> 670 + <svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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> 679 679 この投稿は削除されました 680 680 </div> 681 681 </div> ... ... @@ -685,11 +685,11 @@ 685 685 #set($postHidden = $!post.getValue('hidden')) 686 686 #if($postHidden == 1 || $postHidden == '1') 687 687 #if($viewerAccountType == 'admin') 688 - <div class="thread-post t hread-post-admin-hidden">689 - <div class="thread-post-admin-hidden-content">690 - <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> 691 - <strong>通報により非表示中</strong>（理由: $ !escapetool.xml($!post.getValue('hiddenReason'))）692 - <div class="thread-post-restored-content">$!escapetool.xml($!postContent)</div>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;"> 682 + <svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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> 683 + <strong>通報により非表示中</strong>（理由: $escapetool.xml($!post.getValue('hiddenReason'))） 684 + <div style="margin-top:4px;font-size:0.92em;color:var(--text-mid);">$escapetool.xml($!postContent)</div> 693 693 </div> 694 694 </div> 695 695 #end ... ... @@ -703,7 +703,7 @@ 703 703 #end 704 704 #if(!$canViewPost) 705 705 <div class="thread-post visibility-restricted-post"> 706 - <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> この投稿は #if($postVis == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div> 698 + <div class="visibility-restricted-notice" style="margin:8px 0;"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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> 707 707 </div> 708 708 #else 709 709 ## 投稿者のアカウント種別に基づいたCSSクラス ... ... @@ -722,51 +722,51 @@ 722 722 <div class="thread-post-content"> 723 723 <div class="thread-post-header"> 724 724 #if($isPinned == '1') 725 - <span class="pin-badge"><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> 固定</span>717 + <span class="pin-badge"><svg style="width:12px;height:12px;" 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> 固定</span> 726 726 #end 727 727 #set($postAuthorRef = $!post.getValue('authorRef')) 728 728 <span class="thread-post-author"> 729 729 #if($postAuthorRef && $postAuthorRef != '') 730 - <a href="$xwiki.getURL('SeitokaiCode.UserProfile', 'view', "user=${escapetool.url($postAuthorRef)}")">$ !escapetool.xml($!postAuthor)</a>722 + <a href="$xwiki.getURL('SeitokaiCode.UserProfile', 'view', "user=${escapetool.url($postAuthorRef)}")">$escapetool.xml($!postAuthor)</a> 731 731 #else 732 - $ !escapetool.xml($!postAuthor)724 + $escapetool.xml($!postAuthor) 733 733 #end 734 734 </span> 735 735 <span class="author-badge"> 736 736 #if($postAccountType == 'admin') 737 - <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" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 管理者</span> 738 738 #elseif($postAccountType == 'verified') 739 - <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" style="width:1em;height:1em;vertical-align:-0.125em;" 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> 承認済み</span> 740 740 #elseif($postAccountType == 'referred') 741 - <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" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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> 742 742 #else 743 - <span class="badge badge-general badge-sm">一般</span>735 + <span class="badge badge-general" style="font-size:0.75em;padding:1px 7px;">一般</span> 744 744 #end 745 745 ## 所属バッジ（投稿者の学校コードとページの学校コードを比較） 746 746 #if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general') 747 747 #if($postSchoolCode == $schoolCode) 748 748 #if($postAccountType == 'verified' || $postAccountType == 'admin') 749 - <span class="badge badge-school-internal-confirmed badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内（確認済）</span>741 + <span class="badge badge-school-internal-confirmed" style="font-size:0.75em;padding:1px 7px;"><svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内（確認済）</span> 750 750 #else 751 - <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" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内</span> 752 752 #end 753 753 #else 754 - <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" style="width:1em;height:1em;vertical-align:-0.125em;" 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"/><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> 755 755 #end 756 756 #end 757 757 #if($postUserRole == 'student') 758 - <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" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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> 759 759 #set($postIsOfficer = $!post.getValue('authorIsOfficer')) 760 760 #if($postIsOfficer == 'true') 761 - <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" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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> 762 762 #end 763 763 #elseif($postUserRole == 'teacher') 764 - <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" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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> 765 765 #elseif($postUserRole == 'graduate') 766 - <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" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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> 767 767 #end 768 768 #if($postGrade && $postGrade != '') 769 - <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> 770 770 #end 771 771 </span> 772 772 <span class="thread-post-date">$!postDate</span> ... ... @@ -776,7 +776,7 @@ 776 776 #end 777 777 </div> 778 778 <div class="thread-post-body"> 779 - $ !escapetool.xml($!postContent)771 + $escapetool.xml($!postContent) 780 780 #set($postImages = $!post.getValue('images')) 781 781 #if($postImages && $postImages.trim() != '') 782 782 <div class="post-images"> ... ... @@ -790,7 +790,7 @@ 790 790 #if($imgName != '') 791 791 <div class="post-image-item"> 792 792 <a href="$doc.getAttachmentURL($imgName)" target="_blank"> 793 - <img src="$doc.getAttachmentURL($imgName)" alt="$ !escapetool.xml($imgName)" loading="lazy"/>785 + <img src="$doc.getAttachmentURL($imgName)" alt="$escapetool.xml($imgName)" loading="lazy"/> 794 794 </a> 795 795 </div> 796 796 #end ... ... @@ -821,14 +821,14 @@ 821 821 #set($displayName = $fName.replaceFirst('file_\d{14}_\d+_', '')) 822 822 #end 823 823 <div class="post-file-item"> 824 - <a href="$doc.getAttachmentURL($fName)" target="_blank" download="$ !escapetool.xml($displayName)">825 - #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>826 - #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>827 - #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>828 - #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>829 - #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>816 + <a href="$doc.getAttachmentURL($fName)" target="_blank" download="$escapetool.xml($displayName)"> 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> 830 830 #end 831 - <span class="post-file-name">$ !escapetool.xml($displayName)</span>823 + <span class="post-file-name">$escapetool.xml($displayName)</span> 832 832 </a> 833 833 </div> 834 834 #end ... ... @@ -838,19 +838,19 @@ 838 838 #end 839 839 </div> 840 840 #if($postVis != 'public') 841 - <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" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</div> 842 842 #end 843 843 ## 固定/解除ボタン（承認済み・管理者のみ） 844 844 #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified') 845 845 #set($postObjNum = $post.number) 846 - <div class="post-pin-action post-action-mt">838 + <div class="post-pin-action" style="margin-top:6px;"> 847 847 #if($isPinned == '1') 848 848 <a href="$doc.getURL('view', "action=unpin&postObj=${postObjNum}&form_token=${services.csrf.getToken()}")" class="btn-pin-toggle btn-unpin" title="固定を解除"> 849 - <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> 固定を解除841 + <svg style="width:13px;height:13px;" viewBox="0 0 24 24" fill="currentColor" stroke="none"><path d="M16 2l-4 4-2-1-5 5 3 3-6 6h4l4-4 3 3 5-5-1-2 4-4-5-5z"/></svg> 固定を解除 850 850 </a> 851 851 #else 852 852 <a href="$doc.getURL('view', "action=pin&postObj=${postObjNum}&form_token=${services.csrf.getToken()}")" class="btn-pin-toggle btn-pin" title="この投稿を固定"> 853 - <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> 固定する845 + <svg style="width:13px;height:13px;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><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> 固定する 854 854 </a> 855 855 #end 856 856 </div> ... ... @@ -859,14 +859,14 @@ 859 859 #set($postAuthorRef = $!post.getValue('authorRef')) 860 860 #set($postObjNumED = $post.number) 861 861 #if($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin') 862 - <div class="post-edit-actions post-action-mt">854 + <div class="post-edit-actions" style="margin-top:6px;display:flex;gap:8px;"> 863 863 #if($xcontext.user == $postAuthorRef) 864 - <button type="button" class="btn-post-edit" onclick="openEditPost(this, '${doc.fullName}', $postObjNumED, '$ !escapetool.javascript($!postContent)')" title="この投稿を編集">865 - <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> 編集856 + <button type="button" class="btn-post-edit" onclick="openEditPost(this, '${doc.fullName}', $postObjNumED, '$escapetool.javascript($!postContent)')" title="この投稿を編集"> 857 + <svg style="width:13px;height:13px;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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> 編集 866 866 </button> 867 867 #end 868 868 <button type="button" class="btn-post-delete" onclick="confirmDeletePost('${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を削除"> 869 - <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> 削除861 + <svg style="width:13px;height:13px;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><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> 削除 870 870 </button> 871 871 </div> 872 872 #end ... ... @@ -875,53 +875,15 @@ 875 875 #end## /canViewPost 876 876 #end## /postHidden 877 877 #end## /postDeleted 878 - #end## /postType != comment 879 - #end## /foreach reports 880 - 881 - ## --- コメントセクション（折りたたみ） --- 882 - #if($commentCount > 0) 883 - <details class="thread-comments-section"> 884 - <summary class="thread-comments-toggle"> 885 - <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}件のコメント 886 - </summary> 887 - #foreach($post in $threadPosts) 888 - #set($thisPostType = $!post.getValue('postType')) 889 - #if($thisPostType == 'comment') 890 - #set($postContent = $post.getValue('content')) 891 - #set($postAuthor = $post.getValue('author')) 892 - #set($postAccountType = $!post.getValue('authorAccountType')) 893 - #set($postDate = $post.getValue('createdDate')) 894 - #set($postDeleted = $!post.getValue('deleted')) 895 - #if($postDeleted == 1 || $postDeleted == '1') 896 - <div class="thread-comment thread-comment-deleted"> 897 - <span class="thread-comment-meta">このコメントは削除されました</span> 898 - </div> 899 - #else 900 - #set($postHidden = $!post.getValue('hidden')) 901 - #if($postHidden == 1 || $postHidden == '1') 902 - <div class="thread-comment thread-comment-hidden"> 903 - <span class="thread-comment-meta">このコメントは非表示にされました</span> 904 - </div> 905 - #else 906 - <div class="thread-comment"> 907 - <span class="thread-comment-author">$!escapetool.xml($postAuthor)</span> 908 - <span class="thread-comment-date">$!postDate</span> 909 - <div class="thread-comment-body">$!escapetool.xml($postContent)</div> 910 - </div> 911 - #end 912 - #end 913 - #end 914 - #end 915 - </details> 916 916 #end 917 917 918 918 #if($xcontext.user != "XWiki.XWikiGuest") 919 919 <div class="thread-add-post"> 920 - <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"> 921 921 ＋ 活動報告を追加 922 922 </a> 923 - <a href="/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$ !escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">924 - <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> コメントを書く 877 + <a href="/xwiki/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment"> 878 + <svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M21 15a2 2 0 01-2 2H7l-4 4V5a2 2 0 012-2h14a2 2 0 012 2z"/></svg> コメントを書く 925 925 </a> 926 926 </div> 927 927 #end ... ... @@ -931,7 +931,7 @@ 931 931 #else 932 932 {{html clean="false"}} 933 933 <div class="empty-state"> 934 - <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> 935 935 <div class="empty-state-title">活動報告はまだありません</div> 936 936 <div class="empty-state-desc">この学校の活動を記録して、他校と共有しましょう。<br>「活動を追加」ボタンから最初の活動を作成できます。</div> 937 937 </div> ... ... @@ -942,8 +942,8 @@ 942 942 #if($xcontext.user != "XWiki.XWikiGuest") 943 943 {{html clean="false"}} 944 944 <div class="activity-add-section"> 945 - <a href="/bin/view/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$ !escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity">946 - <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> 活動を追加 899 + <a href="/xwiki/bin/view/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity"> 900 + <svg class="ico" style="width:1em;height:1em;vertical-align:-0.125em;" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round"><line x1="12" y1="5" x2="12" y2="19"/><line x1="5" y1="12" x2="19" y2="12"/></svg> 活動を追加 947 947 </a> 948 948 </div> 949 949 {{/html}} ... ... @@ -951,16 +951,16 @@ 951 951 952 952 ## --- 年度アーカイブ セクション --- 953 953 {{html clean="false"}} 954 -<div class="school-section-card s chool-archive-card">955 - <h2 class="archive-section-title">956 - <svg class="icoico-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> 957 957 年度アーカイブ 958 958 </h2> 959 - <div class="archive-meta">913 + <div style="font-size:0.88em;color:var(--text-mid);margin-bottom:12px;"> 960 960 現在のページ: <strong>${pageFiscalYear}年度</strong> 961 961 #set($lyud = $!doc.getValue('lastYearUpdateDate')) 962 962 #if($lyud && $lyud != '') 963 - | 最終年度更新: $ !escapetool.xml($lyud) ($!escapetool.xml($!doc.getValue('lastYearUpdateBy')))917 + | 最終年度更新: $escapetool.xml($lyud) ($escapetool.xml($!doc.getValue('lastYearUpdateBy'))) 964 964 #end 965 965 </div> 966 966 ... ... @@ -969,16 +969,16 @@ 969 969 #set($archivePages = $archiveQuery.execute()) 970 970 971 971 #if($archivePages && $archivePages.size() > 0) 972 - <div class="archive-card-field-lg">973 - <div class="archive-list-label">過去の年度アーカイブ</div>974 - <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;"> 975 975 #foreach($archPage in $archivePages) 976 976 #set($archPageDoc = $xwiki.getDocument($archPage)) 977 977 #set($archPageObj = $archPageDoc.getObject('SeitokaiCode.SchoolClass')) 978 978 #if($archPageObj) 979 979 #set($archPageFY = $!archPageObj.getValue('fiscalYear')) 980 - <a href="$archPageDoc.getURL('view')" class="archive-link">981 - <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> 982 982 ${archPageFY}年度 983 983 </a> 984 984 #end ... ... @@ -986,17 +986,17 @@ 986 986 </div> 987 987 </div> 988 988 #else 989 - <div class="archive-empty">過去のアーカイブはまだありません</div>943 + <div style="font-size:0.88em;color:var(--text-light);margin-bottom:12px;">過去のアーカイブはまだありません</div> 990 990 #end 991 991 992 992 ## 新年度に移行ボタン（承認済み・管理者のみ） 993 993 #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified') 994 - <div class="archive-action">995 - <a href="/bin/view/SeitokaiCode/YearArchiveAction?schoolPage=${doc.fullName}" class="btn-accent">996 - <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> 997 997 ${pageFiscalYear}年度をアーカイブして新年度に移行 998 998 </a> 999 - <div class="archive-action-hint">現在の学校情報を${pageFiscalYear}年度として保存し、新しい年度に移行します。</div>953 + <div style="font-size:0.8em;color:var(--text-light);margin-top:6px;">現在の学校情報を${pageFiscalYear}年度として保存し、新しい年度に移行します。</div> 1000 1000 </div> 1001 1001 #end 1002 1002 </div> ... ... @@ -1011,18 +1011,25 @@ 1011 1011 btn.classList.add('active'); 1012 1012 // 活動スレッドの表示切り替え 1013 1013 document.querySelectorAll('.activity-thread[data-fiscal-year]').forEach(function(thread) { 1014 - if (fy === 'all' || thread.getAttribute('data-fiscal-year') === fy) { 1015 - 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 = ''; 1016 1016 } else { 1017 - thread. classList.add('fy-hidden');973 + thread.style.display = 'none'; 1018 1018 } 1019 1019 }); 1020 1020 } 1021 -// ページ読み込み時の 初期化977 +// ページ読み込み時にデフォルトで現在の年度を表示 1022 1022 document.addEventListener('DOMContentLoaded', function() { 1023 - // デフォルトで現在の年度を表示 1024 1024 var defaultTab = document.querySelector('.activity-fy-tab.active'); 1025 1025 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 + } 1026 1026 // 保存成功時のトースト通知 1027 1027 if (window.location.search.indexOf('archived=1') !== -1) { 1028 1028 showToast('年度アーカイブを作成しました', 'success'); ... ... @@ -1047,8 +1047,8 @@ 1047 1047 document.body.appendChild(container); 1048 1048 } 1049 1049 var icons = { 1050 - success: '<svg class="icoico-md" viewBox="0 0 24 24" stroke-width="2.5"><path d="M20 6L9 17l-5-5"/></svg>',1051 - error: '<svg class="icoico-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>' 1052 1052 }; 1053 1053 var toast = document.createElement('div'); 1054 1054 toast.className = 'toast toast-' + type; ... ... @@ -1062,6 +1062,7 @@ 1062 1062 var card = document.getElementById(cardId); 1063 1063 if (!card) return; 1064 1064 card.classList.toggle('collapsed'); 1026 + card.classList.remove('mobile-collapse'); 1065 1065 } 1066 1066 1067 1067 // 投稿の編集（インライン編集フォームを開く） ... ... @@ -1093,7 +1093,7 @@ 1093 1093 var csrfEl = document.querySelector('input[name="form_token"]'); 1094 1094 var csrfToken = csrfEl ? csrfEl.value : ''; 1095 1095 var xhr = new XMLHttpRequest(); 1096 - 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); 1097 1097 xhr.onload = function() { 1098 1098 try { 1099 1099 var res = JSON.parse(xhr.responseText); ... ... @@ -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('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); 1117 1117 xhr.onload = function() { 1118 1118 try { 1119 1119 var res = JSON.parse(xhr.responseText);