Changes for page 学校ページ テンプレート
Last modified by Super Admin on 2026/04/05 18:59
From version
27.1
edited by Super Admin
on 2026/03/09 12:42
on 2026/03/09 12:42
Change comment:
There is no comment for this version
To version
20.1
edited by Super Admin
on 2026/03/08 09:26
on 2026/03/08 09:26
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')) ... ... @@ -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') ... ... @@ -262,7 +262,10 @@ 262 262 #end 263 263 <span class="badge-info">最終編集: $!escapetool.xml($authorDisplayName) ($xwiki.formatDate($doc.date, "yyyy/MM/dd"))</span> 264 264 </div> 254 +{{/html}} 265 265 256 +{{html clean="false"}} 257 + 266 266 ## --- ① 学校基本情報 + 連絡先(左右グリッド・折りたたみ対応) --- 267 267 <div class="school-info-grid"> 268 268 <div class="school-info-card mobile-collapse" id="card-basic-info"> ... ... @@ -275,7 +275,7 @@ 275 275 <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr> 276 276 <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr> 277 277 <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr> 278 - <tr><th>課程</th><td> #if($schoolSystem && $schoolSystem!= '' && $schoolSystem != '[]')$!escapetool.xml($!schoolSystem)#end</td></tr>270 + <tr><th>課程</th><td>$!escapetool.xml($!schoolSystem)</td></tr> 279 279 <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> 280 280 </table> 281 281 #set($infoEditDate = $!doc.getValue('lastInfoEditedDate')) ... ... @@ -554,12 +554,6 @@ 554 554 <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> 555 555 <span class="author-legend-item text-hint">※一般アカウントは所属未確認のため非表示</span> 556 556 </div> 557 - <div class="author-legend"> 558 - <span class="author-legend-title">役割:</span> 559 - <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> 560 - <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> 561 - <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> 562 - </div> 563 563 </div> 564 564 </div> 565 565 ... ... @@ -639,17 +639,6 @@ 639 639 #set($threadPosts = []) 640 640 #set($discard = $threadPosts.addAll($pinnedPosts)) 641 641 #set($discard = $threadPosts.addAll($normalPosts)) 642 - ## report/comment カウント 643 - #set($reportCount = 0) 644 - #set($commentCount = 0) 645 - #foreach($tp in $threadPosts) 646 - #set($tpType = $!tp.getValue('postType')) 647 - #if($tpType == 'comment') 648 - #set($commentCount = $commentCount + 1) 649 - #else 650 - #set($reportCount = $reportCount + 1) 651 - #end 652 - #end 653 653 654 654 {{html clean="false"}} 655 655 <div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)"> ... ... @@ -659,7 +659,7 @@ 659 659 <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span> 660 660 </div> 661 661 <div class="thread-meta-row"> 662 - <span class="thread-post-count">${re portCount}件の報告 ・ ${commentCount}件のコメント</span>637 + <span class="thread-post-count">${threadPosts.size()}件の投稿</span> 663 663 #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred') 664 664 #if($actFeatured == '1') 665 665 <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> ... ... @@ -670,10 +670,7 @@ 670 670 </div> 671 671 </div> 672 672 673 - ## --- 活動報告セクション --- 674 674 #foreach($post in $threadPosts) 675 - #set($thisPostType = $!post.getValue('postType')) 676 - #if($thisPostType != 'comment') 677 677 #set($postContent = $post.getValue('content')) 678 678 #set($postAuthor = $post.getValue('author')) 679 679 #set($postAccountType = $!post.getValue('authorAccountType')) ... ... @@ -895,52 +895,14 @@ 895 895 #end## /canViewPost 896 896 #end## /postHidden 897 897 #end## /postDeleted 898 - #end## /postType != comment 899 - #end## /foreach reports 900 - 901 - ## --- コメントセクション(折りたたみ) --- 902 - #if($commentCount > 0) 903 - <details class="thread-comments-section"> 904 - <summary class="thread-comments-toggle"> 905 - <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}件のコメント 906 - </summary> 907 - #foreach($post in $threadPosts) 908 - #set($thisPostType = $!post.getValue('postType')) 909 - #if($thisPostType == 'comment') 910 - #set($postContent = $post.getValue('content')) 911 - #set($postAuthor = $post.getValue('author')) 912 - #set($postAccountType = $!post.getValue('authorAccountType')) 913 - #set($postDate = $post.getValue('createdDate')) 914 - #set($postDeleted = $!post.getValue('deleted')) 915 - #if($postDeleted == 1 || $postDeleted == '1') 916 - <div class="thread-comment thread-comment-deleted"> 917 - <span class="thread-comment-meta">このコメントは削除されました</span> 918 - </div> 919 - #else 920 - #set($postHidden = $!post.getValue('hidden')) 921 - #if($postHidden == 1 || $postHidden == '1') 922 - <div class="thread-comment thread-comment-hidden"> 923 - <span class="thread-comment-meta">このコメントは非表示にされました</span> 924 - </div> 925 - #else 926 - <div class="thread-comment"> 927 - <span class="thread-comment-author">$!escapetool.xml($postAuthor)</span> 928 - <span class="thread-comment-date">$!postDate</span> 929 - <div class="thread-comment-body">$!escapetool.xml($postContent)</div> 930 - </div> 931 - #end 932 - #end 933 - #end 934 - #end 935 - </details> 936 936 #end 937 937 938 938 #if($xcontext.user != "XWiki.XWikiGuest") 939 939 <div class="thread-add-post"> 940 - <a href="/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add"> 874 + <a href="/xwiki/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add"> 941 941 + 活動報告を追加 942 942 </a> 943 - <a href="/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment"> 877 + <a href="/xwiki/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment"> 944 944 <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> コメントを書く 945 945 </a> 946 946 </div> ... ... @@ -962,7 +962,7 @@ 962 962 #if($xcontext.user != "XWiki.XWikiGuest") 963 963 {{html clean="false"}} 964 964 <div class="activity-add-section"> 965 - <a href="/bin/view/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$!escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity"> 899 + <a href="/xwiki/bin/view/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$!escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity"> 966 966 <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> 活動を追加 967 967 </a> 968 968 </div> ... ... @@ -1012,7 +1012,7 @@ 1012 1012 ## 新年度に移行ボタン(承認済み・管理者のみ) 1013 1013 #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified') 1014 1014 <div class="archive-action"> 1015 - <a href="/bin/view/SeitokaiCode/YearArchiveAction?schoolPage=${doc.fullName}" class="btn-accent"> 949 + <a href="/xwiki/bin/view/SeitokaiCode/YearArchiveAction?schoolPage=${doc.fullName}" class="btn-accent"> 1016 1016 <svg class="ico" viewBox="0 0 24 24" stroke-width="2.5"><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> 1017 1017 ${pageFiscalYear}年度をアーカイブして新年度に移行 1018 1018 </a> ... ... @@ -1031,10 +1031,12 @@ 1031 1031 btn.classList.add('active'); 1032 1032 // 活動スレッドの表示切り替え 1033 1033 document.querySelectorAll('.activity-thread[data-fiscal-year]').forEach(function(thread) { 1034 - if (fy === 'all' || thread.getAttribute('data-fiscal-year') === fy) { 1035 - 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 = ''; 1036 1036 } else { 1037 - thread. classList.add('fy-hidden');973 + thread.style.display = 'none'; 1038 1038 } 1039 1039 }); 1040 1040 } ... ... @@ -1119,7 +1119,7 @@ 1119 1119 var csrfEl = document.querySelector('input[name="form_token"]'); 1120 1120 var csrfToken = csrfEl ? csrfEl.value : ''; 1121 1121 var xhr = new XMLHttpRequest(); 1122 - xhr.open('GET', '/bin/view/SeitokaiCode/EditPost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken), true); 1058 + xhr.open('GET', '/xwiki/bin/view/SeitokaiCode/EditPost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken), true); 1123 1123 xhr.onload = function() { 1124 1124 try { 1125 1125 var res = JSON.parse(xhr.responseText); ... ... @@ -1139,7 +1139,7 @@ 1139 1139 function confirmDeletePost(schoolPage, postObjNum, token) { 1140 1140 if (!confirm('この投稿を削除しますか?\\n削除後は「この投稿は削除されました」と表示されます。')) return; 1141 1141 var xhr = new XMLHttpRequest(); 1142 - xhr.open('GET', '/bin/view/SeitokaiCode/DeletePost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token), true); 1078 + xhr.open('GET', '/xwiki/bin/view/SeitokaiCode/DeletePost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token), true); 1143 1143 xhr.onload = function() { 1144 1144 try { 1145 1145 var res = JSON.parse(xhr.responseText);