Skip to Content

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

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

From 31.1 to 32.1 From 44.1 to 45.1

From version

edited by Super Admin
on 2026/03/10 13:45

Change comment: There is no comment for this version

To version

edited by Super Admin
on 2026/03/13 00:18

Change comment: There is no comment for this version

Raw
Rendered

Summary

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

Details

Page properties

Content

@@ -65,9 +65,7 @@
  #set($seitokaiYoutube = $doc.getValue('seitokaiYoutube'))
  #set($seitokaiOtherSns = $doc.getValue('seitokaiOtherSns'))
--## --- 年度アーカイブ ---
--#set($pageFiscalYear = $!doc.getValue('fiscalYear'))
--## 現在の年度を計算（4月始まり）
++## --- 現在の年度を計算（4月始まり） ---
  #set($nowFY = $datetool.date)
  #set($currentFYMonth = $mathtool.toInteger($datetool.format('MM', $nowFY)))
  #set($currentFYYear = $mathtool.toInteger($datetool.format('yyyy', $nowFY)))
@@ -76,10 +76,6 @@
  #else
    #set($currentFiscalYear = $mathtool.sub($currentFYYear, 1))
  #end
--## fiscalYear 未設定時はデフォルトとして現在の年度を使う
--#if(!$pageFiscalYear || $pageFiscalYear == '')
--  #set($pageFiscalYear = $currentFiscalYear.toString())
--#end
  ## --- 公開範囲フィールド ---
  #set($visibilityOrgChart = $!doc.getValue('visibilityOrgChart'))
@@ -224,51 +224,22 @@
    #end
  #end
--## --- 信頼性バッジ + ユーザー情報 ---
--<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
--  ## 編集ボタン（権限があるユーザーのみ表示）
--  #set($canEditSchool = false)
--  #if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode))
--    #set($canEditSchool = true)
--  #end
--  #if($canEditSchool)
++## --- 学校名見出し（XWikiデフォルトタイトルを非表示にし、学校名を表示） ---
++#if($schoolName && $schoolName != '')
++<style>.document-header { display: none !important; }</style>
++<h1 class="school-page-title">$!escapetool.xml($schoolName)</h1>
++#end
++
++## --- 編集ボタン（権限があるユーザーのみ表示） ---
++#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>
--  #end
  </div>
++#end
  ## --- ① 学校基本情報 + 連絡先（左右グリッド・折りたたみ対応） ---
  <div class="school-info-grid">
@@ -282,9 +282,14 @@
        <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>#if($schoolSystem && $schoolSystem != '' && $schoolSystem != '[]')$!escapetool.xml($!schoolSystem)#end</td></tr>
++      <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#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'))
++    #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
++    #if($infoEditDate && $infoEditDate != '')
++    <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>
++    #end
    </div>
    <div class="school-info-card collapsed" id="card-contact">
@@ -335,7 +335,7 @@
  ## --- ③④⑤ 日常の活動・選挙・定例活動 ---
  <div class="school-section-grid">
--  #if($dailyActivities && $dailyActivities != '')
++  #if($dailyActivities && !$dailyActivities.isEmpty())
    <div class="school-section-card">
      <h3><svg class="ico" viewBox="0 0 24 24"><path d="M14 2H6a2 2 0 00-2 2v16a2 2 0 002 2h12a2 2 0 002-2V8z"/><polyline points="14 2 14 8 20 8"/><line x1="16" y1="13" x2="8" y2="13"/><line x1="16" y1="17" x2="8" y2="17"/></svg> 日常の活動</h3>
      <div class="card-inner">
@@ -342,7 +342,7 @@
        <p class="activity-hint">活動時間の多い順に上位3つ</p>
        <div class="tag-container">
          #set($daIdx = 1)
--        #foreach($da in $dailyActivities.split(","))
++        #foreach($da in $dailyActivities)
            <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
            #set($daIdx = $daIdx + 1)
          #end
@@ -393,7 +393,7 @@
    #end
    ## --- ⑦ 予算 ---
--  #set($hasBudget = ($budgetProcess && $budgetProcess != '') || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
++  #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
    #if($hasBudget)
      ## 公開範囲チェック
      #set($canViewBudget = true)
@@ -404,12 +404,12 @@
    <div class="school-section-card">
      <h3><svg class="ico" viewBox="0 0 24 24"><line x1="12" y1="1" x2="12" y2="23"/><path d="M17 5H9.5a3.5 3.5 0 000 7h5a3.5 3.5 0 010 7H6"/></svg> 予算 #if($visibilityBudget != 'public')<span class="visibility-badge visibility-${visibilityBudget}">#if($visibilityBudget == 'members')<svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 登録者限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
      <div class="card-inner">
