Changes for page 学校ページ テンプレート
Last modified by Super Admin on 2026/04/05 18:59
From version 
72.1 
72.1
edited by Super Admin
on 2026/03/18 23:33
on 2026/03/18 23:33
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,27 +1,10 @@ 1 1 {{velocity}} 2 2 ## ===== 学校ページ テンプレート ===== 3 -## ゲストが ?sheet= 付きURL（編集フォーム等）に直接アクセスした場合、ログインページへリダイレクト 4 -#if($xcontext.user == 'XWiki.XWikiGuest' && $request.sheet && $request.sheet != '') 5 - #set($currentUrl = $doc.getURL('view', "sheet=${request.sheet}")) 6 - $response.sendRedirect("/bin/login/XWiki/XWikiLogin?srid=$escapetool.url($currentUrl)") 7 - #stop 8 -#end 9 -{{html clean="false"}} 10 -## メンテナンスバナー（{{include}}ではなくインラインで記述し、<p>タグ挿入を回避） 11 -#set($bannerDoc = $xwiki.getDocument('SeitokaiAdmin.MaintenanceBanner')) 12 -#set($bannerObj = $bannerDoc.getObject('SeitokaiCode.MaintenanceBannerClass')) 13 -#if($bannerObj && $bannerObj.getValue('enabled') == 1) 14 -#set($bannerMsg = $bannerObj.getValue('message')) 15 -#set($bannerLevel = $bannerObj.getValue('level')) 16 -#if(!$bannerLevel || $bannerLevel == '')#set($bannerLevel = 'warning')#end 17 -<div class="maintenance-banner active maintenance-${bannerLevel}" id="maintenance-banner"> 18 - <div class="maintenance-banner-inner"> 19 - <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> 20 - <span class="maintenance-text">$!escapetool.xml($bannerMsg)</span> 21 - <button class="maintenance-close" onclick="document.getElementById('maintenance-banner').style.display='none'">×</button> 22 - </div> 23 -</div> 24 -#end 3 +## このテンプレートは学校ページの表示と入力フォームを制御します。 4 + 5 +## メンテナンスバナー 6 +{{include reference="SeitokaiCode.MaintenanceBannerInclude" /}} 7 + 25 25 ## --- 学校基本情報フィールド --- 26 26 #set($schoolCode = $doc.getValue('schoolCode')) 27 27 #set($schoolName = $doc.getValue('schoolName')) ... ... @@ -71,7 +71,9 @@ 71 71 #set($seitokaiYoutube = $doc.getValue('seitokaiYoutube')) 72 72 #set($seitokaiOtherSns = $doc.getValue('seitokaiOtherSns')) 73 73 74 -## --- 現在の年度を計算（4月始まり） --- 57 +## --- 年度アーカイブ --- 58 +#set($pageFiscalYear = $!doc.getValue('fiscalYear')) 59 +## 現在の年度を計算（4月始まり） 75 75 #set($nowFY = $datetool.date) 76 76 #set($currentFYMonth = $mathtool.toInteger($datetool.format('MM', $nowFY))) 77 77 #set($currentFYYear = $mathtool.toInteger($datetool.format('yyyy', $nowFY))) ... ... @@ -80,6 +80,10 @@ 80 80 #else 81 81 #set($currentFiscalYear = $mathtool.sub($currentFYYear, 1)) 82 82 #end 68 +## fiscalYear 未設定時はデフォルトとして現在の年度を使う 69 +#if(!$pageFiscalYear || $pageFiscalYear == '') 70 + #set($pageFiscalYear = $currentFiscalYear.toString()) 71 +#end 83 83 84 84 ## --- 公開範囲フィールド --- 85 85 #set($visibilityOrgChart = $!doc.getValue('visibilityOrgChart')) ... ... @@ -101,81 +101,15 @@ 101 101 #set($viewerDoc = $xwiki.getDocument($viewerUser)) 102 102 #set($viewerAccountType = $!viewerDoc.getValue('accountType')) 103 103 #set($viewerSchoolCode = $!viewerDoc.getValue('schoolCode')) 104 - #set($viewerSecondarySchoolCode = $!viewerDoc.getValue('secondarySchoolCode')) 105 - #set($viewerUserRole = $!viewerDoc.getValue('userRole')) 106 106 #if($viewerAccountType == 'admin') 107 107 #set($isViewerAdmin = true) 108 108 #end 109 109 #end 110 110 111 -## --- 関連校（中高一貫校）情報 --- 112 -#set($affiliatedSchoolCode = $!doc.getValue('affiliatedSchoolCode')) 113 -#set($affiliatedSchoolName = $!doc.getValue('affiliatedSchoolName')) 114 -#set($isAffiliated = false) 115 -#if($affiliatedSchoolCode && $affiliatedSchoolCode != '') 116 - #if($viewerSchoolCode == $affiliatedSchoolCode) 117 - #set($isAffiliated = true) 118 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode) 119 - #set($isAffiliated = true) 120 - #end 121 -#end 122 - 123 -## --- 校内判定（卒業生を除外、secondarySchoolCodeも含む） --- 124 -#set($isSchoolMember = false) 125 -#if(!$isGuest && $viewerUserRole != 'graduate') 126 - #if($viewerSchoolCode == $schoolCode || $isAffiliated) 127 - #set($isSchoolMember = true) 128 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode) 129 - #set($isSchoolMember = true) 130 - #end 131 -#end 132 -## 卒業生の母校判定（投稿バッジ用） 133 -#set($isAlumniOfSchool = false) 134 -#if(!$isGuest && $viewerUserRole == 'graduate') 135 - #if($viewerSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $viewerSchoolCode == $affiliatedSchoolCode)) 136 - #set($isAlumniOfSchool = true) 137 - #end 138 -#end 139 - 140 -## --- 学校ページ非表示チェック --- 141 -#set($schoolHidden = $doc.getValue('hidden')) 142 -#if($schoolHidden == 1) 143 - #if($isViewerAdmin) 144 - ## 管理者: 黄色バナー + ページ内容は通常表示（プレビュー） 145 -<div class="school-hidden-banner admin"> 146 - <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> 147 - <div> 148 - <strong>このページは非表示になっています</strong>（管理者のみ閲覧可能） 149 - #set($hBy = $!doc.getValue('hiddenBy')) 150 - #set($hAt = $!doc.getValue('hiddenAt')) 151 - #set($hReason = $!doc.getValue('hiddenReason')) 152 - <div class="school-hidden-detail"> 153 - 非表示: $!escapetool.xml($hAt) / $!escapetool.xml($hBy) 154 - #if($hReason && $hReason != '') ・ 理由: $!escapetool.xml($hReason)#end 155 - </div> 156 - <a href="$xwiki.getURL('SeitokaiAdmin.SchoolManagement', 'view')" style="color:#92400e;text-decoration:underline">学校ページ管理へ</a> 157 - </div> 158 -</div> 159 - #else 160 - ## 一般ユーザー・ゲスト: 非公開メッセージを表示して停止 161 -<div class="school-hidden-public"> 162 - <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> 163 - <h2>このページは現在公開されていません</h2> 164 - <p>このページは管理者により非公開に設定されています。</p> 165 - <a href="$xwiki.getURL('Schools.WebHome', 'view')" class="btn-back-list">学校一覧に戻る</a> 166 -</div> 167 -#stop 168 - #end 169 -#end 170 - 171 171 ## --- 投稿固定/解除処理 --- 172 172 #set($pinAction = $!request.action) 173 -#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $isSchoolMember)) && $services.csrf.isTokenValid($request.form_token)) 174 - #set($pinPostObjStr = $!request.postObj) 175 - #if(!$pinPostObjStr.matches('^\d+$')) 176 - ## 不正な値 → 無視 177 - #else 178 - #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)) 179 179 #set($postObj = $doc.getObject('SeitokaiCode.ActivityPostClass', $postObjNum)) 180 180 #if($postObj) 181 181 #if($pinAction == 'pin') ... ... @@ -195,15 +195,12 @@ 195 195 $response.sendRedirect($doc.getURL('view')) 196 196 #stop 197 197 #end 198 - #end## /matches 199 199 #end 200 200 201 201 ## --- 特色ある活動 選定/解除処理 --- 202 202 #set($featAction = $!request.action) 203 -#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $isSchoolMember)) && $services.csrf.isTokenValid($request.form_token)) 204 - #set($featActObjStr = $!request.actObj) 205 - #if($featActObjStr.matches('^\d+$')) 206 - #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)) 207 207 #set($actObj = $doc.getObject('SeitokaiCode.ActivityClass', $actObjNum)) 208 208 #if($actObj) 209 209 #if($featAction == 'feature') ... ... @@ -235,13 +235,12 @@ 235 235 $response.sendRedirect($doc.getURL('view')) 236 236 #stop 237 237 #end 238 - #end## /matches 239 239 #end 240 240 241 241 ## --- ユーザー情報取得 --- 242 242 ## displayName: Wiki上の表示名（ニックネーム）。本名(firstName/lastName)は管理者のみ閲覧可能。 243 243 #set($lastAuthor = $doc.author) 244 -#set($lastAuthorDoc = $xwiki.getDocument($lastAuthor)) 163 +#set($lastAuthorDoc = $xwiki.getDocument("XWiki.${lastAuthor}")) 245 245 #set($authorAccountType = '') 246 246 #set($authorUserRole = '') 247 247 #set($authorUserStatus = '') ... ... @@ -255,8 +255,7 @@ 255 255 #set($authorEnrollmentYear = $!lastAuthorDoc.getValue('enrollmentYear')) 256 256 #set($authorDisplayName = $!lastAuthorDoc.getValue('displayName')) 257 257 #if(!$authorDisplayName || $authorDisplayName == '') 258 - ## false引数でプレーンテキスト（HTMLリンクなし）を取得 259 - #set($authorDisplayName = $xwiki.getUserName($doc.author, false)) 177 + #set($authorDisplayName = $xwiki.getUserName($doc.author)) 260 260 #end 261 261 ## --- 学年の動的計算（学校種別対応） --- 262 262 ## 日本の学校年度: 4月始まり。currentSchoolYear = (月>=4) ? 今年 : 去年 ... ... @@ -294,310 +294,338 @@ 294 294 #end 295 295 #end 296 296 297 -## --- 学校名見出し（XWikiデフォルトタイトルを非表示にし、学校名を表示） --- 298 -#if($schoolName && $schoolName != '') 299 -<style>.document-header { display: none !important; }</style> 300 -<h1 class="school-page-title">$!escapetool.xml($schoolName)</h1> 301 -#end 302 - 303 -## --- 編集ボタン（権限があるユーザーのみ表示） --- 304 -#set($canEditSchool = false) 305 -#if(!$isGuest && ($isViewerAdmin || $isSchoolMember)) 306 - #set($canEditSchool = true) 307 -#end 308 -#if($canEditSchool) 309 -<div style="text-align:right; margin-bottom:12px;"> 310 - <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 + #elseif($authorUserRole == 'teacher') 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> 233 + #elseif($authorUserRole == 'graduate') 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> 235 + #end 236 + ## 学年（生徒のみ公開） 237 + #if($authorGrade && $authorGrade != '') 238 + <span class="badge badge-grade">$authorGrade</span> 239 + #end 240 + ## 在籍状態（卒業・休学等の場合のみ表示） 241 + #if($authorUserStatus == 'graduated') 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> 243 + #elseif($authorUserStatus == 'on_leave') 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> 245 + #elseif($authorUserStatus == 'transferred') 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> 247 + #end 248 + <span class="badge-info">最終編集: $escapetool.xml($authorDisplayName) ($xwiki.formatDate($doc.date, "yyyy/MM/dd"))</span> 311 311 </div> 312 - #end250 +{{/html}} 313 313 314 -## --- 関連校（中高一貫校）バナー --- 315 -#if($affiliatedSchoolCode && $affiliatedSchoolCode != '') 316 - #set($affiliatedPageRef = "Schools.${affiliatedSchoolCode}.WebHome") 317 - #set($affiliatedPageExists = $xwiki.exists($affiliatedPageRef)) 318 -<div class="affiliated-school-banner"> 319 - <svg class="ico" viewBox="0 0 24 24" stroke-width="1.5"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 320 - <div> 321 - <strong>中高一貫校</strong>： 322 - #if($affiliatedPageExists) 323 - <a href="$xwiki.getURL($affiliatedPageRef, 'view')">$!escapetool.xml($affiliatedSchoolName)</a> 324 - #else 325 - $!escapetool.xml($affiliatedSchoolName) 252 +{{html clean="false"}} 253 + 254 +## --- ① 学校基本情報 + 連絡先（左右グリッド・折りたたみ対応） --- 255 +<div class="school-info-grid"> 256 + <div class="school-info-card mobile-collapse" id="card-basic-info"> 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> 258 + <table class="wiki-table school-info-table"> 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> 262 + <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#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> 268 + </table> 269 + #set($infoEditDate = $!doc.getValue('lastInfoEditedDate')) 270 + #set($infoEditBy = $!doc.getValue('lastInfoEditedBy')) 271 + #if($infoEditDate && $infoEditDate != '') 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> 326 326 #end 327 - と連携しています 328 328 </div> 275 + 276 + <div class="school-info-card mobile-collapse" id="card-contact"> 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> 278 + <table class="wiki-table school-info-table"> 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> 285 + </table> 286 + </div> 329 329 </div> 330 -#end 331 331 332 -## --- ① 学校基本情報 --- 333 -<div class="school-info-card collapsed" id="card-basic-info"> 334 - <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><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M4 19.5A2.5 2.5 0 016.5 17H20"/><path d="M6.5 2H20v20H6.5A2.5 2.5 0 014 19.5v-15A2.5 2.5 0 016.5 2z"/></svg> 学校基本情報</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2> 335 - <table class="wiki-table school-info-table"> 336 - <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr> 337 - <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr> 338 - <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr> 339 - <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr> 340 - <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr> 341 - <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr> 342 - <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr> 343 - <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr> 344 - <tr><th>公式サイト</th><td>#if($website && $website != '')<a href="$!escapetool.xml($website)" target="_blank" rel="noopener">$!escapetool.xml($website)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr> 345 - </table> 346 - #set($infoEditDate = $!doc.getValue('lastInfoEditedDate')) 347 - #set($infoEditBy = $!doc.getValue('lastInfoEditedBy')) 348 - #if($infoEditDate && $infoEditDate != '') 349 - <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> 350 - #end 289 +## --- 生徒会情報アコーディオン --- 290 +<div style="margin:20px 0 16px;"> 291 + <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')?'▲':'▼';"> 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> 293 + 生徒会情報を見る <span class="shortcut-arrow">▼</span> 294 + </button> 351 351 </div> 352 352 353 -## --- ② 生徒会基本情報（折りたたみカード） --- 354 -<div class="school-info-card" id="card-seitokai-info"> 355 - <h2 role="button" tabindex="0" aria-expanded="true" onclick="toggleInfoCard('card-seitokai-info')" onkeydown="if(event.key==='Enter'||event.key===' '){event.preventDefault();toggleInfoCard('card-seitokai-info')}"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/></svg> 生徒会基本情報</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2> 356 - <div class="seitokai-info-body"> 297 +<div id="seitokai-info-section" class="seitokai-info-accordion"> 357 357 358 - ## --- 組織図 --- 359 - #set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != '')) 360 - #if($hasOrgContent) 361 - #set($canViewOrgChart = true) 362 - #if($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewOrgChart = false) 363 - #elseif($visibilityOrgChart == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewOrgChart = false) 364 - #end 365 - #if($canViewOrgChart) 366 - <div class="seitokai-subsection"> 367 - <h3 class="seitokai-subsection-title"><svg class="ico" 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 == 'school_trusted')<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> 校内承認者限定#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> 368 - <div class="seitokai-subsection-content"> 369 - #if($orgChartImage && $orgChartImage != '') 370 - <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div> 371 - #end 372 - #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end 373 - </div> 374 - </div> 375 - #else 376 - <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 == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div> 377 - #end 299 +## --- ② 組織図 --- 300 +#set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != '')) 301 +#if($hasOrgContent) 302 + ## 公開範囲チェック 303 + #set($canViewOrgChart = true) 304 + #if($visibilityOrgChart == 'members' && $isGuest) #set($canViewOrgChart = false) 305 + #elseif($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewOrgChart = false) 306 + #end 307 + #if($canViewOrgChart) 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> 309 +<div class="school-section-card"> 310 + <div class="card-inner"> 311 + #if($orgChartImage && $orgChartImage != '') 312 + <div style="margin-bottom:12px;"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" style="max-width:100%; border-radius:8px;" /></div> 378 378 #end 314 + #if($orgChart && $orgChart != '')$escapetool.xml($orgChart)#end 315 + </div> 316 +</div> 317 + #else 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> 319 + #end 320 +#end 379 379 380 - ## --- 日常の活動 --- 381 - #if($dailyActivities && !$dailyActivities.isEmpty()) 382 - <div class="seitokai-subsection"> 383 - <h3 class="seitokai-subsection-title"><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> 384 - <div class="seitokai-subsection-content"> 385 - <p class="activity-hint">活動時間の多い順に上位3つ</p> 386 - <div class="tag-container"> 387 - #set($daIdx = 1) 388 - #foreach($da in $dailyActivities) 389 - <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span> 390 - #set($daIdx = $daIdx + 1) 391 - #end 392 - </div> 393 - #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '') 394 - <div class="free-note">$!escapetool.xml($dailyActivitiesNote)</div> 322 +## --- ③④⑤ 日常の活動・選挙・定例活動 --- 323 +<div class="school-section-grid"> 324 + #if($dailyActivities && $dailyActivities != '') 325 + <div class="school-section-card"> 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> 327 + <div class="card-inner"> 328 + <p style="font-size:0.88em; color:#9ca3af; margin-bottom:12px;">活動時間の多い順に上位3つ</p> 329 + <div class="tag-container"> 330 + #set($daIdx = 1) 331 + #foreach($da in $dailyActivities.split(",")) 332 + <span class="tag tag-accent">${daIdx}. $escapetool.xml($da.trim())</span> 333 + #set($daIdx = $daIdx + 1) 395 395 #end 396 396 </div> 336 + #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '') 337 + <div class="free-note">$escapetool.xml($dailyActivitiesNote)</div> 338 + #end 397 397 </div> 398 - #end 340 + </div> 341 + #end 399 399 400 - ## --- 選挙 --- 401 - #if($electionExists && $electionExists != '') 402 - <div class="seitokai-subsection"> 403 - <h3 class="seitokai-subsection-title"><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> 404 - <div class="seitokai-subsection-content"> 405 - <div class="info-row"> 406 - <span class="info-label">役員選挙</span> 407 - <span class="info-value">$!escapetool.xml($!electionExists)</span> 408 - </div> 409 - #if($electionType && $electionType != '') 410 - <div class="info-row"> 411 - <span class="info-label">直近の選挙方式</span> 412 - <span class="info-value">$!escapetool.xml($!electionType)</span> 413 - </div> 414 - #end 415 - #if($electionNote && $electionNote.trim() != '') 416 - <div class="free-note">$!escapetool.xml($electionNote)</div> 417 - #end 343 + #if($electionExists && $electionExists != '') 344 + <div class="school-section-card"> 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> 346 + <div class="card-inner"> 347 + <div class="info-row"> 348 + <span class="info-label">役員選挙</span> 349 + <span class="info-value">$escapetool.xml($!electionExists)</span> 418 418 </div> 351 + #if($electionType && $electionType != '') 352 + <div class="info-row"> 353 + <span class="info-label">直近の選挙方式</span> 354 + <span class="info-value">$escapetool.xml($!electionType)</span> 355 + </div> 356 + #end 357 + #if($electionNote && $electionNote.trim() != '') 358 + <div class="free-note">$escapetool.xml($electionNote)</div> 359 + #end 419 419 </div> 420 - #end 361 + </div> 362 + #end 363 +</div> 421 421 422 - ## --- 定例活動 --- 423 - #if($meetingFrequency && $meetingFrequency != '') 424 - <div class="seitokai-subsection"> 425 - <h3 class="seitokai-subsection-title"><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> 426 - <div class="seitokai-subsection-content"> 427 - <div class="info-row"> 428 - <span class="info-label">役員定例会の頻度</span> 429 - <span class="info-value">$!escapetool.xml($!meetingFrequency)</span> 430 - </div> 431 - #if($regularActivitiesNote && $regularActivitiesNote.trim() != '') 432 - <div class="free-note">$!escapetool.xml($regularActivitiesNote)</div> 433 - #end 365 +<div class="school-section-grid"> 366 + #if($meetingFrequency && $meetingFrequency != '') 367 + <div class="school-section-card"> 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> 369 + <div class="card-inner"> 370 + <div class="info-row"> 371 + <span class="info-label">役員定例会の頻度</span> 372 + <span class="info-value">$escapetool.xml($!meetingFrequency)</span> 434 434 </div> 374 + #if($regularActivitiesNote && $regularActivitiesNote.trim() != '') 375 + <div class="free-note">$escapetool.xml($regularActivitiesNote)</div> 376 + #end 435 435 </div> 436 - #end 378 + </div> 379 + #end 437 437 438 - ## --- 予算 --- 439 - #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != '')) 440 - #if($hasBudget) 441 - #set($canViewBudget = true) 442 - #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewBudget = false) 443 - #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false) 381 + ## --- ⑦ 予算 --- 382 + #set($hasBudget = ($budgetProcess && $budgetProcess != '') || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != '')) 383 + #if($hasBudget) 384 + ## 公開範囲チェック 385 + #set($canViewBudget = true) 386 + #if($visibilityBudget == 'members' && $isGuest) #set($canViewBudget = false) 387 + #elseif($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewBudget = false) 388 + #end 389 + #if($canViewBudget) 390 + <div class="school-section-card"> 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> 392 + <div class="card-inner"> 393 + #if($budgetProcess && $budgetProcess != '') 394 + <div class="info-row"> 395 + <span class="info-label">作成過程の生徒関与</span> 396 + <span class="info-value"> 397 + <div class="selection-display"> 398 + #foreach($bp in $budgetProcess.split(",")) 399 + <span class="selection-item">$escapetool.xml($bp.trim())</span> 400 + #end 401 + </div> 402 + </span> 403 + </div> 444 444 #end 445 - #if($canViewBudget) 446 - <div class="seitokai-subsection"> 447 - <h3 class="seitokai-subsection-title"><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 == 'school_trusted')<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> 校内承認者限定#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> 448 - <div class="seitokai-subsection-content"> 449 - #if($budgetProcess && !$budgetProcess.isEmpty()) 450 - <div class="info-row"> 451 - <span class="info-label">作成過程の生徒関与</span> 452 - <span class="info-value"> 453 - <div class="selection-display"> 454 - #foreach($bp in $budgetProcess) 455 - <span class="selection-item">$!escapetool.xml($bp.trim())</span> 456 - #end 457 - </div> 458 - </span> 459 - </div> 460 - #end 461 - #if($studentFee && $studentFee != '') 462 - <div class="info-row"> 463 - <span class="info-label">生徒会費（年額）</span> 464 - <span class="info-value">$!escapetool.xml($!studentFee)</span> 465 - </div> 466 - #end 467 - #if($budgetScale && $budgetScale != '') 468 - <div class="info-row"> 469 - <span class="info-label">予算規模</span> 470 - <span class="info-value">$!escapetool.xml($!budgetScale)</span> 471 - </div> 472 - #end 473 - #if($budgetAllocation && !$budgetAllocation.isEmpty()) 474 - <div class="info-row"> 475 - <span class="info-label">主な予算配分</span> 476 - <span class="info-value"> 477 - <div class="selection-display"> 478 - #foreach($ba in $budgetAllocation) 479 - <span class="selection-item">$!escapetool.xml($ba.trim())</span> 480 - #end 481 - </div> 482 - </span> 483 - </div> 484 - #end 485 - #if($budgetNote && $budgetNote.trim() != '') 486 - <div class="free-note">$!escapetool.xml($budgetNote)</div> 487 - #end 405 + #if($studentFee && $studentFee != '') 406 + <div class="info-row"> 407 + <span class="info-label">生徒会費（年額）</span> 408 + <span class="info-value">$escapetool.xml($!studentFee)</span> 488 488 </div> 489 - </div> 490 - #else 491 - <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 == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div> 492 492 #end 411 + #if($budgetScale && $budgetScale != '') 412 + <div class="info-row"> 413 + <span class="info-label">予算規模</span> 414 + <span class="info-value">$escapetool.xml($!budgetScale)</span> 415 + </div> 416 + #end 417 + #if($budgetAllocation && $budgetAllocation != '') 418 + <div class="info-row"> 419 + <span class="info-label">主な予算配分</span> 420 + <span class="info-value"> 421 + <div class="selection-display"> 422 + #foreach($ba in $budgetAllocation.split(",")) 423 + <span class="selection-item">$escapetool.xml($ba.trim())</span> 424 + #end 425 + </div> 426 + </span> 427 + </div> 428 + #end 429 + #if($budgetNote && $budgetNote.trim() != '') 430 + <div class="free-note">$escapetool.xml($budgetNote)</div> 431 + #end 432 + </div> 433 + </div> 434 + #else 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> 493 493 #end 437 + #end 438 +</div> 494 494 495 - ## --- 校則の見直し --- 496 - #if($ruleReviewStatus && $ruleReviewStatus != '') 497 - #set($canViewRuleReview = true) 498 - #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewRuleReview = false) 499 - #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false) 500 - #end 501 - #if($canViewRuleReview) 502 - <div class="seitokai-subsection"> 503 - <h3 class="seitokai-subsection-title"><svg class="ico" 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 == 'school_trusted')<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> 校内承認者限定#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> 504 - <div class="seitokai-subsection-content"> 505 - <div class="info-row"> 506 - <span class="info-label">見直しの有無（3年以内）</span> 507 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span> 440 +## --- ⑧ 校則の見直し --- 441 +#if($ruleReviewStatus && $ruleReviewStatus != '') 442 + ## 公開範囲チェック 443 + #set($canViewRuleReview = true) 444 + #if($visibilityRuleReview == 'members' && $isGuest) #set($canViewRuleReview = false) 445 + #elseif($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewRuleReview = false) 446 + #end 447 + #if($canViewRuleReview) 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> 449 +<div class="school-section-card"> 450 + <div class="card-inner"> 451 + <div class="info-row"> 452 + <span class="info-label">見直しの有無（3年以内）</span> 453 + <span class="info-value"><span class="tag tag-primary" style="font-size:0.9em;">$escapetool.xml($!ruleReviewStatus)</span></span> 454 + </div> 455 + #if($ruleReviewContent && $ruleReviewContent != '') 456 + <div class="info-row"> 457 + <span class="info-label">見直しの内容</span> 458 + <span class="info-value"> 459 + <div class="selection-display"> 460 + #foreach($rc in $ruleReviewContent.split(",")) 461 + <span class="selection-item">$escapetool.xml($rc.trim())</span> 462 + #end 508 508 </div> 509 - #if($ruleReviewContent && !$ruleReviewContent.isEmpty()) 510 - <div class="info-row"> 511 - <span class="info-label">見直しの内容</span> 512 - <span class="info-value"> 513 - <div class="selection-display"> 514 - #foreach($rc in $ruleReviewContent) 515 - <span class="selection-item">$!escapetool.xml($rc.trim())</span> 516 - #end 517 - </div> 518 - </span> 464 + </span> 465 + </div> 466 + #end 467 + #if($ruleReviewProposer && $ruleReviewProposer != '') 468 + <div class="info-row"> 469 + <span class="info-label">見直しの提案者</span> 470 + <span class="info-value"> 471 + <div class="selection-display"> 472 + #foreach($rp in $ruleReviewProposer.split(",")) 473 + <span class="selection-item">$escapetool.xml($rp.trim())</span> 474 + #end 519 519 </div> 520 - #end521 - #if($ruleReviewProposer && !$ruleReviewProposer.isEmpty())522 - <div class="info-row">523 - <spanclass="info-label">見直しの提案者</span>524 - spanclass="info-value">525 - divclass="selection-display">526 - #foreach($rpin$ruleReviewProposer)527 - spanclass="selection-item">$!escapetool.xml($rp.trim())</span>528 - #end529 - < /div>530 - </span>476 + </span> 477 + </div> 478 + #end 479 + #if($ruleReviewImplementer && $ruleReviewImplementer != '') 480 + <div class="info-row"> 481 + <span class="info-label">見直しの実施者</span> 482 + <span class="info-value"> 483 + <div class="selection-display"> 484 + #foreach($ri in $ruleReviewImplementer.split(",")) 485 + <span class="selection-item">$escapetool.xml($ri.trim())</span> 486 + #end 531 531 </div> 532 - #end 533 - #if($ruleReviewImplementer && !$ruleReviewImplementer.isEmpty()) 534 - <div class="info-row"> 535 - <span class="info-label">見直しの実施者</span> 536 - <span class="info-value"> 537 - <div class="selection-display"> 538 - #foreach($ri in $ruleReviewImplementer) 539 - <span class="selection-item">$!escapetool.xml($ri.trim())</span> 540 - #end 541 - </div> 542 - </span> 543 - </div> 544 - #end 545 - #if($ruleReviewSystem && $ruleReviewSystem != '') 546 - <div class="info-row"> 547 - <span class="info-label">見直しの仕組み</span> 548 - <span class="info-value">$!escapetool.xml($!ruleReviewSystem)</span> 549 - </div> 550 - #end 551 - </div> 488 + </span> 552 552 </div> 553 - #else 554 - <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 == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div> 555 - #end 556 556 #end 557 - 558 - ## --- 生徒会の課題意識 --- 559 - #if($challenges && $challenges != '') 560 - #set($canViewChallenges = true) 561 - #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewChallenges = false) 562 - #elseif($visibilityChallenges == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewChallenges = false) 563 - #end 564 - #if($canViewChallenges) 565 - <div class="seitokai-subsection"> 566 - <h3 class="seitokai-subsection-title"><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> 生徒会の課題意識 #if($visibilityChallenges != 'public')<span class="visibility-badge visibility-${visibilityChallenges}">#if($visibilityChallenges == 'school_trusted')<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> 校内承認者限定#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> 567 - <div class="seitokai-subsection-content"> 568 - <div class="challenge-text">$!escapetool.xml($challenges)</div> 569 - </div> 491 + #if($ruleReviewSystem && $ruleReviewSystem != '') 492 + <div class="info-row"> 493 + <span class="info-label">見直しの仕組み</span> 494 + <span class="info-value">$escapetool.xml($!ruleReviewSystem)</span> 570 570 </div> 571 - #else 572 - <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 == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div> 573 - #end 574 574 #end 497 + </div> 498 +</div> 499 + #else 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> 501 + #end 502 +#end 575 575 576 - </div>## seitokai-info-body 終了 577 -</div>## card-seitokai-info 終了 504 +## --- ⑨ 課題 --- 505 +#if($challenges && $challenges != '') 506 + ## 公開範囲チェック 507 + #set($canViewChallenges = true) 508 + #if($visibilityChallenges == 'members' && $isGuest) #set($canViewChallenges = false) 509 + #elseif($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewChallenges = false) 510 + #end 511 + #if($canViewChallenges) 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> 514 + #else 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> 516 + #end 517 +#end 578 578 579 -## --- ③ SNS・連絡先 --- 580 -<div class="school-info-card collapsed" id="card-contact"> 581 - <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><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M22 16.92v3a2 2 0 01-2.18 2 19.79 19.79 0 01-8.63-3.07 19.5 19.5 0 01-6-6 19.79 19.79 0 01-3.07-8.67A2 2 0 014.11 2h3a2 2 0 012 1.72c.127.96.361 1.903.7 2.81a2 2 0 01-.45 2.11L8.09 9.91a16 16 0 006 6l1.27-1.27a2 2 0 012.11-.45c.907.339 1.85.573 2.81.7A2 2 0 0122 16.92z"/></svg> SNS・連絡先</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2> 582 - <table class="wiki-table school-info-table"> 583 - <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr> 584 - <tr><th>生徒会Web</th><td>#if($seitokaiWebsite && $seitokaiWebsite != '')<a href="$!escapetool.xml($seitokaiWebsite)" target="_blank" rel="noopener"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M2 12h20"/><path d="M12 2a15.3 15.3 0 014 10 15.3 15.3 0 01-4 10 15.3 15.3 0 01-4-10 15.3 15.3 0 014-10z"/></svg> $!escapetool.xml($seitokaiWebsite)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr> 585 - <tr><th>X (Twitter)</th><td>#if($seitokaiTwitter && $seitokaiTwitter != '')<a href="https://x.com/$!escapetool.url($seitokaiTwitter)" target="_blank" rel="noopener">𝕏 @$!escapetool.xml($seitokaiTwitter)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr> 586 - <tr><th>Instagram</th><td>#if($seitokaiInstagram && $seitokaiInstagram != '')<a href="https://instagram.com/$!escapetool.url($seitokaiInstagram)" target="_blank" rel="noopener"><svg class="ico" viewBox="0 0 24 24"><path d="M23 19a2 2 0 01-2 2H3a2 2 0 01-2-2V8a2 2 0 012-2h4l2-3h6l2 3h4a2 2 0 012 2z"/><circle cx="12" cy="13" r="4"/></svg> @$!escapetool.xml($seitokaiInstagram)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr> 587 - <tr><th>YouTube</th><td>#if($seitokaiYoutube && $seitokaiYoutube != '')<a href="$!escapetool.xml($seitokaiYoutube)" target="_blank" rel="noopener"><svg class="ico" viewBox="0 0 24 24"><polygon points="5 3 19 12 5 21 5 3"/></svg> YouTubeチャンネル</a>#else<span class="text-placeholder">未登録</span>#end</td></tr> 588 - <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr> 589 - </table> 590 -</div> 519 +</div>## seitokai-info-accordion 終了 591 591 592 592 {{/html}} 593 593 594 ----- 595 - 596 596 ## --- ⑩ 活動報告一覧（スレッド型・年度タブ付き） --- 597 -= 活動報告 = 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> 活動報告 = 598 598 599 -## --- 年度タブ +投稿者ステータス凡例 ---526 +## --- 投稿者ステータス凡例（折りたたみ） --- 600 600 {{html clean="false"}} 528 +<div class="author-legend-wrapper"> 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> 530 + <div class="author-legend-body"> 531 + <div class="author-legend"> 532 + <span class="author-legend-title">投稿者の信頼度:</span> 533 + <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者</span> 534 + <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み</span> 535 + <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介</span> 536 + <span class="author-legend-item"><span class="bar bar-general"></span> 一般（未承認）</span> 537 + </div> 538 + <div class="author-legend"> 539 + <span class="author-legend-title">所属:</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> 544 + </div> 545 + </div> 546 +</div> 601 601 602 602 ## --- 年度タブ --- 603 603 ## 全活動から年度一覧を収集 ... ... @@ -619,49 +619,14 @@ 619 619 #end 620 620 ## ソート（降順にしたいが Velocity にはないので JS で制御） 621 621 622 -<div class="activity-toolbar"> 623 - <div class="activity-fy-tabs"> 624 - <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button> 625 - #foreach($fy in $fySet) 626 - #if($fy != $currentFYStr) 627 - <button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button> 628 - #end 568 +<div class="activity-fy-tabs"> 569 + <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button> 570 + #foreach($fy in $fySet) 571 + #if($fy != $currentFYStr) 572 + <button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button> 629 629 #end 630 - <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button> 631 - </div> 632 - <div class="activity-toolbar-right"> 633 - <button class="btn-view-toggle" id="btnViewToggle" onclick="toggleCompactView()" title="タイトルのみ表示"> 634 - <svg class="ico-list" viewBox="0 0 24 24" stroke="currentColor" fill="none" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><line x1="8" y1="6" x2="21" y2="6"/><line x1="8" y1="12" x2="21" y2="12"/><line x1="8" y1="18" x2="21" y2="18"/><line x1="3" y1="6" x2="3.01" y2="6"/><line x1="3" y1="12" x2="3.01" y2="12"/><line x1="3" y1="18" x2="3.01" y2="18"/></svg> 635 - <svg class="ico-detail" viewBox="0 0 24 24" stroke="currentColor" fill="none" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="3" width="7" height="7"/><rect x="14" y="3" width="7" height="7"/><rect x="3" y="14" width="7" height="7"/><rect x="14" y="14" width="7" height="7"/></svg> 636 - <span class="toggle-label">一覧表示</span> 637 - </button> 638 - </div> 639 - <div class="author-legend-wrapper"> 640 - <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> 641 - <div class="author-legend-body"> 642 - <div class="author-legend"> 643 - <span class="author-legend-title">投稿者の信頼度:</span> 644 - <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者 <span class="text-hint">— 運営スタッフ</span></span> 645 - <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み <span class="text-hint">— 本人確認済みのユーザー</span></span> 646 - <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介 <span class="text-hint">— 承認済みユーザーからの紹介</span></span> 647 - <span class="author-legend-item"><span class="bar bar-general"></span> 一般 <span class="text-hint">— 一般登録ユーザー</span></span> 648 - </div> 649 - <div class="author-legend"> 650 - <span class="author-legend-title">所属:</span> 651 - <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 class="text-hint">所属が確認されたこの学校のユーザー</span></span> 652 - <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 class="text-hint">この学校に所属登録しているユーザー</span></span> 653 - <span class="author-legend-item"><span class="badge badge-alumni 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> <span class="text-hint">この学校の卒業生</span></span> 654 - <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 class="text-hint">別の学校に所属しているユーザー</span></span> 655 - <span class="author-legend-item text-hint">※一般アカウントは所属バッジが表示されません</span> 656 - </div> 657 - <div class="author-legend"> 658 - <span class="author-legend-title">役割:</span> 659 - <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> 660 - <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 class="text-hint">生徒会役員</span></span> 661 - <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> 662 - </div> 663 - </div> 664 - </div> 574 + #end 575 + <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button> 665 665 </div> 666 666 667 667 {{/html}} ... ... @@ -710,47 +710,27 @@ 710 710 #set($threadPosts = []) 711 711 #set($discard = $threadPosts.addAll($pinnedPosts)) 712 712 #set($discard = $threadPosts.addAll($normalPosts)) 713 - ## report/comment カウント 714 - #set($reportCount = 0) 715 - #set($commentCount = 0) 716 - #foreach($tp in $threadPosts) 717 - #set($tpType = $!tp.getValue('postType')) 718 - #if($tpType == 'comment') 719 - #set($commentCount = $commentCount + 1) 720 - #else 721 - #set($reportCount = $reportCount + 1) 722 - #end 723 - #end 724 724 725 725 {{html clean="false"}} 726 -<div class="activity-thread" data-fiscal-year="$ !escapetool.xml($actFY)">626 +<div class="activity-thread" data-fiscal-year="$escapetool.xml($actFY)"> 727 727 <div class="activity-thread-header"> 728 728 <div class="activity-thread-title"> 729 - <h3 #if($actFeatured == '1')class="featured-title"#end>$!escapetool.xml($!actTitle) #if($actFeatured == '1')<svg class="ico ico-fixed-14 ico-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> 730 - <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span> 731 - #set($actTagsList = $activity.getValue('tags')) 732 - #if($actTagsList && !$actTagsList.isEmpty()) 733 - #foreach($tagItem in $actTagsList) 734 - #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end 735 - #end 736 - #end 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> 737 737 </div> 738 - <div class="thread-meta-row">739 - <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> 740 740 #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred') 741 741 #if($actFeatured == '1') 742 - <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> 743 743 #else 744 - <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> 745 745 #end 746 746 #end 747 747 </div> 748 748 </div> 749 749 750 - ## --- 活動報告セクション --- 751 751 #foreach($post in $threadPosts) 752 - #set($thisPostType = $!post.getValue('postType')) 753 - #if($thisPostType != 'comment') 754 754 #set($postContent = $post.getValue('content')) 755 755 #set($postAuthor = $post.getValue('author')) 756 756 #set($postAccountType = $!post.getValue('authorAccountType')) ... ... @@ -758,35 +758,15 @@ 758 758 #set($postGrade = $!post.getValue('authorGrade')) 759 759 #set($postSchoolCode = $!post.getValue('authorSchoolCode')) 760 760 #set($postDate = $post.getValue('createdDate')) 761 - ## 論理削除チェック 762 - #set($postDeleted = $!post.getValue('deleted')) 763 - #if($postDeleted == 1 || $postDeleted == '1') 764 - #if($viewerAccountType == 'admin') 765 - <div class="thread-post thread-post-deleted thread-post-admin-deleted"> 766 - <div class="thread-post-admin-deleted-content"> 767 - <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> 768 - <strong>投稿者により削除済み</strong>（$!post.getValue('deletedAt')） 769 - <div class="thread-post-restored-content">$!escapetool.xml($!postContent)</div> 770 - </div> 771 - </div> 772 - #else 773 - <div class="thread-post thread-post-deleted thread-post-user-deleted"> 774 - <div class="thread-post-user-deleted-content"> 775 - <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> 776 - この投稿は削除されました 777 - </div> 778 - </div> 779 - #end 780 - #else 781 781 ## 通報による非表示チェック 782 782 #set($postHidden = $!post.getValue('hidden')) 783 783 #if($postHidden == 1 || $postHidden == '1') 784 784 #if($viewerAccountType == 'admin') 785 - <div class="thread-post t hread-post-admin-hidden">786 - <div class="thread-post-admin-hidden-content">787 - <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> 788 - <strong>通報により非表示中</strong>（理由: $ !escapetool.xml($!post.getValue('hiddenReason'))）789 - <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> 790 790 </div> 791 791 </div> 792 792 #end ... ... @@ -795,12 +795,12 @@ 795 795 #set($postVis = $!post.getValue('visibility')) 796 796 #if(!$postVis || $postVis == '') #set($postVis = 'public') #end 797 797 #set($canViewPost = true) 798 - #if($postVis == 's chool' &&($isGuest|| (!$isViewerAdmin && !$isSchoolMember)))#set($canViewPost = false)799 - #elseif($postVis == 'school _trusted' && ($isGuest || (!$isViewerAdmin &&((!$isSchoolMember) || ($viewerAccountType !='verified' &&$viewerAccountType != 'referred')))))#set($canViewPost = false)669 + #if($postVis == 'members' && $isGuest) #set($canViewPost = false) 670 + #elseif($postVis == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewPost = false) 800 800 #end 801 801 #if(!$canViewPost) 802 802 <div class="thread-post visibility-restricted-post"> 803 - <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 == ' school_trusted')校内の承認済み・紹介メンバー#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> 804 804 </div> 805 805 #else 806 806 ## 投稿者のアカウント種別に基づいたCSSクラス ... ... @@ -819,61 +819,53 @@ 819 819 <div class="thread-post-content"> 820 820 <div class="thread-post-header"> 821 821 #if($isPinned == '1') 822 - <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> 823 823 #end 824 824 #set($postAuthorRef = $!post.getValue('authorRef')) 825 825 <span class="thread-post-author"> 826 826 #if($postAuthorRef && $postAuthorRef != '') 827 - <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> 828 828 #else 829 - $ !escapetool.xml($!postAuthor)700 + $escapetool.xml($!postAuthor) 830 830 #end 831 831 </span> 832 832 <span class="author-badge"> 833 833 #if($postAccountType == 'admin') 834 - <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> 835 835 #elseif($postAccountType == 'verified') 836 - <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> 837 837 #elseif($postAccountType == 'referred') 838 - <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> 839 839 #else 840 - <span class="badge badge-general badge-sm">一般</span>711 + <span class="badge badge-general" style="font-size:0.75em;padding:1px 7px;">一般</span> 841 841 #end 842 842 ## 所属バッジ（投稿者の学校コードとページの学校コードを比較） 843 - #set($postIsSchoolMatch = ($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode))) 844 844 #if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general') 845 - #if($postUserRole == 'graduate' && $postIsSchoolMatch) 846 - <span class="badge badge-alumni 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> 847 - #elseif($postIsSchoolMatch && $postUserRole != 'graduate') 715 + #if($postSchoolCode == $schoolCode) 848 848 #if($postAccountType == 'verified' || $postAccountType == 'admin') 849 - <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> 850 850 #else 851 - <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> 852 852 #end 853 853 #else 854 - <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> 855 855 #end 856 856 #end 857 857 #if($postUserRole == 'student') 858 - <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> 859 - #set($postIsOfficer = $!post.getValue('authorIsOfficer')) 860 - #if($postIsOfficer == 'true') 861 - <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> 862 - #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> 863 863 #elseif($postUserRole == 'teacher') 864 - <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> 865 865 #elseif($postUserRole == 'graduate') 866 - <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> 867 867 #end 732 + #if($postGrade && $postGrade != '') 733 + <span class="badge badge-grade" style="font-size:0.75em;padding:1px 7px;">$postGrade</span> 734 + #end 868 868 </span> 869 869 <span class="thread-post-date">$!postDate</span> 870 - #set($postEdited = $!post.getValue('edited')) 871 - #if($postEdited == 1 || $postEdited == '1') 872 - <span class="post-edited-label">（編集済み）</span> 873 - #end 874 874 </div> 875 875 <div class="thread-post-body"> 876 - $ !escapetool.xml($!postContent)739 + $escapetool.xml($!postContent) 877 877 #set($postImages = $!post.getValue('images')) 878 878 #if($postImages && $postImages.trim() != '') 879 879 <div class="post-images"> ... ... @@ -887,7 +887,7 @@ 887 887 #if($imgName != '') 888 888 <div class="post-image-item"> 889 889 <a href="$doc.getAttachmentURL($imgName)" target="_blank"> 890 - <img src="$doc.getAttachmentURL($imgName)" alt="$ !escapetool.xml($imgName)" loading="lazy"/>753 + <img src="$doc.getAttachmentURL($imgName)" alt="$escapetool.xml($imgName)" loading="lazy"/> 891 891 </a> 892 892 </div> 893 893 #end ... ... @@ -918,14 +918,14 @@ 918 918 #set($displayName = $fName.replaceFirst('file_\d{14}_\d+_', '')) 919 919 #end 920 920 <div class="post-file-item"> 921 - <a href="$doc.getAttachmentURL($fName)" target="_blank" download="$ !escapetool.xml($displayName)">922 - #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>923 - #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>924 - #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>925 - #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>926 - #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> 927 927 #end 928 - <span class="post-file-name">$ !escapetool.xml($displayName)</span>791 + <span class="post-file-name">$escapetool.xml($displayName)</span> 929 929 </a> 930 930 </div> 931 931 #end ... ... @@ -935,90 +935,36 @@ 935 935 #end 936 936 </div> 937 937 #if($postVis != 'public') 938 - <div class="visibility-badge visibility-${postVis} post-action-mt">#if($postVis == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M1222s8-48-10V5l-8-3-83v7c06810 8 10z"/></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> 939 939 #end 940 940 ## 固定/解除ボタン（承認済み・管理者のみ） 941 941 #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified') 942 942 #set($postObjNum = $post.number) 943 - <div class="post-pin-action post-action-mt">806 + <div class="post-pin-action" style="margin-top:6px;"> 944 944 #if($isPinned == '1') 945 945 <a href="$doc.getURL('view', "action=unpin&postObj=${postObjNum}&form_token=${services.csrf.getToken()}")" class="btn-pin-toggle btn-unpin" title="固定を解除"> 946 - <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> 固定を解除 947 947 </a> 948 948 #else 949 949 <a href="$doc.getURL('view', "action=pin&postObj=${postObjNum}&form_token=${services.csrf.getToken()}")" class="btn-pin-toggle btn-pin" title="この投稿を固定"> 950 - <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> 固定する 951 951 </a> 952 952 #end 953 953 </div> 954 954 #end 955 - ## 編集・削除ボタン（投稿者本人 or 管理者） 956 - #set($postAuthorRef = $!post.getValue('authorRef')) 957 - #set($postObjNumED = $post.number) 958 - #if($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin') 959 - <div class="post-edit-actions post-action-mt"> 960 - #if($xcontext.user == $postAuthorRef) 961 - <button type="button" class="btn-post-edit" onclick="openEditPost(this, '${doc.fullName}', $postObjNumED, '$!escapetool.javascript($!postContent)')" title="この投稿を編集"> 962 - <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> 編集 963 - </button> 964 - #end 965 - <button type="button" class="btn-post-delete" onclick="confirmDeletePost('${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を削除"> 966 - <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> 削除 967 - </button> 968 - </div> 969 - #end 970 970 </div> 971 971 </div> 972 972 #end## /canViewPost 973 973 #end## /postHidden 974 - #end## /postDeleted 975 - #end## /postType != comment 976 - #end## /foreach reports 977 - 978 - ## --- コメントセクション（折りたたみ） --- 979 - #if($commentCount > 0) 980 - <details class="thread-comments-section"> 981 - <summary class="thread-comments-toggle"> 982 - <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}件のコメント 983 - </summary> 984 - #foreach($post in $threadPosts) 985 - #set($thisPostType = $!post.getValue('postType')) 986 - #if($thisPostType == 'comment') 987 - #set($postContent = $post.getValue('content')) 988 - #set($postAuthor = $post.getValue('author')) 989 - #set($postAccountType = $!post.getValue('authorAccountType')) 990 - #set($postDate = $post.getValue('createdDate')) 991 - #set($postDeleted = $!post.getValue('deleted')) 992 - #if($postDeleted == 1 || $postDeleted == '1') 993 - <div class="thread-comment thread-comment-deleted"> 994 - <span class="thread-comment-meta">このコメントは削除されました</span> 995 - </div> 996 - #else 997 - #set($postHidden = $!post.getValue('hidden')) 998 - #if($postHidden == 1 || $postHidden == '1') 999 - <div class="thread-comment thread-comment-hidden"> 1000 - <span class="thread-comment-meta">このコメントは非表示にされました</span> 1001 - </div> 1002 - #else 1003 - <div class="thread-comment"> 1004 - <span class="thread-comment-author">$!escapetool.xml($postAuthor)</span> 1005 - <span class="thread-comment-date">$!postDate</span> 1006 - <div class="thread-comment-body">$!escapetool.xml($postContent)</div> 1007 - </div> 1008 - #end 1009 - #end 1010 - #end 1011 - #end 1012 - </details> 1013 1013 #end 1014 1014 1015 1015 #if($xcontext.user != "XWiki.XWikiGuest") 1016 1016 <div class="thread-add-post"> 1017 - <a href="/bin/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"> 1018 1018 ＋ 活動報告を追加 1019 1019 </a> 1020 - <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$ !escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">1021 - <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> コメントを書く 1022 1022 </a> 1023 1023 </div> 1024 1024 #end ... ... @@ -1028,7 +1028,7 @@ 1028 1028 #else 1029 1029 {{html clean="false"}} 1030 1030 <div class="empty-state"> 1031 - <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> 1032 1032 <div class="empty-state-title">活動報告はまだありません</div> 1033 1033 <div class="empty-state-desc">この学校の活動を記録して、他校と共有しましょう。<br>「活動を追加」ボタンから最初の活動を作成できます。</div> 1034 1034 </div> ... ... @@ -1039,45 +1039,69 @@ 1039 1039 #if($xcontext.user != "XWiki.XWikiGuest") 1040 1040 {{html clean="false"}} 1041 1041 <div class="activity-add-section"> 1042 - <a href="/bin/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$ !escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity">1043 - <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> 活動を追加 1044 1044 </a> 1045 1045 </div> 1046 1046 {{/html}} 1047 1047 #end 1048 1048 1049 -## --- 年度 タブ切り替えJavaScript---858 +## --- 年度アーカイブ セクション --- 1050 1050 {{html clean="false"}} 1051 -<script> 1052 -// コンパクト表示（タイトルのみ）トグル 1053 -function toggleCompactView() { 1054 - var container = document.querySelector('.xwiki-content') || document.body; 1055 - var isCompact = container.classList.toggle('activity-compact-view'); 1056 - var btn = document.getElementById('btnViewToggle'); 1057 - if (btn) { 1058 - btn.querySelector('.toggle-label').textContent = isCompact ? '詳細表示' : '一覧表示'; 1059 - btn.title = isCompact ? '詳細表示に戻す' : 'タイトルのみ表示'; 1060 - } 1061 - // コンパクトモードでは各スレッドヘッダーをクリックで個別展開可能にする 1062 - document.querySelectorAll('.activity-thread').forEach(function(thread) { 1063 - if (isCompact) { 1064 - thread.classList.remove('compact-expanded'); 1065 - } 1066 - }); 1067 -} 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> 863 + 年度アーカイブ 864 + </h2> 865 + <div style="font-size:0.88em;color:var(--text-mid);margin-bottom:12px;"> 866 + 現在のページ: <strong>${pageFiscalYear}年度</strong> 867 + #set($lyud = $!doc.getValue('lastYearUpdateDate')) 868 + #if($lyud && $lyud != '') 869 + | 最終年度更新: $escapetool.xml($lyud) ($escapetool.xml($!doc.getValue('lastYearUpdateBy'))) 870 + #end 871 + </div> 1068 1068 1069 -// コンパクトモードで個別スレッドを展開/折りたたみ 1070 -function toggleThreadExpand(e) { 1071 - var container = document.querySelector('.xwiki-content') || document.body; 1072 - if (!container.classList.contains('activity-compact-view')) return; 1073 - // リンクやボタンのクリックはスルー 1074 - if (e.target.closest('a, button, .btn-featured-toggle')) return; 1075 - var thread = e.target.closest('.activity-thread'); 1076 - if (thread) { 1077 - thread.classList.toggle('compact-expanded'); 1078 - } 1079 -} 873 + ## 過去アーカイブの検索 874 + #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)) 875 + #set($archivePages = $archiveQuery.execute()) 1080 1080 877 + #if($archivePages && $archivePages.size() > 0) 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;"> 881 + #foreach($archPage in $archivePages) 882 + #set($archPageDoc = $xwiki.getDocument($archPage)) 883 + #set($archPageObj = $archPageDoc.getObject('SeitokaiCode.SchoolClass')) 884 + #if($archPageObj) 885 + #set($archPageFY = $!archPageObj.getValue('fiscalYear')) 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> 888 + ${archPageFY}年度 889 + </a> 890 + #end 891 + #end 892 + </div> 893 + </div> 894 + #else 895 + <div style="font-size:0.88em;color:var(--text-light);margin-bottom:12px;">過去のアーカイブはまだありません</div> 896 + #end 897 + 898 + ## 新年度に移行ボタン（承認済み・管理者のみ） 899 + #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified') 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> 903 + ${pageFiscalYear}年度をアーカイブして新年度に移行 904 + </a> 905 + <div style="font-size:0.8em;color:var(--text-light);margin-top:6px;">現在の学校情報を${pageFiscalYear}年度として保存し、新しい年度に移行します。</div> 906 + </div> 907 + #end 908 +</div> 909 +{{/html}} 910 + 911 +## --- 年度タブ切り替え JavaScript --- 912 +{{html clean="false"}} 913 +<script> 1081 1081 function switchActivityFY(fy, btn) { 1082 1082 // タブのアクティブ状態を切り替え 1083 1083 document.querySelectorAll('.activity-fy-tab').forEach(function(t) { t.classList.remove('active'); }); ... ... @@ -1084,40 +1084,29 @@ 1084 1084 btn.classList.add('active'); 1085 1085 // 活動スレッドの表示切り替え 1086 1086 document.querySelectorAll('.activity-thread[data-fiscal-year]').forEach(function(thread) { 1087 - if (fy === 'all' || thread.getAttribute('data-fiscal-year') === fy) { 1088 - 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 = ''; 1089 1089 } else { 1090 - thread. classList.add('fy-hidden');925 + thread.style.display = 'none'; 1091 1091 } 1092 1092 }); 1093 1093 } 1094 -// ページ読み込み時の 初期化929 +// ページ読み込み時にデフォルトで現在の年度を表示 1095 1095 document.addEventListener('DOMContentLoaded', function() { 1096 - // 年度タブを降順にソート（「全期間」タブは末尾に固定） 1097 - var tabContainer = document.querySelector('.activity-fy-tabs'); 1098 - if (tabContainer) { 1099 - var tabs = Array.from(tabContainer.querySelectorAll('.activity-fy-tab')); 1100 - var allTab = null; 1101 - var fyTabs = []; 1102 - tabs.forEach(function(t) { 1103 - var onclickStr = t.getAttribute('onclick') || ''; 1104 - if (onclickStr.indexOf("'all'") !== -1) { allTab = t; } 1105 - else { fyTabs.push(t); } 1106 - }); 1107 - // 年度タブを数値の降順でソート 1108 - fyTabs.sort(function(a, b) { 1109 - var aYear = parseInt(a.textContent) || 0; 1110 - var bYear = parseInt(b.textContent) || 0; 1111 - return bYear - aYear; 1112 - }); 1113 - // DOM再配置 1114 - fyTabs.forEach(function(t) { tabContainer.appendChild(t); }); 1115 - if (allTab) { tabContainer.appendChild(allTab); } 1116 - } 1117 - // デフォルトで現在の年度を表示 1118 1118 var defaultTab = document.querySelector('.activity-fy-tab.active'); 1119 1119 if (defaultTab) { defaultTab.click(); } 933 + // モバイルでは基本情報・連絡先をデフォルト折りたたみ 934 + if (window.innerWidth <= 768) { 935 + document.querySelectorAll('.school-info-card.mobile-collapse').forEach(function(card) { 936 + card.classList.add('collapsed'); 937 + }); 938 + } 1120 1120 // 保存成功時のトースト通知 940 + if (window.location.search.indexOf('archived=1') !== -1) { 941 + showToast('年度アーカイブを作成しました', 'success'); 942 + } 1121 1121 if (window.location.search.indexOf('saved=1') !== -1) { 1122 1122 showToast('学校情報を保存しました', 'success'); 1123 1123 // URLパラメータをクリーンアップ（リロード時に再表示されないよう） ... ... @@ -1125,30 +1125,6 @@ 1125 1125 window.history.replaceState({}, document.title, window.location.pathname); 1126 1126 } 1127 1127 } 1128 - // コンパクトモード: スレッドヘッダークリックで個別展開 1129 - document.querySelectorAll('.activity-thread-header').forEach(function(header) { 1130 - header.addEventListener('click', toggleThreadExpand); 1131 - }); 1132 - // 長文投稿の折りたたみ初期化（max-height: 12em 超で省略） 1133 - document.querySelectorAll('.thread-post-body').forEach(function(body) { 1134 - // pre-wrapのまま高さを測定し、max-height(12em ≒ ~200px)を超える場合に折りたたむ 1135 - var fullH = body.scrollHeight; 1136 - // 12em を px に変換（font-size × line-height × 行数 の近似値ではなくCSSと同じ値を取得） 1137 - body.classList.add('truncated'); 1138 - var maxH = body.clientHeight; // max-height: 12em 適用後の高さ 1139 - body.classList.remove('truncated'); 1140 - if (fullH > maxH + 30) { 1141 - body.classList.add('truncated'); 1142 - var btn = document.createElement('button'); 1143 - btn.className = 'btn-read-more'; 1144 - btn.textContent = '広げて読む ▼'; 1145 - btn.addEventListener('click', function() { 1146 - var isExpanded = body.classList.toggle('expanded'); 1147 - btn.textContent = isExpanded ? '折りたたむ ▲' : '広げて読む ▼'; 1148 - }); 1149 - body.parentNode.insertBefore(btn, body.nextSibling); 1150 - } 1151 - }); 1152 1152 }); 1153 1153 1154 1154 // トースト通知表示 ... ... @@ -1162,8 +1162,8 @@ 1162 1162 document.body.appendChild(container); 1163 1163 } 1164 1164 var icons = { 1165 - success: '<svg class="icoico-md" viewBox="0 0 24 24" stroke-width="2.5"><path d="M20 6L9 17l-5-5"/></svg>',1166 - 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>' 1167 1167 }; 1168 1168 var toast = document.createElement('div'); 1169 1169 toast.className = 'toast toast-' + type; ... ... @@ -1177,79 +1177,8 @@ 1177 1177 var card = document.getElementById(cardId); 1178 1178 if (!card) return; 1179 1179 card.classList.toggle('collapsed'); 1180 - var isCollapsed = card.classList.contains('collapsed'); 1181 - var h2 = card.querySelector('h2[role="button"]'); 1182 - if (h2) h2.setAttribute('aria-expanded', !isCollapsed); 978 + card.classList.remove('mobile-collapse'); 1183 1183 } 1184 - 1185 -// 投稿の編集（インライン編集フォームを開く） 1186 -function openEditPost(btn, schoolPage, postObjNum, currentContent) { 1187 - var postEl = btn.closest('.thread-post'); 1188 - if (!postEl) return; 1189 - // 既存の編集フォームがあれば閉じる 1190 - var existing = postEl.querySelector('.post-edit-form'); 1191 - if (existing) { existing.remove(); return; } 1192 - var bodyEl = postEl.querySelector('.thread-post-body'); 1193 - if (!bodyEl) return; 1194 - var form = document.createElement('div'); 1195 - form.className = 'post-edit-form'; 1196 - form.innerHTML = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&').replace(/</g,'<').replace(/>/g,'>') + '</textarea>' + 1197 - '<div class="post-edit-form-actions">' + 1198 - '<button type="button" class="btn-cancel-edit" onclick="this.closest(\'.post-edit-form\').remove()">キャンセル</button>' + 1199 - '<button type="button" class="btn-save" onclick="saveEditPost(\'' + schoolPage + '\', ' + postObjNum + ')">保存</button>' + 1200 - '</div>'; 1201 - bodyEl.parentNode.insertBefore(form, bodyEl.nextSibling); 1202 - form.querySelector('textarea').focus(); 1203 -} 1204 - 1205 -// 投稿の編集を保存 1206 -function saveEditPost(schoolPage, postObjNum) { 1207 - var textarea = document.getElementById('editContent_' + postObjNum); 1208 - if (!textarea) return; 1209 - var newContent = textarea.value.trim(); 1210 - if (!newContent) { alert('投稿内容を入力してください'); return; } 1211 - var csrfEl = document.querySelector('input[name="form_token"]'); 1212 - var csrfToken = csrfEl ? csrfEl.value : ''; 1213 - var xhr = new XMLHttpRequest(); 1214 - xhr.open('POST', '/bin/get/SeitokaiCode/EditPost?outputSyntax=plain', true); 1215 - xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'); 1216 - var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken); 1217 - xhr.onload = function() { 1218 - try { 1219 - var res = JSON.parse(xhr.responseText); 1220 - if (res.success) { 1221 - showToast('投稿を更新しました', 'success'); 1222 - setTimeout(function() { location.reload(); }, 800); 1223 - } else { 1224 - alert('編集に失敗しました: ' + (res.error || '')); 1225 - } 1226 - } catch(e) { alert('編集に失敗しました'); } 1227 - }; 1228 - xhr.onerror = function() { alert('通信エラーが発生しました'); }; 1229 - xhr.send(editPostData); 1230 -} 1231 - 1232 -// 投稿の削除（確認ダイアログ付き） 1233 -function confirmDeletePost(schoolPage, postObjNum, token) { 1234 - if (!confirm('この投稿を削除しますか？\\n削除後は「この投稿は削除されました」と表示されます。')) return; 1235 - var xhr = new XMLHttpRequest(); 1236 - xhr.open('POST', '/bin/get/SeitokaiCode/DeletePost?outputSyntax=plain', true); 1237 - xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'); 1238 - var deletePostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token); 1239 - xhr.onload = function() { 1240 - try { 1241 - var res = JSON.parse(xhr.responseText); 1242 - if (res.success) { 1243 - showToast('投稿を削除しました', 'success'); 1244 - setTimeout(function() { location.reload(); }, 800); 1245 - } else { 1246 - alert('削除に失敗しました: ' + (res.error || '')); 1247 - } 1248 - } catch(e) { alert('削除に失敗しました'); } 1249 - }; 1250 - xhr.onerror = function() { alert('通信エラーが発生しました'); }; 1251 - xhr.send(deletePostData); 1252 -} 1253 1253 </script> 1254 1254 {{/html}} 1255 1255 {{/velocity}}