Skip to Content
Last modified by Super Admin on 2026/04/05 18:59
From version Icon 88.1 Icon
edited by Super Admin
on 2026/03/20 02:15
Change comment: There is no comment for this version
To version Icon 80.1 Icon
edited by Super Admin
on 2026/03/19 15:50
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,10 +354,11 @@
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>
356 + #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
357 + #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
358 + #if($infoEditDate && $infoEditDate != '')
359 + <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>
359 359   #end
360 -
361 361  </div>
362 362  
363 363  ## --- ② 生徒会基本情報（折りたたみカード） ---
... ... @@ -365,7 +365,7 @@
365 365   <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>
366 366   <div class="seitokai-info-body">
367 367  
368 - ## --- 生徒会組織 ---
368 + ## --- 組織図 ---
369 369   #set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
370 370   #if($hasOrgContent)
371 371   #set($canViewOrgChart = true)
... ... @@ -374,16 +374,16 @@
374 374   #end
375 375   #if($canViewOrgChart)
376 376   <div class="seitokai-subsection">
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>
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>
378 378   <div class="seitokai-subsection-content">
379 379   #if($orgChartImage && $orgChartImage != '')
380 380   <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
381 381   #end
382 - #if($orgChart && $orgChart != '')<div class="free-note">$!escapetool.xml($orgChart)</div>#end
382 + #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end
383 383   </div>
384 384   </div>
385 385   #else
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>
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>
387 387   #end
388 388   #end
389 389  
... ... @@ -392,10 +392,12 @@
392 392   <div class="seitokai-subsection">
393 393   <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>
394 394   <div class="seitokai-subsection-content">
395 - <p class="activity-hint">活動時間が多い3つ</p>
395 + <p class="activity-hint">活動時間の多い順に上位3つ</p>
396 396   <div class="tag-container">
397 + #set($daIdx = 1)
397 397   #foreach($da in $dailyActivities)
398 - <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)
399 399   #end
400 400   </div>
401 401   #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
... ... @@ -452,7 +452,7 @@
452 452   #end
453 453   #if($canViewBudget)
454 454   <div class="seitokai-subsection">
455 - <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>
456 456   <div class="seitokai-subsection-content">
457 457   #if($budgetProcess && !$budgetProcess.isEmpty())
458 458   <div class="info-row">
... ... @@ -459,13 +459,8 @@
459 459   <span class="info-label">作成過程の生徒関与</span>
460 460   <span class="info-value">
461 461   <div class="selection-display">
462 - #set($allBpOpts = ["各部・委員会等への予算希望額調査","予算額調整（折衝等）","生徒会予算案の作成","生徒総会での議決"])
463 - #foreach($bpOpt in $allBpOpts)
464 - #if($budgetProcess.contains($bpOpt))
465 - <span class="selection-item">$!escapetool.xml($bpOpt)</span>
466 - #else
467 - <span class="selection-item selection-item-off">$!escapetool.xml($bpOpt)</span>
468 - #end
464 + #foreach($bp in $budgetProcess)
465 + <span class="selection-item">$!escapetool.xml($bp.trim())</span>
469 469   #end
470 470   </div>
471 471   </span>
... ... @@ -513,7 +513,7 @@
513 513   #end
514 514   #if($canViewRuleReview)
515 515   <div class="seitokai-subsection">
516 - <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>
517 517   <div class="seitokai-subsection-content">
518 518   <div class="info-row">
519 519   <span class="info-label">見直しの有無（3年以内）</span>
... ... @@ -576,7 +576,7 @@
576 576   #end
577 577   #if($canViewChallenges)
578 578   <div class="seitokai-subsection">
579 - <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>
580 580   <div class="seitokai-subsection-content">
581 581   <div class="challenge-text">$!escapetool.xml($challenges)</div>
582 582   </div>
... ... @@ -600,11 +600,6 @@
600 600   <tr><th>YouTube</th><td>#if($seitokaiYoutube && $seitokaiYoutube != '')<a href="$!escapetool.xml($seitokaiYoutube)" target="_blank" rel="noopener"><svg class="ico" viewBox="0 0 24 24"><polygon points="5 3 19 12 5 21 5 3"/></svg> YouTubeチャンネル</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
601 601   <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
602 602   </table>
603 - #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
604 - #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
605 - #if($infoEditDate && $infoEditDate != '')
606 - <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>
607 - #end
608 608  </div>
609 609  
610 610  {{/html}}
... ... @@ -962,7 +962,7 @@
962 962   #end
963 963   </div>
964 964   #if($postVis != 'public')
965 - <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>
957 + <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>
966 966   #end
967 967   ## 固定/編集/削除/通報/非表示ボタン（横並び）
968 968   #set($postAuthorRef = $!post.getValue('authorRef'))
... ... @@ -986,9 +986,7 @@
986 986   #end
987 987   #if($showEditDeleteBtn)
988 988   #if($xcontext.user == $postAuthorRef)
989 - #set($editImages = $!post.getValue('images'))
990 - #set($editFiles = $!post.getValue('files'))
991 - <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="この投稿を編集">
981 + <button type="button" class="btn-post-edit" onclick="openEditPost(this, '${doc.fullName}', $postObjNumED, '$!escapetool.javascript($!postContent)')" title="この投稿を編集">
992 992   <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> 編集
993 993   </button>
994 994   #end
... ... @@ -1221,130 +1221,37 @@
1221 1221  }
1222 1222  
1223 1223  // 投稿の編集（インライン編集フォームを開く）
1224 -function openEditPost(btn) {
1214 +function openEditPost(btn, schoolPage, postObjNum, currentContent) {
1225 1225   var postEl = btn.closest('.thread-post');
1226 1226   if (!postEl) return;
1217 + // 既存の編集フォームがあれば閉じる
1227 1227   var existing = postEl.querySelector('.post-edit-form');
1228 1228   if (existing) { existing.remove(); return; }
1229 1229   var bodyEl = postEl.querySelector('.thread-post-body');
1230 1230   if (!bodyEl) return;
1231 -
1232 - var schoolPage = btn.getAttribute('data-school');
1233 - var postObjNum = btn.getAttribute('data-obj');
1234 - var currentContent = btn.getAttribute('data-content') || '';
1235 - var currentImages = btn.getAttribute('data-images') || '';
1236 - var currentFiles = btn.getAttribute('data-files') || '';
1237 - var postType = btn.getAttribute('data-post-type') || 'report';
1238 -
1239 1239   var form = document.createElement('div');
1240 1240   form.className = 'post-edit-form';
1241 - form.setAttribute('data-school', schoolPage);
1242 - form.setAttribute('data-obj', postObjNum);
1243 -
1244 - var html = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>';
1245 -
1246 - // コメント以外は添付ファイル編集を表示
1247 - if (postType !== 'comment') {
1248 - // 既存画像
1249 - html += '<div class="edit-attachments">';
1250 - if (currentImages.trim()) {
1251 - html += '<div class="edit-attach-section"><span class="edit-attach-label">画像</span>';
1252 - var imgs = currentImages.trim().split('\n');
1253 - for (var i = 0; i < imgs.length; i++) {
1254 - var img = imgs[i].trim();
1255 - if (!img) continue;
1256 - html += '<div class="edit-attach-item" data-name="' + img.replace(/"/g,'&quot;') + '">' +
1257 - '<img src="/xwiki/bin/download/' + schoolPage.replace(/\./g,'/') + '/' + encodeURIComponent(img) + '" class="edit-attach-thumb" />' +
1258 - '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1259 - '<input type="hidden" name="keepImages" value="' + img.replace(/"/g,'&quot;') + '" />' +
1260 - '</div>';
1261 - }
1262 - html += '</div>';
1263 - }
1264 - // 既存ファイル
1265 - if (currentFiles.trim()) {
1266 - html += '<div class="edit-attach-section"><span class="edit-attach-label">ファイル</span>';
1267 - var files = currentFiles.trim().split('\n');
1268 - for (var j = 0; j < files.length; j++) {
1269 - var f = files[j].trim();
1270 - if (!f) continue;
1271 - var displayName = f;
1272 - if (/^file_\d{14}_\d+_/.test(f)) displayName = f.replace(/^file_\d{14}_\d+_/, '');
1273 - html += '<div class="edit-attach-item" data-name="' + f.replace(/"/g,'&quot;') + '">' +
1274 - '<span class="edit-attach-fname">' + displayName.replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</span>' +
1275 - '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1276 - '<input type="hidden" name="keepFiles" value="' + f.replace(/"/g,'&quot;') + '" />' +
1277 - '</div>';
1278 - }
1279 - html += '</div>';
1280 - }
1281 - // 新規追加
1282 - html += '<div class="edit-attach-add">' +
1283 - '<label class="form-label-sm">画像を追加（最大4枚まで）</label>' +
1284 - '<input type="file" name="editNewImages" accept="image/*" multiple class="form-file-input-sm" />' +
1285 - '<div class="form-hint">JPEG / PNG / GIF / WebP、各5MBまで</div>' +
1286 - '<label class="form-label-sm" style="margin-top:8px;">ファイルを追加（最大2つまで）</label>' +
1287 - '<input type="file" name="editNewFiles" accept=".pdf,.docx,.xlsx,.pptx" multiple class="form-file-input-sm" />' +
1288 - '<div class="form-hint">PDF / Word / Excel / PowerPoint、各10MBまで</div>' +
1289 - '</div>';
1290 - html += '</div>';
1291 - }
1292 -
1293 - html += '<div class="post-edit-form-actions">' +
1224 + form.innerHTML = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>' +
1225 + '<div class="post-edit-form-actions">' +
1294 1294   '<button type="button" class="btn-cancel-edit" onclick="this.closest(\'.post-edit-form\').remove()">キャンセル</button>' +
1295 - '<button type="button" class="btn-save" onclick="saveEditPost(this)">保存</button>' +
1227 + '<button type="button" class="btn-save" onclick="saveEditPost(\'' + schoolPage + '\', ' + postObjNum + ')">保存</button>' +
1296 1296   '</div>';
1297 -
1298 - form.innerHTML = html;
1299 1299   bodyEl.parentNode.insertBefore(form, bodyEl.nextSibling);
1300 1300   form.querySelector('textarea').focus();
1301 1301  }
1302 1302  
1303 -function removeEditAttach(btn) {
1304 - var item = btn.closest('.edit-attach-item');
1305 - if (item) item.remove();
1306 -}
1307 -
1308 1308  // 投稿の編集を保存
1309 -function saveEditPost(btn) {
1310 - var formEl = btn.closest('.post-edit-form');
1311 - if (!formEl) return;
1312 - var schoolPage = formEl.getAttribute('data-school');
1313 - var postObjNum = formEl.getAttribute('data-obj');
1314 - var textarea = formEl.querySelector('textarea');
1234 +function saveEditPost(schoolPage, postObjNum) {
1235 + var textarea = document.getElementById('editContent_' + postObjNum);
1315 1315   if (!textarea) return;
1316 1316   var newContent = textarea.value.trim();
1317 1317   if (!newContent) { alert('投稿内容を入力してください'); return; }
1318 -
1319 1319   var csrfEl = document.querySelector('input[name="form_token"]');
1320 1320   var csrfToken = csrfEl ? csrfEl.value : '';
1321 -
1322 - var fd = new FormData();
1323 - fd.append('schoolPage', schoolPage);
1324 - fd.append('postObj', postObjNum);
1325 - fd.append('newContent', newContent);
1326 - fd.append('form_token', csrfToken);
1327 -
1328 - // 残す画像・ファイル
1329 - formEl.querySelectorAll('input[name="keepImages"]').forEach(function(el) { fd.append('keepImages', el.value); });
1330 - formEl.querySelectorAll('input[name="keepFiles"]').forEach(function(el) { fd.append('keepFiles', el.value); });
1331 -
1332 - // 新規画像
1333 - var newImgInput = formEl.querySelector('input[name="editNewImages"]');
1334 - if (newImgInput && newImgInput.files) {
1335 - for (var i = 0; i < newImgInput.files.length; i++) { fd.append('editNewImages', newImgInput.files[i]); }
1336 - }
1337 - // 新規ファイル
1338 - var newFileInput = formEl.querySelector('input[name="editNewFiles"]');
1339 - if (newFileInput && newFileInput.files) {
1340 - for (var j = 0; j < newFileInput.files.length; j++) { fd.append('editNewFiles', newFileInput.files[j]); }
1341 - }
1342 -
1343 - btn.disabled = true;
1344 - btn.textContent = '保存中...';
1345 -
1346 1346   var xhr = new XMLHttpRequest();
1347 1347   xhr.open('POST', '/bin/get/SeitokaiCode/EditPost?outputSyntax=plain', true);
1243 + xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1244 + var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken);
1348 1348   xhr.onload = function() {
1349 1349   try {
1350 1350   var res = JSON.parse(xhr.responseText);
... ... @@ -1352,13 +1352,12 @@
1352 1352   showToast('投稿を更新しました', 'success');
1353 1353   setTimeout(function() { location.reload(); }, 800);
1354 1354   } else {
1355 - btn.disabled = false; btn.textContent = '保存';
1356 1356   alert('編集に失敗しました: ' + (res.error || ''));
1357 1357   }
1358 - } catch(e) { btn.disabled = false; btn.textContent = '保存'; alert('編集に失敗しました'); }
1254 + } catch(e) { alert('編集に失敗しました'); }
1359 1359   };
1360 - xhr.onerror = function() { btn.disabled = false; btn.textContent = '保存'; alert('通信エラーが発生しました'); };
1361 - xhr.send(fd);
1256 + xhr.onerror = function() { alert('通信エラーが発生しました'); };
1257 + xhr.send(editPostData);
1362 1362  }
1363 1363  
1364 1364  // 投稿の削除（確認ダイアログ付き）