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

Summary

Details

Icon Page properties
Content
... ... @@ -35,8 +35,9 @@
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'))
38 38  
39 -## --- 組織図 ---
40 +## --- 生徒会組織 ---
40 40  #set($orgChart = $doc.getValue('orgChart'))
41 41  #set($orgChartImage = $doc.getValue('orgChartImage'))
42 42  
... ... @@ -353,11 +353,10 @@
353 353   </div>
354 354   #end
355 355   </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>
357 + #if($schoolDescription && $schoolDescription.trim() != '')
358 + <div class="free-note" style="margin-top:var(--sp-4);">$!escapetool.xml($schoolDescription)</div>
360 360   #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 != '')$!escapetool.xml($orgChart)#end
382 + #if($orgChart && $orgChart != '')<div class="free-note">$!escapetool.xml($orgChart)</div>#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,12 +392,10 @@
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)
398 398   #foreach($da in $dailyActivities)
399 - <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
400 - #set($daIdx = $daIdx + 1)
398 + <span class="tag tag-accent">$!escapetool.xml($da.trim())</span>
401 401   #end
402 402   </div>
403 403   #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
... ... @@ -454,7 +454,7 @@
454 454   #end
455 455   #if($canViewBudget)
456 456   <div class="seitokai-subsection">
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>
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>
458 458   <div class="seitokai-subsection-content">
459 459   #if($budgetProcess && !$budgetProcess.isEmpty())
460 460   <div class="info-row">
... ... @@ -461,8 +461,13 @@
461 461   <span class="info-label">作成過程の生徒関与</span>
462 462   <span class="info-value">
463 463   <div class="selection-display">
464 - #foreach($bp in $budgetProcess)
465 - <span class="selection-item">$!escapetool.xml($bp.trim())</span>
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
466 466   #end
467 467   </div>
468 468   </span>
... ... @@ -510,7 +510,7 @@
510 510   #end
511 511   #if($canViewRuleReview)
512 512   <div class="seitokai-subsection">
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 + <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>
514 514   <div class="seitokai-subsection-content">
515 515   <div class="info-row">
516 516   <span class="info-label">見直しの有無（3年以内）</span>
... ... @@ -573,7 +573,7 @@
573 573   #end
574 574   #if($canViewChallenges)
575 575   <div class="seitokai-subsection">
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 + <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>
577 577   <div class="seitokai-subsection-content">
578 578   <div class="challenge-text">$!escapetool.xml($challenges)</div>
579 579   </div>
... ... @@ -597,6 +597,11 @@
597 597   <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>
598 598   <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr>
599 599   </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
600 600  </div>
601 601  
602 602  {{/html}}
... ... @@ -736,16 +736,18 @@
736 736  <div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)">
737 737   <div class="activity-thread-header">
738 738   <div class="activity-thread-title">
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
747 + <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>
748 + <div class="activity-meta-line">
749 + <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
750 + #set($actTagsList = $activity.getValue('tags'))
751 + #if($actTagsList && !$actTagsList.isEmpty())
752 + #foreach($tagItem in $actTagsList)
753 + #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end
754 + #end
745 745   #end
746 - #end
756 + </div>
747 747   </div>
748 - <div class="thread-meta-row">
758 + <div class="thread-meta-right">
749 749   <span class="thread-post-count">${reportCount}件の報告 ・ ${commentCount}件のコメント</span>
750 750   #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred')
751 751   #if($actFeatured == '1')
... ... @@ -881,6 +881,13 @@
881 881   #if($postEdited == 1 || $postEdited == '1')
882 882   <span class="post-edited-label">（編集済み）</span>
883 883   #end
894 + #set($postAuthorRefH = $!post.getValue('authorRef'))
895 + #set($postObjNumH = $post.number)
896 + #if(!$isGuest && $xcontext.user != $postAuthorRefH)
897 + <button type="button" class="btn-post-report btn-post-report-header" onclick="openReportDialog(this, '${doc.fullName}', $postObjNumH, '${services.csrf.getToken()}')" title="この投稿を通報">
898 + <svg class="ico ico-fixed-14" viewBox="0 0 24 24"><path d="M4 15s1-1 4-1 5 2 8 2 4-1 4-1V3s-1 1-4 1-5-2-8-2-4 1-4 1z"/><line x1="4" y1="22" x2="4" y2="15"/></svg> 通報
899 + </button>
900 + #end
884 884   </div>
885 885   <div class="thread-post-body">
886 886   $!escapetool.xml($!postContent)
... ... @@ -945,7 +945,7 @@
945 945   #end
946 946   </div>
947 947   #if($postVis != 'public')
948 - <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>
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>
949 949   #end
950 950   ## 固定/編集/削除/通報/非表示ボタン（横並び）
951 951   #set($postAuthorRef = $!post.getValue('authorRef'))
... ... @@ -952,9 +952,8 @@
952 952   #set($postObjNumED = $post.number)
953 953   #set($showPinBtn = ($viewerAccountType == 'admin' || $viewerAccountType == 'verified'))
954 954   #set($showEditDeleteBtn = ($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin'))
955 - #set($showReportBtn = (!$isGuest && $xcontext.user != $postAuthorRef))
956 956   #set($showHideBtn = ($viewerAccountType == 'admin'))
957 - #if($showPinBtn || $showEditDeleteBtn || $showReportBtn || $showHideBtn)
973 + #if($showPinBtn || $showEditDeleteBtn || $showHideBtn)
958 958   <div class="post-edit-actions post-action-mt">
959 959   #if($showPinBtn)
960 960   #set($postObjNum = $post.number)
... ... @@ -970,7 +970,9 @@
970 970   #end
971 971   #if($showEditDeleteBtn)
972 972   #if($xcontext.user == $postAuthorRef)
973 - <button type="button" class="btn-post-edit" onclick="openEditPost(this, '${doc.fullName}', $postObjNumED, '$!escapetool.javascript($!postContent)')" title="この投稿を編集">
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="この投稿を編集">
974 974   <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> 編集
975 975   </button>
976 976   #end
... ... @@ -978,11 +978,6 @@
978 978   <svg class="ico ico-fixed-14" viewBox="0 0 24 24"><polyline points="3 6 5 6 21 6"/><path d="M19 6v14a2 2 0 01-2 2H7a2 2 0 01-2-2V6m3 0V4a2 2 0 012-2h4a2 2 0 012 2v2"/></svg> 削除
979 979   </button>
980 980   #end
981 - #if($showReportBtn)
982 - <button type="button" class="btn-post-report" onclick="openReportDialog(this, '${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を通報">
983 - <svg class="ico ico-fixed-14" viewBox="0 0 24 24"><path d="M4 15s1-1 4-1 5 2 8 2 4-1 4-1V3s-1 1-4 1-5-2-8-2-4 1-4 1z"/><line x1="4" y1="22" x2="4" y2="15"/></svg> 通報
984 - </button>
985 - #end
986 986   #if($showHideBtn)
987 987   <button type="button" class="btn-post-hide" onclick="openHideDialog(this, '${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を非表示にする">
988 988   <svg class="ico ico-fixed-14" viewBox="0 0 24 24"><path d="M17.94 17.94A10.07 10.07 0 0112 20c-7 0-11-8-11-8a18.45 18.45 0 015.06-5.94M9.9 4.24A9.12 9.12 0 0112 4c7 0 11 8 11 8a18.5 18.5 0 01-2.16 3.19m-6.72-1.07a3 3 0 11-4.24-4.24"/><line x1="1" y1="1" x2="23" y2="23"/></svg> 非表示
... ... @@ -1037,9 +1037,11 @@
1037 1037  
1038 1038   #if($xcontext.user != "XWiki.XWikiGuest")
1039 1039   <div class="thread-add-post">
1053 + #if($isSchoolMember || $isViewerAdmin)
1040 1040   <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
1041 1041   ＋ 活動報告を追加
1042 1042   </a>
1057 + #end
1043 1043   <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
1044 1044   <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> コメントを書く
1045 1045   </a>
... ... @@ -1206,37 +1206,130 @@
1206 1206  }
1207 1207  
1208 1208  // 投稿の編集（インライン編集フォームを開く）
1209 -function openEditPost(btn, schoolPage, postObjNum, currentContent) {
1224 +function openEditPost(btn) {
1210 1210   var postEl = btn.closest('.thread-post');
1211 1211   if (!postEl) return;
1212 - // 既存の編集フォームがあれば閉じる
1213 1213   var existing = postEl.querySelector('.post-edit-form');
1214 1214   if (existing) { existing.remove(); return; }
1215 1215   var bodyEl = postEl.querySelector('.thread-post-body');
1216 1216   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 +
1217 1217   var form = document.createElement('div');
1218 1218   form.className = 'post-edit-form';
1219 - form.innerHTML = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>' +
1220 - '<div class="post-edit-form-actions">' +
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">' +
1221 1221   '<button type="button" class="btn-cancel-edit" onclick="this.closest(\'.post-edit-form\').remove()">キャンセル</button>' +
1222 - '<button type="button" class="btn-save" onclick="saveEditPost(\'' + schoolPage + '\', ' + postObjNum + ')">保存</button>' +
1295 + '<button type="button" class="btn-save" onclick="saveEditPost(this)">保存</button>' +
1223 1223   '</div>';
1297 +
1298 + form.innerHTML = html;
1224 1224   bodyEl.parentNode.insertBefore(form, bodyEl.nextSibling);
1225 1225   form.querySelector('textarea').focus();
1226 1226  }
1227 1227  
1303 +function removeEditAttach(btn) {
1304 + var item = btn.closest('.edit-attach-item');
1305 + if (item) item.remove();
1306 +}
1307 +
1228 1228  // 投稿の編集を保存
1229 -function saveEditPost(schoolPage, postObjNum) {
1230 - var textarea = document.getElementById('editContent_' + postObjNum);
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');
1231 1231   if (!textarea) return;
1232 1232   var newContent = textarea.value.trim();
1233 1233   if (!newContent) { alert('投稿内容を入力してください'); return; }
1318 +
1234 1234   var csrfEl = document.querySelector('input[name="form_token"]');
1235 1235   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 +
1236 1236   var xhr = new XMLHttpRequest();
1237 1237   xhr.open('POST', '/bin/get/SeitokaiCode/EditPost?outputSyntax=plain', true);
1238 - xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1239 - var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken);
1240 1240   xhr.onload = function() {
1241 1241   try {
1242 1242   var res = JSON.parse(xhr.responseText);
... ... @@ -1244,12 +1244,13 @@
1244 1244   showToast('投稿を更新しました', 'success');
1245 1245   setTimeout(function() { location.reload(); }, 800);
1246 1246   } else {
1355 + btn.disabled = false; btn.textContent = '保存';
1247 1247   alert('編集に失敗しました: ' + (res.error || ''));
1248 1248   }
1249 - } catch(e) { alert('編集に失敗しました'); }
1358 + } catch(e) { btn.disabled = false; btn.textContent = '保存'; alert('編集に失敗しました'); }
1250 1250   };
1251 - xhr.onerror = function() { alert('通信エラーが発生しました'); };
1252 - xhr.send(editPostData);
1360 + xhr.onerror = function() { btn.disabled = false; btn.textContent = '保存'; alert('通信エラーが発生しました'); };
1361 + xhr.send(fd);
1253 1253  }
1254 1254  
1255 1255  // 投稿の削除（確認ダイアログ付き）