Changes for page 学校ページ テンプレート
Last modified by Super Admin on 2026/04/05 18:59
From version 
95.1 
95.1
edited by Super Admin
on 2026/03/20 18:03
on 2026/03/20 18:03
Change comment:
There is no comment for this version
To version 83.1
83.1
edited by Super Admin
on 2026/03/19 23:49
on 2026/03/19 23:49
Change comment:
There is no comment for this version
Summary
Details
-
Page properties
-
- Content
-
... ... @@ -57,7 +57,7 @@ 57 57 #set($budgetAllocation = $doc.getValue('budgetAllocation')) 58 58 #set($budgetNote = $doc.getValue('budgetNote')) 59 59 60 -## --- 校則 ・生徒会会則の見直し ---60 +## --- 校則の見直し --- 61 61 #set($ruleReviewStatus = $doc.getValue('ruleReviewStatus')) 62 62 #set($ruleReviewContent = $doc.getValue('ruleReviewContent')) 63 63 #set($ruleReviewProposer = $doc.getValue('ruleReviewProposer')) ... ... @@ -64,43 +64,6 @@ 64 64 #set($ruleReviewImplementer = $doc.getValue('ruleReviewImplementer')) 65 65 #set($ruleReviewSystem = $doc.getValue('ruleReviewSystem')) 66 66 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 - 104 104 ## --- 課題・連絡先 --- 105 105 #set($challenges = $doc.getValue('challenges')) 106 106 #set($contactInfo = $doc.getValue('contactInfo')) ... ... @@ -341,7 +341,7 @@ 341 341 342 342 ## --- 編集ボタン（権限があるユーザーのみ表示） --- 343 343 #set($canEditSchool = false) 344 -#if(!$isGuest && ($isViewerAdmin || $isSchoolMember || $isAlumniOfSchool))307 +#if(!$isGuest && ($isViewerAdmin || $isSchoolMember)) 345 345 #set($canEditSchool = true) 346 346 #end 347 347 #if($canEditSchool) ... ... @@ -394,12 +394,16 @@ 394 394 #if($schoolDescription && $schoolDescription.trim() != '') 395 395 <div class="free-note" style="margin-top:var(--sp-4);">$!escapetool.xml($schoolDescription)</div> 396 396 #end 397 - 360 + #set($infoEditDate = $!doc.getValue('lastInfoEditedDate')) 361 + #set($infoEditBy = $!doc.getValue('lastInfoEditedBy')) 362 + #if($infoEditDate && $infoEditDate != '') 363 + <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> 364 + #end 398 398 </div> 399 399 400 -## --- ② 生徒会情報（折りたたみカード） --- 367 +## --- ② 生徒会基本情報（折りたたみカード） --- 401 401 <div class="school-info-card" id="card-seitokai-info"> 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> 369 + <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> 403 403 <div class="seitokai-info-body"> 404 404 405 405 ## --- 生徒会組織 --- ... ... @@ -411,7 +411,7 @@ 411 411 #end 412 412 #if($canViewOrgChart) 413 413 <div class="seitokai-subsection"> 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>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> 415 415 <div class="seitokai-subsection-content"> 416 416 #if($orgChartImage && $orgChartImage != '') 417 417 <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div> ... ... @@ -429,10 +429,12 @@ 429 429 <div class="seitokai-subsection"> 430 430 <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> 431 431 <div class="seitokai-subsection-content"> 432 - <p class="activity-hint">活動時間 が多い3つ</p>399 + <p class="activity-hint">活動時間の多い順に上位3つ</p> 433 433 <div class="tag-container"> 401 + #set($daIdx = 1) 434 434 #foreach($da in $dailyActivities) 435 - <span class="tag tag-accent">$!escapetool.xml($da.trim())</span> 403 + <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span> 404 + #set($daIdx = $daIdx + 1) 436 436 #end 437 437 </div> 438 438 #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '') ... ... @@ -489,7 +489,7 @@ 489 489 #end 490 490 #if($canViewBudget) 491 491 <div class="seitokai-subsection"> 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>461 + <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> 493 493 <div class="seitokai-subsection-content"> 494 494 #if($budgetProcess && !$budgetProcess.isEmpty()) 495 495 <div class="info-row"> ... ... @@ -496,13 +496,8 @@ 496 496 <span class="info-label">作成過程の生徒関与</span> 497 497 <span class="info-value"> 498 498 <div class="selection-display"> 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 468 + #foreach($bp in $budgetProcess) 469 + <span class="selection-item">$!escapetool.xml($bp.trim())</span> 506 506 #end 507 507 </div> 508 508 </span> ... ... @@ -542,7 +542,7 @@ 542 542 #end 543 543 #end 544 544 545 - ## --- 校則 ・生徒会会則の見直し ---509 + ## --- 校則の見直し --- 546 546 #if($ruleReviewStatus && $ruleReviewStatus != '') 547 547 #set($canViewRuleReview = true) 548 548 #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewRuleReview = false) ... ... @@ -550,13 +550,12 @@ 550 550 #end 551 551 #if($canViewRuleReview) 552 552 <div class="seitokai-subsection"> 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>517 + <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> 554 554 <div class="seitokai-subsection-content"> 555 555 <div class="info-row"> 556 556 <span class="info-label">見直しの有無（3年以内）</span> 557 557 <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span> 558 558 </div> 559 - #if($ruleReviewStatus != '実施なし') 560 560 #if($ruleReviewContent && !$ruleReviewContent.isEmpty()) 561 561 <div class="info-row"> 562 562 <span class="info-label">見直しの内容</span> ... ... @@ -593,7 +593,6 @@ 593 593 </span> 594 594 </div> 595 595 #end 596 - #end 597 597 #if($ruleReviewSystem && $ruleReviewSystem != '') 598 598 <div class="info-row"> 599 599 <span class="info-label">見直しの仕組み</span> ... ... @@ -603,197 +603,10 @@ 603 603 </div> 604 604 </div> 605 605 #else 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>568 + <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> 607 607 #end 608 608 #end 609 609 610 - ## --- 活動環境 --- 611 - #set($hasActivityEnv = ($activityPlace && !$activityPlace.isEmpty()) || ($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.isEmpty()) 617 - <div class="info-row"> 618 - <span class="info-label">普段の活動場所</span> 619 - <span class="info-value"> 620 - <div class="selection-display"> 621 - #foreach($ap in $activityPlace) 622 - <span class="selection-item">$!escapetool.xml($ap.trim())</span> 623 - #end 624 - </div> 625 - </span> 626 - </div> 627 - #end 628 - #if($activityRoomEquipment && $activityRoomEquipment != '') 629 - <div class="info-row"> 630 - <span class="info-label">生徒会室の設備</span> 631 - <span class="info-value free-text-value">$!escapetool.xml($activityRoomEquipment)</span> 632 - </div> 633 - #end 634 - #if($activityRoomImage && $activityRoomImage != '') 635 - <div class="info-row"> 636 - <span class="info-label">活動場所の写真</span> 637 - <span class="info-value"><div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($activityRoomImage)" alt="活動場所の写真" class="org-chart-img" /></div></span> 638 - </div> 639 - #end 640 - #if($ictUsage && !$ictUsage.isEmpty()) 641 - <div class="info-row"> 642 - <span class="info-label">ICT活用している場面</span> 643 - <span class="info-value"> 644 - <div class="selection-display"> 645 - #foreach($iu in $ictUsage) 646 - <span class="selection-item">$!escapetool.xml($iu.trim())</span> 647 - #end 648 - </div> 649 - </span> 650 - </div> 651 - #end 652 - </div> 653 - </div> 654 - #end 655 - 656 - ## --- 生徒総会 --- 657 - #set($hasAssembly = ($assemblyFormat && $assemblyFormat != '') || ($assemblyCount && $assemblyCount > 0) || ($assemblyAgenda && !$assemblyAgenda.isEmpty()) || ($assemblyTopics && !$assemblyTopics.isEmpty()) || ($assemblyNote && $assemblyNote != '')) 658 - #if($hasAssembly) 659 - <div class="seitokai-subsection"> 660 - <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> 661 - <div class="seitokai-subsection-content"> 662 - #if($assemblyFormat && $assemblyFormat != '') 663 - <div class="info-row"> 664 - <span class="info-label">開催方式</span> 665 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($assemblyFormat)</span></span> 666 - </div> 667 - #end 668 - #if($assemblyCount && $assemblyCount > 0) 669 - <div class="info-row"> 670 - <span class="info-label">開催回数（年）</span> 671 - <span class="info-value">$!escapetool.xml($assemblyCount)回</span> 672 - </div> 673 - #end 674 - #if($assemblyAgenda && !$assemblyAgenda.isEmpty()) 675 - <div class="info-row"> 676 - <span class="info-label">議案の集め方</span> 677 - <span class="info-value"> 678 - <div class="selection-display"> 679 - #foreach($aa in $assemblyAgenda) 680 - <span class="selection-item">$!escapetool.xml($aa.trim())</span> 681 - #end 682 - </div> 683 - </span> 684 - </div> 685 - #end 686 - #if($assemblyTopics && !$assemblyTopics.isEmpty()) 687 - <div class="info-row"> 688 - <span class="info-label">扱う内容</span> 689 - <span class="info-value"> 690 - <div class="selection-display"> 691 - #foreach($at in $assemblyTopics) 692 - <span class="selection-item">$!escapetool.xml($at.trim())</span> 693 - #end 694 - </div> 695 - </span> 696 - </div> 697 - #end 698 - #if($assemblyNote && $assemblyNote != '') 699 - <div class="info-row"> 700 - <span class="info-label">自由記述</span> 701 - <span class="info-value free-text-value">$!escapetool.xml($assemblyNote)</span> 702 - </div> 703 - #end 704 - </div> 705 - </div> 706 - #end 707 - 708 - ## --- 広報 --- 709 - #set($hasPublicity = ($publicityMethod && !$publicityMethod.isEmpty()) || ($publicityFrequency && $publicityFrequency != '') || ($publicityNote && $publicityNote != '')) 710 - #if($hasPublicity) 711 - <div class="seitokai-subsection"> 712 - <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> 713 - <div class="seitokai-subsection-content"> 714 - #if($publicityMethod && !$publicityMethod.isEmpty()) 715 - <div class="info-row"> 716 - <span class="info-label">方法</span> 717 - <span class="info-value"> 718 - <div class="selection-display"> 719 - #foreach($pm in $publicityMethod) 720 - <span class="selection-item">$!escapetool.xml($pm.trim())</span> 721 - #end 722 - </div> 723 - </span> 724 - </div> 725 - #end 726 - #if($publicityFrequency && $publicityFrequency != '') 727 - <div class="info-row"> 728 - <span class="info-label">頻度</span> 729 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($publicityFrequency)</span></span> 730 - </div> 731 - #end 732 - #if($publicityNote && $publicityNote != '') 733 - <div class="info-row"> 734 - <span class="info-label">自由記述</span> 735 - <span class="info-value free-text-value">$!escapetool.xml($publicityNote)</span> 736 - </div> 737 - #end 738 - </div> 739 - </div> 740 - #end 741 - 742 - ## --- 外部連携 --- 743 - #set($hasExternal = ($externalCooperation && $externalCooperation != '') || ($externalOrgName && $externalOrgName != '') || ($socialParticipation && !$socialParticipation.isEmpty())) 744 - #if($hasExternal) 745 - <div class="seitokai-subsection"> 746 - <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> 747 - <div class="seitokai-subsection-content"> 748 - #if($externalCooperation && $externalCooperation != '') 749 - <div class="info-row"> 750 - <span class="info-label">他校の生徒会との連携</span> 751 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($externalCooperation)</span></span> 752 - </div> 753 - #end 754 - #if($externalOrgName && $externalOrgName != '') 755 - <div class="info-row"> 756 - <span class="info-label">参加している生徒会団体の名前</span> 757 - <span class="info-value">$!escapetool.xml($externalOrgName)</span> 758 - </div> 759 - #end 760 - #if($socialParticipation && !$socialParticipation.isEmpty()) 761 - <div class="info-row"> 762 - <span class="info-label">社会参加・地域連携・ボランティア</span> 763 - <span class="info-value"> 764 - <div class="selection-display"> 765 - #foreach($sp2 in $socialParticipation) 766 - <span class="selection-item">$!escapetool.xml($sp2.trim())</span> 767 - #end 768 - </div> 769 - </span> 770 - </div> 771 - #end 772 - </div> 773 - </div> 774 - #end 775 - 776 - ## --- 年間主要行事 --- 777 - #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]]) 778 - #set($hasAnyEvent = false) 779 - #foreach($m in $months) 780 - #if($m.get(1) && $m.get(1) != '') #set($hasAnyEvent = true) #end 781 - #end 782 - #if($hasAnyEvent) 783 - <div class="seitokai-subsection"> 784 - <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> 785 - <div class="seitokai-subsection-content"> 786 - <table class="wiki-table school-info-table" style="margin:0"> 787 - #foreach($m in $months) 788 - #if($m.get(1) && $m.get(1) != '') 789 - <tr><td style="width:60px;font-weight:600;white-space:nowrap">$m.get(0)</td><td>$!escapetool.xml($m.get(1))</td></tr> 790 - #end 791 - #end 792 - </table> 793 - </div> 794 - </div> 795 - #end 796 - 797 797 ## --- 生徒会の課題意識 --- 798 798 #if($challenges && $challenges != '') 799 799 #set($canViewChallenges = true) ... ... @@ -802,7 +802,7 @@ 802 802 #end 803 803 #if($canViewChallenges) 804 804 <div class="seitokai-subsection"> 805 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M12 16v-4"/><path d="M12 8h.01"/></svg> 生徒会の課題意識 #if($visibilityChallenges != 'public')<span class="visibility-badge visibility-${visibilityChallenges}">#if($visibilityChallenges == 'school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z"/></svg> 校内承認 ・紹介限定#else<svg class="ico" viewBox="0 0 24 24"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>580 + <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> 806 806 <div class="seitokai-subsection-content"> 807 807 <div class="challenge-text">$!escapetool.xml($challenges)</div> 808 808 </div> ... ... @@ -826,11 +826,6 @@ 826 826 <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> 827 827 <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr> 828 828 </table> 829 - #set($infoEditDate = $!doc.getValue('lastInfoEditedDate')) 830 - #set($infoEditBy = $!doc.getValue('lastInfoEditedBy')) 831 - #if($infoEditDate && $infoEditDate != '') 832 - <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> 833 - #end 834 834 </div> 835 835 836 836 {{/html}} ... ... @@ -1188,7 +1188,7 @@ 1188 1188 #end 1189 1189 </div> 1190 1190 #if($postVis != 'public') 1191 - <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>961 + <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> 1192 1192 #end 1193 1193 ## 固定/編集/削除/通報/非表示ボタン（横並び） 1194 1194 #set($postAuthorRef = $!post.getValue('authorRef')) ... ... @@ -1212,9 +1212,7 @@ 1212 1212 #end 1213 1213 #if($showEditDeleteBtn) 1214 1214 #if($xcontext.user == $postAuthorRef) 1215 - #set($editImages = $!post.getValue('images')) 1216 - #set($editFiles = $!post.getValue('files')) 1217 - <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="この投稿を編集"> 985 + <button type="button" class="btn-post-edit" onclick="openEditPost(this, '${doc.fullName}', $postObjNumED, '$!escapetool.javascript($!postContent)')" title="この投稿を編集"> 1218 1218 <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> 編集 1219 1219 </button> 1220 1220 #end ... ... @@ -1276,7 +1276,7 @@ 1276 1276 1277 1277 #if($xcontext.user != "XWiki.XWikiGuest") 1278 1278 <div class="thread-add-post"> 1279 - #if($isSchoolMember || $is AlumniOfSchool || $isViewerAdmin)1047 + #if($isSchoolMember || $isViewerAdmin) 1280 1280 <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add"> 1281 1281 ＋ 活動報告を追加 1282 1282 </a> ... ... @@ -1447,130 +1447,37 @@ 1447 1447 } 1448 1448 1449 1449 // 投稿の編集（インライン編集フォームを開く） 1450 -function openEditPost(btn) { 1218 +function openEditPost(btn, schoolPage, postObjNum, currentContent) { 1451 1451 var postEl = btn.closest('.thread-post'); 1452 1452 if (!postEl) return; 1221 + // 既存の編集フォームがあれば閉じる 1453 1453 var existing = postEl.querySelector('.post-edit-form'); 1454 1454 if (existing) { existing.remove(); return; } 1455 1455 var bodyEl = postEl.querySelector('.thread-post-body'); 1456 1456 if (!bodyEl) return; 1457 - 1458 - var schoolPage = btn.getAttribute('data-school'); 1459 - var postObjNum = btn.getAttribute('data-obj'); 1460 - var currentContent = btn.getAttribute('data-content') || ''; 1461 - var currentImages = btn.getAttribute('data-images') || ''; 1462 - var currentFiles = btn.getAttribute('data-files') || ''; 1463 - var postType = btn.getAttribute('data-post-type') || 'report'; 1464 - 1465 1465 var form = document.createElement('div'); 1466 1466 form.className = 'post-edit-form'; 1467 - form.setAttribute('data-school', schoolPage); 1468 - form.setAttribute('data-obj', postObjNum); 1469 - 1470 - var html = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&').replace(/</g,'<').replace(/>/g,'>') + '</textarea>'; 1471 - 1472 - // コメント以外は添付ファイル編集を表示 1473 - if (postType !== 'comment') { 1474 - // 既存画像 1475 - html += '<div class="edit-attachments">'; 1476 - if (currentImages.trim()) { 1477 - html += '<div class="edit-attach-section"><span class="edit-attach-label">画像</span>'; 1478 - var imgs = currentImages.trim().split('\n'); 1479 - for (var i = 0; i < imgs.length; i++) { 1480 - var img = imgs[i].trim(); 1481 - if (!img) continue; 1482 - html += '<div class="edit-attach-item" data-name="' + img.replace(/"/g,'"') + '">' + 1483 - '<img src="/xwiki/bin/download/' + schoolPage.replace(/\./g,'/') + '/' + encodeURIComponent(img) + '" class="edit-attach-thumb" />' + 1484 - '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' + 1485 - '<input type="hidden" name="keepImages" value="' + img.replace(/"/g,'"') + '" />' + 1486 - '</div>'; 1487 - } 1488 - html += '</div>'; 1489 - } 1490 - // 既存ファイル 1491 - if (currentFiles.trim()) { 1492 - html += '<div class="edit-attach-section"><span class="edit-attach-label">ファイル</span>'; 1493 - var files = currentFiles.trim().split('\n'); 1494 - for (var j = 0; j < files.length; j++) { 1495 - var f = files[j].trim(); 1496 - if (!f) continue; 1497 - var displayName = f; 1498 - if (/^file_\d{14}_\d+_/.test(f)) displayName = f.replace(/^file_\d{14}_\d+_/, ''); 1499 - html += '<div class="edit-attach-item" data-name="' + f.replace(/"/g,'"') + '">' + 1500 - '<span class="edit-attach-fname">' + displayName.replace(/</g,'<').replace(/>/g,'>') + '</span>' + 1501 - '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' + 1502 - '<input type="hidden" name="keepFiles" value="' + f.replace(/"/g,'"') + '" />' + 1503 - '</div>'; 1504 - } 1505 - html += '</div>'; 1506 - } 1507 - // 新規追加 1508 - html += '<div class="edit-attach-add">' + 1509 - '<label class="form-label-sm">画像を追加（最大4枚まで）</label>' + 1510 - '<input type="file" name="editNewImages" accept="image/*" multiple class="form-file-input-sm" />' + 1511 - '<div class="form-hint">JPEG / PNG / GIF / WebP、各5MBまで</div>' + 1512 - '<label class="form-label-sm" style="margin-top:8px;">ファイルを追加（最大2つまで）</label>' + 1513 - '<input type="file" name="editNewFiles" accept=".pdf,.docx,.xlsx,.pptx" multiple class="form-file-input-sm" />' + 1514 - '<div class="form-hint">PDF / Word / Excel / PowerPoint、各10MBまで</div>' + 1515 - '</div>'; 1516 - html += '</div>'; 1517 - } 1518 - 1519 - html += '<div class="post-edit-form-actions">' + 1228 + form.innerHTML = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&').replace(/</g,'<').replace(/>/g,'>') + '</textarea>' + 1229 + '<div class="post-edit-form-actions">' + 1520 1520 '<button type="button" class="btn-cancel-edit" onclick="this.closest(\'.post-edit-form\').remove()">キャンセル</button>' + 1521 - '<button type="button" class="btn-save" onclick="saveEditPost( this)">保存</button>' +1231 + '<button type="button" class="btn-save" onclick="saveEditPost(\'' + schoolPage + '\', ' + postObjNum + ')">保存</button>' + 1522 1522 '</div>'; 1523 - 1524 - form.innerHTML = html; 1525 1525 bodyEl.parentNode.insertBefore(form, bodyEl.nextSibling); 1526 1526 form.querySelector('textarea').focus(); 1527 1527 } 1528 1528 1529 -function removeEditAttach(btn) { 1530 - var item = btn.closest('.edit-attach-item'); 1531 - if (item) item.remove(); 1532 -} 1533 - 1534 1534 // 投稿の編集を保存 1535 -function saveEditPost(btn) { 1536 - var formEl = btn.closest('.post-edit-form'); 1537 - if (!formEl) return; 1538 - var schoolPage = formEl.getAttribute('data-school'); 1539 - var postObjNum = formEl.getAttribute('data-obj'); 1540 - var textarea = formEl.querySelector('textarea'); 1238 +function saveEditPost(schoolPage, postObjNum) { 1239 + var textarea = document.getElementById('editContent_' + postObjNum); 1541 1541 if (!textarea) return; 1542 1542 var newContent = textarea.value.trim(); 1543 1543 if (!newContent) { alert('投稿内容を入力してください'); return; } 1544 - 1545 1545 var csrfEl = document.querySelector('input[name="form_token"]'); 1546 1546 var csrfToken = csrfEl ? csrfEl.value : ''; 1547 - 1548 - var fd = new FormData(); 1549 - fd.append('schoolPage', schoolPage); 1550 - fd.append('postObj', postObjNum); 1551 - fd.append('newContent', newContent); 1552 - fd.append('form_token', csrfToken); 1553 - 1554 - // 残す画像・ファイル 1555 - formEl.querySelectorAll('input[name="keepImages"]').forEach(function(el) { fd.append('keepImages', el.value); }); 1556 - formEl.querySelectorAll('input[name="keepFiles"]').forEach(function(el) { fd.append('keepFiles', el.value); }); 1557 - 1558 - // 新規画像 1559 - var newImgInput = formEl.querySelector('input[name="editNewImages"]'); 1560 - if (newImgInput && newImgInput.files) { 1561 - for (var i = 0; i < newImgInput.files.length; i++) { fd.append('editNewImages', newImgInput.files[i]); } 1562 - } 1563 - // 新規ファイル 1564 - var newFileInput = formEl.querySelector('input[name="editNewFiles"]'); 1565 - if (newFileInput && newFileInput.files) { 1566 - for (var j = 0; j < newFileInput.files.length; j++) { fd.append('editNewFiles', newFileInput.files[j]); } 1567 - } 1568 - 1569 - btn.disabled = true; 1570 - btn.textContent = '保存中...'; 1571 - 1572 1572 var xhr = new XMLHttpRequest(); 1573 1573 xhr.open('POST', '/bin/get/SeitokaiCode/EditPost?outputSyntax=plain', true); 1247 + xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'); 1248 + var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken); 1574 1574 xhr.onload = function() { 1575 1575 try { 1576 1576 var res = JSON.parse(xhr.responseText); ... ... @@ -1578,13 +1578,12 @@ 1578 1578 showToast('投稿を更新しました', 'success'); 1579 1579 setTimeout(function() { location.reload(); }, 800); 1580 1580 } else { 1581 - btn.disabled = false; btn.textContent = '保存'; 1582 1582 alert('編集に失敗しました: ' + (res.error || '')); 1583 1583 } 1584 - } catch(e) { btn.disabled = false; btn.textContent = '保存'; alert('編集に失敗しました'); }1258 + } catch(e) { alert('編集に失敗しました'); } 1585 1585 }; 1586 - xhr.onerror = function() { btn.disabled = false; btn.textContent = '保存'; alert('通信エラーが発生しました'); };1587 - xhr.send( fd);1260 + xhr.onerror = function() { alert('通信エラーが発生しました'); }; 1261 + xhr.send(editPostData); 1588 1588 } 1589 1589 1590 1590 // 投稿の削除（確認ダイアログ付き）