Changes for page 学校ページ テンプレート
Last modified by Super Admin on 2026/04/05 18:59
From version
32.1
edited by Super Admin
on 2026/03/10 13:45
on 2026/03/10 13:45
Change comment:
There is no comment for this version
To version
21.1
edited by Super Admin
on 2026/03/08 18:52
on 2026/03/08 18:52
Change comment:
There is no comment for this version
Summary
Details
- Page properties
-
- Content
-
... ... @@ -1,21 +1,10 @@ 1 1 {{velocity}} 2 2 ## ===== 学校ページ テンプレート ===== 3 -{{html clean="false"}} 4 -## メンテナンスバナー({{include}}ではなくインラインで記述し、<p>タグ挿入を回避) 5 -#set($bannerDoc = $xwiki.getDocument('SeitokaiAdmin.MaintenanceBanner')) 6 -#set($bannerObj = $bannerDoc.getObject('SeitokaiCode.MaintenanceBannerClass')) 7 -#if($bannerObj && $bannerObj.getValue('enabled') == 1) 8 -#set($bannerMsg = $bannerObj.getValue('message')) 9 -#set($bannerLevel = $bannerObj.getValue('level')) 10 -#if(!$bannerLevel || $bannerLevel == '')#set($bannerLevel = 'warning')#end 11 -<div class="maintenance-banner active maintenance-${bannerLevel}" id="maintenance-banner"> 12 - <div class="maintenance-banner-inner"> 13 - <span class="maintenance-icon">#if($bannerLevel == 'urgent')<svg class="ico-banner" viewBox="0 0 24 24"><path d="M10.29 3.86L1.82 18a2 2 0 001.71 3h16.94a2 2 0 001.71-3L13.71 3.86a2 2 0 00-3.42 0z"/><line x1="12" y1="9" x2="12" y2="13"/><line x1="12" y1="17" x2="12.01" y2="17"/></svg>#elseif($bannerLevel == 'info')<svg class="ico-banner" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><line x1="12" y1="16" x2="12" y2="12"/><line x1="12" y1="8" x2="12.01" y2="8"/></svg>#else<svg class="ico-banner" viewBox="0 0 24 24"><path d="M14.7 6.3a1 1 0 000 1.4l1.6 1.6a1 1 0 001.4 0l3.77-3.77a6 6 0 01-7.94 7.94l-6.91 6.91a2.12 2.12 0 01-3-3l6.91-6.91a6 6 0 017.94-7.94l-3.76 3.76z"/></svg>#end</span> 14 - <span class="maintenance-text">$!escapetool.xml($bannerMsg)</span> 15 - <button class="maintenance-close" onclick="document.getElementById('maintenance-banner').style.display='none'">×</button> 16 - </div> 17 -</div> 18 -#end 3 +## このテンプレートは学校ページの表示と入力フォームを制御します。 4 + 5 +## メンテナンスバナー 6 +{{include reference="SeitokaiCode.MaintenanceBannerInclude" /}} 7 + 19 19 ## --- 学校基本情報フィールド --- 20 20 #set($schoolCode = $doc.getValue('schoolCode')) 21 21 #set($schoolName = $doc.getValue('schoolName')) ... ... @@ -171,7 +171,7 @@ 171 171 ## --- ユーザー情報取得 --- 172 172 ## displayName: Wiki上の表示名(ニックネーム)。本名(firstName/lastName)は管理者のみ閲覧可能。 173 173 #set($lastAuthor = $doc.author) 174 -#set($lastAuthorDoc = $xwiki.getDocument($lastAuthor)) 163 +#set($lastAuthorDoc = $xwiki.getDocument("XWiki.${lastAuthor}")) 175 175 #set($authorAccountType = '') 176 176 #set($authorUserRole = '') 177 177 #set($authorUserStatus = '') ... ... @@ -185,8 +185,7 @@ 185 185 #set($authorEnrollmentYear = $!lastAuthorDoc.getValue('enrollmentYear')) 186 186 #set($authorDisplayName = $!lastAuthorDoc.getValue('displayName')) 187 187 #if(!$authorDisplayName || $authorDisplayName == '') 188 - ## false引数でプレーンテキスト(HTMLリンクなし)を取得 189 - #set($authorDisplayName = $xwiki.getUserName($doc.author, false)) 177 + #set($authorDisplayName = $xwiki.getUserName($doc.author)) 190 190 #end 191 191 ## --- 学年の動的計算(学校種別対応) --- 192 192 ## 日本の学校年度: 4月始まり。currentSchoolYear = (月>=4) ? 今年 : 去年 ... ... @@ -225,6 +225,7 @@ 225 225 #end 226 226 227 227 ## --- 信頼性バッジ + ユーザー情報 --- 216 +{{html clean="false"}} 228 228 <div class="seitokai-badge-container"> 229 229 ## 承認バッジ 230 230 #if($authorAccountType == 'admin') ... ... @@ -260,19 +260,15 @@ 260 260 #elseif($authorUserStatus == 'transferred') 261 261 <span class="badge badge-status-transferred"><svg class="ico" viewBox="0 0 24 24"><polyline points="23 4 23 10 17 10"/><polyline points="1 20 1 14 7 14"/><path d="M3.51 9a9 9 0 0114.85-3.36L23 10M1 14l4.64 4.36A9 9 0 0020.49 15"/></svg> 転校済み</span> 262 262 #end 263 - ## 編集ボタン(権限があるユーザーのみ表示) 264 - #set($canEditSchool = false) 265 - #if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode)) 266 - #set($canEditSchool = true) 267 - #end 268 - #if($canEditSchool) 269 - <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> 270 - #end 252 + <span class="badge-info">最終編集: $!escapetool.xml($authorDisplayName) ($xwiki.formatDate($doc.date, "yyyy/MM/dd"))</span> 271 271 </div> 254 +{{/html}} 272 272 256 +{{html clean="false"}} 257 + 273 273 ## --- ① 学校基本情報 + 連絡先(左右グリッド・折りたたみ対応) --- 274 274 <div class="school-info-grid"> 275 - <div class="school-info-card collapse d" id="card-basic-info">260 + <div class="school-info-card mobile-collapse" id="card-basic-info"> 276 276 <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> 277 277 <table class="wiki-table school-info-table"> 278 278 <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr> ... ... @@ -282,12 +282,17 @@ 282 282 <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr> 283 283 <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr> 284 284 <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr> 285 - <tr><th>課程</th><td> #if($schoolSystem && $schoolSystem!= '' && $schoolSystem != '[]')$!escapetool.xml($!schoolSystem)#end</td></tr>270 + <tr><th>課程</th><td>$!escapetool.xml($!schoolSystem)</td></tr> 286 286 <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> 287 287 </table> 273 + #set($infoEditDate = $!doc.getValue('lastInfoEditedDate')) 274 + #set($infoEditBy = $!doc.getValue('lastInfoEditedBy')) 275 + #if($infoEditDate && $infoEditDate != '') 276 + <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> 277 + #end 288 288 </div> 289 289 290 - <div class="school-info-card collapse d" id="card-contact">280 + <div class="school-info-card mobile-collapse" id="card-contact"> 291 291 <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> 292 292 <table class="wiki-table school-info-table"> 293 293 <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr> ... ... @@ -556,12 +556,6 @@ 556 556 <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> 557 557 <span class="author-legend-item text-hint">※一般アカウントは所属未確認のため非表示</span> 558 558 </div> 559 - <div class="author-legend"> 560 - <span class="author-legend-title">役割:</span> 561 - <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> 562 - <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> 563 - <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> 564 - </div> 565 565 </div> 566 566 </div> 567 567 ... ... @@ -641,17 +641,6 @@ 641 641 #set($threadPosts = []) 642 642 #set($discard = $threadPosts.addAll($pinnedPosts)) 643 643 #set($discard = $threadPosts.addAll($normalPosts)) 644 - ## report/comment カウント 645 - #set($reportCount = 0) 646 - #set($commentCount = 0) 647 - #foreach($tp in $threadPosts) 648 - #set($tpType = $!tp.getValue('postType')) 649 - #if($tpType == 'comment') 650 - #set($commentCount = $commentCount + 1) 651 - #else 652 - #set($reportCount = $reportCount + 1) 653 - #end 654 - #end 655 655 656 656 {{html clean="false"}} 657 657 <div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)"> ... ... @@ -661,7 +661,7 @@ 661 661 <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span> 662 662 </div> 663 663 <div class="thread-meta-row"> 664 - <span class="thread-post-count">${re portCount}件の報告 ・ ${commentCount}件のコメント</span>637 + <span class="thread-post-count">${threadPosts.size()}件の投稿</span> 665 665 #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred') 666 666 #if($actFeatured == '1') 667 667 <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> ... ... @@ -672,10 +672,7 @@ 672 672 </div> 673 673 </div> 674 674 675 - ## --- 活動報告セクション --- 676 676 #foreach($post in $threadPosts) 677 - #set($thisPostType = $!post.getValue('postType')) 678 - #if($thisPostType != 'comment') 679 679 #set($postContent = $post.getValue('content')) 680 680 #set($postAuthor = $post.getValue('author')) 681 681 #set($postAccountType = $!post.getValue('authorAccountType')) ... ... @@ -897,44 +897,6 @@ 897 897 #end## /canViewPost 898 898 #end## /postHidden 899 899 #end## /postDeleted 900 - #end## /postType != comment 901 - #end## /foreach reports 902 - 903 - ## --- コメントセクション(折りたたみ) --- 904 - #if($commentCount > 0) 905 - <details class="thread-comments-section"> 906 - <summary class="thread-comments-toggle"> 907 - <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}件のコメント 908 - </summary> 909 - #foreach($post in $threadPosts) 910 - #set($thisPostType = $!post.getValue('postType')) 911 - #if($thisPostType == 'comment') 912 - #set($postContent = $post.getValue('content')) 913 - #set($postAuthor = $post.getValue('author')) 914 - #set($postAccountType = $!post.getValue('authorAccountType')) 915 - #set($postDate = $post.getValue('createdDate')) 916 - #set($postDeleted = $!post.getValue('deleted')) 917 - #if($postDeleted == 1 || $postDeleted == '1') 918 - <div class="thread-comment thread-comment-deleted"> 919 - <span class="thread-comment-meta">このコメントは削除されました</span> 920 - </div> 921 - #else 922 - #set($postHidden = $!post.getValue('hidden')) 923 - #if($postHidden == 1 || $postHidden == '1') 924 - <div class="thread-comment thread-comment-hidden"> 925 - <span class="thread-comment-meta">このコメントは非表示にされました</span> 926 - </div> 927 - #else 928 - <div class="thread-comment"> 929 - <span class="thread-comment-author">$!escapetool.xml($postAuthor)</span> 930 - <span class="thread-comment-date">$!postDate</span> 931 - <div class="thread-comment-body">$!escapetool.xml($postContent)</div> 932 - </div> 933 - #end 934 - #end 935 - #end 936 - #end 937 - </details> 938 938 #end 939 939 940 940 #if($xcontext.user != "XWiki.XWikiGuest") ... ... @@ -1033,10 +1033,12 @@ 1033 1033 btn.classList.add('active'); 1034 1034 // 活動スレッドの表示切り替え 1035 1035 document.querySelectorAll('.activity-thread[data-fiscal-year]').forEach(function(thread) { 1036 - if (fy === 'all' || thread.getAttribute('data-fiscal-year') === fy) { 1037 - thread.classList.remove('fy-hidden'); 968 + if (fy === 'all') { 969 + thread.style.display = ''; 970 + } else if (thread.getAttribute('data-fiscal-year') === fy) { 971 + thread.style.display = ''; 1038 1038 } else { 1039 - thread. classList.add('fy-hidden');973 + thread.style.display = 'none'; 1040 1040 } 1041 1041 }); 1042 1042 } ... ... @@ -1044,6 +1044,12 @@ 1044 1044 document.addEventListener('DOMContentLoaded', function() { 1045 1045 var defaultTab = document.querySelector('.activity-fy-tab.active'); 1046 1046 if (defaultTab) { defaultTab.click(); } 981 + // モバイルでは基本情報・連絡先をデフォルト折りたたみ 982 + if (window.innerWidth <= 768) { 983 + document.querySelectorAll('.school-info-card.mobile-collapse').forEach(function(card) { 984 + card.classList.add('collapsed'); 985 + }); 986 + } 1047 1047 // 保存成功時のトースト通知 1048 1048 if (window.location.search.indexOf('archived=1') !== -1) { 1049 1049 showToast('年度アーカイブを作成しました', 'success'); ... ... @@ -1083,6 +1083,7 @@ 1083 1083 var card = document.getElementById(cardId); 1084 1084 if (!card) return; 1085 1085 card.classList.toggle('collapsed'); 1026 + card.classList.remove('mobile-collapse'); 1086 1086 } 1087 1087 1088 1088 // 投稿の編集(インライン編集フォームを開く)