Skip to Content

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

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

From 80.1 to 79.1 From 86.1 to 85.1

From version

edited by Super Admin
on 2026/03/20 01:46

Change comment: There is no comment for this version

To version

edited by Super Admin
on 2026/03/19 15:50

Change comment: There is no comment for this version

Raw
Rendered

Summary

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

Details

Page properties

Content

@@ -35,9 +35,8 @@
  #set($schoolSystem = $doc.getValue('schoolSystem'))
  #set($website = $doc.getValue('website'))
  #set($schoolPhoto = $doc.getValue('schoolPhoto'))
--#set($schoolDescription = $doc.getValue('schoolDescription'))
--## --- 生徒会組織 ---
++## --- 組織図 ---
  #set($orgChart = $doc.getValue('orgChart'))
  #set($orgChartImage = $doc.getValue('orgChartImage'))
@@ -354,9 +354,6 @@
      </div>
      #end
    </div>
--  #if($schoolDescription && $schoolDescription.trim() != '')
--  <div class="free-note" style="margin-top:var(--sp-4);">$!escapetool.xml($schoolDescription)</div>
--  #end
    #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
    #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
    #if($infoEditDate && $infoEditDate != '')
@@ -369,7 +369,7 @@
    <h2 role="button" tabindex="0" aria-expanded="true" onclick="toggleInfoCard('card-seitokai-info')" onkeydown="if(event.key==='Enter'||event.key===' '){event.preventDefault();toggleInfoCard('card-seitokai-info')}"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/></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>
    <div class="seitokai-info-body">
--    ## --- 生徒会組織 ---
++    ## --- 組織図 ---
      #set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
      #if($hasOrgContent)
        #set($canViewOrgChart = true)
@@ -378,16 +378,16 @@
        #end
        #if($canViewOrgChart)
      <div class="seitokai-subsection">
--      <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/><line x1="9" y1="10" x2="9" y2="10.01"/><line x1="15" y1="10" x2="15" y2="10.01"/><line x1="9" y1="14" x2="9" y2="14.01"/><line x1="15" y1="14" x2="15" y2="14.01"/></svg> 生徒会組織 #if($visibilityOrgChart != 'public')<span class="visibility-badge visibility-${visibilityOrgChart}">#if($visibilityOrgChart == 'school_trusted')<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> 校内承認・紹介限定#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>
++      <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M3 21h18"/><path d="M5 21V7l7-4 7 4v14"/><path d="M9 21v-4h6v4"/><line x1="9" y1="10" x2="9" y2="10.01"/><line x1="15" y1="10" x2="15" y2="10.01"/><line x1="9" y1="14" x2="9" y2="14.01"/><line x1="15" y1="14" x2="15" y2="14.01"/></svg> 組織図 #if($visibilityOrgChart != 'public')<span class="visibility-badge visibility-${visibilityOrgChart}">#if($visibilityOrgChart == 'school_trusted')<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> 校内承認者限定#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="seitokai-subsection-content">
          #if($orgChartImage && $orgChartImage != '')
          <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
          #end
--        #if($orgChart && $orgChart != '')<div class="free-note">$!escapetool.xml($orgChart)</div>#end
++        #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end
        </div>
      </div>
        #else
--    <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 生徒会組織は #if($visibilityOrgChart == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
++    <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 組織図は #if($visibilityOrgChart == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>
        #end
      #end
@@ -458,7 +458,7 @@
        #end
        #if($canViewBudget)
      <div class="seitokai-subsection">
--      <h3 class="seitokai-subsection-title"><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 == 'school_trusted')<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> 校内承認・紹介限定#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>
++      <h3 class="seitokai-subsection-title"><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 == 'school_trusted')<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> 校内承認者限定#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="seitokai-subsection-content">
          #if($budgetProcess && !$budgetProcess.isEmpty())
          <div class="info-row">
@@ -514,7 +514,7 @@
        #end
        #if($canViewRuleReview)
      <div class="seitokai-subsection">
--      <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M16 4h2a2 2 0 012 2v12a2 2 0 01-2 2h-2"/><path d="M8 4H6a2 2 0 00-2 2v12a2 2 0 002 2h2"/><line x1="12" y1="4" x2="12" y2="8"/><line x1="12" y1="16" x2="12" y2="20"/><line x1="8" y1="8" x2="16" y2="8"/><line x1="8" y1="16" x2="16" y2="16"/></svg> 校則の見直し #if($visibilityRuleReview != 'public')<span class="visibility-badge visibility-${visibilityRuleReview}">#if($visibilityRuleReview == 'school_trusted')<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> 校内承認・紹介限定#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>
++      <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M16 4h2a2 2 0 012 2v12a2 2 0 01-2 2h-2"/><path d="M8 4H6a2 2 0 00-2 2v12a2 2 0 002 2h2"/><line x1="12" y1="4" x2="12" y2="8"/><line x1="12" y1="16" x2="12" y2="20"/><line x1="8" y1="8" x2="16" y2="8"/><line x1="8" y1="16" x2="16" y2="16"/></svg> 校則の見直し #if($visibilityRuleReview != 'public')<span class="visibility-badge visibility-${visibilityRuleReview}">#if($visibilityRuleReview == 'school_trusted')<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> 校内承認者限定#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="seitokai-subsection-content">
          <div class="info-row">
            <span class="info-label">見直しの有無（3年以内）</span>
