Skip to Content
Last modified by Super Admin on 2026/04/05 18:59
From version Icon 18.1 Icon
edited by Super Admin
on 2026/03/08 00:14
Change comment: There is no comment for this version
To version Icon 32.1 Icon
edited by Super Admin
on 2026/03/10 13:45
Change comment: There is no comment for this version

Summary

Details

Icon Page properties
Content
... ... @@ -1,10 +1,21 @@
1 1  {{velocity}}
2 2  ## ===== 学校ページ テンプレート =====
3 -## このテンプレートは学校ページの表示と入力フォームを制御します。
4 -
5 -## メンテナンスバナー
6 -{{include reference="SeitokaiCode.MaintenanceBannerInclude" /}}
7 -
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'">&times;</button>
16 + </div>
17 +</div>
18 +#end
8 8  ## --- 学校基本情報フィールド ---
9 9  #set($schoolCode = $doc.getValue('schoolCode'))
10 10  #set($schoolName = $doc.getValue('schoolName'))
... ... @@ -160,7 +160,7 @@
160 160  ## --- ユーザー情報取得 ---
161 161  ## displayName: Wiki上の表示名（ニックネーム）。本名(firstName/lastName)は管理者のみ閲覧可能。
162 162  #set($lastAuthor = $doc.author)
163 -#set($lastAuthorDoc = $xwiki.getDocument("XWiki.${lastAuthor}"))
174 +#set($lastAuthorDoc = $xwiki.getDocument($lastAuthor))
164 164  #set($authorAccountType = '')
165 165  #set($authorUserRole = '')
166 166  #set($authorUserStatus = '')
... ... @@ -174,7 +174,8 @@
174 174   #set($authorEnrollmentYear = $!lastAuthorDoc.getValue('enrollmentYear'))
175 175   #set($authorDisplayName = $!lastAuthorDoc.getValue('displayName'))
176 176   #if(!$authorDisplayName || $authorDisplayName == '')
177 - #set($authorDisplayName = $xwiki.getUserName($doc.author))
188 + ## false引数でプレーンテキスト（HTMLリンクなし）を取得
189 + #set($authorDisplayName = $xwiki.getUserName($doc.author, false))
178 178   #end
179 179   ## --- 学年の動的計算（学校種別対応） ---
180 180   ## 日本の学校年度: 4月始まり。currentSchoolYear = (月>=4) ? 今年 : 去年
... ... @@ -213,7 +213,6 @@
213 213  #end
214 214  
215 215  ## --- 信頼性バッジ + ユーザー情報 ---
216 -{{html clean="false"}}
217 217  <div class="seitokai-badge-container">
218 218   ## 承認バッジ
219 219   #if($authorAccountType == 'admin')
... ... @@ -249,15 +249,19 @@
249 249   #elseif($authorUserStatus == 'transferred')
250 250   <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>
251 251   #end
252 - <span class="badge-info">最終編集: $!escapetool.xml($authorDisplayName) ($xwiki.formatDate($doc.date, "yyyy/MM/dd"))</span>
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
253 253  </div>
254 -{{/html}}
255 255  
256 -{{html clean="false"}}
257 -
258 258  ## --- ① 学校基本情報 + 連絡先（左右グリッド・折りたたみ対応） ---
259 259  <div class="school-info-grid">
260 - <div class="school-info-card mobile-collapse" id="card-basic-info">
275 + <div class="school-info-card collapsed" id="card-basic-info">
261 261   <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>
262 262   <table class="wiki-table school-info-table">
263 263   <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
... ... @@ -267,17 +267,12 @@
267 267   <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
268 268   <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
269 269   <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
270 - <tr><th>課程</th><td>$!escapetool.xml($!schoolSystem)</td></tr>
285 + <tr><th>課程</th><td>#if($schoolSystem && $schoolSystem != '' && $schoolSystem != '[]')$!escapetool.xml($!schoolSystem)#end</td></tr>
271 271   <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>
272 272   </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
278 278   </div>
279 279  
280 - <div class="school-info-card mobile-collapse" id="card-contact">
290 + <div class="school-info-card collapsed" id="card-contact">
281 281   <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>
282 282   <table class="wiki-table school-info-table">
283 283   <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr>
... ... @@ -546,6 +546,12 @@
546 546   <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>
547 547   <span class="author-legend-item text-hint">※一般アカウントは所属未確認のため非表示</span>
548 548   </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>
549 549   </div>
550 550  </div>
551 551  
... ... @@ -625,6 +625,17 @@
625 625   #set($threadPosts = [])
626 626   #set($discard = $threadPosts.addAll($pinnedPosts))
627 627   #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
628 628  
629 629  {{html clean="false"}}
630 630  <div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)">
... ... @@ -634,7 +634,7 @@
634 634   <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
635 635   </div>
636 636   <div class="thread-meta-row">
637 - <span class="thread-post-count">${threadPosts.size()}件の投稿</span>
664 + <span class="thread-post-count">${reportCount}件の報告 ・ ${commentCount}件のコメント</span>
638 638   #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred')
639 639   #if($actFeatured == '1')
640 640   <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>
... ... @@ -645,7 +645,10 @@
645 645   </div>
646 646   </div>
647 647  
675 + ## --- 活動報告セクション ---
648 648   #foreach($post in $threadPosts)
677 + #set($thisPostType = $!post.getValue('postType'))
678 + #if($thisPostType != 'comment')
649 649   #set($postContent = $post.getValue('content'))
650 650   #set($postAuthor = $post.getValue('author'))
651 651   #set($postAccountType = $!post.getValue('authorAccountType'))
... ... @@ -867,14 +867,52 @@
867 867   #end## /canViewPost
868 868   #end## /postHidden
869 869   #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>
870 870   #end
871 871  
872 872   #if($xcontext.user != "XWiki.XWikiGuest")
873 873   <div class="thread-add-post">
874 - <a href="/xwiki/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
942 + <a href="/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
875 875   ＋ 活動報告を追加
876 876   </a>
877 - <a href="/xwiki/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
945 + <a href="/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
878 878   <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> コメントを書く
879 879   </a>
880 880   </div>
... ... @@ -896,7 +896,7 @@
896 896  #if($xcontext.user != "XWiki.XWikiGuest")
897 897  {{html clean="false"}}
898 898  <div class="activity-add-section">
899 - <a href="/xwiki/bin/view/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$!escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity">
967 + <a href="/bin/view/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$!escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity">
900 900   <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> 活動を追加
901 901   </a>
902 902  </div>
... ... @@ -946,7 +946,7 @@
946 946   ## 新年度に移行ボタン（承認済み・管理者のみ）
947 947   #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
948 948   <div class="archive-action">
949 - <a href="/xwiki/bin/view/SeitokaiCode/YearArchiveAction?schoolPage=${doc.fullName}" class="btn-accent">
1017 + <a href="/bin/view/SeitokaiCode/YearArchiveAction?schoolPage=${doc.fullName}" class="btn-accent">
950 950   <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>
951 951   ${pageFiscalYear}年度をアーカイブして新年度に移行
952 952   </a>
... ... @@ -965,12 +965,10 @@
965 965   btn.classList.add('active');
966 966   // 活動スレッドの表示切り替え
967 967   document.querySelectorAll('.activity-thread[data-fiscal-year]').forEach(function(thread) {
968 - if (fy === 'all') {
969 - thread.style.display = '';
970 - } else if (thread.getAttribute('data-fiscal-year') === fy) {
971 - thread.style.display = '';
1036 + if (fy === 'all' || thread.getAttribute('data-fiscal-year') === fy) {
1037 + thread.classList.remove('fy-hidden');
972 972   } else {
973 - thread.style.display = 'none';
1039 + thread.classList.add('fy-hidden');
974 974   }
975 975   });
976 976  }
... ... @@ -978,12 +978,6 @@
978 978  document.addEventListener('DOMContentLoaded', function() {
979 979   var defaultTab = document.querySelector('.activity-fy-tab.active');
980 980   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 - }
987 987   // 保存成功時のトースト通知
988 988   if (window.location.search.indexOf('archived=1') !== -1) {
989 989   showToast('年度アーカイブを作成しました', 'success');
... ... @@ -1023,7 +1023,6 @@
1023 1023   var card = document.getElementById(cardId);
1024 1024   if (!card) return;
1025 1025   card.classList.toggle('collapsed');
1026 - card.classList.remove('mobile-collapse');
1027 1027  }
1028 1028  
1029 1029  // 投稿の編集（インライン編集フォームを開く）
... ... @@ -1055,7 +1055,7 @@
1055 1055   var csrfEl = document.querySelector('input[name="form_token"]');
1056 1056   var csrfToken = csrfEl ? csrfEl.value : '';
1057 1057   var xhr = new XMLHttpRequest();
1058 - xhr.open('GET', '/xwiki/bin/view/SeitokaiCode/EditPost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken), true);
1117 + xhr.open('GET', '/bin/view/SeitokaiCode/EditPost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken), true);
1059 1059   xhr.onload = function() {
1060 1060   try {
1061 1061   var res = JSON.parse(xhr.responseText);
... ... @@ -1075,7 +1075,7 @@
1075 1075  function confirmDeletePost(schoolPage, postObjNum, token) {
1076 1076   if (!confirm('この投稿を削除しますか？\\n削除後は「この投稿は削除されました」と表示されます。')) return;
1077 1077   var xhr = new XMLHttpRequest();
1078 - xhr.open('GET', '/xwiki/bin/view/SeitokaiCode/DeletePost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token), true);
1137 + xhr.open('GET', '/bin/view/SeitokaiCode/DeletePost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token), true);
1079 1079   xhr.onload = function() {
1080 1080   try {
1081 1081   var res = JSON.parse(xhr.responseText);