Skip to Content

Changes for page 学校ページテンプレート

Last modified by Super Admin on 2026/04/05 18:59

From 20.1 to 21.1 From 35.1 to 36.1

From version

edited by Super Admin
on 2026/03/08 18:52

Change comment: There is no comment for this version

To version

edited by Super Admin
on 2026/03/10 14:36

Change comment: There is no comment for this version

Raw
Rendered

Summary

Page properties (1 modified, 0 added, 0 removed)

Details

Page properties

Content

@@ -1,10 +1,21 @@
  {{velocity}}
  ## ===== 学校ページ テンプレート =====
--## このテンプレートは学校ページの表示と入力フォームを制御します。
--
--## メンテナンスバナー
--{{include reference="SeitokaiCode.MaintenanceBannerInclude" /}}
--
++{{html clean="false"}}
++## メンテナンスバナー（{{include}}ではなくインラインで記述し、<p>タグ挿入を回避）
++#set($bannerDoc = $xwiki.getDocument('SeitokaiAdmin.MaintenanceBanner'))
++#set($bannerObj = $bannerDoc.getObject('SeitokaiCode.MaintenanceBannerClass'))
++#if($bannerObj && $bannerObj.getValue('enabled') == 1)
++#set($bannerMsg = $bannerObj.getValue('message'))
++#set($bannerLevel = $bannerObj.getValue('level'))
++#if(!$bannerLevel || $bannerLevel == '')#set($bannerLevel = 'warning')#end
++<div class="maintenance-banner active maintenance-${bannerLevel}" id="maintenance-banner">
++  <div class="maintenance-banner-inner">
++    <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>
++    <span class="maintenance-text">$!escapetool.xml($bannerMsg)</span>
++    <button class="maintenance-close" onclick="document.getElementById('maintenance-banner').style.display='none'">&times;</button>
++  </div>
++</div>
++#end
  ## --- 学校基本情報フィールド ---
  #set($schoolCode = $doc.getValue('schoolCode'))
  #set($schoolName = $doc.getValue('schoolName'))
@@ -160,7 +160,7 @@
  ## --- ユーザー情報取得 ---
  ## displayName: Wiki上の表示名（ニックネーム）。本名(firstName/lastName)は管理者のみ閲覧可能。
  #set($lastAuthor = $doc.author)
--#set($lastAuthorDoc = $xwiki.getDocument("XWiki.${lastAuthor}"))
++#set($lastAuthorDoc = $xwiki.getDocument($lastAuthor))
  #set($authorAccountType = '')
  #set($authorUserRole = '')
  #set($authorUserStatus = '')
@@ -174,7 +174,8 @@
    #set($authorEnrollmentYear = $!lastAuthorDoc.getValue('enrollmentYear'))
    #set($authorDisplayName = $!lastAuthorDoc.getValue('displayName'))
    #if(!$authorDisplayName || $authorDisplayName == '')
--    #set($authorDisplayName = $xwiki.getUserName($doc.author))
++    ## false引数でプレーンテキスト（HTMLリンクなし）を取得
++    #set($authorDisplayName = $xwiki.getUserName($doc.author, false))
    #end
    ## --- 学年の動的計算（学校種別対応） ---
    ## 日本の学校年度: 4月始まり。currentSchoolYear = (月>=4) ? 今年 : 去年
@@ -212,52 +212,20 @@
    #end
  #end