--      #if($budgetProcess && $budgetProcess != '')
++      #if($budgetProcess && !$budgetProcess.isEmpty())
        <div class="info-row">
          <span class="info-label">作成過程の生徒関与</span>
          <span class="info-value">
            <div class="selection-display">
--            #foreach($bp in $budgetProcess.split(","))
++            #foreach($bp in $budgetProcess)
                <span class="selection-item">$!escapetool.xml($bp.trim())</span>
              #end
            </div>
@@ -428,12 +428,12 @@
          <span class="info-value">$!escapetool.xml($!budgetScale)</span>
        </div>
        #end
--      #if($budgetAllocation && $budgetAllocation != '')
++      #if($budgetAllocation && !$budgetAllocation.isEmpty())
        <div class="info-row">
          <span class="info-label">主な予算配分</span>
          <span class="info-value">
            <div class="selection-display">
--            #foreach($ba in $budgetAllocation.split(","))
++            #foreach($ba in $budgetAllocation)
                <span class="selection-item">$!escapetool.xml($ba.trim())</span>
              #end
            </div>
@@ -466,12 +466,12 @@
        <span class="info-label">見直しの有無（3年以内）</span>
        <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
      </div>
--    #if($ruleReviewContent && $ruleReviewContent != '')
++    #if($ruleReviewContent && !$ruleReviewContent.isEmpty())
      <div class="info-row">
        <span class="info-label">見直しの内容</span>
        <span class="info-value">
          <div class="selection-display">
--          #foreach($rc in $ruleReviewContent.split(","))
++          #foreach($rc in $ruleReviewContent)
              <span class="selection-item">$!escapetool.xml($rc.trim())</span>
            #end
          </div>
@@ -478,12 +478,12 @@
        </span>
      </div>
      #end
--    #if($ruleReviewProposer && $ruleReviewProposer != '')
++    #if($ruleReviewProposer && !$ruleReviewProposer.isEmpty())
      <div class="info-row">
        <span class="info-label">見直しの提案者</span>
        <span class="info-value">
          <div class="selection-display">
--          #foreach($rp in $ruleReviewProposer.split(","))
++          #foreach($rp in $ruleReviewProposer)
              <span class="selection-item">$!escapetool.xml($rp.trim())</span>
            #end
          </div>
@@ -490,12 +490,12 @@
        </span>
      </div>
      #end
--    #if($ruleReviewImplementer && $ruleReviewImplementer != '')
++    #if($ruleReviewImplementer && !$ruleReviewImplementer.isEmpty())
      <div class="info-row">
        <span class="info-label">見直しの実施者</span>
        <span class="info-value">
          <div class="selection-display">
--          #foreach($ri in $ruleReviewImplementer.split(","))
++          #foreach($ri in $ruleReviewImplementer)
              <span class="selection-item">$!escapetool.xml($ri.trim())</span>
            #end
          </div>
@@ -939,10 +939,10 @@
    #if($xcontext.user != "XWiki.XWikiGuest")
    <div class="thread-add-post">
--    <a href="/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
++    <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
        ＋ 活動報告を追加
      </a>
--    <a href="/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
++    <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
        <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> コメントを書く
      </a>
    </div>
@@ -964,7 +964,7 @@
  #if($xcontext.user != "XWiki.XWikiGuest")
  {{html clean="false"}}
  <div class="activity-add-section">
--  <a href="/bin/view/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$!escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity">
++  <a href="/bin/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$!escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity">
      <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> 活動を追加
    </a>
  </div>
@@ -971,59 +971,6 @@
  {{/html}}
  #end
