Changes for page 学校ページ テンプレート
Last modified by Super Admin on 2026/04/05 18:59
From version 
49.1 
49.1
edited by Super Admin
on 2026/03/13 21:55
on 2026/03/13 21:55
Change comment:
There is no comment for this version
To version 5.1
5.1
edited by Super Admin
on 2026/03/06 09:17
on 2026/03/06 09:17
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')) ... ... @@ -65,7 +65,9 @@ 65 65 #set($seitokaiYoutube = $doc.getValue('seitokaiYoutube')) 66 66 #set($seitokaiOtherSns = $doc.getValue('seitokaiOtherSns')) 67 67 68 -## --- 現在の年度を計算（4月始まり） --- 57 +## --- 年度アーカイブ --- 58 +#set($pageFiscalYear = $!doc.getValue('fiscalYear')) 59 +## 現在の年度を計算（4月始まり） 69 69 #set($nowFY = $datetool.date) 70 70 #set($currentFYMonth = $mathtool.toInteger($datetool.format('MM', $nowFY))) 71 71 #set($currentFYYear = $mathtool.toInteger($datetool.format('yyyy', $nowFY))) ... ... @@ -74,6 +74,10 @@ 74 74 #else 75 75 #set($currentFiscalYear = $mathtool.sub($currentFYYear, 1)) 76 76 #end 68 +## fiscalYear 未設定時はデフォルトとして現在の年度を使う 69 +#if(!$pageFiscalYear || $pageFiscalYear == '') 70 + #set($pageFiscalYear = $currentFiscalYear.toString()) 71 +#end 77 77 78 78 ## --- 公開範囲フィールド --- 79 79 #set($visibilityOrgChart = $!doc.getValue('visibilityOrgChart')) ... ... @@ -100,45 +100,10 @@ 100 100 #end 101 101 #end 102 102 103 -## --- 学校ページ非表示チェック --- 104 -#set($schoolHidden = $doc.getValue('hidden')) 105 -#if($schoolHidden == 1) 106 - #if($isViewerAdmin) 107 - ## 管理者: 黄色バナー + ページ内容は通常表示（プレビュー） 108 -<div class="school-hidden-banner admin"> 109 - <svg class="ico" viewBox="0 0 24 24"><path d="M17.94 17.94A10.07 10.07 0 0112 20c-7 0-11-8-11-8a18.45 18.45 0 015.06-5.94M9.9 4.24A9.12 9.12 0 0112 4c7 0 11 8 11 8a18.5 18.5 0 01-2.16 3.19m-6.72-1.07a3 3 0 01-4.24-4.24"/><line x1="1" y1="1" x2="23" y2="23"/></svg> 110 - <div> 111 - <strong>このページは非表示になっています</strong>（管理者のみ閲覧可能） 112 - #set($hBy = $!doc.getValue('hiddenBy')) 113 - #set($hAt = $!doc.getValue('hiddenAt')) 114 - #set($hReason = $!doc.getValue('hiddenReason')) 115 - <div class="school-hidden-detail"> 116 - 非表示: $!escapetool.xml($hAt) / $!escapetool.xml($hBy) 117 - #if($hReason && $hReason != '') ・ 理由: $!escapetool.xml($hReason)#end 118 - </div> 119 - <a href="$xwiki.getURL('SeitokaiAdmin.SchoolManagement', 'view')" style="color:#92400e;text-decoration:underline">学校ページ管理へ</a> 120 - </div> 121 -</div> 122 - #else 123 - ## 一般ユーザー・ゲスト: 非公開メッセージを表示して停止 124 -<div class="school-hidden-public"> 125 - <svg class="ico" viewBox="0 0 24 24" style="width:2.5em;height:2.5em"><path d="M17.94 17.94A10.07 10.07 0 0112 20c-7 0-11-8-11-8a18.45 18.45 0 015.06-5.94M9.9 4.24A9.12 9.12 0 0112 4c7 0 11 8 11 8a18.5 18.5 0 01-2.16 3.19m-6.72-1.07a3 3 0 01-4.24-4.24"/><line x1="1" y1="1" x2="23" y2="23"/></svg> 126 - <h2>このページは現在公開されていません</h2> 127 - <p>このページは管理者により非公開に設定されています。</p> 128 - <a href="$xwiki.getURL('Schools.WebHome', 'view')" class="btn-back-list">学校一覧に戻る</a> 129 -</div> 130 -#stop 131 - #end 132 -#end 133 - 134 134 ## --- 投稿固定/解除処理 --- 135 135 #set($pinAction = $!request.action) 136 -#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token)) 137 - #set($pinPostObjStr = $!request.postObj) 138 - #if(!$pinPostObjStr.matches('^\d+$')) 139 - ## 不正な値 → 無視 140 - #else 141 - #set($postObjNum = $mathtool.toInteger($pinPostObjStr)) 100 +#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || $viewerAccountType == 'verified') && $services.csrf.isTokenValid($request.form_token)) 101 + #set($postObjNum = $mathtool.toInteger($!request.postObj)) 142 142 #set($postObj = $doc.getObject('SeitokaiCode.ActivityPostClass', $postObjNum)) 143 143 #if($postObj) 144 144 #if($pinAction == 'pin') ... ... @@ -158,15 +158,12 @@ 158 158 $response.sendRedirect($doc.getURL('view')) 159 159 #stop 160 160 #end 161 - #end## /matches 162 162 #end 163 163 164 164 ## --- 特色ある活動 選定/解除処理 --- 165 165 #set($featAction = $!request.action) 166 -#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token)) 167 - #set($featActObjStr = $!request.actObj) 168 - #if($featActObjStr.matches('^\d+$')) 169 - #set($actObjNum = $mathtool.toInteger($featActObjStr)) 125 +#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $services.csrf.isTokenValid($request.form_token)) 126 + #set($actObjNum = $mathtool.toInteger($!request.actObj)) 170 170 #set($actObj = $doc.getObject('SeitokaiCode.ActivityClass', $actObjNum)) 171 171 #if($actObj) 172 172 #if($featAction == 'feature') ... ... @@ -198,13 +198,12 @@ 198 198 $response.sendRedirect($doc.getURL('view')) 199 199 #stop 200 200 #end 201 - #end## /matches 202 202 #end 203 203 204 204 ## --- ユーザー情報取得 --- 205 205 ## displayName: Wiki上の表示名（ニックネーム）。本名(firstName/lastName)は管理者のみ閲覧可能。 206 206 #set($lastAuthor = $doc.author) 207 -#set($lastAuthorDoc = $xwiki.getDocument($lastAuthor)) 163 +#set($lastAuthorDoc = $xwiki.getDocument("XWiki.${lastAuthor}")) 208 208 #set($authorAccountType = '') 209 209 #set($authorUserRole = '') 210 210 #set($authorUserStatus = '') ... ... @@ -218,8 +218,7 @@ 218 218 #set($authorEnrollmentYear = $!lastAuthorDoc.getValue('enrollmentYear')) 219 219 #set($authorDisplayName = $!lastAuthorDoc.getValue('displayName')) 220 220 #if(!$authorDisplayName || $authorDisplayName == '') 221 - ## false引数でプレーンテキスト（HTMLリンクなし）を取得 222 - #set($authorDisplayName = $xwiki.getUserName($doc.author, false)) 177 + #set($authorDisplayName = $xwiki.getUserName($doc.author)) 223 223 #end 224 224 ## --- 学年の動的計算（学校種別対応） --- 225 225 ## 日本の学校年度: 4月始まり。currentSchoolYear = (月>=4) ? 今年 : 去年 ... ... @@ -257,62 +257,88 @@ 257 257 #end 258 258 #end 259 259 260 -## --- 学校名見出し（XWikiデフォルトタイトルを非表示にし、学校名を表示） --- 261 -#if($schoolName && $schoolName != '') 262 -<style>.document-header { display: none !important; }</style> 263 -<h1 class="school-page-title">$!escapetool.xml($schoolName)</h1> 264 -#end 265 - 266 -## --- 編集ボタン（権限があるユーザーのみ表示） --- 267 -#set($canEditSchool = false) 268 -#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode)) 269 - #set($canEditSchool = true) 270 -#end 271 -#if($canEditSchool) 272 -<div style="text-align:right; margin-bottom:12px;"> 273 - <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> 274 274 </div> 275 - #end254 +{{/html}} 276 276 256 +{{html clean="false"}} 257 + 277 277 ## --- ① 学校基本情報 + 連絡先（左右グリッド・折りたたみ対応） --- 278 278 <div class="school-info-grid"> 279 - <div class="school-info-card collapse d" id="card-basic-info">280 - <h2 role="button" tabindex="0" aria-expanded="false" onclick="toggleInfoCard('card-basic-info')" onkeydown="if(event.key==='Enter'||event.key===''){event.preventDefault();toggleInfoCard('card-basic-info')}"><span><svgclass="icoico-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> 281 281 <table class="wiki-table school-info-table"> 282 - <tr><th>学校コード</th><td>$ !escapetool.xml($!schoolCode)</td></tr>283 - <tr><th>学校名</th><td>$ !escapetool.xml($!schoolName)</td></tr>284 - <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> 285 285 <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr> 286 - <tr><th>共学・別学</th><td>$ !escapetool.xml($!coeducation)</td></tr>287 - <tr><th>設置者</th><td>$ !escapetool.xml($!establishment)</td></tr>288 - <tr><th>学校種</th><td>$ !escapetool.xml($!schoolLevel)</td></tr>289 - <tr><th>課程</th><td> #if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>290 - <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> 291 291 </table> 292 292 #set($infoEditDate = $!doc.getValue('lastInfoEditedDate')) 293 293 #set($infoEditBy = $!doc.getValue('lastInfoEditedBy')) 294 294 #if($infoEditDate && $infoEditDate != '') 295 - <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> 296 296 #end 297 297 </div> 298 298 299 - <div class="school-info-card collapse d" id="card-contact">300 - <h2 role="button" tabindex="0" aria-expanded="false" onclick="toggleInfoCard('card-contact')" onkeydown="if(event.key==='Enter'||event.key===''){event.preventDefault();toggleInfoCard('card-contact')}"><span><svgclass="icoico-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> 301 301 <table class="wiki-table school-info-table"> 302 - <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$ !escapetool.xml($contactInfo)#else<spanclass="text-placeholder">未登録</span>#end</td></tr>303 - <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>304 - <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>305 - <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>306 - <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>307 - <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> 308 308 </table> 309 309 </div> 310 310 </div> 311 311 312 312 ## --- 生徒会情報アコーディオン --- 313 -<div class="school-section-divider">294 +<div style="margin:20px 0 16px;"> 314 314 <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')?'▲':'▼';"> 315 - <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> 316 316 生徒会情報を見る <span class="shortcut-arrow">▼</span> 317 317 </button> 318 318 </div> ... ... @@ -328,36 +328,36 @@ 328 328 #elseif($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewOrgChart = false) 329 329 #end 330 330 #if($canViewOrgChart) 331 -<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> 332 332 <div class="school-section-card"> 333 333 <div class="card-inner"> 334 334 #if($orgChartImage && $orgChartImage != '') 335 - <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> 336 336 #end 337 - #if($orgChart && $orgChart != '')$ !escapetool.xml($orgChart)#end318 + #if($orgChart && $orgChart != '')$escapetool.xml($orgChart)#end 338 338 </div> 339 339 </div> 340 340 #else 341 -<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> 342 342 #end 343 343 #end 344 344 345 345 ## --- ③④⑤ 日常の活動・選挙・定例活動 --- 346 346 <div class="school-section-grid"> 347 - #if($dailyActivities && !$dailyActivities.isEmpty())328 + #if($dailyActivities && $dailyActivities != '') 348 348 <div class="school-section-card"> 349 - <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> 350 350 <div class="card-inner"> 351 - <p class="activity-hint">活動時間の多い順に上位3つ</p>332 + <p style="font-size:0.88em; color:#9ca3af; margin-bottom:12px;">活動時間の多い順に上位3つ</p> 352 352 <div class="tag-container"> 353 353 #set($daIdx = 1) 354 - #foreach($da in $dailyActivities) 355 - <span class="tag tag-accent">${daIdx}. $ !escapetool.xml($da.trim())</span>335 + #foreach($da in $dailyActivities.split(",")) 336 + <span class="tag tag-accent">${daIdx}. $escapetool.xml($da.trim())</span> 356 356 #set($daIdx = $daIdx + 1) 357 357 #end 358 358 </div> 359 359 #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '') 360 - <div class="free-note">$ !escapetool.xml($dailyActivitiesNote)</div>341 + <div class="free-note">$escapetool.xml($dailyActivitiesNote)</div> 361 361 #end 362 362 </div> 363 363 </div> ... ... @@ -365,20 +365,20 @@ 365 365 366 366 #if($electionExists && $electionExists != '') 367 367 <div class="school-section-card"> 368 - <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> 369 369 <div class="card-inner"> 370 370 <div class="info-row"> 371 371 <span class="info-label">役員選挙</span> 372 - <span class="info-value">$ !escapetool.xml($!electionExists)</span>353 + <span class="info-value">$escapetool.xml($!electionExists)</span> 373 373 </div> 374 374 #if($electionType && $electionType != '') 375 375 <div class="info-row"> 376 376 <span class="info-label">直近の選挙方式</span> 377 - <span class="info-value">$ !escapetool.xml($!electionType)</span>358 + <span class="info-value">$escapetool.xml($!electionType)</span> 378 378 </div> 379 379 #end 380 380 #if($electionNote && $electionNote.trim() != '') 381 - <div class="free-note">$ !escapetool.xml($electionNote)</div>362 + <div class="free-note">$escapetool.xml($electionNote)</div> 382 382 #end 383 383 </div> 384 384 </div> ... ... @@ -388,14 +388,14 @@ 388 388 <div class="school-section-grid"> 389 389 #if($meetingFrequency && $meetingFrequency != '') 390 390 <div class="school-section-card"> 391 - <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> 392 392 <div class="card-inner"> 393 393 <div class="info-row"> 394 394 <span class="info-label">役員定例会の頻度</span> 395 - <span class="info-value">$ !escapetool.xml($!meetingFrequency)</span>376 + <span class="info-value">$escapetool.xml($!meetingFrequency)</span> 396 396 </div> 397 397 #if($regularActivitiesNote && $regularActivitiesNote.trim() != '') 398 - <div class="free-note">$ !escapetool.xml($regularActivitiesNote)</div>379 + <div class="free-note">$escapetool.xml($regularActivitiesNote)</div> 399 399 #end 400 400 </div> 401 401 </div> ... ... @@ -402,7 +402,7 @@ 402 402 #end 403 403 404 404 ## --- ⑦ 予算 --- 405 - #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty())|| ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))386 + #set($hasBudget = ($budgetProcess && $budgetProcess != '') || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != '')) 406 406 #if($hasBudget) 407 407 ## 公開範囲チェック 408 408 #set($canViewBudget = true) ... ... @@ -411,15 +411,15 @@ 411 411 #end 412 412 #if($canViewBudget) 413 413 <div class="school-section-card"> 414 - <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> 415 415 <div class="card-inner"> 416 - #if($budgetProcess && !$budgetProcess.isEmpty())397 + #if($budgetProcess && $budgetProcess != '') 417 417 <div class="info-row"> 418 418 <span class="info-label">作成過程の生徒関与</span> 419 419 <span class="info-value"> 420 420 <div class="selection-display"> 421 - #foreach($bp in $budgetProcess) 422 - <span class="selection-item">$ !escapetool.xml($bp.trim())</span>402 + #foreach($bp in $budgetProcess.split(",")) 403 + <span class="selection-item">$escapetool.xml($bp.trim())</span> 423 423 #end 424 424 </div> 425 425 </span> ... ... @@ -428,22 +428,22 @@ 428 428 #if($studentFee && $studentFee != '') 429 429 <div class="info-row"> 430 430 <span class="info-label">生徒会費（年額）</span> 431 - <span class="info-value">$ !escapetool.xml($!studentFee)</span>412 + <span class="info-value">$escapetool.xml($!studentFee)</span> 432 432 </div> 433 433 #end 434 434 #if($budgetScale && $budgetScale != '') 435 435 <div class="info-row"> 436 436 <span class="info-label">予算規模</span> 437 - <span class="info-value">$ !escapetool.xml($!budgetScale)</span>418 + <span class="info-value">$escapetool.xml($!budgetScale)</span> 438 438 </div> 439 439 #end 440 - #if($budgetAllocation && !$budgetAllocation.isEmpty())421 + #if($budgetAllocation && $budgetAllocation != '') 441 441 <div class="info-row"> 442 442 <span class="info-label">主な予算配分</span> 443 443 <span class="info-value"> 444 444 <div class="selection-display"> 445 - #foreach($ba in $budgetAllocation) 446 - <span class="selection-item">$ !escapetool.xml($ba.trim())</span>426 + #foreach($ba in $budgetAllocation.split(",")) 427 + <span class="selection-item">$escapetool.xml($ba.trim())</span> 447 447 #end 448 448 </div> 449 449 </span> ... ... @@ -450,12 +450,12 @@ 450 450 </div> 451 451 #end 452 452 #if($budgetNote && $budgetNote.trim() != '') 453 - <div class="free-note">$ !escapetool.xml($budgetNote)</div>434 + <div class="free-note">$escapetool.xml($budgetNote)</div> 454 454 #end 455 455 </div> 456 456 </div> 457 457 #else 458 - <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> 459 459 #end 460 460 #end 461 461 </div> ... ... @@ -468,44 +468,44 @@ 468 468 #elseif($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewRuleReview = false) 469 469 #end 470 470 #if($canViewRuleReview) 471 -<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> 472 472 <div class="school-section-card"> 473 473 <div class="card-inner"> 474 474 <div class="info-row"> 475 475 <span class="info-label">見直しの有無（3年以内）</span> 476 - <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> 477 477 </div> 478 - #if($ruleReviewContent && !$ruleReviewContent.isEmpty())459 + #if($ruleReviewContent && $ruleReviewContent != '') 479 479 <div class="info-row"> 480 480 <span class="info-label">見直しの内容</span> 481 481 <span class="info-value"> 482 482 <div class="selection-display"> 483 - #foreach($rc in $ruleReviewContent) 484 - <span class="selection-item">$ !escapetool.xml($rc.trim())</span>464 + #foreach($rc in $ruleReviewContent.split(",")) 465 + <span class="selection-item">$escapetool.xml($rc.trim())</span> 485 485 #end 486 486 </div> 487 487 </span> 488 488 </div> 489 489 #end 490 - #if($ruleReviewProposer && !$ruleReviewProposer.isEmpty())471 + #if($ruleReviewProposer && $ruleReviewProposer != '') 491 491 <div class="info-row"> 492 492 <span class="info-label">見直しの提案者</span> 493 493 <span class="info-value"> 494 494 <div class="selection-display"> 495 - #foreach($rp in $ruleReviewProposer) 496 - <span class="selection-item">$ !escapetool.xml($rp.trim())</span>476 + #foreach($rp in $ruleReviewProposer.split(",")) 477 + <span class="selection-item">$escapetool.xml($rp.trim())</span> 497 497 #end 498 498 </div> 499 499 </span> 500 500 </div> 501 501 #end 502 - #if($ruleReviewImplementer && !$ruleReviewImplementer.isEmpty())483 + #if($ruleReviewImplementer && $ruleReviewImplementer != '') 503 503 <div class="info-row"> 504 504 <span class="info-label">見直しの実施者</span> 505 505 <span class="info-value"> 506 506 <div class="selection-display"> 507 - #foreach($ri in $ruleReviewImplementer) 508 - <span class="selection-item">$ !escapetool.xml($ri.trim())</span>488 + #foreach($ri in $ruleReviewImplementer.split(",")) 489 + <span class="selection-item">$escapetool.xml($ri.trim())</span> 509 509 #end 510 510 </div> 511 511 </span> ... ... @@ -514,13 +514,13 @@ 514 514 #if($ruleReviewSystem && $ruleReviewSystem != '') 515 515 <div class="info-row"> 516 516 <span class="info-label">見直しの仕組み</span> 517 - <span class="info-value">$ !escapetool.xml($!ruleReviewSystem)</span>498 + <span class="info-value">$escapetool.xml($!ruleReviewSystem)</span> 518 518 </div> 519 519 #end 520 520 </div> 521 521 </div> 522 522 #else 523 -<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> 524 524 #end 525 525 #end 526 526 ... ... @@ -532,10 +532,10 @@ 532 532 #elseif($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewChallenges = false) 533 533 #end 534 534 #if($canViewChallenges) 535 -<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> 536 -<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> 537 537 #else 538 -<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> 539 539 #end 540 540 #end 541 541 ... ... @@ -549,7 +549,7 @@ 549 549 ## --- 投稿者ステータス凡例（折りたたみ） --- 550 550 {{html clean="false"}} 551 551 <div class="author-legend-wrapper"> 552 - <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> 553 553 <div class="author-legend-body"> 554 554 <div class="author-legend"> 555 555 <span class="author-legend-title">投稿者の信頼度:</span> ... ... @@ -560,17 +560,11 @@ 560 560 </div> 561 561 <div class="author-legend"> 562 562 <span class="author-legend-title">所属:</span> 563 - <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>564 - <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>565 - <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>566 - <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> 567 567 </div> 568 - <div class="author-legend"> 569 - <span class="author-legend-title">役割:</span> 570 - <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> 571 - <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> 572 - <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> 573 - </div> 574 574 </div> 575 575 </div> 576 576 ... ... @@ -650,41 +650,27 @@ 650 650 #set($threadPosts = []) 651 651 #set($discard = $threadPosts.addAll($pinnedPosts)) 652 652 #set($discard = $threadPosts.addAll($normalPosts)) 653 - ## report/comment カウント 654 - #set($reportCount = 0) 655 - #set($commentCount = 0) 656 - #foreach($tp in $threadPosts) 657 - #set($tpType = $!tp.getValue('postType')) 658 - #if($tpType == 'comment') 659 - #set($commentCount = $commentCount + 1) 660 - #else 661 - #set($reportCount = $reportCount + 1) 662 - #end 663 - #end 664 664 665 665 {{html clean="false"}} 666 -<div class="activity-thread" data-fiscal-year="$ !escapetool.xml($actFY)">630 +<div class="activity-thread" data-fiscal-year="$escapetool.xml($actFY)"> 667 667 <div class="activity-thread-header"> 668 668 <div class="activity-thread-title"> 669 - <h3 #if($actFeatured == '1')class="featured-title"#end>$ !escapetool.xml($!actTitle) #if($actFeatured == '1')<svgclass="ico ico-fixed-14o-star-offset" viewBox="0 0 24 24" fill="currentColor" stroke="none"><polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"/></svg>#end</h3>670 - <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> 671 671 </div> 672 - <div class="thread-meta-row">673 - <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> 674 674 #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred') 675 675 #if($actFeatured == '1') 676 - <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> 677 677 #else 678 - <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> 679 679 #end 680 680 #end 681 681 </div> 682 682 </div> 683 683 684 - ## --- 活動報告セクション --- 685 685 #foreach($post in $threadPosts) 686 - #set($thisPostType = $!post.getValue('postType')) 687 - #if($thisPostType != 'comment') 688 688 #set($postContent = $post.getValue('content')) 689 689 #set($postAuthor = $post.getValue('author')) 690 690 #set($postAccountType = $!post.getValue('authorAccountType')) ... ... @@ -696,17 +696,17 @@ 696 696 #set($postDeleted = $!post.getValue('deleted')) 697 697 #if($postDeleted == 1 || $postDeleted == '1') 698 698 #if($viewerAccountType == 'admin') 699 - <div class="thread-post thread-post-deleted t hread-post-admin-deleted">700 - <div class="thread-post-admin-deleted-content">701 - <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> 702 702 <strong>投稿者により削除済み</strong>（$!post.getValue('deletedAt')） 703 - <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> 704 704 </div> 705 705 </div> 706 706 #else 707 - <div class="thread-post thread-post-deleted thread-post-user-deleted">708 - <div class="thread-post-user-deleted-content">709 - <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> 710 710 この投稿は削除されました 711 711 </div> 712 712 </div> ... ... @@ -716,11 +716,11 @@ 716 716 #set($postHidden = $!post.getValue('hidden')) 717 717 #if($postHidden == 1 || $postHidden == '1') 718 718 #if($viewerAccountType == 'admin') 719 - <div class="thread-post t hread-post-admin-hidden">720 - <div class="thread-post-admin-hidden-content">721 - <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> 722 - <strong>通報により非表示中</strong>（理由: $ !escapetool.xml($!post.getValue('hiddenReason'))）723 - <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> 724 724 </div> 725 725 </div> 726 726 #end ... ... @@ -734,7 +734,7 @@ 734 734 #end 735 735 #if(!$canViewPost) 736 736 <div class="thread-post visibility-restricted-post"> 737 - <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> 738 738 </div> 739 739 #else 740 740 ## 投稿者のアカウント種別に基づいたCSSクラス ... ... @@ -753,49 +753,52 @@ 753 753 <div class="thread-post-content"> 754 754 <div class="thread-post-header"> 755 755 #if($isPinned == '1') 756 - <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> 757 757 #end 758 758 #set($postAuthorRef = $!post.getValue('authorRef')) 759 759 <span class="thread-post-author"> 760 760 #if($postAuthorRef && $postAuthorRef != '') 761 - <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> 762 762 #else 763 - $ !escapetool.xml($!postAuthor)724 + $escapetool.xml($!postAuthor) 764 764 #end 765 765 </span> 766 766 <span class="author-badge"> 767 767 #if($postAccountType == 'admin') 768 - <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> 769 769 #elseif($postAccountType == 'verified') 770 - <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> 771 771 #elseif($postAccountType == 'referred') 772 - <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> 773 773 #else 774 - <span class="badge badge-general badge-sm">一般</span>735 + <span class="badge badge-general" style="font-size:0.75em;padding:1px 7px;">一般</span> 775 775 #end 776 776 ## 所属バッジ（投稿者の学校コードとページの学校コードを比較） 777 777 #if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general') 778 778 #if($postSchoolCode == $schoolCode) 779 779 #if($postAccountType == 'verified' || $postAccountType == 'admin') 780 - <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> 781 781 #else 782 - <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> 783 783 #end 784 784 #else 785 - <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> 786 786 #end 787 787 #end 788 788 #if($postUserRole == 'student') 789 - <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> 790 790 #set($postIsOfficer = $!post.getValue('authorIsOfficer')) 791 791 #if($postIsOfficer == 'true') 792 - <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> 793 793 #end 794 794 #elseif($postUserRole == 'teacher') 795 - <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> 796 796 #elseif($postUserRole == 'graduate') 797 - <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> 798 798 #end 760 + #if($postGrade && $postGrade != '') 761 + <span class="badge badge-grade" style="font-size:0.75em;padding:1px 7px;">$postGrade</span> 762 + #end 799 799 </span> 800 800 <span class="thread-post-date">$!postDate</span> 801 801 #set($postEdited = $!post.getValue('edited')) ... ... @@ -804,7 +804,7 @@ 804 804 #end 805 805 </div> 806 806 <div class="thread-post-body"> 807 - $ !escapetool.xml($!postContent)771 + $escapetool.xml($!postContent) 808 808 #set($postImages = $!post.getValue('images')) 809 809 #if($postImages && $postImages.trim() != '') 810 810 <div class="post-images"> ... ... @@ -818,7 +818,7 @@ 818 818 #if($imgName != '') 819 819 <div class="post-image-item"> 820 820 <a href="$doc.getAttachmentURL($imgName)" target="_blank"> 821 - <img src="$doc.getAttachmentURL($imgName)" alt="$ !escapetool.xml($imgName)" loading="lazy"/>785 + <img src="$doc.getAttachmentURL($imgName)" alt="$escapetool.xml($imgName)" loading="lazy"/> 822 822 </a> 823 823 </div> 824 824 #end ... ... @@ -849,14 +849,14 @@ 849 849 #set($displayName = $fName.replaceFirst('file_\d{14}_\d+_', '')) 850 850 #end 851 851 <div class="post-file-item"> 852 - <a href="$doc.getAttachmentURL($fName)" target="_blank" download="$ !escapetool.xml($displayName)">853 - #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>854 - #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>855 - #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>856 - #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>857 - #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> 858 858 #end 859 - <span class="post-file-name">$ !escapetool.xml($displayName)</span>823 + <span class="post-file-name">$escapetool.xml($displayName)</span> 860 860 </a> 861 861 </div> 862 862 #end ... ... @@ -866,19 +866,19 @@ 866 866 #end 867 867 </div> 868 868 #if($postVis != 'public') 869 - <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> 870 870 #end 871 871 ## 固定/解除ボタン（承認済み・管理者のみ） 872 872 #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified') 873 873 #set($postObjNum = $post.number) 874 - <div class="post-pin-action post-action-mt">838 + <div class="post-pin-action" style="margin-top:6px;"> 875 875 #if($isPinned == '1') 876 876 <a href="$doc.getURL('view', "action=unpin&postObj=${postObjNum}&form_token=${services.csrf.getToken()}")" class="btn-pin-toggle btn-unpin" title="固定を解除"> 877 - <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> 固定を解除 878 878 </a> 879 879 #else 880 880 <a href="$doc.getURL('view', "action=pin&postObj=${postObjNum}&form_token=${services.csrf.getToken()}")" class="btn-pin-toggle btn-pin" title="この投稿を固定"> 881 - <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> 固定する 882 882 </a> 883 883 #end 884 884 </div> ... ... @@ -887,14 +887,14 @@ 887 887 #set($postAuthorRef = $!post.getValue('authorRef')) 888 888 #set($postObjNumED = $post.number) 889 889 #if($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin') 890 - <div class="post-edit-actions post-action-mt">854 + <div class="post-edit-actions" style="margin-top:6px;display:flex;gap:8px;"> 891 891 #if($xcontext.user == $postAuthorRef) 892 - <button type="button" class="btn-post-edit" onclick="openEditPost(this, '${doc.fullName}', $postObjNumED, '$ !escapetool.javascript($!postContent)')" title="この投稿を編集">893 - <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> 編集 894 894 </button> 895 895 #end 896 896 <button type="button" class="btn-post-delete" onclick="confirmDeletePost('${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を削除"> 897 - <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> 削除 898 898 </button> 899 899 </div> 900 900 #end ... ... @@ -903,53 +903,15 @@ 903 903 #end## /canViewPost 904 904 #end## /postHidden 905 905 #end## /postDeleted 906 - #end## /postType != comment 907 - #end## /foreach reports 908 - 909 - ## --- コメントセクション（折りたたみ） --- 910 - #if($commentCount > 0) 911 - <details class="thread-comments-section"> 912 - <summary class="thread-comments-toggle"> 913 - <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}件のコメント 914 - </summary> 915 - #foreach($post in $threadPosts) 916 - #set($thisPostType = $!post.getValue('postType')) 917 - #if($thisPostType == 'comment') 918 - #set($postContent = $post.getValue('content')) 919 - #set($postAuthor = $post.getValue('author')) 920 - #set($postAccountType = $!post.getValue('authorAccountType')) 921 - #set($postDate = $post.getValue('createdDate')) 922 - #set($postDeleted = $!post.getValue('deleted')) 923 - #if($postDeleted == 1 || $postDeleted == '1') 924 - <div class="thread-comment thread-comment-deleted"> 925 - <span class="thread-comment-meta">このコメントは削除されました</span> 926 - </div> 927 - #else 928 - #set($postHidden = $!post.getValue('hidden')) 929 - #if($postHidden == 1 || $postHidden == '1') 930 - <div class="thread-comment thread-comment-hidden"> 931 - <span class="thread-comment-meta">このコメントは非表示にされました</span> 932 - </div> 933 - #else 934 - <div class="thread-comment"> 935 - <span class="thread-comment-author">$!escapetool.xml($postAuthor)</span> 936 - <span class="thread-comment-date">$!postDate</span> 937 - <div class="thread-comment-body">$!escapetool.xml($postContent)</div> 938 - </div> 939 - #end 940 - #end 941 - #end 942 - #end 943 - </details> 944 944 #end 945 945 946 946 #if($xcontext.user != "XWiki.XWikiGuest") 947 947 <div class="thread-add-post"> 948 - <a href="/bin/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"> 949 949 ＋ 活動報告を追加 950 950 </a> 951 - <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$ !escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">952 - <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> コメントを書く 953 953 </a> 954 954 </div> 955 955 #end ... ... @@ -959,7 +959,7 @@ 959 959 #else 960 960 {{html clean="false"}} 961 961 <div class="empty-state"> 962 - <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> 963 963 <div class="empty-state-title">活動報告はまだありません</div> 964 964 <div class="empty-state-desc">この学校の活動を記録して、他校と共有しましょう。<br>「活動を追加」ボタンから最初の活動を作成できます。</div> 965 965 </div> ... ... @@ -970,13 +970,66 @@ 970 970 #if($xcontext.user != "XWiki.XWikiGuest") 971 971 {{html clean="false"}} 972 972 <div class="activity-add-section"> 973 - <a href="/bin/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$ !escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity">974 - <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> 活動を追加 975 975 </a> 976 976 </div> 977 977 {{/html}} 978 978 #end 979 979 906 +## --- 年度アーカイブ セクション --- 907 +{{html clean="false"}} 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> 911 + 年度アーカイブ 912 + </h2> 913 + <div style="font-size:0.88em;color:var(--text-mid);margin-bottom:12px;"> 914 + 現在のページ: <strong>${pageFiscalYear}年度</strong> 915 + #set($lyud = $!doc.getValue('lastYearUpdateDate')) 916 + #if($lyud && $lyud != '') 917 + | 最終年度更新: $escapetool.xml($lyud) ($escapetool.xml($!doc.getValue('lastYearUpdateBy'))) 918 + #end 919 + </div> 920 + 921 + ## 過去アーカイブの検索 922 + #set($archiveQuery = $services.query.hql("where doc.fullName like :pattern and doc.fullName like '%Archive_%' order by doc.fullName desc").bindValue("pattern", "${doc.fullName}.Archive_%").setLimit(20)) 923 + #set($archivePages = $archiveQuery.execute()) 924 + 925 + #if($archivePages && $archivePages.size() > 0) 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;"> 929 + #foreach($archPage in $archivePages) 930 + #set($archPageDoc = $xwiki.getDocument($archPage)) 931 + #set($archPageObj = $archPageDoc.getObject('SeitokaiCode.SchoolClass')) 932 + #if($archPageObj) 933 + #set($archPageFY = $!archPageObj.getValue('fiscalYear')) 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> 936 + ${archPageFY}年度 937 + </a> 938 + #end 939 + #end 940 + </div> 941 + </div> 942 + #else 943 + <div style="font-size:0.88em;color:var(--text-light);margin-bottom:12px;">過去のアーカイブはまだありません</div> 944 + #end 945 + 946 + ## 新年度に移行ボタン（承認済み・管理者のみ） 947 + #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified') 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> 951 + ${pageFiscalYear}年度をアーカイブして新年度に移行 952 + </a> 953 + <div style="font-size:0.8em;color:var(--text-light);margin-top:6px;">現在の学校情報を${pageFiscalYear}年度として保存し、新しい年度に移行します。</div> 954 + </div> 955 + #end 956 +</div> 957 +{{/html}} 958 + 980 980 ## --- 年度タブ切り替え JavaScript --- 981 981 {{html clean="false"}} 982 982 <script> ... ... @@ -986,19 +986,29 @@ 986 986 btn.classList.add('active'); 987 987 // 活動スレッドの表示切り替え 988 988 document.querySelectorAll('.activity-thread[data-fiscal-year]').forEach(function(thread) { 989 - if (fy === 'all' || thread.getAttribute('data-fiscal-year') === fy) { 990 - 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 = ''; 991 991 } else { 992 - thread. classList.add('fy-hidden');973 + thread.style.display = 'none'; 993 993 } 994 994 }); 995 995 } 996 -// ページ読み込み時の 初期化977 +// ページ読み込み時にデフォルトで現在の年度を表示 997 997 document.addEventListener('DOMContentLoaded', function() { 998 - // デフォルトで現在の年度を表示 999 999 var defaultTab = document.querySelector('.activity-fy-tab.active'); 1000 1000 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 + } 1001 1001 // 保存成功時のトースト通知 988 + if (window.location.search.indexOf('archived=1') !== -1) { 989 + showToast('年度アーカイブを作成しました', 'success'); 990 + } 1002 1002 if (window.location.search.indexOf('saved=1') !== -1) { 1003 1003 showToast('学校情報を保存しました', 'success'); 1004 1004 // URLパラメータをクリーンアップ（リロード時に再表示されないよう） ... ... @@ -1019,8 +1019,8 @@ 1019 1019 document.body.appendChild(container); 1020 1020 } 1021 1021 var icons = { 1022 - success: '<svg class="icoico-md" viewBox="0 0 24 24" stroke-width="2.5"><path d="M20 6L9 17l-5-5"/></svg>',1023 - 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>' 1024 1024 }; 1025 1025 var toast = document.createElement('div'); 1026 1026 toast.className = 'toast toast-' + type; ... ... @@ -1034,9 +1034,7 @@ 1034 1034 var card = document.getElementById(cardId); 1035 1035 if (!card) return; 1036 1036 card.classList.toggle('collapsed'); 1037 - var isCollapsed = card.classList.contains('collapsed'); 1038 - var h2 = card.querySelector('h2[role="button"]'); 1039 - if (h2) h2.setAttribute('aria-expanded', !isCollapsed); 1026 + card.classList.remove('mobile-collapse'); 1040 1040 } 1041 1041 1042 1042 // 投稿の編集（インライン編集フォームを開く） ... ... @@ -1068,9 +1068,7 @@ 1068 1068 var csrfEl = document.querySelector('input[name="form_token"]'); 1069 1069 var csrfToken = csrfEl ? csrfEl.value : ''; 1070 1070 var xhr = new XMLHttpRequest(); 1071 - xhr.open('POST', '/bin/SeitokaiCode/EditPost?outputSyntax=plain', true); 1072 - xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'); 1073 - var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken); 1058 + xhr.open('GET', '/xwiki/bin/view/SeitokaiCode/EditPost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken), true); 1074 1074 xhr.onload = function() { 1075 1075 try { 1076 1076 var res = JSON.parse(xhr.responseText); ... ... @@ -1083,7 +1083,7 @@ 1083 1083 } catch(e) { alert('編集に失敗しました'); } 1084 1084 }; 1085 1085 xhr.onerror = function() { alert('通信エラーが発生しました'); }; 1086 - xhr.send( editPostData);1071 + xhr.send(); 1087 1087 } 1088 1088 1089 1089 // 投稿の削除（確認ダイアログ付き） ... ... @@ -1090,9 +1090,7 @@ 1090 1090 function confirmDeletePost(schoolPage, postObjNum, token) { 1091 1091 if (!confirm('この投稿を削除しますか？\\n削除後は「この投稿は削除されました」と表示されます。')) return; 1092 1092 var xhr = new XMLHttpRequest(); 1093 - xhr.open('POST', '/bin/SeitokaiCode/DeletePost?outputSyntax=plain', true); 1094 - xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'); 1095 - var deletePostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token); 1078 + xhr.open('GET', '/xwiki/bin/view/SeitokaiCode/DeletePost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token), true); 1096 1096 xhr.onload = function() { 1097 1097 try { 1098 1098 var res = JSON.parse(xhr.responseText); ... ... @@ -1105,7 +1105,7 @@ 1105 1105 } catch(e) { alert('削除に失敗しました'); } 1106 1106 }; 1107 1107 xhr.onerror = function() { alert('通信エラーが発生しました'); }; 1108 - xhr.send( deletePostData);1091 + xhr.send(); 1109 1109 } 1110 1110 </script> 1111 1111 {{/html}}