--## --- 信頼性バッジ + ユーザー情報 ---
--{{html clean="false"}}
--<div class="seitokai-badge-container">
--  ## 承認バッジ
--  #if($authorAccountType == 'admin')
--    <span class="badge badge-admin"><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> 管理者</span>
--  #elseif($authorAccountType == 'verified')
--    <span class="badge badge-verified"><svg class="ico" viewBox="0 0 24 24" stroke-width="2.5"><path d="M20 6L9 17l-5-5"/></svg> 承認済み</span>
--  #elseif($authorAccountType == 'referred')
--    <span class="badge badge-referred"><svg class="ico" viewBox="0 0 24 24"><path d="M10 13a5 5 0 007.54.54l3-3a5 5 0 00-7.07-7.07l-1.72 1.71"/><path d="M14 11a5 5 0 00-7.54-.54l-3 3a5 5 0 007.07 7.07l1.71-1.71"/></svg> 紹介</span>
--  #else
--    <span class="badge badge-general">一般</span>
--  #end
--  ## 役割バッジ
--  #if($authorUserRole == 'student')
--    <span class="badge badge-role-student"><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>
--    #set($authorIsOfficer = $!lastAuthorDoc.getValue('isOfficer'))
--    #if($authorIsOfficer == 'true')
--      <span class="badge badge-role-officer"><svg class="ico" viewBox="0 0 24 24"><path d="M12 2l3.09 6.26L22 9.27l-5 4.87 1.18 6.88L12 17.77l-6.18 3.25L7 14.14 2 9.27l6.91-1.01L12 2z"/></svg> 役員</span>
--    #end
--  #elseif($authorUserRole == 'teacher')
--    <span class="badge badge-role-teacher"><svg class="ico" 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>
--  #elseif($authorUserRole == 'graduate')
--    <span class="badge badge-role-graduate"><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>
--  #end
--  ## 学年（生徒のみ公開）
--  #if($authorGrade && $authorGrade != '')
--    <span class="badge badge-grade">$authorGrade</span>
--  #end
--  ## 在籍状態（卒業・休学等の場合のみ表示）
--  #if($authorUserStatus == 'graduated')
--    <span class="badge badge-status-graduated"><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>
--  #elseif($authorUserStatus == 'on_leave')
--    <span class="badge badge-status-onleave"><svg class="ico" viewBox="0 0 24 24" fill="currentColor"><rect x="6" y="4" width="4" height="16" rx="1"/><rect x="14" y="4" width="4" height="16" rx="1"/></svg> 休学中</span>
--  #elseif($authorUserStatus == 'transferred')
--    <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>
--  #end
--  <span class="badge-info">最終編集: $!escapetool.xml($authorDisplayName) ($xwiki.formatDate($doc.date, "yyyy/MM/dd"))</span>
++## --- 編集ボタン（権限があるユーザーのみ表示） ---
++#set($canEditSchool = false)
++#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode))
++  #set($canEditSchool = true)
++#end
++#if($canEditSchool)
++<div style="text-align:right; margin-bottom:12px;">
++  <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>
  </div>
--{{/html}}
++#end
--{{html clean="false"}}
--
  ## --- ① 学校基本情報 + 連絡先（左右グリッド・折りたたみ対応） ---
  <div class="school-info-grid">
--  <div class="school-info-card mobile-collapse" id="card-basic-info">
++  <div class="school-info-card collapsed" id="card-basic-info">
      <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>
      <table class="wiki-table school-info-table">
        <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
@@ -267,7 +267,7 @@
        <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
        <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
        <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
--      <tr><th>課程</th><td>$!escapetool.xml($!schoolSystem)</td></tr>
++      <tr><th>課程</th><td>#if($schoolSystem && $schoolSystem != '' && $schoolSystem != '[]')$!escapetool.xml($!schoolSystem)#end</td></tr>
        <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>
      </table>
      #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
@@ -277,7 +277,7 @@
      #end
    </div>
--  <div class="school-info-card mobile-collapse" id="card-contact">
++  <div class="school-info-card collapsed" id="card-contact">
      <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>
      <table class="wiki-table school-info-table">
        <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr>
@@ -546,6 +546,12 @@
        <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>
        <span class="author-legend-item text-hint">※一般アカウントは所属未確認のため非表示</span>
      </div>
++    <div class="author-legend">
++      <span class="author-legend-title">役割:</span>
++      <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>
++      <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>
++      <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>
++    </div>
    </div>
  </div>
@@ -625,6 +625,17 @@
      #set($threadPosts = [])
      #set($discard = $threadPosts.addAll($pinnedPosts))
      #set($discard = $threadPosts.addAll($normalPosts))
++    ## report/comment カウント
++    #set($reportCount = 0)
++    #set($commentCount = 0)
++    #foreach($tp in $threadPosts)
++      #set($tpType = $!tp.getValue('postType'))
++      #if($tpType == 'comment')
++        #set($commentCount = $commentCount + 1)
++      #else
++        #set($reportCount = $reportCount + 1)
++      #end
++    #end
  {{html clean="false"}}
  <div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)">
@@ -634,7 +634,7 @@
        <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
      </div>
      <div class="thread-meta-row">