--## --- 年度アーカイブ セクション ---
--{{html clean="false"}}
--<div class="school-section-card school-archive-card">
--  <h2 class="archive-section-title">
--    <svg class="ico ico-md" viewBox="0 0 24 24"><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>
--    年度アーカイブ
--  </h2>
--  <div class="archive-meta">
--    現在のページ: <strong>${pageFiscalYear}年度</strong>
--    #set($lyud = $!doc.getValue('lastYearUpdateDate'))
--    #if($lyud && $lyud != '')
--      | 最終年度更新: $!escapetool.xml($lyud) ($!escapetool.xml($!doc.getValue('lastYearUpdateBy')))
--    #end
--  </div>
--
--  ## 過去アーカイブの検索
--  #set($archiveQuery = $services.query.hql("where doc.fullName like :pattern and doc.fullName like '%Archive_%' order by doc.fullName desc").bindValue("pattern", "${doc.fullName}.Archive_%").setLimit(20))
--  #set($archivePages = $archiveQuery.execute())
--
--  #if($archivePages && $archivePages.size() > 0)
--  <div class="archive-card-field-lg">
--    <div class="archive-list-label">過去の年度アーカイブ</div>
--    <div class="archive-list">
--      #foreach($archPage in $archivePages)
--        #set($archPageDoc = $xwiki.getDocument($archPage))
--        #set($archPageObj = $archPageDoc.getObject('SeitokaiCode.SchoolClass'))
--        #if($archPageObj)
--          #set($archPageFY = $!archPageObj.getValue('fiscalYear'))
--          <a href="$archPageDoc.getURL('view')" class="archive-link">
--            <svg class="ico" viewBox="0 0 24 24"><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>
--            ${archPageFY}年度
--          </a>
--        #end
--      #end
--    </div>
--  </div>
--  #else
--  <div class="archive-empty">過去のアーカイブはまだありません</div>
--  #end
--
--  ## 新年度に移行ボタン（承認済み・管理者のみ）
--  #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
--  <div class="archive-action">
--    <a href="/bin/view/SeitokaiCode/YearArchiveAction?schoolPage=${doc.fullName}" class="btn-accent">
--      <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>
--      ${pageFiscalYear}年度をアーカイブして新年度に移行
--    </a>
--    <div class="archive-action-hint">現在の学校情報を${pageFiscalYear}年度として保存し、新しい年度に移行します。</div>
--  </div>
--  #end
--</div>
--{{/html}}
--
  ## --- 年度タブ切り替え JavaScript ---
  {{html clean="false"}}
  <script>
@@ -1040,14 +1040,12 @@
      }
    });
  }
--// ページ読み込み時にデフォルトで現在の年度を表示
++// ページ読み込み時の初期化
  document.addEventListener('DOMContentLoaded', function() {
++  // デフォルトで現在の年度を表示
    var defaultTab = document.querySelector('.activity-fy-tab.active');
    if (defaultTab) { defaultTab.click(); }
    // 保存成功時のトースト通知
--  if (window.location.search.indexOf('archived=1') !== -1) {
--    showToast('年度アーカイブを作成しました', 'success');
--  }
    if (window.location.search.indexOf('saved=1') !== -1) {
      showToast('学校情報を保存しました', 'success');
      // URLパラメータをクリーンアップ（リロード時に再表示されないよう）
@@ -1114,7 +1114,9 @@
    var csrfEl = document.querySelector('input[name="form_token"]');
    var csrfToken = csrfEl ? csrfEl.value : '';
    var xhr = new XMLHttpRequest();
--  xhr.open('GET', '/bin/view/SeitokaiCode/EditPost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken), true);
++  xhr.open('POST', '/bin/SeitokaiCode/EditPost?outputSyntax=plain', true);
++  xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
++  var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken);
    xhr.onload = function() {
      try {
        var res = JSON.parse(xhr.responseText);
@@ -1127,7 +1127,7 @@
      } catch(e) { alert('編集に失敗しました'); }
    };
    xhr.onerror = function() { alert('通信エラーが発生しました'); };
--  xhr.send();
++  xhr.send(editPostData);
  }
  // 投稿の削除（確認ダイアログ付き）
@@ -1134,7 +1134,9 @@
  function confirmDeletePost(schoolPage, postObjNum, token) {
    if (!confirm('この投稿を削除しますか？\\n削除後は「この投稿は削除されました」と表示されます。')) return;
    var xhr = new XMLHttpRequest();
--  xhr.open('GET', '/bin/view/SeitokaiCode/DeletePost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token), true);
++  xhr.open('POST', '/bin/SeitokaiCode/DeletePost?outputSyntax=plain', true);
++  xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
++  var deletePostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token);
    xhr.onload = function() {
      try {
        var res = JSON.parse(xhr.responseText);
@@ -1147,7 +1147,7 @@
      } catch(e) { alert('削除に失敗しました'); }
    };
    xhr.onerror = function() { alert('通信エラーが発生しました'); };
--  xhr.send();
++  xhr.send(deletePostData);
  }
  </script>
  {{/html}}