Changes for page 学校ページ テンプレート
Last modified by Super Admin on 2026/04/05 18:59
From version
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
To version
44.1
edited by Super Admin
on 2026/03/13 00:18
on 2026/03/13 00:18
Change comment:
There is no comment for this version
Summary
Details
- Page properties
-
- Content
-
... ... @@ -100,47 +100,10 @@ 100 100 #end 101 101 #end 102 102 103 -## --- 学校ページ非表示チェック --- 104 -#set($schoolHidden = $doc.getValue('hidden')) 105 -#if($schoolHidden == 1) 106 - #if($isViewerAdmin) 107 - ## 管理者: 黄色バナー + ページ内容は通常表示(プレビュー) 108 -<div class="school-hidden-banner admin"> 109 - <svg class="ico" viewBox="0 0 24 24"><path d="M17.94 17.94A10.07 10.07 0 0112 20c-7 0-11-8-11-8a18.45 18.45 0 015.06-5.94M9.9 4.24A9.12 9.12 0 0112 4c7 0 11 8 11 8a18.5 18.5 0 01-2.16 3.19m-6.72-1.07a3 3 0 01-4.24-4.24"/><line x1="1" y1="1" x2="23" y2="23"/></svg> 110 - <div> 111 - <strong>このページは非表示になっています</strong>(管理者のみ閲覧可能) 112 - #set($hBy = $!doc.getValue('hiddenBy')) 113 - #set($hAt = $!doc.getValue('hiddenAt')) 114 - #set($hReason = $!doc.getValue('hiddenReason')) 115 - <div class="school-hidden-detail"> 116 - 非表示: $!escapetool.xml($hAt) / $!escapetool.xml($hBy) 117 - #if($hReason && $hReason != '') ・ 理由: $!escapetool.xml($hReason)#end 118 - </div> 119 - <a href="$xwiki.getURL('SeitokaiAdmin.SchoolManagement', 'view')" style="color:#92400e;text-decoration:underline">学校ページ管理へ</a> 120 - </div> 121 -</div> 122 - #else 123 - ## 一般ユーザー・ゲスト: 非公開メッセージを表示して停止 124 -<div class="school-hidden-public"> 125 - <svg class="ico" viewBox="0 0 24 24" style="width:2.5em;height:2.5em"><path d="M17.94 17.94A10.07 10.07 0 0112 20c-7 0-11-8-11-8a18.45 18.45 0 015.06-5.94M9.9 4.24A9.12 9.12 0 0112 4c7 0 11 8 11 8a18.5 18.5 0 01-2.16 3.19m-6.72-1.07a3 3 0 01-4.24-4.24"/><line x1="1" y1="1" x2="23" y2="23"/></svg> 126 - <h2>このページは現在公開されていません</h2> 127 - <p>このページは管理者により非公開に設定されています。</p> 128 - <a href="$xwiki.getURL('Schools.WebHome', 'view')" class="btn-back-list">学校一覧に戻る</a> 129 -</div> 130 -{{/html}} 131 -{{/velocity}} 132 -#stop 133 - #end 134 -#end 135 - 136 136 ## --- 投稿固定/解除処理 --- 137 137 #set($pinAction = $!request.action) 138 -#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token)) 139 - #set($pinPostObjStr = $!request.postObj) 140 - #if(!$pinPostObjStr.matches('^\d+$')) 141 - ## 不正な値 → 無視 142 - #else 143 - #set($postObjNum = $mathtool.toInteger($pinPostObjStr)) 105 +#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || $viewerAccountType == 'verified') && $services.csrf.isTokenValid($request.form_token)) 106 + #set($postObjNum = $mathtool.toInteger($!request.postObj)) 144 144 #set($postObj = $doc.getObject('SeitokaiCode.ActivityPostClass', $postObjNum)) 145 145 #if($postObj) 146 146 #if($pinAction == 'pin') ... ... @@ -160,15 +160,12 @@ 160 160 $response.sendRedirect($doc.getURL('view')) 161 161 #stop 162 162 #end 163 - #end## /matches 164 164 #end 165 165 166 166 ## --- 特色ある活動 選定/解除処理 --- 167 167 #set($featAction = $!request.action) 168 -#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token)) 169 - #set($featActObjStr = $!request.actObj) 170 - #if($featActObjStr.matches('^\d+$')) 171 - #set($actObjNum = $mathtool.toInteger($featActObjStr)) 130 +#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $services.csrf.isTokenValid($request.form_token)) 131 + #set($actObjNum = $mathtool.toInteger($!request.actObj)) 172 172 #set($actObj = $doc.getObject('SeitokaiCode.ActivityClass', $actObjNum)) 173 173 #if($actObj) 174 174 #if($featAction == 'feature') ... ... @@ -200,7 +200,6 @@ 200 200 $response.sendRedirect($doc.getURL('view')) 201 201 #stop 202 202 #end 203 - #end## /matches 204 204 #end 205 205 206 206 ## --- ユーザー情報取得 --- ... ... @@ -279,7 +279,7 @@ 279 279 ## --- ① 学校基本情報 + 連絡先(左右グリッド・折りたたみ対応) --- 280 280 <div class="school-info-grid"> 281 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>241 + <h2 onclick="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 283 <table class="wiki-table school-info-table"> 284 284 <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr> 285 285 <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr> ... ... @@ -299,7 +299,7 @@ 299 299 </div> 300 300 301 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>261 + <h2 onclick="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 303 <table class="wiki-table school-info-table"> 304 304 <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr> 305 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> ... ... @@ -668,7 +668,7 @@ 668 668 <div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)"> 669 669 <div class="activity-thread-header"> 670 670 <div class="activity-thread-title"> 671 - <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>630 + <h3 #if($actFeatured == '1')class="featured-title"#end>$!escapetool.xml($!actTitle) #if($actFeatured == '1')<svg class="ico ico-fixed-14" viewBox="0 0 24 24" fill="currentColor" stroke="none" class="ico-star-offset"><polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"/></svg>#end</h3> 672 672 <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span> 673 673 </div> 674 674 <div class="thread-meta-row"> ... ... @@ -798,6 +798,9 @@ 798 798 #elseif($postUserRole == 'graduate') 799 799 <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> 800 800 #end 760 + #if($postGrade && $postGrade != '') 761 + <span class="badge badge-grade badge-sm">$postGrade</span> 762 + #end 801 801 </span> 802 802 <span class="thread-post-date">$!postDate</span> 803 803 #set($postEdited = $!post.getValue('edited')) ... ... @@ -1036,9 +1036,6 @@ 1036 1036 var card = document.getElementById(cardId); 1037 1037 if (!card) return; 1038 1038 card.classList.toggle('collapsed'); 1039 - var isCollapsed = card.classList.contains('collapsed'); 1040 - var h2 = card.querySelector('h2[role="button"]'); 1041 - if (h2) h2.setAttribute('aria-expanded', !isCollapsed); 1042 1042 } 1043 1043 1044 1044 // 投稿の編集(インライン編集フォームを開く)