Changes for page 学校ページ テンプレート
Last modified by Super Admin on 2026/04/05 18:59
From version
73.1
edited by Super Admin
on 2026/03/18 23:46
on 2026/03/18 23:46
Change comment:
There is no comment for this version
To version
94.1
edited by Super Admin
on 2026/03/20 17:50
on 2026/03/20 17:50
Change comment:
There is no comment for this version
Summary
Details
- 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 ... ... @@ -56,7 +56,7 @@ 56 56 #set($budgetAllocation = $doc.getValue('budgetAllocation')) 57 57 #set($budgetNote = $doc.getValue('budgetNote')) 58 58 59 -## --- 校則の見直し --- 60 +## --- 校則・生徒会会則の見直し --- 60 60 #set($ruleReviewStatus = $doc.getValue('ruleReviewStatus')) 61 61 #set($ruleReviewContent = $doc.getValue('ruleReviewContent')) 62 62 #set($ruleReviewProposer = $doc.getValue('ruleReviewProposer')) ... ... @@ -63,6 +63,43 @@ 63 63 #set($ruleReviewImplementer = $doc.getValue('ruleReviewImplementer')) 64 64 #set($ruleReviewSystem = $doc.getValue('ruleReviewSystem')) 65 65 67 +## --- 活動環境 --- 68 +#set($activityPlace = $doc.getValue('activityPlace')) 69 +#set($activityRoomEquipment = $doc.getValue('activityRoomEquipment')) 70 +#set($activityRoomImage = $doc.getValue('activityRoomImage')) 71 +#set($ictUsage = $doc.getValue('ictUsage')) 72 + 73 +## --- 生徒総会 --- 74 +#set($assemblyFormat = $doc.getValue('assemblyFormat')) 75 +#set($assemblyCount = $doc.getValue('assemblyCount')) 76 +#set($assemblyAgenda = $doc.getValue('assemblyAgenda')) 77 +#set($assemblyTopics = $doc.getValue('assemblyTopics')) 78 +#set($assemblyNote = $doc.getValue('assemblyNote')) 79 + 80 +## --- 広報 --- 81 +#set($publicityMethod = $doc.getValue('publicityMethod')) 82 +#set($publicityFrequency = $doc.getValue('publicityFrequency')) 83 +#set($publicityNote = $doc.getValue('publicityNote')) 84 + 85 +## --- 外部連携 --- 86 +#set($externalCooperation = $doc.getValue('externalCooperation')) 87 +#set($externalOrgName = $doc.getValue('externalOrgName')) 88 +#set($socialParticipation = $doc.getValue('socialParticipation')) 89 + 90 +## --- 年間主要行事 --- 91 +#set($eventApril = $doc.getValue('eventApril')) 92 +#set($eventMay = $doc.getValue('eventMay')) 93 +#set($eventJune = $doc.getValue('eventJune')) 94 +#set($eventJuly = $doc.getValue('eventJuly')) 95 +#set($eventAugust = $doc.getValue('eventAugust')) 96 +#set($eventSeptember = $doc.getValue('eventSeptember')) 97 +#set($eventOctober = $doc.getValue('eventOctober')) 98 +#set($eventNovember = $doc.getValue('eventNovember')) 99 +#set($eventDecember = $doc.getValue('eventDecember')) 100 +#set($eventJanuary = $doc.getValue('eventJanuary')) 101 +#set($eventFebruary = $doc.getValue('eventFebruary')) 102 +#set($eventMarch = $doc.getValue('eventMarch')) 103 + 66 66 ## --- 課題・連絡先 --- 67 67 #set($challenges = $doc.getValue('challenges')) 68 68 #set($contactInfo = $doc.getValue('contactInfo')) ... ... @@ -303,7 +303,7 @@ 303 303 304 304 ## --- 編集ボタン(権限があるユーザーのみ表示) --- 305 305 #set($canEditSchool = false) 306 -#if(!$isGuest && ($isViewerAdmin || $isSchoolMember)) 344 +#if(!$isGuest && ($isViewerAdmin || $isSchoolMember || $isAlumniOfSchool)) 307 307 #set($canEditSchool = true) 308 308 #end 309 309 #if($canEditSchool) ... ... @@ -353,19 +353,18 @@ 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> 394 + #if($schoolDescription && $schoolDescription.trim() != '') 395 + <div class="free-note" style="margin-top:var(--sp-4);">$!escapetool.xml($schoolDescription)</div> 360 360 #end 397 + 361 361 </div> 362 362 363 -## --- ② 生徒会 基本情報(折りたたみカード) ---400 +## --- ② 生徒会情報(折りたたみカード) --- 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>402 + <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 - ## --- 組織 図---405 + ## --- 生徒会組織 --- 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>414 + <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 419 + #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>423 + <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>432 + <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) 435 + <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>492 + <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> 499 + #set($allBpOpts = ["各部・委員会等への予算希望額調査","予算額調整(折衝等)","生徒会予算案の作成","生徒総会での議決","生徒関与なし","その他"]) 500 + #foreach($bpOpt in $allBpOpts) 501 + #if($budgetProcess.contains($bpOpt)) 502 + <span class="selection-item">$!escapetool.xml($bpOpt)</span> 503 + #else 504 + <span class="selection-item selection-item-off">$!escapetool.xml($bpOpt)</span> 505 + #end 466 466 #end 467 467 </div> 468 468 </span> ... ... @@ -502,7 +502,7 @@ 502 502 #end 503 503 #end 504 504 505 - ## --- 校則の見直し --- 545 + ## --- 校則・生徒会会則の見直し --- 506 506 #if($ruleReviewStatus && $ruleReviewStatus != '') 507 507 #set($canViewRuleReview = true) 508 508 #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewRuleReview = false) ... ... @@ -510,12 +510,13 @@ 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>553 + <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> 517 517 <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span> 518 518 </div> 559 + #if($ruleReviewStatus != '実施なし') 519 519 #if($ruleReviewContent && !$ruleReviewContent.isEmpty()) 520 520 <div class="info-row"> 521 521 <span class="info-label">見直しの内容</span> ... ... @@ -552,6 +552,7 @@ 552 552 </span> 553 553 </div> 554 554 #end 596 + #end 555 555 #if($ruleReviewSystem && $ruleReviewSystem != '') 556 556 <div class="info-row"> 557 557 <span class="info-label">見直しの仕組み</span> ... ... @@ -561,10 +561,191 @@ 561 561 </div> 562 562 </div> 563 563 #else 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> 606 + <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> 565 565 #end 566 566 #end 567 567 610 + ## --- 活動環境 --- 611 + #set($hasActivityEnv = ($activityPlace && $activityPlace != '') || ($activityRoomEquipment && $activityRoomEquipment != '') || ($activityRoomImage && $activityRoomImage != '') || ($ictUsage && !$ictUsage.isEmpty())) 612 + #if($hasActivityEnv) 613 + <div class="seitokai-subsection"> 614 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M3 9l9-7 9 7v11a2 2 0 01-2 2H5a2 2 0 01-2-2z"/><polyline points="9 22 9 12 15 12 15 22"/></svg> 生徒会の活動環境</h3> 615 + <div class="seitokai-subsection-content"> 616 + #if($activityPlace && $activityPlace != '') 617 + <div class="info-row"> 618 + <span class="info-label">普段の活動場所</span> 619 + <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($activityPlace)</span></span> 620 + </div> 621 + #end 622 + #if($activityRoomEquipment && $activityRoomEquipment != '') 623 + <div class="info-row"> 624 + <span class="info-label">生徒会室の設備</span> 625 + <span class="info-value free-text-value">$!escapetool.xml($activityRoomEquipment)</span> 626 + </div> 627 + #end 628 + #if($activityRoomImage && $activityRoomImage != '') 629 + <div class="info-row"> 630 + <span class="info-label">活動場所の写真</span> 631 + <span class="info-value"><div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($activityRoomImage)" alt="活動場所の写真" class="org-chart-img" /></div></span> 632 + </div> 633 + #end 634 + #if($ictUsage && !$ictUsage.isEmpty()) 635 + <div class="info-row"> 636 + <span class="info-label">ICT活用している場面</span> 637 + <span class="info-value"> 638 + <div class="selection-display"> 639 + #foreach($iu in $ictUsage) 640 + <span class="selection-item">$!escapetool.xml($iu.trim())</span> 641 + #end 642 + </div> 643 + </span> 644 + </div> 645 + #end 646 + </div> 647 + </div> 648 + #end 649 + 650 + ## --- 生徒総会 --- 651 + #set($hasAssembly = ($assemblyFormat && $assemblyFormat != '') || ($assemblyCount && $assemblyCount > 0) || ($assemblyAgenda && !$assemblyAgenda.isEmpty()) || ($assemblyTopics && !$assemblyTopics.isEmpty()) || ($assemblyNote && $assemblyNote != '')) 652 + #if($hasAssembly) 653 + <div class="seitokai-subsection"> 654 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg> 生徒総会</h3> 655 + <div class="seitokai-subsection-content"> 656 + #if($assemblyFormat && $assemblyFormat != '') 657 + <div class="info-row"> 658 + <span class="info-label">開催方式</span> 659 + <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($assemblyFormat)</span></span> 660 + </div> 661 + #end 662 + #if($assemblyCount && $assemblyCount > 0) 663 + <div class="info-row"> 664 + <span class="info-label">開催回数(年)</span> 665 + <span class="info-value">$!escapetool.xml($assemblyCount)回</span> 666 + </div> 667 + #end 668 + #if($assemblyAgenda && !$assemblyAgenda.isEmpty()) 669 + <div class="info-row"> 670 + <span class="info-label">議案の集め方</span> 671 + <span class="info-value"> 672 + <div class="selection-display"> 673 + #foreach($aa in $assemblyAgenda) 674 + <span class="selection-item">$!escapetool.xml($aa.trim())</span> 675 + #end 676 + </div> 677 + </span> 678 + </div> 679 + #end 680 + #if($assemblyTopics && !$assemblyTopics.isEmpty()) 681 + <div class="info-row"> 682 + <span class="info-label">扱う内容</span> 683 + <span class="info-value"> 684 + <div class="selection-display"> 685 + #foreach($at in $assemblyTopics) 686 + <span class="selection-item">$!escapetool.xml($at.trim())</span> 687 + #end 688 + </div> 689 + </span> 690 + </div> 691 + #end 692 + #if($assemblyNote && $assemblyNote != '') 693 + <div class="info-row"> 694 + <span class="info-label">自由記述</span> 695 + <span class="info-value free-text-value">$!escapetool.xml($assemblyNote)</span> 696 + </div> 697 + #end 698 + </div> 699 + </div> 700 + #end 701 + 702 + ## --- 広報 --- 703 + #set($hasPublicity = ($publicityMethod && !$publicityMethod.isEmpty()) || ($publicityFrequency && $publicityFrequency != '') || ($publicityNote && $publicityNote != '')) 704 + #if($hasPublicity) 705 + <div class="seitokai-subsection"> 706 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><path d="M1 12s4-8 11-8 11 8 11 8-4 8-11 8-11-8-11-8z"/><circle cx="12" cy="12" r="3"/></svg> 広報</h3> 707 + <div class="seitokai-subsection-content"> 708 + #if($publicityMethod && !$publicityMethod.isEmpty()) 709 + <div class="info-row"> 710 + <span class="info-label">方法</span> 711 + <span class="info-value"> 712 + <div class="selection-display"> 713 + #foreach($pm in $publicityMethod) 714 + <span class="selection-item">$!escapetool.xml($pm.trim())</span> 715 + #end 716 + </div> 717 + </span> 718 + </div> 719 + #end 720 + #if($publicityFrequency && $publicityFrequency != '') 721 + <div class="info-row"> 722 + <span class="info-label">頻度</span> 723 + <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($publicityFrequency)</span></span> 724 + </div> 725 + #end 726 + #if($publicityNote && $publicityNote != '') 727 + <div class="info-row"> 728 + <span class="info-label">自由記述</span> 729 + <span class="info-value free-text-value">$!escapetool.xml($publicityNote)</span> 730 + </div> 731 + #end 732 + </div> 733 + </div> 734 + #end 735 + 736 + ## --- 外部連携 --- 737 + #set($hasExternal = ($externalCooperation && $externalCooperation != '') || ($externalOrgName && $externalOrgName != '') || ($socialParticipation && !$socialParticipation.isEmpty())) 738 + #if($hasExternal) 739 + <div class="seitokai-subsection"> 740 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><circle cx="18" cy="5" r="3"/><circle cx="6" cy="12" r="3"/><circle cx="18" cy="19" r="3"/><line x1="8.59" y1="13.51" x2="15.42" y2="17.49"/><line x1="15.41" y1="6.51" x2="8.59" y2="10.49"/></svg> 外部連携</h3> 741 + <div class="seitokai-subsection-content"> 742 + #if($externalCooperation && $externalCooperation != '') 743 + <div class="info-row"> 744 + <span class="info-label">他校の生徒会との連携</span> 745 + <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($externalCooperation)</span></span> 746 + </div> 747 + #end 748 + #if($externalOrgName && $externalOrgName != '') 749 + <div class="info-row"> 750 + <span class="info-label">参加している生徒会団体の名前</span> 751 + <span class="info-value">$!escapetool.xml($externalOrgName)</span> 752 + </div> 753 + #end 754 + #if($socialParticipation && !$socialParticipation.isEmpty()) 755 + <div class="info-row"> 756 + <span class="info-label">社会参加・地域連携・ボランティア</span> 757 + <span class="info-value"> 758 + <div class="selection-display"> 759 + #foreach($sp2 in $socialParticipation) 760 + <span class="selection-item">$!escapetool.xml($sp2.trim())</span> 761 + #end 762 + </div> 763 + </span> 764 + </div> 765 + #end 766 + </div> 767 + </div> 768 + #end 769 + 770 + ## --- 年間主要行事 --- 771 + #set($months = [["4月", $eventApril], ["5月", $eventMay], ["6月", $eventJune], ["7月", $eventJuly], ["8月", $eventAugust], ["9月", $eventSeptember], ["10月", $eventOctober], ["11月", $eventNovember], ["12月", $eventDecember], ["1月", $eventJanuary], ["2月", $eventFebruary], ["3月", $eventMarch]]) 772 + #set($hasAnyEvent = false) 773 + #foreach($m in $months) 774 + #if($m.get(1) && $m.get(1) != '') #set($hasAnyEvent = true) #end 775 + #end 776 + #if($hasAnyEvent) 777 + <div class="seitokai-subsection"> 778 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="4" width="18" height="18" rx="2" ry="2"/><line x1="16" y1="2" x2="16" y2="6"/><line x1="8" y1="2" x2="8" y2="6"/><line x1="3" y1="10" x2="21" y2="10"/></svg> 年間主要行事</h3> 779 + <div class="seitokai-subsection-content"> 780 + <table class="wiki-table school-info-table" style="margin:0"> 781 + #foreach($m in $months) 782 + #if($m.get(1) && $m.get(1) != '') 783 + <tr><td style="width:60px;font-weight:600;white-space:nowrap">$m.get(0)</td><td>$!escapetool.xml($m.get(1))</td></tr> 784 + #end 785 + #end 786 + </table> 787 + </div> 788 + </div> 789 + #end 790 + 568 568 ## --- 生徒会の課題意識 --- 569 569 #if($challenges && $challenges != '') 570 570 #set($canViewChallenges = true) ... ... @@ -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>799 + <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> 823 + #set($infoEditDate = $!doc.getValue('lastInfoEditedDate')) 824 + #set($infoEditBy = $!doc.getValue('lastInfoEditedBy')) 825 + #if($infoEditDate && $infoEditDate != '') 826 + <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> 827 + #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 967 + <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> 968 + <div class="activity-meta-line"> 969 + <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span> 970 + #set($actTagsList = $activity.getValue('tags')) 971 + #if($actTagsList && !$actTagsList.isEmpty()) 972 + #foreach($tagItem in $actTagsList) 973 + #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end 974 + #end 745 745 #end 746 - #end976 + </div> 747 747 </div> 748 - <div class="thread-meta-r ow">978 + <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 1114 + #set($postAuthorRefH = $!post.getValue('authorRef')) 1115 + #set($postObjNumH = $post.number) 1116 + #if(!$isGuest && $xcontext.user != $postAuthorRefH) 1117 + <button type="button" class="btn-post-report btn-post-report-header" onclick="openReportDialog(this, '${doc.fullName}', $postObjNumH, '${services.csrf.getToken()}')" title="この投稿を通報"> 1118 + <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> 通報 1119 + </button> 1120 + #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>1185 + <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"> 1187 + ## 固定/編集/削除/通報/非表示ボタン(横並び) 1188 + #set($postAuthorRef = $!post.getValue('authorRef')) 1189 + #set($postObjNumED = $post.number) 1190 + #set($showPinBtn = ($viewerAccountType == 'admin' || $viewerAccountType == 'verified')) 1191 + #set($showEditDeleteBtn = ($xcontext.user == $postAuthorRef || $viewerAccountType == 'admin')) 1192 + #set($showHideBtn = ($viewerAccountType == 'admin')) 1193 + #if($showPinBtn || $showEditDeleteBtn || $showHideBtn) 1194 + <div class="post-edit-actions post-action-mt"> 1195 + #if($showPinBtn) 1196 + #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"> 1206 + #end 1207 + #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="この投稿を編集"> 1209 + #set($editImages = $!post.getValue('images')) 1210 + #set($editFiles = $!post.getValue('files')) 1211 + <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> 1218 + #end 1219 + #if($showHideBtn) 1220 + <button type="button" class="btn-post-hide" onclick="openHideDialog(this, '${doc.fullName}', $postObjNumED, '${services.csrf.getToken()}')" title="この投稿を非表示にする"> 1221 + <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> 非表示 1222 + </button> 1223 + #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"> 1273 + #if($isSchoolMember || $isAlumniOfSchool || $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> 1277 + #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) {1444 +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; 1451 + 1452 + var schoolPage = btn.getAttribute('data-school'); 1453 + var postObjNum = btn.getAttribute('data-obj'); 1454 + var currentContent = btn.getAttribute('data-content') || ''; 1455 + var currentImages = btn.getAttribute('data-images') || ''; 1456 + var currentFiles = btn.getAttribute('data-files') || ''; 1457 + var postType = btn.getAttribute('data-post-type') || 'report'; 1458 + 1204 1204 var form = document.createElement('div'); 1205 1205 form.className = 'post-edit-form'; 1206 - form.innerHTML = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&').replace(/</g,'<').replace(/>/g,'>') + '</textarea>' + 1207 - '<div class="post-edit-form-actions">' + 1461 + form.setAttribute('data-school', schoolPage); 1462 + form.setAttribute('data-obj', postObjNum); 1463 + 1464 + var html = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&').replace(/</g,'<').replace(/>/g,'>') + '</textarea>'; 1465 + 1466 + // コメント以外は添付ファイル編集を表示 1467 + if (postType !== 'comment') { 1468 + // 既存画像 1469 + html += '<div class="edit-attachments">'; 1470 + if (currentImages.trim()) { 1471 + html += '<div class="edit-attach-section"><span class="edit-attach-label">画像</span>'; 1472 + var imgs = currentImages.trim().split('\n'); 1473 + for (var i = 0; i < imgs.length; i++) { 1474 + var img = imgs[i].trim(); 1475 + if (!img) continue; 1476 + html += '<div class="edit-attach-item" data-name="' + img.replace(/"/g,'"') + '">' + 1477 + '<img src="/xwiki/bin/download/' + schoolPage.replace(/\./g,'/') + '/' + encodeURIComponent(img) + '" class="edit-attach-thumb" />' + 1478 + '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' + 1479 + '<input type="hidden" name="keepImages" value="' + img.replace(/"/g,'"') + '" />' + 1480 + '</div>'; 1481 + } 1482 + html += '</div>'; 1483 + } 1484 + // 既存ファイル 1485 + if (currentFiles.trim()) { 1486 + html += '<div class="edit-attach-section"><span class="edit-attach-label">ファイル</span>'; 1487 + var files = currentFiles.trim().split('\n'); 1488 + for (var j = 0; j < files.length; j++) { 1489 + var f = files[j].trim(); 1490 + if (!f) continue; 1491 + var displayName = f; 1492 + if (/^file_\d{14}_\d+_/.test(f)) displayName = f.replace(/^file_\d{14}_\d+_/, ''); 1493 + html += '<div class="edit-attach-item" data-name="' + f.replace(/"/g,'"') + '">' + 1494 + '<span class="edit-attach-fname">' + displayName.replace(/</g,'<').replace(/>/g,'>') + '</span>' + 1495 + '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' + 1496 + '<input type="hidden" name="keepFiles" value="' + f.replace(/"/g,'"') + '" />' + 1497 + '</div>'; 1498 + } 1499 + html += '</div>'; 1500 + } 1501 + // 新規追加 1502 + html += '<div class="edit-attach-add">' + 1503 + '<label class="form-label-sm">画像を追加(最大4枚まで)</label>' + 1504 + '<input type="file" name="editNewImages" accept="image/*" multiple class="form-file-input-sm" />' + 1505 + '<div class="form-hint">JPEG / PNG / GIF / WebP、各5MBまで</div>' + 1506 + '<label class="form-label-sm" style="margin-top:8px;">ファイルを追加(最大2つまで)</label>' + 1507 + '<input type="file" name="editNewFiles" accept=".pdf,.docx,.xlsx,.pptx" multiple class="form-file-input-sm" />' + 1508 + '<div class="form-hint">PDF / Word / Excel / PowerPoint、各10MBまで</div>' + 1509 + '</div>'; 1510 + html += '</div>'; 1511 + } 1512 + 1513 + 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>' +1515 + '<button type="button" class="btn-save" onclick="saveEditPost(this)">保存</button>' + 1210 1210 '</div>'; 1517 + 1518 + form.innerHTML = html; 1211 1211 bodyEl.parentNode.insertBefore(form, bodyEl.nextSibling); 1212 1212 form.querySelector('textarea').focus(); 1213 1213 } 1214 1214 1523 +function removeEditAttach(btn) { 1524 + var item = btn.closest('.edit-attach-item'); 1525 + if (item) item.remove(); 1526 +} 1527 + 1215 1215 // 投稿の編集を保存 1216 -function saveEditPost(schoolPage, postObjNum) { 1217 - var textarea = document.getElementById('editContent_' + postObjNum); 1529 +function saveEditPost(btn) { 1530 + var formEl = btn.closest('.post-edit-form'); 1531 + if (!formEl) return; 1532 + var schoolPage = formEl.getAttribute('data-school'); 1533 + var postObjNum = formEl.getAttribute('data-obj'); 1534 + var textarea = formEl.querySelector('textarea'); 1218 1218 if (!textarea) return; 1219 1219 var newContent = textarea.value.trim(); 1220 1220 if (!newContent) { alert('投稿内容を入力してください'); return; } 1538 + 1221 1221 var csrfEl = document.querySelector('input[name="form_token"]'); 1222 1222 var csrfToken = csrfEl ? csrfEl.value : ''; 1541 + 1542 + var fd = new FormData(); 1543 + fd.append('schoolPage', schoolPage); 1544 + fd.append('postObj', postObjNum); 1545 + fd.append('newContent', newContent); 1546 + fd.append('form_token', csrfToken); 1547 + 1548 + // 残す画像・ファイル 1549 + formEl.querySelectorAll('input[name="keepImages"]').forEach(function(el) { fd.append('keepImages', el.value); }); 1550 + formEl.querySelectorAll('input[name="keepFiles"]').forEach(function(el) { fd.append('keepFiles', el.value); }); 1551 + 1552 + // 新規画像 1553 + var newImgInput = formEl.querySelector('input[name="editNewImages"]'); 1554 + if (newImgInput && newImgInput.files) { 1555 + for (var i = 0; i < newImgInput.files.length; i++) { fd.append('editNewImages', newImgInput.files[i]); } 1556 + } 1557 + // 新規ファイル 1558 + var newFileInput = formEl.querySelector('input[name="editNewFiles"]'); 1559 + if (newFileInput && newFileInput.files) { 1560 + for (var j = 0; j < newFileInput.files.length; j++) { fd.append('editNewFiles', newFileInput.files[j]); } 1561 + } 1562 + 1563 + btn.disabled = true; 1564 + btn.textContent = '保存中...'; 1565 + 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 { 1575 + btn.disabled = false; btn.textContent = '保存'; 1234 1234 alert('編集に失敗しました: ' + (res.error || '')); 1235 1235 } 1236 - } catch(e) { alert('編集に失敗しました'); } 1578 + } catch(e) { btn.disabled = false; btn.textContent = '保存'; alert('編集に失敗しました'); } 1237 1237 }; 1238 - xhr.onerror = function() { alert('通信エラーが発生しました'); }; 1239 - xhr.send( editPostData);1580 + xhr.onerror = function() { btn.disabled = false; btn.textContent = '保存'; alert('通信エラーが発生しました'); }; 1581 + 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 } 1605 + 1606 +/* --- 通報ダイアログ --- */ 1607 +function openReportDialog(btn, targetPage, postObjNum, token) { 1608 + if (document.getElementById('report-dialog-overlay')) return; 1609 + var reasons = ['宣伝・スパム','不適切な内容','個人情報の露出','誹謗中傷','誤情報','その他']; 1610 + var overlay = document.createElement('div'); 1611 + overlay.id = 'report-dialog-overlay'; 1612 + 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;'; 1613 + var dialog = document.createElement('div'); 1614 + dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;max-height:80vh;overflow-y:auto;'; 1615 + var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を通報</h3>'; 1616 + html += '<p style="margin:0 0 12px;font-size:0.9em;color:#4b5563;">通報された投稿は管理者が確認するまで一時的に非表示になります。</p>'; 1617 + html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">通報理由</label>'; 1618 + html += '<select id="report-reason" style="width:100%;padding:8px;border:1px solid #d1d5db;border-radius:8px;margin-bottom:12px;font-size:0.9em;">'; 1619 + for (var i=0; i<reasons.length; i++) html += '<option value="'+reasons[i]+'">'+reasons[i]+'</option>'; 1620 + html += '</select>'; 1621 + html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">補足コメント(任意)</label>'; 1622 + 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>'; 1623 + html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">'; 1624 + html += '<button type="button" id="report-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>'; 1625 + 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>'; 1626 + html += '</div>'; 1627 + dialog.innerHTML = html; 1628 + overlay.appendChild(dialog); 1629 + document.body.appendChild(overlay); 1630 + overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); }); 1631 + document.getElementById('report-cancel-btn').addEventListener('click', function() { overlay.remove(); }); 1632 + document.getElementById('report-submit-btn').addEventListener('click', function() { 1633 + var reason = document.getElementById('report-reason').value; 1634 + var detail = document.getElementById('report-detail').value; 1635 + var submitBtn = document.getElementById('report-submit-btn'); 1636 + submitBtn.disabled = true; submitBtn.textContent = '送信中...'; 1637 + var xhr = new XMLHttpRequest(); 1638 + xhr.open('POST', '/bin/get/SeitokaiCode/ReportAction?outputSyntax=plain', true); 1639 + xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'); 1640 + var data = 'targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&detail=' + encodeURIComponent(detail) + '&form_token=' + encodeURIComponent(token); 1641 + xhr.onload = function() { 1642 + overlay.remove(); 1643 + showToast('通報を受け付けました', 'success'); 1644 + setTimeout(function() { location.reload(); }, 1000); 1645 + }; 1646 + xhr.onerror = function() { overlay.remove(); alert('通信エラーが発生しました'); }; 1647 + xhr.send(data); 1648 + }); 1649 +} 1650 + 1651 +/* --- 非表示ダイアログ(管理者用) --- */ 1652 +function openHideDialog(btn, targetPage, postObjNum, token) { 1653 + if (document.getElementById('hide-dialog-overlay')) return; 1654 + var overlay = document.createElement('div'); 1655 + overlay.id = 'hide-dialog-overlay'; 1656 + 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;'; 1657 + var dialog = document.createElement('div'); 1658 + dialog.style.cssText = 'background:#fff;border-radius:12px;padding:24px;max-width:400px;width:90%;'; 1659 + var html = '<h3 style="margin:0 0 16px;font-size:1.1em;">投稿を非表示にする</h3>'; 1660 + html += '<label style="display:block;margin-bottom:8px;font-weight:600;font-size:0.9em;">非表示の理由</label>'; 1661 + 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="理由を入力" />'; 1662 + html += '<div style="display:flex;gap:8px;margin-top:16px;justify-content:flex-end;">'; 1663 + html += '<button type="button" id="hide-cancel-btn" style="padding:8px 16px;border:1px solid #d1d5db;border-radius:8px;background:#fff;cursor:pointer;">キャンセル</button>'; 1664 + 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>'; 1665 + 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>'; 1666 + html += '</div>'; 1667 + dialog.innerHTML = html; 1668 + overlay.appendChild(dialog); 1669 + document.body.appendChild(overlay); 1670 + overlay.addEventListener('click', function(e) { if (e.target === overlay) overlay.remove(); }); 1671 + document.getElementById('hide-cancel-btn').addEventListener('click', function() { overlay.remove(); }); 1672 + function doHide(action) { 1673 + var reason = document.getElementById('hide-reason').value || '管理者判断'; 1674 + window.location.href = '/bin/view/SeitokaiCode/ModerationAction?action=' + action + '&targetPage=' + encodeURIComponent(targetPage) + '&targetPost=' + postObjNum + '&reason=' + encodeURIComponent(reason) + '&form_token=' + encodeURIComponent(token); 1675 + } 1676 + document.getElementById('hide-submit-btn').addEventListener('click', function() { doHide('hide'); }); 1677 + document.getElementById('hide-warn-btn').addEventListener('click', function() { doHide('hide-warn'); }); 1678 +} 1263 1263 </script> 1264 1264 {{/html}} 1265 1265 {{/velocity}}