Skip to Content
Last modified by Super Admin on 2026/04/05 18:59
From version Icon 86.1 Icon
edited by Super Admin
on 2026/03/20 02:01
Change comment: There is no comment for this version
To version Icon 76.1 Icon
edited by Super Admin
on 2026/03/19 13:11
Change comment: There is no comment for this version

Summary

Details

Icon Page properties
Content
... ... @@ -35,9 +35,8 @@
35 35  #set($schoolSystem = $doc.getValue('schoolSystem'))
36 36  #set($website = $doc.getValue('website'))
37 37  #set($schoolPhoto = $doc.getValue('schoolPhoto'))
38 -#set($schoolDescription = $doc.getValue('schoolDescription'))
39 39  
40 -## --- 生徒会組織 ---
39 +## --- 組織図 ---
41 41  #set($orgChart = $doc.getValue('orgChart'))
42 42  #set($orgChartImage = $doc.getValue('orgChartImage'))
43 43  
... ... @@ -354,9 +354,6 @@
354 354   </div>
355 355   #end
356 356   </div>
357 - #if($schoolDescription && $schoolDescription.trim() != '')
358 - <div class="free-note" style="margin-top:var(--sp-4);">$!escapetool.xml($schoolDescription)</div>
359 - #end
360 360   #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
361 361   #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
362 362   #if($infoEditDate && $infoEditDate != '')
... ... @@ -369,7 +369,7 @@
369 369   <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>
370 370   <div class="seitokai-info-body">
371 371  
372 - ## --- 生徒会組織 ---
368 + ## --- 組織図 ---
373 373   #set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
374 374   #if($hasOrgContent)
375 375   #set($canViewOrgChart = true)
... ... @@ -378,16 +378,16 @@
378 378   #end
379 379   #if($canViewOrgChart)
380 380   <div class="seitokai-subsection">
381 - <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>
377 + <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>
382 382   <div class="seitokai-subsection-content">
383 383   #if($orgChartImage && $orgChartImage != '')
384 384   <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
385 385   #end
386 - #if($orgChart && $orgChart != '')<div class="free-note">$!escapetool.xml($orgChart)</div>#end
382 + #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end
387 387   </div>
388 388   </div>
389 389   #else
390 - <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>
386 + <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>
391 391   #end
392 392   #end
393 393  
... ... @@ -396,10 +396,12 @@
396 396   <div class="seitokai-subsection">
397 397   <h3 class="seitokai-subsection-title"><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>
398 398   <div class="seitokai-subsection-content">
399 - <p class="activity-hint">活動時間が多い3つ</p>
395 + <p class="activity-hint">活動時間の多い順に上位3つ</p>
400 400   <div class="tag-container">
397 + #set($daIdx = 1)
401 401   #foreach($da in $dailyActivities)
402 - <span class="tag tag-accent">$!escapetool.xml($da.trim())</span>
399 + <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
400 + #set($daIdx = $daIdx + 1)
403 403   #end
404 404   </div>
405 405   #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
... ... @@ -456,7 +456,7 @@
456 456   #end
457 457   #if($canViewBudget)
458 458   <div class="seitokai-subsection">
459 - <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>
457 + <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>
460 460   <div class="seitokai-subsection-content">
461 461   #if($budgetProcess && !$budgetProcess.isEmpty())
462 462   <div class="info-row">
... ... @@ -512,7 +512,7 @@
512 512   #end
513 513   #if($canViewRuleReview)
514 514   <div class="seitokai-subsection">
515 - <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>
513 + <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>
516 516   <div class="seitokai-subsection-content">
517 517   <div class="info-row">
518 518   <span class="info-label">見直しの有無（3年以内）</span>
... ... @@ -575,7 +575,7 @@
575 575   #end
576 576   #if($canViewChallenges)
577 577   <div class="seitokai-subsection">
578 - <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>
576 + <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>
579 579   <div class="seitokai-subsection-content">
580 580   <div class="challenge-text">$!escapetool.xml($challenges)</div>
581 581   </div>
... ... @@ -738,18 +738,16 @@
738 738  <div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)">
739 739   <div class="activity-thread-header">
740 740   <div class="activity-thread-title">
741 - <h3 #if($actFeatured == '1')class="featured-title"#end>#if($actFeatured == '1')<svg class="ico ico-fixed-14 ico-star-offset" 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> #end$!escapetool.xml($!actTitle)</h3>
742 - <div class="activity-meta-line">
743 - <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
744 - #set($actTagsList = $activity.getValue('tags'))
745 - #if($actTagsList && !$actTagsList.isEmpty())
746 - #foreach($tagItem in $actTagsList)
747 - #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end
748 - #end
739 + <h3 #if($actFeatured == '1')class="featured-title"#end>$!escapetool.xml($!actTitle) #if($actFeatured == '1')<svg class="ico ico-fixed-14 ico-star-offset" 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>#end</h3>
740 + <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
741 + #set($actTagsList = $activity.getValue('tags'))
742 + #if($actTagsList && !$actTagsList.isEmpty())
743 + #foreach($tagItem in $actTagsList)
744 + #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end
749 749   #end
750 - </div>
746 + #end
751 751   </div>
752 - <div class="thread-meta-right">
748 + <div class="thread-meta-row">
753 753   <span class="thread-post-count">${reportCount}件の報告 ・ ${commentCount}件のコメント</span>
754 754   #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred')
755 755   #if($actFeatured == '1')
... ... @@ -956,7 +956,7 @@
956 956   #end
957 957   </div>
958 958   #if($postVis != 'public')
959 - <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>
955 + <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>
960 960   #end
961 961   ## 固定/編集/削除/通報/非表示ボタン（横並び）
962 962   #set($postAuthorRef = $!post.getValue('authorRef'))
... ... @@ -980,9 +980,7 @@
980 980   #end
981 981   #if($showEditDeleteBtn)
982 982   #if($xcontext.user == $postAuthorRef)
983 - #set($editImages = $!post.getValue('images'))
984 - #set($editFiles = $!post.getValue('files'))
985 - <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="この投稿を編集">
979 + <button type="button" class="btn-post-edit" onclick="openEditPost(this, '${doc.fullName}', $postObjNumED, '$!escapetool.javascript($!postContent)')" title="この投稿を編集">
986 986   <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> 編集
987 987   </button>
988 988   #end
... ... @@ -1044,11 +1044,9 @@
1044 1044  
1045 1045   #if($xcontext.user != "XWiki.XWikiGuest")
1046 1046   <div class="thread-add-post">
1047 - #if($isSchoolMember || $isViewerAdmin)
1048 1048   <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
1049 1049   ＋ 活動報告を追加
1050 1050   </a>
1051 - #end
1052 1052   <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
1053 1053   <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> コメントを書く
1054 1054   </a>
... ... @@ -1215,130 +1215,37 @@
1215 1215  }
1216 1216  
1217 1217  // 投稿の編集（インライン編集フォームを開く）
1218 -function openEditPost(btn) {
1210 +function openEditPost(btn, schoolPage, postObjNum, currentContent) {
1219 1219   var postEl = btn.closest('.thread-post');
1220 1220   if (!postEl) return;
1213 + // 既存の編集フォームがあれば閉じる
1221 1221   var existing = postEl.querySelector('.post-edit-form');
1222 1222   if (existing) { existing.remove(); return; }
1223 1223   var bodyEl = postEl.querySelector('.thread-post-body');
1224 1224   if (!bodyEl) return;
1225 -
1226 - var schoolPage = btn.getAttribute('data-school');
1227 - var postObjNum = btn.getAttribute('data-obj');
1228 - var currentContent = btn.getAttribute('data-content') || '';
1229 - var currentImages = btn.getAttribute('data-images') || '';
1230 - var currentFiles = btn.getAttribute('data-files') || '';
1231 - var postType = btn.getAttribute('data-post-type') || 'report';
1232 -
1233 1233   var form = document.createElement('div');
1234 1234   form.className = 'post-edit-form';
1235 - form.setAttribute('data-school', schoolPage);
1236 - form.setAttribute('data-obj', postObjNum);
1237 -
1238 - var html = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>';
1239 -
1240 - // コメント以外は添付ファイル編集を表示
1241 - if (postType !== 'comment') {
1242 - // 既存画像
1243 - html += '<div class="edit-attachments">';
1244 - if (currentImages.trim()) {
1245 - html += '<div class="edit-attach-section"><span class="edit-attach-label">画像</span>';
1246 - var imgs = currentImages.trim().split('\n');
1247 - for (var i = 0; i < imgs.length; i++) {
1248 - var img = imgs[i].trim();
1249 - if (!img) continue;
1250 - html += '<div class="edit-attach-item" data-name="' + img.replace(/"/g,'&quot;') + '">' +
1251 - '<img src="/xwiki/bin/download/' + schoolPage.replace(/\./g,'/') + '/' + encodeURIComponent(img) + '" class="edit-attach-thumb" />' +
1252 - '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1253 - '<input type="hidden" name="keepImages" value="' + img.replace(/"/g,'&quot;') + '" />' +
1254 - '</div>';
1255 - }
1256 - html += '</div>';
1257 - }
1258 - // 既存ファイル
1259 - if (currentFiles.trim()) {
1260 - html += '<div class="edit-attach-section"><span class="edit-attach-label">ファイル</span>';
1261 - var files = currentFiles.trim().split('\n');
1262 - for (var j = 0; j < files.length; j++) {
1263 - var f = files[j].trim();
1264 - if (!f) continue;
1265 - var displayName = f;
1266 - if (/^file_\d{14}_\d+_/.test(f)) displayName = f.replace(/^file_\d{14}_\d+_/, '');
1267 - html += '<div class="edit-attach-item" data-name="' + f.replace(/"/g,'&quot;') + '">' +
1268 - '<span class="edit-attach-fname">' + displayName.replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</span>' +
1269 - '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1270 - '<input type="hidden" name="keepFiles" value="' + f.replace(/"/g,'&quot;') + '" />' +
1271 - '</div>';
1272 - }
1273 - html += '</div>';
1274 - }
1275 - // 新規追加
1276 - html += '<div class="edit-attach-add">' +
1277 - '<label class="form-label-sm">画像を追加（最大4枚まで）</label>' +
1278 - '<input type="file" name="editNewImages" accept="image/*" multiple class="form-file-input-sm" />' +
1279 - '<div class="form-hint">JPEG / PNG / GIF / WebP、各5MBまで</div>' +
1280 - '<label class="form-label-sm" style="margin-top:8px;">ファイルを追加（最大2つまで）</label>' +
1281 - '<input type="file" name="editNewFiles" accept=".pdf,.docx,.xlsx,.pptx" multiple class="form-file-input-sm" />' +
1282 - '<div class="form-hint">PDF / Word / Excel / PowerPoint、各10MBまで</div>' +
1283 - '</div>';
1284 - html += '</div>';
1285 - }
1286 -
1287 - html += '<div class="post-edit-form-actions">' +
1220 + form.innerHTML = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>' +
1221 + '<div class="post-edit-form-actions">' +
1288 1288   '<button type="button" class="btn-cancel-edit" onclick="this.closest(\'.post-edit-form\').remove()">キャンセル</button>' +
1289 - '<button type="button" class="btn-save" onclick="saveEditPost(this)">保存</button>' +
1223 + '<button type="button" class="btn-save" onclick="saveEditPost(\'' + schoolPage + '\', ' + postObjNum + ')">保存</button>' +
1290 1290   '</div>';
1291 -
1292 - form.innerHTML = html;
1293 1293   bodyEl.parentNode.insertBefore(form, bodyEl.nextSibling);
1294 1294   form.querySelector('textarea').focus();
1295 1295  }
1296 1296  
1297 -function removeEditAttach(btn) {
1298 - var item = btn.closest('.edit-attach-item');
1299 - if (item) item.remove();
1300 -}
1301 -
1302 1302  // 投稿の編集を保存
1303 -function saveEditPost(btn) {
1304 - var formEl = btn.closest('.post-edit-form');
1305 - if (!formEl) return;
1306 - var schoolPage = formEl.getAttribute('data-school');
1307 - var postObjNum = formEl.getAttribute('data-obj');
1308 - var textarea = formEl.querySelector('textarea');
1230 +function saveEditPost(schoolPage, postObjNum) {
1231 + var textarea = document.getElementById('editContent_' + postObjNum);
1309 1309   if (!textarea) return;
1310 1310   var newContent = textarea.value.trim();
1311 1311   if (!newContent) { alert('投稿内容を入力してください'); return; }
1312 -
1313 1313   var csrfEl = document.querySelector('input[name="form_token"]');
1314 1314   var csrfToken = csrfEl ? csrfEl.value : '';
1315 -
1316 - var fd = new FormData();
1317 - fd.append('schoolPage', schoolPage);
1318 - fd.append('postObj', postObjNum);
1319 - fd.append('newContent', newContent);
1320 - fd.append('form_token', csrfToken);
1321 -
1322 - // 残す画像・ファイル
1323 - formEl.querySelectorAll('input[name="keepImages"]').forEach(function(el) { fd.append('keepImages', el.value); });
1324 - formEl.querySelectorAll('input[name="keepFiles"]').forEach(function(el) { fd.append('keepFiles', el.value); });
1325 -
1326 - // 新規画像
1327 - var newImgInput = formEl.querySelector('input[name="editNewImages"]');
1328 - if (newImgInput && newImgInput.files) {
1329 - for (var i = 0; i < newImgInput.files.length; i++) { fd.append('editNewImages', newImgInput.files[i]); }
1330 - }
1331 - // 新規ファイル
1332 - var newFileInput = formEl.querySelector('input[name="editNewFiles"]');
1333 - if (newFileInput && newFileInput.files) {
1334 - for (var j = 0; j < newFileInput.files.length; j++) { fd.append('editNewFiles', newFileInput.files[j]); }
1335 - }
1336 -
1337 - btn.disabled = true;
1338 - btn.textContent = '保存中...';
1339 -
1340 1340   var xhr = new XMLHttpRequest();
1341 1341   xhr.open('POST', '/bin/get/SeitokaiCode/EditPost?outputSyntax=plain', true);
1239 + xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1240 + var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken);
1342 1342   xhr.onload = function() {
1343 1343   try {
1344 1344   var res = JSON.parse(xhr.responseText);
... ... @@ -1346,13 +1346,12 @@
1346 1346   showToast('投稿を更新しました', 'success');
1347 1347   setTimeout(function() { location.reload(); }, 800);
1348 1348   } else {
1349 - btn.disabled = false; btn.textContent = '保存';
1350 1350   alert('編集に失敗しました: ' + (res.error || ''));
1351 1351   }
1352 - } catch(e) { btn.disabled = false; btn.textContent = '保存'; alert('編集に失敗しました'); }
1250 + } catch(e) { alert('編集に失敗しました'); }
1353 1353   };
1354 - xhr.onerror = function() { btn.disabled = false; btn.textContent = '保存'; alert('通信エラーが発生しました'); };
1355 - xhr.send(fd);
1252 + xhr.onerror = function() { alert('通信エラーが発生しました'); };
1253 + xhr.send(editPostData);
1356 1356  }
1357 1357  
1358 1358  // 投稿の削除（確認ダイアログ付き）