@@ -577,7 +577,7 @@
        #end
        #if($canViewChallenges)
      <div class="seitokai-subsection">
--      <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M12 16v-4"/><path d="M12 8h.01"/></svg> 生徒会の課題意識 #if($visibilityChallenges != 'public')<span class="visibility-badge visibility-${visibilityChallenges}">#if($visibilityChallenges == 'school_trusted')<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> 校内承認・紹介限定#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>
++      <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M12 16v-4"/><path d="M12 8h.01"/></svg> 生徒会の課題意識 #if($visibilityChallenges != 'public')<span class="visibility-badge visibility-${visibilityChallenges}">#if($visibilityChallenges == 'school_trusted')<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> 校内承認者限定#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="seitokai-subsection-content">
          <div class="challenge-text">$!escapetool.xml($challenges)</div>
        </div>
@@ -958,7 +958,7 @@
          #end
        </div>
        #if($postVis != 'public')
--      <div class="visibility-badge visibility-${postVis} post-action-mt">#if($postVis == 'school_trusted')<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> 校内承認・紹介限定#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</div>
++      <div class="visibility-badge visibility-${postVis} post-action-mt">#if($postVis == 'school_trusted')<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> 校内承認者限定#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</div>
        #end
        ## 固定/編集/削除/通報/非表示ボタン（横並び）
        #set($postAuthorRef = $!post.getValue('authorRef'))
@@ -982,9 +982,7 @@
          #end
          #if($showEditDeleteBtn)
          #if($xcontext.user == $postAuthorRef)
--        #set($editImages = $!post.getValue('images'))
--        #set($editFiles = $!post.getValue('files'))
--        <button type="button" class="btn-post-edit" data-school="${doc.fullName}" data-obj="$postObjNumED" data-content="$!escapetool.xml($!postContent)" data-images="$!escapetool.xml($!editImages)" data-files="$!escapetool.xml($!editFiles)" data-post-type="$!post.getValue('postType')" onclick="openEditPost(this)" title="この投稿を編集">
++        <button type="button" class="btn-post-edit" onclick="openEditPost(this, '${doc.fullName}', $postObjNumED, '$!escapetool.javascript($!postContent)')" title="この投稿を編集">
            <svg class="ico ico-fixed-14" 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> 編集
          </button>
          #end
@@ -1217,130 +1217,37 @@
  }
  // 投稿の編集（インライン編集フォームを開く）
