Changes for page 学校ページ テンプレート
Last modified by Super Admin on 2026/04/05 18:59
From version 
69.1 
69.1
edited by Super Admin
on 2026/03/18 11:44
on 2026/03/18 11:44
Change comment:
There is no comment for this version
To version 48.1
48.1
edited by Super Admin
on 2026/03/13 21:13
on 2026/03/13 21:13
Change comment:
There is no comment for this version
Summary
Details
-
Page properties
-
- Content
-
... ... @@ -100,14 +100,6 @@ 100 100 #end 101 101 #end 102 102 103 -## --- 関連校（中高一貫校）情報 --- 104 -#set($affiliatedSchoolCode = $!doc.getValue('affiliatedSchoolCode')) 105 -#set($affiliatedSchoolName = $!doc.getValue('affiliatedSchoolName')) 106 -#set($isAffiliated = false) 107 -#if($affiliatedSchoolCode && $affiliatedSchoolCode != '' && $viewerSchoolCode == $affiliatedSchoolCode) 108 - #set($isAffiliated = true) 109 -#end 110 - 111 111 ## --- 学校ページ非表示チェック --- 112 112 #set($schoolHidden = $doc.getValue('hidden')) 113 113 #if($schoolHidden == 1) ... ... @@ -135,6 +135,8 @@ 135 135 <p>このページは管理者により非公開に設定されています。</p> 136 136 <a href="$xwiki.getURL('Schools.WebHome', 'view')" class="btn-back-list">学校一覧に戻る</a> 137 137 </div> 130 +{{/html}} 131 +{{/velocity}} 138 138 #stop 139 139 #end 140 140 #end ... ... @@ -141,7 +141,7 @@ 141 141 142 142 ## --- 投稿固定/解除処理 --- 143 143 #set($pinAction = $!request.action) 144 -#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && ($viewerSchoolCode == $schoolCode|| $isAffiliated)))&& $services.csrf.isTokenValid($request.form_token))138 +#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token)) 145 145 #set($pinPostObjStr = $!request.postObj) 146 146 #if(!$pinPostObjStr.matches('^\d+$')) 147 147 ## 不正な値 → 無視 ... ... @@ -273,7 +273,7 @@ 273 273 274 274 ## --- 編集ボタン（権限があるユーザーのみ表示） --- 275 275 #set($canEditSchool = false) 276 -#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode || $isAffiliated))270 +#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode)) 277 277 #set($canEditSchool = true) 278 278 #end 279 279 #if($canEditSchool) ... ... @@ -282,293 +282,305 @@ 282 282 </div> 283 283 #end 284 284 285 -## --- 関連校（中高一貫校）バナー --- 286 -#if($affiliatedSchoolCode && $affiliatedSchoolCode != '') 287 - #set($affiliatedPageRef = "Schools.${affiliatedSchoolCode}.WebHome") 288 - #set($affiliatedPageExists = $xwiki.exists($affiliatedPageRef)) 289 -<div class="affiliated-school-banner"> 290 - <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> 291 - <div> 292 - <strong>中高一貫校</strong>： 293 - #if($affiliatedPageExists) 294 - <a href="$xwiki.getURL($affiliatedPageRef, 'view')">$!escapetool.xml($affiliatedSchoolName)</a> 295 - #else 296 - $!escapetool.xml($affiliatedSchoolName) 279 +## --- ① 学校基本情報 + 連絡先（左右グリッド・折りたたみ対応） --- 280 +<div class="school-info-grid"> 281 + <div class="school-info-card collapsed" id="card-basic-info"> 282 + <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> 283 + <table class="wiki-table school-info-table"> 284 + <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr> 285 + <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr> 286 + <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr> 287 + <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr> 288 + <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr> 289 + <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr> 290 + <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr> 291 + <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr> 292 + <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> 293 + </table> 294 + #set($infoEditDate = $!doc.getValue('lastInfoEditedDate')) 295 + #set($infoEditBy = $!doc.getValue('lastInfoEditedBy')) 296 + #if($infoEditDate && $infoEditDate != '') 297 + <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> 297 297 #end 298 - と連携しています 299 299 </div> 300 + 301 + <div class="school-info-card collapsed" id="card-contact"> 302 + <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> 303 + <table class="wiki-table school-info-table"> 304 + <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr> 305 + <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> 306 + <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> 307 + <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> 308 + <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> 309 + <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr> 310 + </table> 311 + </div> 300 300 </div> 301 -#end 302 302 303 -## --- ① 学校基本情報 --- 304 -<div class="school-info-card collapsed" id="card-basic-info"> 305 - <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> 306 - <table class="wiki-table school-info-table"> 307 - <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr> 308 - <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr> 309 - <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr> 310 - <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr> 311 - <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr> 312 - <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr> 313 - <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr> 314 - <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr> 315 - <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> 316 - </table> 317 - #set($infoEditDate = $!doc.getValue('lastInfoEditedDate')) 318 - #set($infoEditBy = $!doc.getValue('lastInfoEditedBy')) 319 - #if($infoEditDate && $infoEditDate != '') 320 - <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> 321 - #end 314 +## --- 生徒会情報アコーディオン --- 315 +<div class="school-section-divider"> 316 + <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')?'▲':'▼';"> 317 + <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> 318 + 生徒会情報を見る <span class="shortcut-arrow">▼</span> 319 + </button> 322 322 </div> 323 323 324 -## --- ② 生徒会基本情報（折りたたみカード） --- 325 -<div class="school-info-card" id="card-seitokai-info"> 326 - <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> 327 - <div class="seitokai-info-body"> 322 +<div id="seitokai-info-section" class="seitokai-info-accordion"> 328 328 329 - ## --- 組織図 --- 330 - #set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != '')) 331 - #if($hasOrgContent) 332 - #set($canViewOrgChart = true) 333 - #if($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewOrgChart = false) 334 - #elseif($visibilityOrgChart == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewOrgChart = false) 335 - #end 336 - #if($canViewOrgChart) 337 - <div class="seitokai-subsection"> 338 - <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> 339 - <div class="seitokai-subsection-content"> 340 - #if($orgChartImage && $orgChartImage != '') 341 - <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div> 342 - #end 343 - #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end 344 - </div> 345 - </div> 346 - #else 347 - <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> 348 - #end 324 +## --- ② 組織図 --- 325 +#set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != '')) 326 +#if($hasOrgContent) 327 + ## 公開範囲チェック 328 + #set($canViewOrgChart = true) 329 + #if($visibilityOrgChart == 'members' && $isGuest) #set($canViewOrgChart = false) 330 + #elseif($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewOrgChart = false) 331 + #end 332 + #if($canViewOrgChart) 333 +<h2 class="section-title"><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"/><line x1="9" y1="10" x2="9" y2="10.01"/><line x1="15" y1="10" x2="15" y2="10.01"/><line x1="9" y1="14" x2="9" y2="14.01"/><line x1="15" y1="14" x2="15" y2="14.01"/></svg> 組織図 #if($visibilityOrgChart != 'public')<span class="visibility-badge visibility-${visibilityOrgChart}">#if($visibilityOrgChart == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h2> 334 +<div class="school-section-card"> 335 + <div class="card-inner"> 336 + #if($orgChartImage && $orgChartImage != '') 337 + <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div> 349 349 #end 339 + #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end 340 + </div> 341 +</div> 342 + #else 343 +<div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 組織図は #if($visibilityOrgChart == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div> 344 + #end 345 +#end 350 350 351 - ## --- 日常の活動 --- 352 - #if($dailyActivities && !$dailyActivities.isEmpty()) 353 - <div class="seitokai-subsection"> 354 - <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> 355 - <div class="seitokai-subsection-content"> 356 - <p class="activity-hint">活動時間の多い順に上位3つ</p> 357 - <div class="tag-container"> 358 - #set($daIdx = 1) 359 - #foreach($da in $dailyActivities) 360 - <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span> 361 - #set($daIdx = $daIdx + 1) 362 - #end 363 - </div> 364 - #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '') 365 - <div class="free-note">$!escapetool.xml($dailyActivitiesNote)</div> 347 +## --- ③④⑤ 日常の活動・選挙・定例活動 --- 348 +<div class="school-section-grid"> 349 + #if($dailyActivities && !$dailyActivities.isEmpty()) 350 + <div class="school-section-card"> 351 + <h3><svg class="ico" viewBox="0 0 24 24"><path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z"/><polyline points="14 2 14 8 20 8"/><line x1="16" y1="13" x2="8" y2="13"/><line x1="16" y1="17" x2="8" y2="17"/></svg> 日常の活動</h3> 352 + <div class="card-inner"> 353 + <p class="activity-hint">活動時間の多い順に上位3つ</p> 354 + <div class="tag-container"> 355 + #set($daIdx = 1) 356 + #foreach($da in $dailyActivities) 357 + <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span> 358 + #set($daIdx = $daIdx + 1) 366 366 #end 367 367 </div> 361 + #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '') 362 + <div class="free-note">$!escapetool.xml($dailyActivitiesNote)</div> 363 + #end 368 368 </div> 369 - #end 365 + </div> 366 + #end 370 370 371 - ## --- 選挙 --- 372 - #if($electionExists && $electionExists != '') 373 - <div class="seitokai-subsection"> 374 - <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> 375 - <div class="seitokai-subsection-content"> 376 - <div class="info-row"> 377 - <span class="info-label">役員選挙</span> 378 - <span class="info-value">$!escapetool.xml($!electionExists)</span> 379 - </div> 380 - #if($electionType && $electionType != '') 381 - <div class="info-row"> 382 - <span class="info-label">直近の選挙方式</span> 383 - <span class="info-value">$!escapetool.xml($!electionType)</span> 384 - </div> 385 - #end 386 - #if($electionNote && $electionNote.trim() != '') 387 - <div class="free-note">$!escapetool.xml($electionNote)</div> 388 - #end 368 + #if($electionExists && $electionExists != '') 369 + <div class="school-section-card"> 370 + <h3><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="3" width="18" height="18" rx="2"/><path d="M7 13l3 3 7-7"/></svg> 選挙</h3> 371 + <div class="card-inner"> 372 + <div class="info-row"> 373 + <span class="info-label">役員選挙</span> 374 + <span class="info-value">$!escapetool.xml($!electionExists)</span> 389 389 </div> 376 + #if($electionType && $electionType != '') 377 + <div class="info-row"> 378 + <span class="info-label">直近の選挙方式</span> 379 + <span class="info-value">$!escapetool.xml($!electionType)</span> 380 + </div> 381 + #end 382 + #if($electionNote && $electionNote.trim() != '') 383 + <div class="free-note">$!escapetool.xml($electionNote)</div> 384 + #end 390 390 </div> 391 - #end 386 + </div> 387 + #end 388 +</div> 392 392 393 - ## --- 定例活動 --- 394 - #if($meetingFrequency && $meetingFrequency != '') 395 - <div class="seitokai-subsection"> 396 - <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> 397 - <div class="seitokai-subsection-content"> 398 - <div class="info-row"> 399 - <span class="info-label">役員定例会の頻度</span> 400 - <span class="info-value">$!escapetool.xml($!meetingFrequency)</span> 401 - </div> 402 - #if($regularActivitiesNote && $regularActivitiesNote.trim() != '') 403 - <div class="free-note">$!escapetool.xml($regularActivitiesNote)</div> 404 - #end 390 +<div class="school-section-grid"> 391 + #if($meetingFrequency && $meetingFrequency != '') 392 + <div class="school-section-card"> 393 + <h3><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="4" width="18" height="18" rx="2"/><line x1="16" y1="2" x2="16" y2="6"/><line x1="8" y1="2" x2="8" y2="6"/><line x1="3" y1="10" x2="21" y2="10"/></svg> 定例活動</h3> 394 + <div class="card-inner"> 395 + <div class="info-row"> 396 + <span class="info-label">役員定例会の頻度</span> 397 + <span class="info-value">$!escapetool.xml($!meetingFrequency)</span> 405 405 </div> 399 + #if($regularActivitiesNote && $regularActivitiesNote.trim() != '') 400 + <div class="free-note">$!escapetool.xml($regularActivitiesNote)</div> 401 + #end 406 406 </div> 407 - #end 403 + </div> 404 + #end 408 408 409 - ## --- 予算 --- 410 - #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != '')) 411 - #if($hasBudget) 412 - #set($canViewBudget = true) 413 - #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewBudget = false) 414 - #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false) 406 + ## --- ⑦ 予算 --- 407 + #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != '')) 408 + #if($hasBudget) 409 + ## 公開範囲チェック 410 + #set($canViewBudget = true) 411 + #if($visibilityBudget == 'members' && $isGuest) #set($canViewBudget = false) 412 + #elseif($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewBudget = false) 413 + #end 414 + #if($canViewBudget) 415 + <div class="school-section-card"> 416 + <h3><svg class="ico" viewBox="0 0 24 24"><line x1="12" y1="1" x2="12" y2="23"/><path d="M17 5H9.5a3.5 3.5 0 000 7h5a3.5 3.5 0 010 7H6"/></svg> 予算 #if($visibilityBudget != 'public')<span class="visibility-badge visibility-${visibilityBudget}">#if($visibilityBudget == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3> 417 + <div class="card-inner"> 418 + #if($budgetProcess && !$budgetProcess.isEmpty()) 419 + <div class="info-row"> 420 + <span class="info-label">作成過程の生徒関与</span> 421 + <span class="info-value"> 422 + <div class="selection-display"> 423 + #foreach($bp in $budgetProcess) 424 + <span class="selection-item">$!escapetool.xml($bp.trim())</span> 425 + #end 426 + </div> 427 + </span> 428 + </div> 415 415 #end 416 - #if($canViewBudget) 417 - <div class="seitokai-subsection"> 418 - <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> 419 - <div class="seitokai-subsection-content"> 420 - #if($budgetProcess && !$budgetProcess.isEmpty()) 421 - <div class="info-row"> 422 - <span class="info-label">作成過程の生徒関与</span> 423 - <span class="info-value"> 424 - <div class="selection-display"> 425 - #foreach($bp in $budgetProcess) 426 - <span class="selection-item">$!escapetool.xml($bp.trim())</span> 427 - #end 428 - </div> 429 - </span> 430 - </div> 431 - #end 432 - #if($studentFee && $studentFee != '') 433 - <div class="info-row"> 434 - <span class="info-label">生徒会費（年額）</span> 435 - <span class="info-value">$!escapetool.xml($!studentFee)</span> 436 - </div> 437 - #end 438 - #if($budgetScale && $budgetScale != '') 439 - <div class="info-row"> 440 - <span class="info-label">予算規模</span> 441 - <span class="info-value">$!escapetool.xml($!budgetScale)</span> 442 - </div> 443 - #end 444 - #if($budgetAllocation && !$budgetAllocation.isEmpty()) 445 - <div class="info-row"> 446 - <span class="info-label">主な予算配分</span> 447 - <span class="info-value"> 448 - <div class="selection-display"> 449 - #foreach($ba in $budgetAllocation) 450 - <span class="selection-item">$!escapetool.xml($ba.trim())</span> 451 - #end 452 - </div> 453 - </span> 454 - </div> 455 - #end 456 - #if($budgetNote && $budgetNote.trim() != '') 457 - <div class="free-note">$!escapetool.xml($budgetNote)</div> 458 - #end 430 + #if($studentFee && $studentFee != '') 431 + <div class="info-row"> 432 + <span class="info-label">生徒会費（年額）</span> 433 + <span class="info-value">$!escapetool.xml($!studentFee)</span> 459 459 </div> 460 - </div> 461 - #else 462 - <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> 463 463 #end 436 + #if($budgetScale && $budgetScale != '') 437 + <div class="info-row"> 438 + <span class="info-label">予算規模</span> 439 + <span class="info-value">$!escapetool.xml($!budgetScale)</span> 440 + </div> 441 + #end 442 + #if($budgetAllocation && !$budgetAllocation.isEmpty()) 443 + <div class="info-row"> 444 + <span class="info-label">主な予算配分</span> 445 + <span class="info-value"> 446 + <div class="selection-display"> 447 + #foreach($ba in $budgetAllocation) 448 + <span class="selection-item">$!escapetool.xml($ba.trim())</span> 449 + #end 450 + </div> 451 + </span> 452 + </div> 453 + #end 454 + #if($budgetNote && $budgetNote.trim() != '') 455 + <div class="free-note">$!escapetool.xml($budgetNote)</div> 456 + #end 457 + </div> 458 + </div> 459 + #else 460 + <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 予算情報は #if($visibilityBudget == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div> 464 464 #end 462 + #end 463 +</div> 465 465 466 - ## --- 校則の見直し --- 467 - #if($ruleReviewStatus && $ruleReviewStatus != '') 468 - #set($canViewRuleReview = true) 469 - #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewRuleReview = false) 470 - #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false) 471 - #end 472 - #if($canViewRuleReview) 473 - <div class="seitokai-subsection"> 474 - <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> 475 - <div class="seitokai-subsection-content"> 476 - <div class="info-row"> 477 - <span class="info-label">見直しの有無（3年以内）</span> 478 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span> 465 +## --- ⑧ 校則の見直し --- 466 +#if($ruleReviewStatus && $ruleReviewStatus != '') 467 + ## 公開範囲チェック 468 + #set($canViewRuleReview = true) 469 + #if($visibilityRuleReview == 'members' && $isGuest) #set($canViewRuleReview = false) 470 + #elseif($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewRuleReview = false) 471 + #end 472 + #if($canViewRuleReview) 473 +<h2 class="section-title"><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M16 4h2a2 2 0 012 2v12a2 2 0 01-2 2h-2"/><path d="M8 4H6a2 2 0 00-2 2v12a2 2 0 002 2h2"/><line x1="12" y1="4" x2="12" y2="8"/><line x1="12" y1="16" x2="12" y2="20"/><line x1="8" y1="8" x2="16" y2="8"/><line x1="8" y1="16" x2="16" y2="16"/></svg> 校則の見直し #if($visibilityRuleReview != 'public')<span class="visibility-badge visibility-${visibilityRuleReview}">#if($visibilityRuleReview == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h2> 474 +<div class="school-section-card"> 475 + <div class="card-inner"> 476 + <div class="info-row"> 477 + <span class="info-label">見直しの有無（3年以内）</span> 478 + <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span> 479 + </div> 480 + #if($ruleReviewContent && !$ruleReviewContent.isEmpty()) 481 + <div class="info-row"> 482 + <span class="info-label">見直しの内容</span> 483 + <span class="info-value"> 484 + <div class="selection-display"> 485 + #foreach($rc in $ruleReviewContent) 486 + <span class="selection-item">$!escapetool.xml($rc.trim())</span> 487 + #end 479 479 </div> 480 - #if($ruleReviewContent && !$ruleReviewContent.isEmpty()) 481 - <div class="info-row"> 482 - <span class="info-label">見直しの内容</span> 483 - <span class="info-value"> 484 - <div class="selection-display"> 485 - #foreach($rc in $ruleReviewContent) 486 - <span class="selection-item">$!escapetool.xml($rc.trim())</span> 487 - #end 488 - </div> 489 - </span> 489 + </span> 490 + </div> 491 + #end 492 + #if($ruleReviewProposer && !$ruleReviewProposer.isEmpty()) 493 + <div class="info-row"> 494 + <span class="info-label">見直しの提案者</span> 495 + <span class="info-value"> 496 + <div class="selection-display"> 497 + #foreach($rp in $ruleReviewProposer) 498 + <span class="selection-item">$!escapetool.xml($rp.trim())</span> 499 + #end 490 490 </div> 491 - #end492 - #if($ruleReviewProposer && !$ruleReviewProposer.isEmpty())493 - <div class="info-row">494 - <spanclass="info-label">見直しの提案者</span>495 - spanclass="info-value">496 - divclass="selection-display">497 - #foreach($rpin$ruleReviewProposer)498 - spanclass="selection-item">$!escapetool.xml($rp.trim())</span>499 - #end500 - < /div>501 - </span>501 + </span> 502 + </div> 503 + #end 504 + #if($ruleReviewImplementer && !$ruleReviewImplementer.isEmpty()) 505 + <div class="info-row"> 506 + <span class="info-label">見直しの実施者</span> 507 + <span class="info-value"> 508 + <div class="selection-display"> 509 + #foreach($ri in $ruleReviewImplementer) 510 + <span class="selection-item">$!escapetool.xml($ri.trim())</span> 511 + #end 502 502 </div> 503 - #end 504 - #if($ruleReviewImplementer && !$ruleReviewImplementer.isEmpty()) 505 - <div class="info-row"> 506 - <span class="info-label">見直しの実施者</span> 507 - <span class="info-value"> 508 - <div class="selection-display"> 509 - #foreach($ri in $ruleReviewImplementer) 510 - <span class="selection-item">$!escapetool.xml($ri.trim())</span> 511 - #end 512 - </div> 513 - </span> 514 - </div> 515 - #end 516 - #if($ruleReviewSystem && $ruleReviewSystem != '') 517 - <div class="info-row"> 518 - <span class="info-label">見直しの仕組み</span> 519 - <span class="info-value">$!escapetool.xml($!ruleReviewSystem)</span> 520 - </div> 521 - #end 522 - </div> 513 + </span> 523 523 </div> 524 - #else 525 - <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> 526 - #end 527 527 #end 528 - 529 - ## --- 生徒会の課題意識 --- 530 - #if($challenges && $challenges != '') 531 - #set($canViewChallenges = true) 532 - #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewChallenges = false) 533 - #elseif($visibilityChallenges == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewChallenges = false) 534 - #end 535 - #if($canViewChallenges) 536 - <div class="seitokai-subsection"> 537 - <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> 538 - <div class="seitokai-subsection-content"> 539 - <div class="challenge-text">$!escapetool.xml($challenges)</div> 540 - </div> 516 + #if($ruleReviewSystem && $ruleReviewSystem != '') 517 + <div class="info-row"> 518 + <span class="info-label">見直しの仕組み</span> 519 + <span class="info-value">$!escapetool.xml($!ruleReviewSystem)</span> 541 541 </div> 542 - #else 543 - <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> 544 - #end 545 545 #end 522 + </div> 523 +</div> 524 + #else 525 +<div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 校則の見直し情報は #if($visibilityRuleReview == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div> 526 + #end 527 +#end 546 546 547 - </div>## seitokai-info-body 終了 548 -</div>## card-seitokai-info 終了 529 +## --- ⑨ 課題 --- 530 +#if($challenges && $challenges != '') 531 + ## 公開範囲チェック 532 + #set($canViewChallenges = true) 533 + #if($visibilityChallenges == 'members' && $isGuest) #set($canViewChallenges = false) 534 + #elseif($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewChallenges = false) 535 + #end 536 + #if($canViewChallenges) 537 +<h2 class="section-title">生徒会の課題意識 #if($visibilityChallenges != 'public')<span class="visibility-badge visibility-${visibilityChallenges}">#if($visibilityChallenges == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h2> 538 +<div class="challenge-text">$!escapetool.xml($challenges)</div> 539 + #else 540 +<div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 課題情報は #if($visibilityChallenges == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div> 541 + #end 542 +#end 549 549 550 -## --- ③ SNS・連絡先 --- 551 -<div class="school-info-card collapsed" id="card-contact"> 552 - <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> 553 - <table class="wiki-table school-info-table"> 554 - <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr> 555 - <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> 556 - <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> 557 - <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> 558 - <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> 559 - <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr> 560 - </table> 561 -</div> 544 +</div>## seitokai-info-accordion 終了 562 562 563 563 {{/html}} 564 564 565 ----- 566 - 567 567 ## --- ⑩ 活動報告一覧（スレッド型・年度タブ付き） --- 568 568 = 活動報告 = 569 569 570 -## --- 年度タブ +投稿者ステータス凡例 ---551 +## --- 投稿者ステータス凡例（折りたたみ） --- 571 571 {{html clean="false"}} 553 +<div class="author-legend-wrapper"> 554 + <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> 555 + <div class="author-legend-body"> 556 + <div class="author-legend"> 557 + <span class="author-legend-title">投稿者の信頼度:</span> 558 + <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者</span> 559 + <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み</span> 560 + <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介</span> 561 + <span class="author-legend-item"><span class="bar bar-general"></span> 一般（未承認）</span> 562 + </div> 563 + <div class="author-legend"> 564 + <span class="author-legend-title">所属:</span> 565 + <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> 566 + <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> 567 + <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> 568 + <span class="author-legend-item text-hint">※一般アカウントは所属未確認のため非表示</span> 569 + </div> 570 + <div class="author-legend"> 571 + <span class="author-legend-title">役割:</span> 572 + <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> 573 + <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> 574 + <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> 575 + </div> 576 + </div> 577 +</div> 572 572 573 573 ## --- 年度タブ --- 574 574 ## 全活動から年度一覧を収集 ... ... @@ -590,48 +590,14 @@ 590 590 #end 591 591 ## ソート（降順にしたいが Velocity にはないので JS で制御） 592 592 593 -<div class="activity-toolbar"> 594 - <div class="activity-fy-tabs"> 595 - <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button> 596 - #foreach($fy in $fySet) 597 - #if($fy != $currentFYStr) 598 - <button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button> 599 - #end 599 +<div class="activity-fy-tabs"> 600 + <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button> 601 + #foreach($fy in $fySet) 602 + #if($fy != $currentFYStr) 603 + <button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button> 600 600 #end 601 - <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button> 602 - </div> 603 - <div class="activity-toolbar-right"> 604 - <button class="btn-view-toggle" id="btnViewToggle" onclick="toggleCompactView()" title="タイトルのみ表示"> 605 - <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> 606 - <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> 607 - <span class="toggle-label">一覧表示</span> 608 - </button> 609 - </div> 610 - <div class="author-legend-wrapper"> 611 - <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> 612 - <div class="author-legend-body"> 613 - <div class="author-legend"> 614 - <span class="author-legend-title">投稿者の信頼度:</span> 615 - <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者 <span class="text-hint">— 運営スタッフ</span></span> 616 - <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み <span class="text-hint">— 本人確認済みのユーザー</span></span> 617 - <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介 <span class="text-hint">— 承認済みユーザーからの紹介</span></span> 618 - <span class="author-legend-item"><span class="bar bar-general"></span> 一般 <span class="text-hint">— 一般登録ユーザー</span></span> 619 - </div> 620 - <div class="author-legend"> 621 - <span class="author-legend-title">所属:</span> 622 - <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> 623 - <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> 624 - <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> 625 - <span class="author-legend-item text-hint">※一般アカウントは所属バッジが表示されません</span> 626 - </div> 627 - <div class="author-legend"> 628 - <span class="author-legend-title">役割:</span> 629 - <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> 630 - <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> 631 - <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> 632 - </div> 633 - </div> 634 - </div> 605 + #end 606 + <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button> 635 635 </div> 636 636 637 637 {{/html}} ... ... @@ -698,12 +698,6 @@ 698 698 <div class="activity-thread-title"> 699 699 <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> 700 700 <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span> 701 - #set($actTagsList = $activity.getValue('tags')) 702 - #if($actTagsList && !$actTagsList.isEmpty()) 703 - #foreach($tagItem in $actTagsList) 704 - #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end 705 - #end 706 - #end 707 707 </div> 708 708 <div class="thread-meta-row"> 709 709 <span class="thread-post-count">${reportCount}件の報告 ・ ${commentCount}件のコメント</span> ... ... @@ -765,12 +765,12 @@ 765 765 #set($postVis = $!post.getValue('visibility')) 766 766 #if(!$postVis || $postVis == '') #set($postVis = 'public') #end 767 767 #set($canViewPost = true) 768 - #if($postVis == 's chool' &&($isGuest|| (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated)))#set($canViewPost = false)769 - #elseif($postVis == 'school _trusted' && ($isGuest || (!$isViewerAdmin &&(($viewerSchoolCode != $schoolCode&& !$isAffiliated)|| ($viewerAccountType != 'verified' && $viewerAccountType != 'referred')))))#set($canViewPost = false)734 + #if($postVis == 'members' && $isGuest) #set($canViewPost = false) 735 + #elseif($postVis == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewPost = false) 770 770 #end 771 771 #if(!$canViewPost) 772 772 <div class="thread-post visibility-restricted-post"> 773 - <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>739 + <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> この投稿は #if($postVis == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div> 774 774 </div> 775 775 #else 776 776 ## 投稿者のアカウント種別に基づいたCSSクラス ... ... @@ -811,7 +811,7 @@ 811 811 #end 812 812 ## 所属バッジ（投稿者の学校コードとページの学校コードを比較） 813 813 #if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general') 814 - #if($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode))780 + #if($postSchoolCode == $schoolCode) 815 815 #if($postAccountType == 'verified' || $postAccountType == 'admin') 816 816 <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> 817 817 #else ... ... @@ -902,7 +902,7 @@ 902 902 #end 903 903 </div> 904 904 #if($postVis != 'public') 905 - <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>871 + <div class="visibility-badge visibility-${postVis} post-action-mt">#if($postVis == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</div> 906 906 #end 907 907 ## 固定/解除ボタン（承認済み・管理者のみ） 908 908 #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified') ... ... @@ -1016,35 +1016,6 @@ 1016 1016 ## --- 年度タブ切り替え JavaScript --- 1017 1017 {{html clean="false"}} 1018 1018 <script> 1019 -// コンパクト表示（タイトルのみ）トグル 1020 -function toggleCompactView() { 1021 - var container = document.querySelector('.xwiki-content') || document.body; 1022 - var isCompact = container.classList.toggle('activity-compact-view'); 1023 - var btn = document.getElementById('btnViewToggle'); 1024 - if (btn) { 1025 - btn.querySelector('.toggle-label').textContent = isCompact ? '詳細表示' : '一覧表示'; 1026 - btn.title = isCompact ? '詳細表示に戻す' : 'タイトルのみ表示'; 1027 - } 1028 - // コンパクトモードでは各スレッドヘッダーをクリックで個別展開可能にする 1029 - document.querySelectorAll('.activity-thread').forEach(function(thread) { 1030 - if (isCompact) { 1031 - thread.classList.remove('compact-expanded'); 1032 - } 1033 - }); 1034 -} 1035 - 1036 -// コンパクトモードで個別スレッドを展開/折りたたみ 1037 -function toggleThreadExpand(e) { 1038 - var container = document.querySelector('.xwiki-content') || document.body; 1039 - if (!container.classList.contains('activity-compact-view')) return; 1040 - // リンクやボタンのクリックはスルー 1041 - if (e.target.closest('a, button, .btn-featured-toggle')) return; 1042 - var thread = e.target.closest('.activity-thread'); 1043 - if (thread) { 1044 - thread.classList.toggle('compact-expanded'); 1045 - } 1046 -} 1047 - 1048 1048 function switchActivityFY(fy, btn) { 1049 1049 // タブのアクティブ状態を切り替え 1050 1050 document.querySelectorAll('.activity-fy-tab').forEach(function(t) { t.classList.remove('active'); }); ... ... @@ -1071,30 +1071,6 @@ 1071 1071 window.history.replaceState({}, document.title, window.location.pathname); 1072 1072 } 1073 1073 } 1074 - // コンパクトモード: スレッドヘッダークリックで個別展開 1075 - document.querySelectorAll('.activity-thread-header').forEach(function(header) { 1076 - header.addEventListener('click', toggleThreadExpand); 1077 - }); 1078 - // 長文投稿の折りたたみ初期化（max-height: 12em 超で省略） 1079 - document.querySelectorAll('.thread-post-body').forEach(function(body) { 1080 - // pre-wrapのまま高さを測定し、max-height(12em ≒ ~200px)を超える場合に折りたたむ 1081 - var fullH = body.scrollHeight; 1082 - // 12em を px に変換（font-size × line-height × 行数 の近似値ではなくCSSと同じ値を取得） 1083 - body.classList.add('truncated'); 1084 - var maxH = body.clientHeight; // max-height: 12em 適用後の高さ 1085 - body.classList.remove('truncated'); 1086 - if (fullH > maxH + 30) { 1087 - body.classList.add('truncated'); 1088 - var btn = document.createElement('button'); 1089 - btn.className = 'btn-read-more'; 1090 - btn.textContent = '広げて読む ▼'; 1091 - btn.addEventListener('click', function() { 1092 - var isExpanded = body.classList.toggle('expanded'); 1093 - btn.textContent = isExpanded ? '折りたたむ ▲' : '広げて読む ▼'; 1094 - }); 1095 - body.parentNode.insertBefore(btn, body.nextSibling); 1096 - } 1097 - }); 1098 1098 }); 1099 1099 1100 1100 // トースト通知表示 ... ... @@ -1157,7 +1157,7 @@ 1157 1157 var csrfEl = document.querySelector('input[name="form_token"]'); 1158 1158 var csrfToken = csrfEl ? csrfEl.value : ''; 1159 1159 var xhr = new XMLHttpRequest(); 1160 - xhr.open('POST', '/bin/ get/SeitokaiCode/EditPost?outputSyntax=plain', true);1073 + xhr.open('POST', '/bin/SeitokaiCode/EditPost?outputSyntax=plain', true); 1161 1161 xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'); 1162 1162 var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken); 1163 1163 xhr.onload = function() { ... ... @@ -1179,7 +1179,7 @@ 1179 1179 function confirmDeletePost(schoolPage, postObjNum, token) { 1180 1180 if (!confirm('この投稿を削除しますか？\\n削除後は「この投稿は削除されました」と表示されます。')) return; 1181 1181 var xhr = new XMLHttpRequest(); 1182 - xhr.open('POST', '/bin/ get/SeitokaiCode/DeletePost?outputSyntax=plain', true);1095 + xhr.open('POST', '/bin/SeitokaiCode/DeletePost?outputSyntax=plain', true); 1183 1183 xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'); 1184 1184 var deletePostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token); 1185 1185 xhr.onload = function() {