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

From version Icon 73.1 Icon
edited by Super Admin
on 2026/03/18 23:46
Change comment: There is no comment for this version
To version Icon 86.1 Icon
edited by Super Admin
on 2026/03/20 02:01
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,6 +353,9 @@
353 353   </div>
354 354   #end
355 355   </div>
357 + #if($schoolDescription && $schoolDescription.trim() != '')
358 + <div class="free-note" style="margin-top:var(--sp-4);">$!escapetool.xml($schoolDescription)</div>
359 + #end
356 356   #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
357 357   #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
358 358   #if($infoEditDate && $infoEditDate != '')
... ... @@ -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 - ## --- 組織 ---
372 + ## --- 生徒会組織 ---
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>
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>
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
386 + #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>
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>
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>
399 + <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)
402 + <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>
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>
458 458   <div class="seitokai-subsection-content">
459 459   #if($budgetProcess && !$budgetProcess.isEmpty())
460 460   <div class="info-row">
... ... @@ -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>
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>
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>
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>
577 577   <div class="seitokai-subsection-content">
578 578   <div class="challenge-text">$!escapetool.xml($challenges)</div>
579 579   </div>
... ... @@ -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
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
745 745   #end
746 - #end
750 + </div>
747 747   </div>
748 - <div class="thread-meta-row">
752 + <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
888 + #set($postAuthorRefH = $!post.getValue('authorRef'))
889 + #set($postObjNumH = $post.number)
890 + #if(!$isGuest && $xcontext.user != $postAuthorRefH)
891 + <button type="button" class="btn-post-report btn-post-report-header" onclick="openReportDialog(this, '${doc.fullName}', $postObjNumH, '${services.csrf.getToken()}')" title="この投稿を通報">
892 + <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> 通報
893 + </button>
894 + #end
884 884   </div>
885 885   <div class="thread-post-body">
886 886   $!escapetool.xml($!postContent)
... ... @@ -945,12 +945,18 @@
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>
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>
949 949   #end
950 - ## 固定/解除ボタン(承認済み・管理者のみ)
951 - #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
952 - #set($postObjNum = $post.number)
953 - <div class="post-pin-action post-action-mt">
961 + ## 固定/編集/削除/通報/非表示ボタン(横並び)
962 + #set($postAuthorRef = $!post.getValue('authorRef'))
963 + #set($postObjNumED = $post.number)
964 + #set($showPinBtn = ($viewerAccountType == 'admin' || $viewerAccountType == 'verified'))
965 + #set($showEditDeleteBtn = ($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin'))
966 + #set($showHideBtn = ($viewerAccountType == 'admin'))
967 + #if($showPinBtn || $showEditDeleteBtn || $showHideBtn)
968 + <div class="post-edit-actions post-action-mt">
969 + #if($showPinBtn)
970 + #set($postObjNum = $post.number)
954 954   #if($isPinned == '1')
955 955   <a href="$doc.getURL('view', "action=unpin&postObj=${postObjNum}&form_token=${services.csrf.getToken()}")" class="btn-pin-toggle btn-unpin" title="固定を解除">
956 956   <svg class="ico ico-fixed-14" viewBox="0 0 24 24" fill="currentColor" stroke="none"><path d="M16 2l-4 4-2-1-5 5 3 3-6 6h4l4-4 3 3 5-5-1-2 4-4-5-5z"/></svg> 固定を解除
... ... @@ -960,15 +960,12 @@
960 960   <svg class="ico ico-fixed-14" viewBox="0 0 24 24"><path d="M16 2l-4 4-2-1-5 5 3 3-6 6h4l4-4 3 3 5-5-1-2 4-4-5-5z"/></svg> 固定する
961 961   </a>
962 962   #end
963 - </div>
964 - #end
965 - ## 編集・削除ボタン(投稿者本人 or 管理者)
966 - #set($postAuthorRef = $!post.getValue('authorRef'))
967 - #set($postObjNumED = $post.number)
968 - #if($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin')
969 - <div class="post-edit-actions post-action-mt">
980 + #end
981 + #if($showEditDeleteBtn)
970 970   #if($xcontext.user == $postAuthorRef)
971 - <button type="button" class="btn-post-edit" onclick="openEditPost(this, '${doc.fullName}', $postObjNumED, '$!escapetool.javascript($!postContent)')" title="この投稿を編集">
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="この投稿を編集">
972 972   <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> 編集
973 973   </button>
974 974   #end
... ... @@ -975,6 +975,12 @@
975 975   <button type="button" class="btn-post-delete" onclick="confirmDeletePost('${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を削除">
976 976   <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> 削除
977 977   </button>
992 + #end
993 + #if($showHideBtn)
994 + <button type="button" class="btn-post-hide" onclick="openHideDialog(this, '${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を非表示にする">
995 + <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> 非表示
996 + </button>
997 + #end
978 978   </div>
979 979   #end
980 980   </div>
... ... @@ -1024,9 +1024,11 @@
1024 1024  
1025 1025   #if($xcontext.user != "XWiki.XWikiGuest")
1026 1026   <div class="thread-add-post">
1047 + #if($isSchoolMember || $isViewerAdmin)
1027 1027   <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
1028 1028   + 活動報告を追加
1029 1029   </a>
1051 + #end
1030 1030   <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
1031 1031   <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> コメントを書く
1032 1032   </a>
... ... @@ -1193,37 +1193,130 @@
1193 1193  }
1194 1194  
1195 1195  // 投稿の編集(インライン編集フォームを開く)
1196 -function openEditPost(btn, schoolPage, postObjNum, currentContent) {
1218 +function openEditPost(btn) {
1197 1197   var postEl = btn.closest('.thread-post');
1198 1198   if (!postEl) return;
1199 - // 既存の編集フォームがあれば閉じる
1200 1200   var existing = postEl.querySelector('.post-edit-form');
1201 1201   if (existing) { existing.remove(); return; }
1202 1202   var bodyEl = postEl.querySelector('.thread-post-body');
1203 1203   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 +
1204 1204   var form = document.createElement('div');
1205 1205   form.className = 'post-edit-form';
1206 - form.innerHTML = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>' +
1207 - '<div class="post-edit-form-actions">' +
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">' +
1208 1208   '<button type="button" class="btn-cancel-edit" onclick="this.closest(\'.post-edit-form\').remove()">キャンセル</button>' +
1209 - '<button type="button" class="btn-save" onclick="saveEditPost(\'' + schoolPage + '\', ' + postObjNum + ')">保存</button>' +
1289 + '<button type="button" class="btn-save" onclick="saveEditPost(this)">保存</button>' +
1210 1210   '</div>';
1291 +
1292 + form.innerHTML = html;
1211 1211   bodyEl.parentNode.insertBefore(form, bodyEl.nextSibling);
1212 1212   form.querySelector('textarea').focus();
1213 1213  }
1214 1214  
1297 +function removeEditAttach(btn) {
1298 + var item = btn.closest('.edit-attach-item');
1299 + if (item) item.remove();
1300 +}
1301 +
1215 1215  // 投稿の編集を保存
1216 -function saveEditPost(schoolPage, postObjNum) {
1217 - var textarea = document.getElementById('editContent_' + postObjNum);
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');
1218 1218   if (!textarea) return;
1219 1219   var newContent = textarea.value.trim();
1220 1220   if (!newContent) { alert('投稿内容を入力してください'); return; }
1312 +
1221 1221   var csrfEl = document.querySelector('input[name="form_token"]');
1222 1222   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 +
1223 1223   var xhr = new XMLHttpRequest();
1224 1224   xhr.open('POST', '/bin/get/SeitokaiCode/EditPost?outputSyntax=plain', true);
1225 - xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1226 - var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken);
1227 1227   xhr.onload = function() {
1228 1228   try {
1229 1229   var res = JSON.parse(xhr.responseText);
... ... @@ -1231,12 +1231,13 @@
1231 1231   showToast('投稿を更新しました', 'success');
1232 1232   setTimeout(function() { location.reload(); }, 800);
1233 1233   } else {
1349 + btn.disabled = false; btn.textContent = '保存';
1234 1234   alert('編集に失敗しました: ' + (res.error || ''));
1235 1235   }
1236 - } catch(e) { alert('編集に失敗しました'); }
1352 + } catch(e) { btn.disabled = false; btn.textContent = '保存'; alert('編集に失敗しました'); }
1237 1237   };
1238 - xhr.onerror = function() { alert('通信エラーが発生しました'); };
1239 - xhr.send(editPostData);
1354 + xhr.onerror = function() { btn.disabled = false; btn.textContent = '保存'; alert('通信エラーが発生しました'); };
1355 + xhr.send(fd);
1240 1240  }
1241 1241  
1242 1242  // 投稿の削除(確認ダイアログ付き)
... ... @@ -1260,6 +1260,80 @@
1260 1260   xhr.onerror = function() { alert('通信エラーが発生しました'); };
1261 1261   xhr.send(deletePostData);
1262 1262  }
1379 +
1380 +/* --- 通報ダイアログ --- */
1381 +function openReportDialog(btn, targetPage, postObjNum, token) {
1382 + if (document.getElementById('report-dialog-overlay')) return;
1383 + var reasons = ['宣伝・スパム','不適切な内容','個人情報の露出','誹謗中傷','誤情報','その他'];
1384 + var overlay = document.createElement('div');
1385 + overlay.id = 'report-dialog-overlay';
1386 + overlay.style.cssText = 'position:fixed;inset:0;background:rgba(0,0,0,0.5);z-index:9999;display:flex;align-items:center;justify-content:center;';
1387 + var dialog = document.createElement('div');
1388 + dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;max-height:80vh;overflow-y:auto;';
1389 + var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を通報</h3>';
1390 + html += '<p style="margin:0 0 12px;font-size:0.9em;color:#4b5563;">通報された投稿は管理者が確認するまで一時的に非表示になります。</p>';
1391 + html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">通報理由</label>';
1392 + html += '<select id="report-reason" style="width:100%;padding:8px;border:1px solid #d1d5db;border-radius:8px;margin-bottom:12px;font-size:0.9em;">';
1393 + for (var i=0; i<reasons.length; i++) html += '<option value="'+reasons[i]+'">'+reasons[i]+'</option>';
1394 + html += '</select>';
1395 + html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">補足コメント(任意)</label>';
1396 + html += '<textarea id="report-detail" rows="3" maxlength="500" style="width:100%;padding:8px;border:1px solid #d1d5db;border-radius:8px;resize:vertical;font-size:0.9em;box-sizing:border-box;" placeholder="具体的な内容があればご記入ください"></textarea>';
1397 + html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
1398 + html += '<button type="button" id="report-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
1399 + html += '<button type="button" id="report-submit-btn" style="padding:8px 16px;border:none;border-radius:8px;background:#dc2626;color:#fff;cursor:pointer;font-weight:600;">通報する</button>';
1400 + html += '</div>';
1401 + dialog.innerHTML = html;
1402 + overlay.appendChild(dialog);
1403 + document.body.appendChild(overlay);
1404 + overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
1405 + document.getElementById('report-cancel-btn').addEventListener('click', function() { overlay.remove(); });
1406 + document.getElementById('report-submit-btn').addEventListener('click', function() {
1407 + var reason = document.getElementById('report-reason').value;
1408 + var detail = document.getElementById('report-detail').value;
1409 + var submitBtn = document.getElementById('report-submit-btn');
1410 + submitBtn.disabled = true; submitBtn.textContent = '送信中...';
1411 + var xhr = new XMLHttpRequest();
1412 + xhr.open('POST', '/bin/get/SeitokaiCode/ReportAction?outputSyntax=plain', true);
1413 + xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1414 + var data = 'targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&detail=' + encodeURIComponent(detail) + '&form_token=' + encodeURIComponent(token);
1415 + xhr.onload = function() {
1416 + overlay.remove();
1417 + showToast('通報を受け付けました', 'success');
1418 + setTimeout(function() { location.reload(); }, 1000);
1419 + };
1420 + xhr.onerror = function() { overlay.remove(); alert('通信エラーが発生しました'); };
1421 + xhr.send(data);
1422 + });
1423 +}
1424 +
1425 +/* --- 非表示ダイアログ(管理者用) --- */
1426 +function openHideDialog(btn, targetPage, postObjNum, token) {
1427 + if (document.getElementById('hide-dialog-overlay')) return;
1428 + var overlay = document.createElement('div');
1429 + overlay.id = 'hide-dialog-overlay';
1430 + overlay.style.cssText = 'position:fixed;inset:0;background:rgba(0,0,0,0.5);z-index:9999;display:flex;align-items:center;justify-content:center;';
1431 + var dialog = document.createElement('div');
1432 + dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;';
1433 + var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を非表示にする</h3>';
1434 + html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">非表示の理由</label>';
1435 + html += '<input type="text" id="hide-reason" style="width:100%;padding:8px;border:1px solid #d1d5db;border-radius:8px;margin-bottom:12px;font-size:0.9em;box-sizing:border-box;" placeholder="理由を入力" />';
1436 + html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">';
1437 + html += '<button type="button" id="hide-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>';
1438 + html += '<button type="button" id="hide-submit-btn" style="padding:8px 16px;border:none;border-radius:8px;background:#d97706;color:#fff;cursor:pointer;font-weight:600;">非表示にする</button>';
1439 + html += '<button type="button" id="hide-warn-btn" style="padding:8px 16px;border:none;border-radius:8px;background:#dc2626;color:#fff;cursor:pointer;font-weight:600;">非表示+警告</button>';
1440 + html += '</div>';
1441 + dialog.innerHTML = html;
1442 + overlay.appendChild(dialog);
1443 + document.body.appendChild(overlay);
1444 + overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); });
1445 + document.getElementById('hide-cancel-btn').addEventListener('click', function() { overlay.remove(); });
1446 + function doHide(action) {
1447 + var reason = document.getElementById('hide-reason').value || '管理者判断';
1448 + window.location.href = '/bin/view/SeitokaiCode/ModerationAction?action=' + action + '&targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&form_token=' + encodeURIComponent(token);
1449 + }
1450 + document.getElementById('hide-submit-btn').addEventListener('click', function() { doHide('hide'); });
1451 + document.getElementById('hide-warn-btn').addEventListener('click', function() { doHide('hide-warn'); });
1452 +}
1263 1263  </script>
1264 1264  {{/html}}
1265 1265  {{/velocity}}