--function openEditPost(btn) {
++function openEditPost(btn, schoolPage, postObjNum, currentContent) {
    var postEl = btn.closest('.thread-post');
    if (!postEl) return;
++  // 既存の編集フォームがあれば閉じる
    var existing = postEl.querySelector('.post-edit-form');
    if (existing) { existing.remove(); return; }
    var bodyEl = postEl.querySelector('.thread-post-body');
    if (!bodyEl) return;
--
--  var schoolPage = btn.getAttribute('data-school');
--  var postObjNum = btn.getAttribute('data-obj');
--  var currentContent = btn.getAttribute('data-content') || '';
--  var currentImages = btn.getAttribute('data-images') || '';
--  var currentFiles = btn.getAttribute('data-files') || '';
--  var postType = btn.getAttribute('data-post-type') || 'report';
--
    var form = document.createElement('div');
    form.className = 'post-edit-form';
--  form.setAttribute('data-school', schoolPage);
--  form.setAttribute('data-obj', postObjNum);
--
--  var html = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>';
--
--  // コメント以外は添付ファイル編集を表示
--  if (postType !== 'comment') {
--    // 既存画像
--    html += '<div class="edit-attachments">';
--    if (currentImages.trim()) {
--      html += '<div class="edit-attach-section"><span class="edit-attach-label">画像</span>';
--      var imgs = currentImages.trim().split('\n');
--      for (var i = 0; i < imgs.length; i++) {
--        var img = imgs[i].trim();
--        if (!img) continue;
--        html += '<div class="edit-attach-item" data-name="' + img.replace(/"/g,'&quot;') + '">' +
--          '<img src="/xwiki/bin/download/' + schoolPage.replace(/\./g,'/') + '/' + encodeURIComponent(img) + '" class="edit-attach-thumb" />' +
--          '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
--          '<input type="hidden" name="keepImages" value="' + img.replace(/"/g,'&quot;') + '" />' +
--          '</div>';
--      }
--      html += '</div>';
--    }
--    // 既存ファイル
--    if (currentFiles.trim()) {
--      html += '<div class="edit-attach-section"><span class="edit-attach-label">ファイル</span>';
--      var files = currentFiles.trim().split('\n');
--      for (var j = 0; j < files.length; j++) {
--        var f = files[j].trim();
--        if (!f) continue;
--        var displayName = f;
--        if (/^file_\d{14}_\d+_/.test(f)) displayName = f.replace(/^file_\d{14}_\d+_/, '');
--        html += '<div class="edit-attach-item" data-name="' + f.replace(/"/g,'&quot;') + '">' +
--          '<span class="edit-attach-fname">' + displayName.replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</span>' +
--          '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
--          '<input type="hidden" name="keepFiles" value="' + f.replace(/"/g,'&quot;') + '" />' +
--          '</div>';
--      }
--      html += '</div>';
--    }
--    // 新規追加
--    html += '<div class="edit-attach-add">' +
--      '<label class="form-label-sm">画像を追加（最大4枚まで）</label>' +
--      '<input type="file" name="editNewImages" accept="image/*" multiple class="form-file-input-sm" />' +
--      '<div class="form-hint">JPEG / PNG / GIF / WebP、各5MBまで</div>' +
--      '<label class="form-label-sm" style="margin-top:8px;">ファイルを追加（最大2つまで）</label>' +
--      '<input type="file" name="editNewFiles" accept=".pdf,.docx,.xlsx,.pptx" multiple class="form-file-input-sm" />' +
--      '<div class="form-hint">PDF / Word / Excel / PowerPoint、各10MBまで</div>' +
--      '</div>';
--    html += '</div>';
--  }
--
--  html += '<div class="post-edit-form-actions">' +
++  form.innerHTML = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>' +
++    '<div class="post-edit-form-actions">' +
      '<button type="button" class="btn-cancel-edit" onclick="this.closest(\'.post-edit-form\').remove()">キャンセル</button>' +
--    '<button type="button" class="btn-save" onclick="saveEditPost(this)">保存</button>' +
++    '<button type="button" class="btn-save" onclick="saveEditPost(\'' + schoolPage + '\', ' + postObjNum + ')">保存</button>' +
      '</div>';
--
--  form.innerHTML = html;
    bodyEl.parentNode.insertBefore(form, bodyEl.nextSibling);
    form.querySelector('textarea').focus();
  }
--function removeEditAttach(btn) {
--  var item = btn.closest('.edit-attach-item');
--  if (item) item.remove();
--}
--
  // 投稿の編集を保存
--function saveEditPost(btn) {
--  var formEl = btn.closest('.post-edit-form');
--  if (!formEl) return;
--  var schoolPage = formEl.getAttribute('data-school');
--  var postObjNum = formEl.getAttribute('data-obj');
--  var textarea = formEl.querySelector('textarea');
++function saveEditPost(schoolPage, postObjNum) {
++  var textarea = document.getElementById('editContent_' + postObjNum);
    if (!textarea) return;
    var newContent = textarea.value.trim();
    if (!newContent) { alert('投稿内容を入力してください'); return; }
--
    var csrfEl = document.querySelector('input[name="form_token"]');
    var csrfToken = csrfEl ? csrfEl.value : '';
--
--  var fd = new FormData();
--  fd.append('schoolPage', schoolPage);
--  fd.append('postObj', postObjNum);
--  fd.append('newContent', newContent);
--  fd.append('form_token', csrfToken);
--
--  // 残す画像・ファイル
--  formEl.querySelectorAll('input[name="keepImages"]').forEach(function(el) { fd.append('keepImages', el.value); });
--  formEl.querySelectorAll('input[name="keepFiles"]').forEach(function(el) { fd.append('keepFiles', el.value); });
--
--  // 新規画像
--  var newImgInput = formEl.querySelector('input[name="editNewImages"]');
--  if (newImgInput && newImgInput.files) {
--    for (var i = 0; i < newImgInput.files.length; i++) { fd.append('editNewImages', newImgInput.files[i]); }
--  }
--  // 新規ファイル
--  var newFileInput = formEl.querySelector('input[name="editNewFiles"]');
--  if (newFileInput && newFileInput.files) {
--    for (var j = 0; j < newFileInput.files.length; j++) { fd.append('editNewFiles', newFileInput.files[j]); }
--  }
--
--  btn.disabled = true;
--  btn.textContent = '保存中...';
--
    var xhr = new XMLHttpRequest();
    xhr.open('POST', '/bin/get/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);
@@ -1348,13 +1348,12 @@
          showToast('投稿を更新しました', 'success');
          setTimeout(function() { location.reload(); }, 800);
        } else {
--        btn.disabled = false; btn.textContent = '保存';
          alert('編集に失敗しました: ' + (res.error || ''));
        }
--    } catch(e) { btn.disabled = false; btn.textContent = '保存'; alert('編集に失敗しました'); }
++    } catch(e) { alert('編集に失敗しました'); }
    };
--  xhr.onerror = function() { btn.disabled = false; btn.textContent = '保存'; alert('通信エラーが発生しました'); };
--  xhr.send(fd);
++  xhr.onerror = function() { alert('通信エラーが発生しました'); };
++  xhr.send(editPostData);
  }
  // 投稿の削除（確認ダイアログ付き）