--      <span class="thread-post-count">${threadPosts.size()}件の投稿</span>
++      <span class="thread-post-count">${reportCount}件の報告 ・ ${commentCount}件のコメント</span>
        #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred')
          #if($actFeatured == '1')
            <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 @@
      </div>
    </div>
++  ## --- 活動報告セクション ---
    #foreach($post in $threadPosts)
++    #set($thisPostType = $!post.getValue('postType'))
++    #if($thisPostType != 'comment')
      #set($postContent = $post.getValue('content'))
      #set($postAuthor = $post.getValue('author'))
      #set($postAccountType = $!post.getValue('authorAccountType'))
@@ -867,6 +867,44 @@
      #end## /canViewPost
      #end## /postHidden
      #end## /postDeleted
++    #end## /postType != comment
++  #end## /foreach reports
++
++  ## --- コメントセクション（折りたたみ） ---
++  #if($commentCount > 0)
++  <details class="thread-comments-section">
++    <summary class="thread-comments-toggle">
++      <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}件のコメント
++    </summary>
++    #foreach($post in $threadPosts)
++      #set($thisPostType = $!post.getValue('postType'))
++      #if($thisPostType == 'comment')
++        #set($postContent = $post.getValue('content'))
++        #set($postAuthor = $post.getValue('author'))
++        #set($postAccountType = $!post.getValue('authorAccountType'))
++        #set($postDate = $post.getValue('createdDate'))
++        #set($postDeleted = $!post.getValue('deleted'))
++        #if($postDeleted == 1 || $postDeleted == '1')
++          <div class="thread-comment thread-comment-deleted">
++            <span class="thread-comment-meta">このコメントは削除されました</span>
++          </div>
++        #else
++          #set($postHidden = $!post.getValue('hidden'))
++          #if($postHidden == 1 || $postHidden == '1')
++            <div class="thread-comment thread-comment-hidden">
++              <span class="thread-comment-meta">このコメントは非表示にされました</span>
++            </div>
++          #else
++            <div class="thread-comment">
++              <span class="thread-comment-author">$!escapetool.xml($postAuthor)</span>
++              <span class="thread-comment-date">$!postDate</span>
++              <div class="thread-comment-body">$!escapetool.xml($postContent)</div>
++            </div>
++          #end
++        #end
++      #end
++    #end
++  </details>
    #end
    #if($xcontext.user != "XWiki.XWikiGuest")
@@ -965,25 +965,22 @@
    btn.classList.add('active');
    // 活動スレッドの表示切り替え
    document.querySelectorAll('.activity-thread[data-fiscal-year]').forEach(function(thread) {
--    if (fy === 'all') {
--      thread.style.display = '';
--    } else if (thread.getAttribute('data-fiscal-year') === fy) {
--      thread.style.display = '';
++    if (fy === 'all' || thread.getAttribute('data-fiscal-year') === fy) {
++      thread.classList.remove('fy-hidden');
      } else {
--      thread.style.display = 'none';
++      thread.classList.add('fy-hidden');
      }
    });
  }
--// ページ読み込み時にデフォルトで現在の年度を表示
++// ページ読み込み時の初期化
  document.addEventListener('DOMContentLoaded', function() {
++  // ページタイトルを学校名に置換（デフォルトでは学校コードが表示されるため）
++  var titleEl = document.querySelector('#document-title h1');
++  var schoolNameVal = "$!escapetool.javascript($!schoolName)";
++  if (titleEl && schoolNameVal) { titleEl.textContent = schoolNameVal; }
++  // デフォルトで現在の年度を表示
    var defaultTab = document.querySelector('.activity-fy-tab.active');
    if (defaultTab) { defaultTab.click(); }
--  // モバイルでは基本情報・連絡先をデフォルト折りたたみ
--  if (window.innerWidth <= 768) {
--    document.querySelectorAll('.school-info-card.mobile-collapse').forEach(function(card) {
--      card.classList.add('collapsed');
--    });
--  }
    // 保存成功時のトースト通知
    if (window.location.search.indexOf('archived=1') !== -1) {
      showToast('年度アーカイブを作成しました', 'success');
@@ -1023,7 +1023,6 @@
    var card = document.getElementById(cardId);
    if (!card) return;
    card.classList.toggle('collapsed');
--  card.classList.remove('mobile-collapse');
  }
  // 投稿の編集（インライン編集フォームを開く）