Changes for page 学校ページ テンプレート
Last modified by Super Admin on 2026/04/05 18:59
From version 
27.1 
27.1
edited by Super Admin
on 2026/03/09 12:42
on 2026/03/09 12:42
Change comment:
There is no comment for this version
To version 1.1
edited by Super Admin
on 2026/03/05 22:05
on 2026/03/05 22:05
Change comment:
There is no comment for this version
Summary
Details
-
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'">×</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')) ... ... @@ -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,28 +225,25 @@ 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') 231 - <span class="badge badge-admin"><svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 管理者</span> 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> 232 232 #elseif($authorAccountType == 'verified') 233 - <span class="badge badge-verified"><svg class="ico" viewBox="0 0 24 24" stroke-width="2.5"><path d="M20 6L9 17l-5-5"/></svg> 承認済み</span> 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> 234 234 #elseif($authorAccountType == 'referred') 235 - <span class="badge badge-referred"><svg class="ico" viewBox="0 0 24 24"><path d="M10 13a5 5 0 007.54.54l3-3a5 5 0 00-7.07-7.07l-1.72 1.71"/><path d="M14 11a5 5 0 00-7.54-.54l-3 3a5 5 0 007.07 7.07l1.71-1.71"/></svg> 紹介</span> 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> 236 236 #else 237 237 <span class="badge badge-general">一般</span> 238 238 #end 239 239 ## 役割バッジ 240 240 #if($authorUserRole == 'student') 241 - <span class="badge badge-role-student"><svg class="ico" viewBox="0 0 24 24"><path d="M22 10l-10-5L2 10l10 5 10-5z"/><path d="M6 12v5c0 1.66 2.69 3 6 3s6-1.34 6-3v-5"/></svg> 生徒</span> 242 - #set($authorIsOfficer = $!lastAuthorDoc.getValue('isOfficer')) 243 - #if($authorIsOfficer == 'true') 244 - <span class="badge badge-role-officer"><svg class="ico" viewBox="0 0 24 24"><path d="M12 2l3.09 6.26L22 9.27l-5 4.87 1.18 6.88L12 17.77l-6.18 3.25L7 14.14 2 9.27l6.91-1.01L12 2z"/></svg> 役員</span> 245 - #end 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> 246 246 #elseif($authorUserRole == 'teacher') 247 - <span class="badge badge-role-teacher"><svg class="ico" viewBox="0 0 24 24"><path d="M4 19.5A2.5 2.5 0 016.5 17H20"/><path d="M6.5 2H20v20H6.5A2.5 2.5 0 014 19.5v-15A2.5 2.5 0 016.5 2z"/></svg> 教員</span> 232 + <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> 248 248 #elseif($authorUserRole == 'graduate') 249 - <span class="badge badge-role-graduate"><svg class="ico" viewBox="0 0 24 24"><path d="M22 10l-10-5L2 10l10 5 10-5z"/><path d="M6 12v5c0 1.66 2.69 3 6 3s6-1.34 6-3v-5"/></svg> 卒業生</span> 234 + <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> 250 250 #end 251 251 ## 学年（生徒のみ公開） 252 252 #if($authorGrade && $authorGrade != '') ... ... @@ -254,54 +254,57 @@ 254 254 #end 255 255 ## 在籍状態（卒業・休学等の場合のみ表示） 256 256 #if($authorUserStatus == 'graduated') 257 - <span class="badge badge-status-graduated"><svg class="ico" viewBox="0 0 24 24"><path d="M22 10l-10-5L2 10l10 5 10-5z"/><path d="M6 12v5c0 1.66 2.69 3 6 3s6-1.34 6-3v-5"/></svg> 卒業済み</span> 242 + <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> 258 258 #elseif($authorUserStatus == 'on_leave') 259 - <span class="badge badge-status-onleave"><svg class="ico" viewBox="0 0 24 24" fill="currentColor"><rect x="6" y="4" width="4" height="16" rx="1"/><rect x="14" y="4" width="4" height="16" rx="1"/></svg> 休学中</span> 244 + <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> 260 260 #elseif($authorUserStatus == 'transferred') 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> 246 + <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> 262 262 #end 263 - <span class="badge-info">最終編集: $ !escapetool.xml($authorDisplayName) ($xwiki.formatDate($doc.date, "yyyy/MM/dd"))</span>248 + <span class="badge-info">最終編集: $escapetool.xml($authorDisplayName) ($xwiki.formatDate($doc.date, "yyyy/MM/dd"))</span> 264 264 </div> 250 +{{/html}} 265 265 252 +{{html clean="false"}} 253 + 266 266 ## --- ① 学校基本情報 + 連絡先（左右グリッド・折りたたみ対応） --- 267 267 <div class="school-info-grid"> 268 268 <div class="school-info-card mobile-collapse" id="card-basic-info"> 269 - <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>257 + <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> 270 270 <table class="wiki-table school-info-table"> 271 - <tr><th>学校コード</th><td>$ !escapetool.xml($!schoolCode)</td></tr>272 - <tr><th>学校名</th><td>$ !escapetool.xml($!schoolName)</td></tr>273 - <tr><th>所在地</th><td>$ !escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>259 + <tr><th>学校コード</th><td>$escapetool.xml($!schoolCode)</td></tr> 260 + <tr><th>学校名</th><td>$escapetool.xml($!schoolName)</td></tr> 261 + <tr><th>所在地</th><td>$escapetool.xml($!prefecture) #if($city && $city != '')$escapetool.xml($city)#end</td></tr> 274 274 <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr> 275 - <tr><th>共学・別学</th><td>$ !escapetool.xml($!coeducation)</td></tr>276 - <tr><th>設置者</th><td>$ !escapetool.xml($!establishment)</td></tr>277 - <tr><th>学校種</th><td>$ !escapetool.xml($!schoolLevel)</td></tr>278 - <tr><th>課程</th><td> #if($schoolSystem && $schoolSystem != '' && $schoolSystem != '[]')$!escapetool.xml($!schoolSystem)#end</td></tr>279 - <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>263 + <tr><th>共学・別学</th><td>$escapetool.xml($!coeducation)</td></tr> 264 + <tr><th>設置者</th><td>$escapetool.xml($!establishment)</td></tr> 265 + <tr><th>学校種</th><td>$escapetool.xml($!schoolLevel)</td></tr> 266 + <tr><th>課程</th><td>$escapetool.xml($!schoolSystem)</td></tr> 267 + <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> 280 280 </table> 281 281 #set($infoEditDate = $!doc.getValue('lastInfoEditedDate')) 282 282 #set($infoEditBy = $!doc.getValue('lastInfoEditedBy')) 283 283 #if($infoEditDate && $infoEditDate != '') 284 - <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>272 + <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> 285 285 #end 286 286 </div> 287 287 288 288 <div class="school-info-card mobile-collapse" id="card-contact"> 289 - <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>277 + <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> 290 290 <table class="wiki-table school-info-table"> 291 - <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$ !escapetool.xml($contactInfo)#else<spanclass="text-placeholder">未登録</span>#end</td></tr>292 - <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>293 - <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>294 - <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>295 - <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>296 - <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$ !escapetool.xml($seitokaiOtherSns)#else<spanclass="text-placeholder">未登録</span>#end</td></tr>279 + <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$escapetool.xml($contactInfo)#else<span style="color:#9ca3af;">未登録</span>#end</td></tr> 280 + <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> 281 + <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> 282 + <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> 283 + <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> 284 + <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$escapetool.xml($seitokaiOtherSns)#else<span style="color:#9ca3af;">未登録</span>#end</td></tr> 297 297 </table> 298 298 </div> 299 299 </div> 300 300 301 301 ## --- 生徒会情報アコーディオン --- 302 -<div class="school-section-divider">290 +<div style="margin:20px 0 16px;"> 303 303 <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')?'▲':'▼';"> 304 - <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>292 + <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> 305 305 生徒会情報を見る <span class="shortcut-arrow">▼</span> 306 306 </button> 307 307 </div> ... ... @@ -317,17 +317,17 @@ 317 317 #elseif($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewOrgChart = false) 318 318 #end 319 319 #if($canViewOrgChart) 320 -<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>308 +<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> 321 321 <div class="school-section-card"> 322 322 <div class="card-inner"> 323 323 #if($orgChartImage && $orgChartImage != '') 324 - <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図"class="org-chart-img" /></div>312 + <div style="margin-bottom:12px;"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" style="max-width:100%; border-radius:8px;" /></div> 325 325 #end 326 - #if($orgChart && $orgChart != '')$ !escapetool.xml($orgChart)#end314 + #if($orgChart && $orgChart != '')$escapetool.xml($orgChart)#end 327 327 </div> 328 328 </div> 329 329 #else 330 -<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> 318 +<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> 331 331 #end 332 332 #end 333 333 ... ... @@ -335,18 +335,18 @@ 335 335 <div class="school-section-grid"> 336 336 #if($dailyActivities && $dailyActivities != '') 337 337 <div class="school-section-card"> 338 - <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> 326 + <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> 339 339 <div class="card-inner"> 340 - <p class="activity-hint">活動時間の多い順に上位3つ</p>328 + <p style="font-size:0.88em; color:#9ca3af; margin-bottom:12px;">活動時間の多い順に上位3つ</p> 341 341 <div class="tag-container"> 342 342 #set($daIdx = 1) 343 343 #foreach($da in $dailyActivities.split(",")) 344 - <span class="tag tag-accent">${daIdx}. $ !escapetool.xml($da.trim())</span>332 + <span class="tag tag-accent">${daIdx}. $escapetool.xml($da.trim())</span> 345 345 #set($daIdx = $daIdx + 1) 346 346 #end 347 347 </div> 348 348 #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '') 349 - <div class="free-note">$ !escapetool.xml($dailyActivitiesNote)</div>337 + <div class="free-note">$escapetool.xml($dailyActivitiesNote)</div> 350 350 #end 351 351 </div> 352 352 </div> ... ... @@ -354,20 +354,20 @@ 354 354 355 355 #if($electionExists && $electionExists != '') 356 356 <div class="school-section-card"> 357 - <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> 345 + <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> 358 358 <div class="card-inner"> 359 359 <div class="info-row"> 360 360 <span class="info-label">役員選挙</span> 361 - <span class="info-value">$ !escapetool.xml($!electionExists)</span>349 + <span class="info-value">$escapetool.xml($!electionExists)</span> 362 362 </div> 363 363 #if($electionType && $electionType != '') 364 364 <div class="info-row"> 365 365 <span class="info-label">直近の選挙方式</span> 366 - <span class="info-value">$ !escapetool.xml($!electionType)</span>354 + <span class="info-value">$escapetool.xml($!electionType)</span> 367 367 </div> 368 368 #end 369 369 #if($electionNote && $electionNote.trim() != '') 370 - <div class="free-note">$ !escapetool.xml($electionNote)</div>358 + <div class="free-note">$escapetool.xml($electionNote)</div> 371 371 #end 372 372 </div> 373 373 </div> ... ... @@ -377,14 +377,14 @@ 377 377 <div class="school-section-grid"> 378 378 #if($meetingFrequency && $meetingFrequency != '') 379 379 <div class="school-section-card"> 380 - <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> 368 + <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> 381 381 <div class="card-inner"> 382 382 <div class="info-row"> 383 383 <span class="info-label">役員定例会の頻度</span> 384 - <span class="info-value">$ !escapetool.xml($!meetingFrequency)</span>372 + <span class="info-value">$escapetool.xml($!meetingFrequency)</span> 385 385 </div> 386 386 #if($regularActivitiesNote && $regularActivitiesNote.trim() != '') 387 - <div class="free-note">$ !escapetool.xml($regularActivitiesNote)</div>375 + <div class="free-note">$escapetool.xml($regularActivitiesNote)</div> 388 388 #end 389 389 </div> 390 390 </div> ... ... @@ -400,7 +400,7 @@ 400 400 #end 401 401 #if($canViewBudget) 402 402 <div class="school-section-card"> 403 - <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> 391 + <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> 404 404 <div class="card-inner"> 405 405 #if($budgetProcess && $budgetProcess != '') 406 406 <div class="info-row"> ... ... @@ -408,7 +408,7 @@ 408 408 <span class="info-value"> 409 409 <div class="selection-display"> 410 410 #foreach($bp in $budgetProcess.split(",")) 411 - <span class="selection-item">$ !escapetool.xml($bp.trim())</span>399 + <span class="selection-item">$escapetool.xml($bp.trim())</span> 412 412 #end 413 413 </div> 414 414 </span> ... ... @@ -417,13 +417,13 @@ 417 417 #if($studentFee && $studentFee != '') 418 418 <div class="info-row"> 419 419 <span class="info-label">生徒会費（年額）</span> 420 - <span class="info-value">$ !escapetool.xml($!studentFee)</span>408 + <span class="info-value">$escapetool.xml($!studentFee)</span> 421 421 </div> 422 422 #end 423 423 #if($budgetScale && $budgetScale != '') 424 424 <div class="info-row"> 425 425 <span class="info-label">予算規模</span> 426 - <span class="info-value">$ !escapetool.xml($!budgetScale)</span>414 + <span class="info-value">$escapetool.xml($!budgetScale)</span> 427 427 </div> 428 428 #end 429 429 #if($budgetAllocation && $budgetAllocation != '') ... ... @@ -432,7 +432,7 @@ 432 432 <span class="info-value"> 433 433 <div class="selection-display"> 434 434 #foreach($ba in $budgetAllocation.split(",")) 435 - <span class="selection-item">$ !escapetool.xml($ba.trim())</span>423 + <span class="selection-item">$escapetool.xml($ba.trim())</span> 436 436 #end 437 437 </div> 438 438 </span> ... ... @@ -439,12 +439,12 @@ 439 439 </div> 440 440 #end 441 441 #if($budgetNote && $budgetNote.trim() != '') 442 - <div class="free-note">$ !escapetool.xml($budgetNote)</div>430 + <div class="free-note">$escapetool.xml($budgetNote)</div> 443 443 #end 444 444 </div> 445 445 </div> 446 446 #else 447 - <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> 435 + <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> 448 448 #end 449 449 #end 450 450 </div> ... ... @@ -457,12 +457,12 @@ 457 457 #elseif($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewRuleReview = false) 458 458 #end 459 459 #if($canViewRuleReview) 460 -<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>448 +<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> 461 461 <div class="school-section-card"> 462 462 <div class="card-inner"> 463 463 <div class="info-row"> 464 464 <span class="info-label">見直しの有無（3年以内）</span> 465 - <span class="info-value"><span class="tag tag-primary t ag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>453 + <span class="info-value"><span class="tag tag-primary" style="font-size:0.9em;">$escapetool.xml($!ruleReviewStatus)</span></span> 466 466 </div> 467 467 #if($ruleReviewContent && $ruleReviewContent != '') 468 468 <div class="info-row"> ... ... @@ -470,7 +470,7 @@ 470 470 <span class="info-value"> 471 471 <div class="selection-display"> 472 472 #foreach($rc in $ruleReviewContent.split(",")) 473 - <span class="selection-item">$ !escapetool.xml($rc.trim())</span>461 + <span class="selection-item">$escapetool.xml($rc.trim())</span> 474 474 #end 475 475 </div> 476 476 </span> ... ... @@ -482,7 +482,7 @@ 482 482 <span class="info-value"> 483 483 <div class="selection-display"> 484 484 #foreach($rp in $ruleReviewProposer.split(",")) 485 - <span class="selection-item">$ !escapetool.xml($rp.trim())</span>473 + <span class="selection-item">$escapetool.xml($rp.trim())</span> 486 486 #end 487 487 </div> 488 488 </span> ... ... @@ -494,7 +494,7 @@ 494 494 <span class="info-value"> 495 495 <div class="selection-display"> 496 496 #foreach($ri in $ruleReviewImplementer.split(",")) 497 - <span class="selection-item">$ !escapetool.xml($ri.trim())</span>485 + <span class="selection-item">$escapetool.xml($ri.trim())</span> 498 498 #end 499 499 </div> 500 500 </span> ... ... @@ -503,13 +503,13 @@ 503 503 #if($ruleReviewSystem && $ruleReviewSystem != '') 504 504 <div class="info-row"> 505 505 <span class="info-label">見直しの仕組み</span> 506 - <span class="info-value">$ !escapetool.xml($!ruleReviewSystem)</span>494 + <span class="info-value">$escapetool.xml($!ruleReviewSystem)</span> 507 507 </div> 508 508 #end 509 509 </div> 510 510 </div> 511 511 #else 512 -<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> 500 +<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> 513 513 #end 514 514 #end 515 515 ... ... @@ -521,10 +521,10 @@ 521 521 #elseif($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewChallenges = false) 522 522 #end 523 523 #if($canViewChallenges) 524 -<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> 525 -<div class="challenge-text">$ !escapetool.xml($challenges)</div>512 +<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> 513 +<div class="challenge-text">$escapetool.xml($challenges)</div> 526 526 #else 527 -<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> 515 +<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> 528 528 #end 529 529 #end 530 530 ... ... @@ -533,12 +533,12 @@ 533 533 {{/html}} 534 534 535 535 ## --- ⑩ 活動報告一覧（スレッド型・年度タブ付き） --- 536 -= 活動報告 = 524 += <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> 活動報告 = 537 537 538 538 ## --- 投稿者ステータス凡例（折りたたみ） --- 539 539 {{html clean="false"}} 540 540 <div class="author-legend-wrapper"> 541 - <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> 529 + <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> 542 542 <div class="author-legend-body"> 543 543 <div class="author-legend"> 544 544 <span class="author-legend-title">投稿者の信頼度:</span> ... ... @@ -549,17 +549,11 @@ 549 549 </div> 550 550 <div class="author-legend"> 551 551 <span class="author-legend-title">所属:</span> 552 - <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>553 - <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>554 - <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>555 - <span class="author-legend-item text- hint">※一般アカウントは所属未確認のため非表示</span>540 + <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> 541 + <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> 542 + <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> 543 + <span class="author-legend-item" style="color:var(--text-light);font-size:0.85em;">※一般アカウントは所属未確認のため非表示</span> 556 556 </div> 557 - <div class="author-legend"> 558 - <span class="author-legend-title">役割:</span> 559 - <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> 560 - <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> 561 - <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> 562 - </div> 563 563 </div> 564 564 </div> 565 565 ... ... @@ -639,41 +639,27 @@ 639 639 #set($threadPosts = []) 640 640 #set($discard = $threadPosts.addAll($pinnedPosts)) 641 641 #set($discard = $threadPosts.addAll($normalPosts)) 642 - ## report/comment カウント 643 - #set($reportCount = 0) 644 - #set($commentCount = 0) 645 - #foreach($tp in $threadPosts) 646 - #set($tpType = $!tp.getValue('postType')) 647 - #if($tpType == 'comment') 648 - #set($commentCount = $commentCount + 1) 649 - #else 650 - #set($reportCount = $reportCount + 1) 651 - #end 652 - #end 653 653 654 654 {{html clean="false"}} 655 -<div class="activity-thread" data-fiscal-year="$ !escapetool.xml($actFY)">626 +<div class="activity-thread" data-fiscal-year="$escapetool.xml($actFY)"> 656 656 <div class="activity-thread-header"> 657 657 <div class="activity-thread-title"> 658 - <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>659 - <span class="activity-meta">$ !escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>629 + <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> 630 + <span class="activity-meta">$escapetool.xml($!actCommittee) | $escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $escapetool.xml($actFY)年度#end</span> 660 660 </div> 661 - <div class="thread-meta-row">662 - <span class="thread-post-count">${re portCount}件の報告 ・ ${commentCount}件のコメント</span>632 + <div style="display:flex;align-items:center;gap:8px;"> 633 + <span class="thread-post-count">${threadPosts.size()}件の投稿</span> 663 663 #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred') 664 664 #if($actFeatured == '1') 665 - <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>636 + <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> 666 666 #else 667 - <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>638 + <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> 668 668 #end 669 669 #end 670 670 </div> 671 671 </div> 672 672 673 - ## --- 活動報告セクション --- 674 674 #foreach($post in $threadPosts) 675 - #set($thisPostType = $!post.getValue('postType')) 676 - #if($thisPostType != 'comment') 677 677 #set($postContent = $post.getValue('content')) 678 678 #set($postAuthor = $post.getValue('author')) 679 679 #set($postAccountType = $!post.getValue('authorAccountType')) ... ... @@ -681,35 +681,15 @@ 681 681 #set($postGrade = $!post.getValue('authorGrade')) 682 682 #set($postSchoolCode = $!post.getValue('authorSchoolCode')) 683 683 #set($postDate = $post.getValue('createdDate')) 684 - ## 論理削除チェック 685 - #set($postDeleted = $!post.getValue('deleted')) 686 - #if($postDeleted == 1 || $postDeleted == '1') 687 - #if($viewerAccountType == 'admin') 688 - <div class="thread-post thread-post-deleted thread-post-admin-deleted"> 689 - <div class="thread-post-admin-deleted-content"> 690 - <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> 691 - <strong>投稿者により削除済み</strong>（$!post.getValue('deletedAt')） 692 - <div class="thread-post-restored-content">$!escapetool.xml($!postContent)</div> 693 - </div> 694 - </div> 695 - #else 696 - <div class="thread-post thread-post-deleted thread-post-user-deleted"> 697 - <div class="thread-post-user-deleted-content"> 698 - <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> 699 - この投稿は削除されました 700 - </div> 701 - </div> 702 - #end 703 - #else 704 704 ## 通報による非表示チェック 705 705 #set($postHidden = $!post.getValue('hidden')) 706 706 #if($postHidden == 1 || $postHidden == '1') 707 707 #if($viewerAccountType == 'admin') 708 - <div class="thread-post t hread-post-admin-hidden">709 - <div class="thread-post-admin-hidden-content">710 - <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> 711 - <strong>通報により非表示中</strong>（理由: $ !escapetool.xml($!post.getValue('hiddenReason'))）712 - <div class="thread-post-restored-content">$!escapetool.xml($!postContent)</div>656 + <div class="thread-post" style="opacity:0.5;border:2px dashed #dc2626;"> 657 + <div style="padding:10px 16px;font-size:0.85em;color:#dc2626;"> 658 + <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> 659 + <strong>通報により非表示中</strong>（理由: $escapetool.xml($!post.getValue('hiddenReason'))） 660 + <div style="margin-top:4px;font-size:0.92em;color:var(--text-mid);">$escapetool.xml($!postContent)</div> 713 713 </div> 714 714 </div> 715 715 #end ... ... @@ -723,7 +723,7 @@ 723 723 #end 724 724 #if(!$canViewPost) 725 725 <div class="thread-post visibility-restricted-post"> 726 - <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> 674 + <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> 727 727 </div> 728 728 #else 729 729 ## 投稿者のアカウント種別に基づいたCSSクラス ... ... @@ -742,61 +742,53 @@ 742 742 <div class="thread-post-content"> 743 743 <div class="thread-post-header"> 744 744 #if($isPinned == '1') 745 - <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>693 + <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> 746 746 #end 747 747 #set($postAuthorRef = $!post.getValue('authorRef')) 748 748 <span class="thread-post-author"> 749 749 #if($postAuthorRef && $postAuthorRef != '') 750 - <a href="$xwiki.getURL('SeitokaiCode.UserProfile', 'view', "user=${escapetool.url($postAuthorRef)}")">$ !escapetool.xml($!postAuthor)</a>698 + <a href="$xwiki.getURL('SeitokaiCode.UserProfile', 'view', "user=${escapetool.url($postAuthorRef)}")">$escapetool.xml($!postAuthor)</a> 751 751 #else 752 - $ !escapetool.xml($!postAuthor)700 + $escapetool.xml($!postAuthor) 753 753 #end 754 754 </span> 755 755 <span class="author-badge"> 756 756 #if($postAccountType == 'admin') 757 - <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>705 + <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> 758 758 #elseif($postAccountType == 'verified') 759 - <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>707 + <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> 760 760 #elseif($postAccountType == 'referred') 761 - <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>709 + <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> 762 762 #else 763 - <span class="badge badge-general badge-sm">一般</span>711 + <span class="badge badge-general" style="font-size:0.75em;padding:1px 7px;">一般</span> 764 764 #end 765 765 ## 所属バッジ（投稿者の学校コードとページの学校コードを比較） 766 766 #if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general') 767 767 #if($postSchoolCode == $schoolCode) 768 768 #if($postAccountType == 'verified' || $postAccountType == 'admin') 769 - <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>717 + <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> 770 770 #else 771 - <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>719 + <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> 772 772 #end 773 773 #else 774 - <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>722 + <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> 775 775 #end 776 776 #end 777 777 #if($postUserRole == 'student') 778 - <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> 779 - #set($postIsOfficer = $!post.getValue('authorIsOfficer')) 780 - #if($postIsOfficer == 'true') 781 - <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> 782 - #end 726 + <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> 783 783 #elseif($postUserRole == 'teacher') 784 - <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>728 + <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> 785 785 #elseif($postUserRole == 'graduate') 786 - <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>730 + <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> 787 787 #end 788 788 #if($postGrade && $postGrade != '') 789 - <span class="badge badge-grade badge-sm">$postGrade</span>733 + <span class="badge badge-grade" style="font-size:0.75em;padding:1px 7px;">$postGrade</span> 790 790 #end 791 791 </span> 792 792 <span class="thread-post-date">$!postDate</span> 793 - #set($postEdited = $!post.getValue('edited')) 794 - #if($postEdited == 1 || $postEdited == '1') 795 - <span class="post-edited-label">（編集済み）</span> 796 - #end 797 797 </div> 798 798 <div class="thread-post-body"> 799 - $ !escapetool.xml($!postContent)739 + $escapetool.xml($!postContent) 800 800 #set($postImages = $!post.getValue('images')) 801 801 #if($postImages && $postImages.trim() != '') 802 802 <div class="post-images"> ... ... @@ -810,7 +810,7 @@ 810 810 #if($imgName != '') 811 811 <div class="post-image-item"> 812 812 <a href="$doc.getAttachmentURL($imgName)" target="_blank"> 813 - <img src="$doc.getAttachmentURL($imgName)" alt="$ !escapetool.xml($imgName)" loading="lazy"/>753 + <img src="$doc.getAttachmentURL($imgName)" alt="$escapetool.xml($imgName)" loading="lazy"/> 814 814 </a> 815 815 </div> 816 816 #end ... ... @@ -841,14 +841,14 @@ 841 841 #set($displayName = $fName.replaceFirst('file_\d{14}_\d+_', '')) 842 842 #end 843 843 <div class="post-file-item"> 844 - <a href="$doc.getAttachmentURL($fName)" target="_blank" download="$ !escapetool.xml($displayName)">845 - #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>846 - #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>847 - #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>848 - #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>849 - #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>784 + <a href="$doc.getAttachmentURL($fName)" target="_blank" download="$escapetool.xml($displayName)"> 785 + #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> 786 + #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> 787 + #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> 788 + #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> 789 + #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> 850 850 #end 851 - <span class="post-file-name">$ !escapetool.xml($displayName)</span>791 + <span class="post-file-name">$escapetool.xml($displayName)</span> 852 852 </a> 853 853 </div> 854 854 #end ... ... @@ -858,90 +858,36 @@ 858 858 #end 859 859 </div> 860 860 #if($postVis != 'public') 861 - <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>801 + <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> 862 862 #end 863 863 ## 固定/解除ボタン（承認済み・管理者のみ） 864 864 #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified') 865 865 #set($postObjNum = $post.number) 866 - <div class="post-pin-action post-action-mt">806 + <div class="post-pin-action" style="margin-top:6px;"> 867 867 #if($isPinned == '1') 868 868 <a href="$doc.getURL('view', "action=unpin&postObj=${postObjNum}&form_token=${services.csrf.getToken()}")" class="btn-pin-toggle btn-unpin" title="固定を解除"> 869 - <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> 固定を解除809 + <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> 固定を解除 870 870 </a> 871 871 #else 872 872 <a href="$doc.getURL('view', "action=pin&postObj=${postObjNum}&form_token=${services.csrf.getToken()}")" class="btn-pin-toggle btn-pin" title="この投稿を固定"> 873 - <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> 固定する813 + <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> 固定する 874 874 </a> 875 875 #end 876 876 </div> 877 877 #end 878 - ## 編集・削除ボタン（投稿者本人 or 管理者） 879 - #set($postAuthorRef = $!post.getValue('authorRef')) 880 - #set($postObjNumED = $post.number) 881 - #if($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin') 882 - <div class="post-edit-actions post-action-mt"> 883 - #if($xcontext.user == $postAuthorRef) 884 - <button type="button" class="btn-post-edit" onclick="openEditPost(this, '${doc.fullName}', $postObjNumED, '$!escapetool.javascript($!postContent)')" title="この投稿を編集"> 885 - <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> 編集 886 - </button> 887 - #end 888 - <button type="button" class="btn-post-delete" onclick="confirmDeletePost('${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を削除"> 889 - <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> 削除 890 - </button> 891 - </div> 892 - #end 893 893 </div> 894 894 </div> 895 895 #end## /canViewPost 896 896 #end## /postHidden 897 - #end## /postDeleted 898 - #end## /postType != comment 899 - #end## /foreach reports 900 - 901 - ## --- コメントセクション（折りたたみ） --- 902 - #if($commentCount > 0) 903 - <details class="thread-comments-section"> 904 - <summary class="thread-comments-toggle"> 905 - <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}件のコメント 906 - </summary> 907 - #foreach($post in $threadPosts) 908 - #set($thisPostType = $!post.getValue('postType')) 909 - #if($thisPostType == 'comment') 910 - #set($postContent = $post.getValue('content')) 911 - #set($postAuthor = $post.getValue('author')) 912 - #set($postAccountType = $!post.getValue('authorAccountType')) 913 - #set($postDate = $post.getValue('createdDate')) 914 - #set($postDeleted = $!post.getValue('deleted')) 915 - #if($postDeleted == 1 || $postDeleted == '1') 916 - <div class="thread-comment thread-comment-deleted"> 917 - <span class="thread-comment-meta">このコメントは削除されました</span> 918 - </div> 919 - #else 920 - #set($postHidden = $!post.getValue('hidden')) 921 - #if($postHidden == 1 || $postHidden == '1') 922 - <div class="thread-comment thread-comment-hidden"> 923 - <span class="thread-comment-meta">このコメントは非表示にされました</span> 924 - </div> 925 - #else 926 - <div class="thread-comment"> 927 - <span class="thread-comment-author">$!escapetool.xml($postAuthor)</span> 928 - <span class="thread-comment-date">$!postDate</span> 929 - <div class="thread-comment-body">$!escapetool.xml($postContent)</div> 930 - </div> 931 - #end 932 - #end 933 - #end 934 - #end 935 - </details> 936 936 #end 937 937 938 938 #if($xcontext.user != "XWiki.XWikiGuest") 939 939 <div class="thread-add-post"> 940 - <a href="/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$ !escapetool.url($schoolCode)&postType=report" class="btn-thread-add">826 + <a href="/xwiki/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$escapetool.url($schoolCode)&postType=report" class="btn-thread-add"> 941 941 ＋ 活動報告を追加 942 942 </a> 943 - <a href="/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$ !escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">944 - <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> コメントを書く 829 + <a href="/xwiki/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment"> 830 + <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> コメントを書く 945 945 </a> 946 946 </div> 947 947 #end ... ... @@ -951,7 +951,7 @@ 951 951 #else 952 952 {{html clean="false"}} 953 953 <div class="empty-state"> 954 - <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>840 + <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> 955 955 <div class="empty-state-title">活動報告はまだありません</div> 956 956 <div class="empty-state-desc">この学校の活動を記録して、他校と共有しましょう。<br>「活動を追加」ボタンから最初の活動を作成できます。</div> 957 957 </div> ... ... @@ -962,8 +962,8 @@ 962 962 #if($xcontext.user != "XWiki.XWikiGuest") 963 963 {{html clean="false"}} 964 964 <div class="activity-add-section"> 965 - <a href="/bin/view/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$ !escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity">966 - <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> 活動を追加 851 + <a href="/xwiki/bin/view/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity"> 852 + <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> 活動を追加 967 967 </a> 968 968 </div> 969 969 {{/html}} ... ... @@ -971,16 +971,16 @@ 971 971 972 972 ## --- 年度アーカイブ セクション --- 973 973 {{html clean="false"}} 974 -<div class="school-section-card s chool-archive-card">975 - <h2 class="archive-section-title">976 - <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>860 +<div class="school-section-card" style="margin-top:24px;"> 861 + <h2 style="font-size:1.05em;font-weight:700;margin:0 0 12px;display:flex;align-items:center;gap:6px;"> 862 + <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> 977 977 年度アーカイブ 978 978 </h2> 979 - <div class="archive-meta">865 + <div style="font-size:0.88em;color:var(--text-mid);margin-bottom:12px;"> 980 980 現在のページ: <strong>${pageFiscalYear}年度</strong> 981 981 #set($lyud = $!doc.getValue('lastYearUpdateDate')) 982 982 #if($lyud && $lyud != '') 983 - | 最終年度更新: $ !escapetool.xml($lyud) ($!escapetool.xml($!doc.getValue('lastYearUpdateBy')))869 + | 最終年度更新: $escapetool.xml($lyud) ($escapetool.xml($!doc.getValue('lastYearUpdateBy'))) 984 984 #end 985 985 </div> 986 986 ... ... @@ -989,16 +989,16 @@ 989 989 #set($archivePages = $archiveQuery.execute()) 990 990 991 991 #if($archivePages && $archivePages.size() > 0) 992 - <div class="archive-card-field-lg">993 - <div class="archive-list-label">過去の年度アーカイブ</div>994 - <div class="archive-list">878 + <div style="margin-bottom:12px;"> 879 + <div style="font-weight:600;font-size:0.9em;margin-bottom:8px;">過去の年度アーカイブ</div> 880 + <div style="display:flex;flex-wrap:wrap;gap:8px;"> 995 995 #foreach($archPage in $archivePages) 996 996 #set($archPageDoc = $xwiki.getDocument($archPage)) 997 997 #set($archPageObj = $archPageDoc.getObject('SeitokaiCode.SchoolClass')) 998 998 #if($archPageObj) 999 999 #set($archPageFY = $!archPageObj.getValue('fiscalYear')) 1000 - <a href="$archPageDoc.getURL('view')" class="archive-link">1001 - <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>886 + <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;"> 887 + <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> 1002 1002 ${archPageFY}年度 1003 1003 </a> 1004 1004 #end ... ... @@ -1006,17 +1006,17 @@ 1006 1006 </div> 1007 1007 </div> 1008 1008 #else 1009 - <div class="archive-empty">過去のアーカイブはまだありません</div>895 + <div style="font-size:0.88em;color:var(--text-light);margin-bottom:12px;">過去のアーカイブはまだありません</div> 1010 1010 #end 1011 1011 1012 1012 ## 新年度に移行ボタン（承認済み・管理者のみ） 1013 1013 #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified') 1014 - <div class="archive-action">1015 - <a href="/bin/view/SeitokaiCode/YearArchiveAction?schoolPage=${doc.fullName}" class="btn-accent">1016 - <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>900 + <div style="margin-top:12px;padding-top:12px;border-top:1px solid #e2e8f0;"> 901 + <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;"> 902 + <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> 1017 1017 ${pageFiscalYear}年度をアーカイブして新年度に移行 1018 1018 </a> 1019 - <div class="archive-action-hint">現在の学校情報を${pageFiscalYear}年度として保存し、新しい年度に移行します。</div>905 + <div style="font-size:0.8em;color:var(--text-light);margin-top:6px;">現在の学校情報を${pageFiscalYear}年度として保存し、新しい年度に移行します。</div> 1020 1020 </div> 1021 1021 #end 1022 1022 </div> ... ... @@ -1031,10 +1031,12 @@ 1031 1031 btn.classList.add('active'); 1032 1032 // 活動スレッドの表示切り替え 1033 1033 document.querySelectorAll('.activity-thread[data-fiscal-year]').forEach(function(thread) { 1034 - if (fy === 'all' || thread.getAttribute('data-fiscal-year') === fy) { 1035 - thread.classList.remove('fy-hidden'); 920 + if (fy === 'all') { 921 + thread.style.display = ''; 922 + } else if (thread.getAttribute('data-fiscal-year') === fy) { 923 + thread.style.display = ''; 1036 1036 } else { 1037 - thread. classList.add('fy-hidden');925 + thread.style.display = 'none'; 1038 1038 } 1039 1039 }); 1040 1040 } ... ... @@ -1072,8 +1072,8 @@ 1072 1072 document.body.appendChild(container); 1073 1073 } 1074 1074 var icons = { 1075 - success: '<svg class="icoico-md" viewBox="0 0 24 24" stroke-width="2.5"><path d="M20 6L9 17l-5-5"/></svg>',1076 - 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>'963 + 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>', 964 + 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>' 1077 1077 }; 1078 1078 var toast = document.createElement('div'); 1079 1079 toast.className = 'toast toast-' + type; ... ... @@ -1089,71 +1089,6 @@ 1089 1089 card.classList.toggle('collapsed'); 1090 1090 card.classList.remove('mobile-collapse'); 1091 1091 } 1092 - 1093 -// 投稿の編集（インライン編集フォームを開く） 1094 -function openEditPost(btn, schoolPage, postObjNum, currentContent) { 1095 - var postEl = btn.closest('.thread-post'); 1096 - if (!postEl) return; 1097 - // 既存の編集フォームがあれば閉じる 1098 - var existing = postEl.querySelector('.post-edit-form'); 1099 - if (existing) { existing.remove(); return; } 1100 - var bodyEl = postEl.querySelector('.thread-post-body'); 1101 - if (!bodyEl) return; 1102 - var form = document.createElement('div'); 1103 - form.className = 'post-edit-form'; 1104 - form.innerHTML = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&').replace(/</g,'<').replace(/>/g,'>') + '</textarea>' + 1105 - '<div class="post-edit-form-actions">' + 1106 - '<button type="button" class="btn-cancel-edit" onclick="this.closest(\'.post-edit-form\').remove()">キャンセル</button>' + 1107 - '<button type="button" class="btn-save" onclick="saveEditPost(\'' + schoolPage + '\', ' + postObjNum + ')">保存</button>' + 1108 - '</div>'; 1109 - bodyEl.parentNode.insertBefore(form, bodyEl.nextSibling); 1110 - form.querySelector('textarea').focus(); 1111 -} 1112 - 1113 -// 投稿の編集を保存 1114 -function saveEditPost(schoolPage, postObjNum) { 1115 - var textarea = document.getElementById('editContent_' + postObjNum); 1116 - if (!textarea) return; 1117 - var newContent = textarea.value.trim(); 1118 - if (!newContent) { alert('投稿内容を入力してください'); return; } 1119 - var csrfEl = document.querySelector('input[name="form_token"]'); 1120 - var csrfToken = csrfEl ? csrfEl.value : ''; 1121 - var xhr = new XMLHttpRequest(); 1122 - xhr.open('GET', '/bin/view/SeitokaiCode/EditPost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken), true); 1123 - xhr.onload = function() { 1124 - try { 1125 - var res = JSON.parse(xhr.responseText); 1126 - if (res.success) { 1127 - showToast('投稿を更新しました', 'success'); 1128 - setTimeout(function() { location.reload(); }, 800); 1129 - } else { 1130 - alert('編集に失敗しました: ' + (res.error || '')); 1131 - } 1132 - } catch(e) { alert('編集に失敗しました'); } 1133 - }; 1134 - xhr.onerror = function() { alert('通信エラーが発生しました'); }; 1135 - xhr.send(); 1136 -} 1137 - 1138 -// 投稿の削除（確認ダイアログ付き） 1139 -function confirmDeletePost(schoolPage, postObjNum, token) { 1140 - if (!confirm('この投稿を削除しますか？\\n削除後は「この投稿は削除されました」と表示されます。')) return; 1141 - var xhr = new XMLHttpRequest(); 1142 - xhr.open('GET', '/bin/view/SeitokaiCode/DeletePost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token), true); 1143 - xhr.onload = function() { 1144 - try { 1145 - var res = JSON.parse(xhr.responseText); 1146 - if (res.success) { 1147 - showToast('投稿を削除しました', 'success'); 1148 - setTimeout(function() { location.reload(); }, 800); 1149 - } else { 1150 - alert('削除に失敗しました: ' + (res.error || '')); 1151 - } 1152 - } catch(e) { alert('削除に失敗しました'); } 1153 - }; 1154 - xhr.onerror = function() { alert('通信エラーが発生しました'); }; 1155 - xhr.send(); 1156 -} 1157 1157 </script> 1158 1158 {{/html}} 1159 1159 {{/velocity}}