Changes for page 学校ページ テンプレート
Last modified by Super Admin on 2026/04/05 18:59
From version
93.1
edited by Super Admin
on 2026/03/20 10:33
on 2026/03/20 10:33
Change comment:
There is no comment for this version
To version
81.1
edited by Super Admin
on 2026/03/19 22:11
on 2026/03/19 22:11
Change comment:
There is no comment for this version
Summary
Details
- Page properties
-
- Content
-
... ... @@ -35,7 +35,6 @@ 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 40 ## --- 生徒会組織 --- 41 41 #set($orgChart = $doc.getValue('orgChart')) ... ... @@ -57,7 +57,7 @@ 57 57 #set($budgetAllocation = $doc.getValue('budgetAllocation')) 58 58 #set($budgetNote = $doc.getValue('budgetNote')) 59 59 60 -## --- 校則 ・生徒会会則の見直し ---59 +## --- 校則の見直し --- 61 61 #set($ruleReviewStatus = $doc.getValue('ruleReviewStatus')) 62 62 #set($ruleReviewContent = $doc.getValue('ruleReviewContent')) 63 63 #set($ruleReviewProposer = $doc.getValue('ruleReviewProposer')) ... ... @@ -304,7 +304,7 @@ 304 304 305 305 ## --- 編集ボタン(権限があるユーザーのみ表示) --- 306 306 #set($canEditSchool = false) 307 -#if(!$isGuest && ($isViewerAdmin || $isSchoolMember || $isAlumniOfSchool))306 +#if(!$isGuest && ($isViewerAdmin || $isSchoolMember)) 308 308 #set($canEditSchool = true) 309 309 #end 310 310 #if($canEditSchool) ... ... @@ -354,15 +354,16 @@ 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 +## --- ② 生徒会基本情報(折りたたみカード) --- 364 364 <div class="school-info-card" id="card-seitokai-info"> 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> 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 ## --- 生徒会組織 --- ... ... @@ -374,12 +374,12 @@ 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>#end382 + #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end 383 383 </div> 384 384 </div> 385 385 #else ... ... @@ -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> ... ... @@ -505,7 +505,7 @@ 505 505 #end 506 506 #end 507 507 508 - ## --- 校則 ・生徒会会則の見直し ---505 + ## --- 校則の見直し --- 509 509 #if($ruleReviewStatus && $ruleReviewStatus != '') 510 510 #set($canViewRuleReview = true) 511 511 #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewRuleReview = false) ... ... @@ -513,13 +513,12 @@ 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> 520 520 <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span> 521 521 </div> 522 - #if($ruleReviewStatus != '実施なし') 523 523 #if($ruleReviewContent && !$ruleReviewContent.isEmpty()) 524 524 <div class="info-row"> 525 525 <span class="info-label">見直しの内容</span> ... ... @@ -556,7 +556,6 @@ 556 556 </span> 557 557 </div> 558 558 #end 559 - #end 560 560 #if($ruleReviewSystem && $ruleReviewSystem != '') 561 561 <div class="info-row"> 562 562 <span class="info-label">見直しの仕組み</span> ... ... @@ -566,7 +566,7 @@ 566 566 </div> 567 567 </div> 568 568 #else 569 - <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($visibilityRuleReview == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>564 + <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($visibilityRuleReview == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div> 570 570 #end 571 571 #end 572 572 ... ... @@ -578,7 +578,7 @@ 578 578 #end 579 579 #if($canViewChallenges) 580 580 <div class="seitokai-subsection"> 581 - <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> 582 582 <div class="seitokai-subsection-content"> 583 583 <div class="challenge-text">$!escapetool.xml($challenges)</div> 584 584 </div> ... ... @@ -602,11 +602,6 @@ 602 602 <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> 603 603 <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr> 604 604 </table> 605 - #set($infoEditDate = $!doc.getValue('lastInfoEditedDate')) 606 - #set($infoEditBy = $!doc.getValue('lastInfoEditedBy')) 607 - #if($infoEditDate && $infoEditDate != '') 608 - <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> 609 - #end 610 610 </div> 611 611 612 612 {{/html}} ... ... @@ -964,7 +964,7 @@ 964 964 #end 965 965 </div> 966 966 #if($postVis != 'public') 967 - <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> 968 968 #end 969 969 ## 固定/編集/削除/通報/非表示ボタン(横並び) 970 970 #set($postAuthorRef = $!post.getValue('authorRef')) ... ... @@ -988,9 +988,7 @@ 988 988 #end 989 989 #if($showEditDeleteBtn) 990 990 #if($xcontext.user == $postAuthorRef) 991 - #set($editImages = $!post.getValue('images')) 992 - #set($editFiles = $!post.getValue('files')) 993 - <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="この投稿を編集"> 994 994 <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> 編集 995 995 </button> 996 996 #end ... ... @@ -1052,7 +1052,7 @@ 1052 1052 1053 1053 #if($xcontext.user != "XWiki.XWikiGuest") 1054 1054 <div class="thread-add-post"> 1055 - #if($isSchoolMember || $is AlumniOfSchool || $isViewerAdmin)1043 + #if($isSchoolMember || $isViewerAdmin) 1056 1056 <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add"> 1057 1057 + 活動報告を追加 1058 1058 </a> ... ... @@ -1223,130 +1223,37 @@ 1223 1223 } 1224 1224 1225 1225 // 投稿の編集(インライン編集フォームを開く) 1226 -function openEditPost(btn) { 1214 +function openEditPost(btn, schoolPage, postObjNum, currentContent) { 1227 1227 var postEl = btn.closest('.thread-post'); 1228 1228 if (!postEl) return; 1217 + // 既存の編集フォームがあれば閉じる 1229 1229 var existing = postEl.querySelector('.post-edit-form'); 1230 1230 if (existing) { existing.remove(); return; } 1231 1231 var bodyEl = postEl.querySelector('.thread-post-body'); 1232 1232 if (!bodyEl) return; 1233 - 1234 - var schoolPage = btn.getAttribute('data-school'); 1235 - var postObjNum = btn.getAttribute('data-obj'); 1236 - var currentContent = btn.getAttribute('data-content') || ''; 1237 - var currentImages = btn.getAttribute('data-images') || ''; 1238 - var currentFiles = btn.getAttribute('data-files') || ''; 1239 - var postType = btn.getAttribute('data-post-type') || 'report'; 1240 - 1241 1241 var form = document.createElement('div'); 1242 1242 form.className = 'post-edit-form'; 1243 - form.setAttribute('data-school', schoolPage); 1244 - form.setAttribute('data-obj', postObjNum); 1245 - 1246 - var html = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&').replace(/</g,'<').replace(/>/g,'>') + '</textarea>'; 1247 - 1248 - // コメント以外は添付ファイル編集を表示 1249 - if (postType !== 'comment') { 1250 - // 既存画像 1251 - html += '<div class="edit-attachments">'; 1252 - if (currentImages.trim()) { 1253 - html += '<div class="edit-attach-section"><span class="edit-attach-label">画像</span>'; 1254 - var imgs = currentImages.trim().split('\n'); 1255 - for (var i = 0; i < imgs.length; i++) { 1256 - var img = imgs[i].trim(); 1257 - if (!img) continue; 1258 - html += '<div class="edit-attach-item" data-name="' + img.replace(/"/g,'"') + '">' + 1259 - '<img src="/xwiki/bin/download/' + schoolPage.replace(/\./g,'/') + '/' + encodeURIComponent(img) + '" class="edit-attach-thumb" />' + 1260 - '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' + 1261 - '<input type="hidden" name="keepImages" value="' + img.replace(/"/g,'"') + '" />' + 1262 - '</div>'; 1263 - } 1264 - html += '</div>'; 1265 - } 1266 - // 既存ファイル 1267 - if (currentFiles.trim()) { 1268 - html += '<div class="edit-attach-section"><span class="edit-attach-label">ファイル</span>'; 1269 - var files = currentFiles.trim().split('\n'); 1270 - for (var j = 0; j < files.length; j++) { 1271 - var f = files[j].trim(); 1272 - if (!f) continue; 1273 - var displayName = f; 1274 - if (/^file_\d{14}_\d+_/.test(f)) displayName = f.replace(/^file_\d{14}_\d+_/, ''); 1275 - html += '<div class="edit-attach-item" data-name="' + f.replace(/"/g,'"') + '">' + 1276 - '<span class="edit-attach-fname">' + displayName.replace(/</g,'<').replace(/>/g,'>') + '</span>' + 1277 - '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' + 1278 - '<input type="hidden" name="keepFiles" value="' + f.replace(/"/g,'"') + '" />' + 1279 - '</div>'; 1280 - } 1281 - html += '</div>'; 1282 - } 1283 - // 新規追加 1284 - html += '<div class="edit-attach-add">' + 1285 - '<label class="form-label-sm">画像を追加(最大4枚まで)</label>' + 1286 - '<input type="file" name="editNewImages" accept="image/*" multiple class="form-file-input-sm" />' + 1287 - '<div class="form-hint">JPEG / PNG / GIF / WebP、各5MBまで</div>' + 1288 - '<label class="form-label-sm" style="margin-top:8px;">ファイルを追加(最大2つまで)</label>' + 1289 - '<input type="file" name="editNewFiles" accept=".pdf,.docx,.xlsx,.pptx" multiple class="form-file-input-sm" />' + 1290 - '<div class="form-hint">PDF / Word / Excel / PowerPoint、各10MBまで</div>' + 1291 - '</div>'; 1292 - html += '</div>'; 1293 - } 1294 - 1295 - html += '<div class="post-edit-form-actions">' + 1224 + form.innerHTML = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&').replace(/</g,'<').replace(/>/g,'>') + '</textarea>' + 1225 + '<div class="post-edit-form-actions">' + 1296 1296 '<button type="button" class="btn-cancel-edit" onclick="this.closest(\'.post-edit-form\').remove()">キャンセル</button>' + 1297 - '<button type="button" class="btn-save" onclick="saveEditPost( this)">保存</button>' +1227 + '<button type="button" class="btn-save" onclick="saveEditPost(\'' + schoolPage + '\', ' + postObjNum + ')">保存</button>' + 1298 1298 '</div>'; 1299 - 1300 - form.innerHTML = html; 1301 1301 bodyEl.parentNode.insertBefore(form, bodyEl.nextSibling); 1302 1302 form.querySelector('textarea').focus(); 1303 1303 } 1304 1304 1305 -function removeEditAttach(btn) { 1306 - var item = btn.closest('.edit-attach-item'); 1307 - if (item) item.remove(); 1308 -} 1309 - 1310 1310 // 投稿の編集を保存 1311 -function saveEditPost(btn) { 1312 - var formEl = btn.closest('.post-edit-form'); 1313 - if (!formEl) return; 1314 - var schoolPage = formEl.getAttribute('data-school'); 1315 - var postObjNum = formEl.getAttribute('data-obj'); 1316 - var textarea = formEl.querySelector('textarea'); 1234 +function saveEditPost(schoolPage, postObjNum) { 1235 + var textarea = document.getElementById('editContent_' + postObjNum); 1317 1317 if (!textarea) return; 1318 1318 var newContent = textarea.value.trim(); 1319 1319 if (!newContent) { alert('投稿内容を入力してください'); return; } 1320 - 1321 1321 var csrfEl = document.querySelector('input[name="form_token"]'); 1322 1322 var csrfToken = csrfEl ? csrfEl.value : ''; 1323 - 1324 - var fd = new FormData(); 1325 - fd.append('schoolPage', schoolPage); 1326 - fd.append('postObj', postObjNum); 1327 - fd.append('newContent', newContent); 1328 - fd.append('form_token', csrfToken); 1329 - 1330 - // 残す画像・ファイル 1331 - formEl.querySelectorAll('input[name="keepImages"]').forEach(function(el) { fd.append('keepImages', el.value); }); 1332 - formEl.querySelectorAll('input[name="keepFiles"]').forEach(function(el) { fd.append('keepFiles', el.value); }); 1333 - 1334 - // 新規画像 1335 - var newImgInput = formEl.querySelector('input[name="editNewImages"]'); 1336 - if (newImgInput && newImgInput.files) { 1337 - for (var i = 0; i < newImgInput.files.length; i++) { fd.append('editNewImages', newImgInput.files[i]); } 1338 - } 1339 - // 新規ファイル 1340 - var newFileInput = formEl.querySelector('input[name="editNewFiles"]'); 1341 - if (newFileInput && newFileInput.files) { 1342 - for (var j = 0; j < newFileInput.files.length; j++) { fd.append('editNewFiles', newFileInput.files[j]); } 1343 - } 1344 - 1345 - btn.disabled = true; 1346 - btn.textContent = '保存中...'; 1347 - 1348 1348 var xhr = new XMLHttpRequest(); 1349 1349 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); 1350 1350 xhr.onload = function() { 1351 1351 try { 1352 1352 var res = JSON.parse(xhr.responseText); ... ... @@ -1354,13 +1354,12 @@ 1354 1354 showToast('投稿を更新しました', 'success'); 1355 1355 setTimeout(function() { location.reload(); }, 800); 1356 1356 } else { 1357 - btn.disabled = false; btn.textContent = '保存'; 1358 1358 alert('編集に失敗しました: ' + (res.error || '')); 1359 1359 } 1360 - } catch(e) { btn.disabled = false; btn.textContent = '保存'; alert('編集に失敗しました'); }1254 + } catch(e) { alert('編集に失敗しました'); } 1361 1361 }; 1362 - xhr.onerror = function() { btn.disabled = false; btn.textContent = '保存'; alert('通信エラーが発生しました'); };1363 - xhr.send( fd);1256 + xhr.onerror = function() { alert('通信エラーが発生しました'); }; 1257 + xhr.send(editPostData); 1364 1364 } 1365 1365 1366 1366 // 投稿の削除(確認ダイアログ付き)