Changes for page 学校ページ テンプレート
Last modified by Super Admin on 2026/04/05 18:59
From version 
96.1 
96.1
edited by Super Admin
on 2026/03/20 18:06
on 2026/03/20 18:06
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')) ... ... @@ -125,14 +125,6 @@ 125 125 #set($visibilityBudget = $!doc.getValue('visibilityBudget')) 126 126 #set($visibilityRuleReview = $!doc.getValue('visibilityRuleReview')) 127 127 #set($visibilityChallenges = $!doc.getValue('visibilityChallenges')) 128 -#set($visibilityDailyActivities = $!doc.getValue('visibilityDailyActivities')) 129 -#set($visibilityElection = $!doc.getValue('visibilityElection')) 130 -#set($visibilityMeeting = $!doc.getValue('visibilityMeeting')) 131 -#set($visibilityActivityEnv = $!doc.getValue('visibilityActivityEnv')) 132 -#set($visibilityAssembly = $!doc.getValue('visibilityAssembly')) 133 -#set($visibilityPublicity = $!doc.getValue('visibilityPublicity')) 134 -#set($visibilityExternal = $!doc.getValue('visibilityExternal')) 135 -#set($visibilityAnnualEvents = $!doc.getValue('visibilityAnnualEvents')) 136 136 ## デフォルト値（未設定なら全体公開） 137 137 #if(!$visibilityOrgChart || $visibilityOrgChart == '') #set($visibilityOrgChart = 'public') #end 138 138 #if(!$visibilityBudget || $visibilityBudget == '') #set($visibilityBudget = 'public') #end ... ... @@ -349,7 +349,7 @@ 349 349 350 350 ## --- 編集ボタン（権限があるユーザーのみ表示） --- 351 351 #set($canEditSchool = false) 352 -#if(!$isGuest && ($isViewerAdmin || $isSchoolMember || $isAlumniOfSchool))307 +#if(!$isGuest && ($isViewerAdmin || $isSchoolMember)) 353 353 #set($canEditSchool = true) 354 354 #end 355 355 #if($canEditSchool) ... ... @@ -402,12 +402,16 @@ 402 402 #if($schoolDescription && $schoolDescription.trim() != '') 403 403 <div class="free-note" style="margin-top:var(--sp-4);">$!escapetool.xml($schoolDescription)</div> 404 404 #end 405 - 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 406 406 </div> 407 407 408 -## --- ② 生徒会情報（折りたたみカード） --- 367 +## --- ② 生徒会基本情報（折りたたみカード） --- 409 409 <div class="school-info-card" id="card-seitokai-info"> 410 - <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> 411 411 <div class="seitokai-info-body"> 412 412 413 413 ## --- 生徒会組織 --- ... ... @@ -419,7 +419,7 @@ 419 419 #end 420 420 #if($canViewOrgChart) 421 421 <div class="seitokai-subsection"> 422 - <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> 423 423 <div class="seitokai-subsection-content"> 424 424 #if($orgChartImage && $orgChartImage != '') 425 425 <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div> ... ... @@ -437,10 +437,12 @@ 437 437 <div class="seitokai-subsection"> 438 438 <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> 439 439 <div class="seitokai-subsection-content"> 440 - <p class="activity-hint">活動時間 が多い3つ</p>399 + <p class="activity-hint">活動時間の多い順に上位3つ</p> 441 441 <div class="tag-container"> 401 + #set($daIdx = 1) 442 442 #foreach($da in $dailyActivities) 443 - <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) 444 444 #end 445 445 </div> 446 446 #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '') ... ... @@ -497,7 +497,7 @@ 497 497 #end 498 498 #if($canViewBudget) 499 499 <div class="seitokai-subsection"> 500 - <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> 501 501 <div class="seitokai-subsection-content"> 502 502 #if($budgetProcess && !$budgetProcess.isEmpty()) 503 503 <div class="info-row"> ... ... @@ -504,13 +504,8 @@ 504 504 <span class="info-label">作成過程の生徒関与</span> 505 505 <span class="info-value"> 506 506 <div class="selection-display"> 507 - #set($allBpOpts = ["各部・委員会等への予算希望額調査","予算額調整（折衝等）","生徒会予算案の作成","生徒総会での議決","生徒関与なし","その他"]) 508 - #foreach($bpOpt in $allBpOpts) 509 - #if($budgetProcess.contains($bpOpt)) 510 - <span class="selection-item">$!escapetool.xml($bpOpt)</span> 511 - #else 512 - <span class="selection-item selection-item-off">$!escapetool.xml($bpOpt)</span> 513 - #end 468 + #foreach($bp in $budgetProcess) 469 + <span class="selection-item">$!escapetool.xml($bp.trim())</span> 514 514 #end 515 515 </div> 516 516 </span> ... ... @@ -550,7 +550,7 @@ 550 550 #end 551 551 #end 552 552 553 - ## --- 校則 ・生徒会会則の見直し ---509 + ## --- 校則の見直し --- 554 554 #if($ruleReviewStatus && $ruleReviewStatus != '') 555 555 #set($canViewRuleReview = true) 556 556 #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewRuleReview = false) ... ... @@ -558,13 +558,12 @@ 558 558 #end 559 559 #if($canViewRuleReview) 560 560 <div class="seitokai-subsection"> 561 - <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> 562 562 <div class="seitokai-subsection-content"> 563 563 <div class="info-row"> 564 564 <span class="info-label">見直しの有無（3年以内）</span> 565 565 <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span> 566 566 </div> 567 - #if($ruleReviewStatus != '実施なし') 568 568 #if($ruleReviewContent && !$ruleReviewContent.isEmpty()) 569 569 <div class="info-row"> 570 570 <span class="info-label">見直しの内容</span> ... ... @@ -601,7 +601,6 @@ 601 601 </span> 602 602 </div> 603 603 #end 604 - #end 605 605 #if($ruleReviewSystem && $ruleReviewSystem != '') 606 606 <div class="info-row"> 607 607 <span class="info-label">見直しの仕組み</span> ... ... @@ -611,197 +611,10 @@ 611 611 </div> 612 612 </div> 613 613 #else 614 - <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> 615 615 #end 616 616 #end 617 617 618 - ## --- 活動環境 --- 619 - #set($hasActivityEnv = ($activityPlace && !$activityPlace.isEmpty()) || ($activityRoomEquipment && $activityRoomEquipment != '') || ($activityRoomImage && $activityRoomImage != '') || ($ictUsage && !$ictUsage.isEmpty())) 620 - #if($hasActivityEnv) 621 - <div class="seitokai-subsection"> 622 - <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> 623 - <div class="seitokai-subsection-content"> 624 - #if($activityPlace && !$activityPlace.isEmpty()) 625 - <div class="info-row"> 626 - <span class="info-label">普段の活動場所</span> 627 - <span class="info-value"> 628 - <div class="selection-display"> 629 - #foreach($ap in $activityPlace) 630 - <span class="selection-item">$!escapetool.xml($ap.trim())</span> 631 - #end 632 - </div> 633 - </span> 634 - </div> 635 - #end 636 - #if($activityRoomEquipment && $activityRoomEquipment != '') 637 - <div class="info-row"> 638 - <span class="info-label">生徒会室の設備</span> 639 - <span class="info-value free-text-value">$!escapetool.xml($activityRoomEquipment)</span> 640 - </div> 641 - #end 642 - #if($activityRoomImage && $activityRoomImage != '') 643 - <div class="info-row"> 644 - <span class="info-label">活動場所の写真</span> 645 - <span class="info-value"><div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($activityRoomImage)" alt="活動場所の写真" class="org-chart-img" /></div></span> 646 - </div> 647 - #end 648 - #if($ictUsage && !$ictUsage.isEmpty()) 649 - <div class="info-row"> 650 - <span class="info-label">ICT活用している場面</span> 651 - <span class="info-value"> 652 - <div class="selection-display"> 653 - #foreach($iu in $ictUsage) 654 - <span class="selection-item">$!escapetool.xml($iu.trim())</span> 655 - #end 656 - </div> 657 - </span> 658 - </div> 659 - #end 660 - </div> 661 - </div> 662 - #end 663 - 664 - ## --- 生徒総会 --- 665 - #set($hasAssembly = ($assemblyFormat && $assemblyFormat != '') || ($assemblyCount && $assemblyCount > 0) || ($assemblyAgenda && !$assemblyAgenda.isEmpty()) || ($assemblyTopics && !$assemblyTopics.isEmpty()) || ($assemblyNote && $assemblyNote != '')) 666 - #if($hasAssembly) 667 - <div class="seitokai-subsection"> 668 - <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> 669 - <div class="seitokai-subsection-content"> 670 - #if($assemblyFormat && $assemblyFormat != '') 671 - <div class="info-row"> 672 - <span class="info-label">開催方式</span> 673 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($assemblyFormat)</span></span> 674 - </div> 675 - #end 676 - #if($assemblyCount && $assemblyCount > 0) 677 - <div class="info-row"> 678 - <span class="info-label">開催回数（年）</span> 679 - <span class="info-value">$!escapetool.xml($assemblyCount)回</span> 680 - </div> 681 - #end 682 - #if($assemblyAgenda && !$assemblyAgenda.isEmpty()) 683 - <div class="info-row"> 684 - <span class="info-label">議案の集め方</span> 685 - <span class="info-value"> 686 - <div class="selection-display"> 687 - #foreach($aa in $assemblyAgenda) 688 - <span class="selection-item">$!escapetool.xml($aa.trim())</span> 689 - #end 690 - </div> 691 - </span> 692 - </div> 693 - #end 694 - #if($assemblyTopics && !$assemblyTopics.isEmpty()) 695 - <div class="info-row"> 696 - <span class="info-label">扱う内容</span> 697 - <span class="info-value"> 698 - <div class="selection-display"> 699 - #foreach($at in $assemblyTopics) 700 - <span class="selection-item">$!escapetool.xml($at.trim())</span> 701 - #end 702 - </div> 703 - </span> 704 - </div> 705 - #end 706 - #if($assemblyNote && $assemblyNote != '') 707 - <div class="info-row"> 708 - <span class="info-label">自由記述</span> 709 - <span class="info-value free-text-value">$!escapetool.xml($assemblyNote)</span> 710 - </div> 711 - #end 712 - </div> 713 - </div> 714 - #end 715 - 716 - ## --- 広報 --- 717 - #set($hasPublicity = ($publicityMethod && !$publicityMethod.isEmpty()) || ($publicityFrequency && $publicityFrequency != '') || ($publicityNote && $publicityNote != '')) 718 - #if($hasPublicity) 719 - <div class="seitokai-subsection"> 720 - <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> 721 - <div class="seitokai-subsection-content"> 722 - #if($publicityMethod && !$publicityMethod.isEmpty()) 723 - <div class="info-row"> 724 - <span class="info-label">方法</span> 725 - <span class="info-value"> 726 - <div class="selection-display"> 727 - #foreach($pm in $publicityMethod) 728 - <span class="selection-item">$!escapetool.xml($pm.trim())</span> 729 - #end 730 - </div> 731 - </span> 732 - </div> 733 - #end 734 - #if($publicityFrequency && $publicityFrequency != '') 735 - <div class="info-row"> 736 - <span class="info-label">頻度</span> 737 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($publicityFrequency)</span></span> 738 - </div> 739 - #end 740 - #if($publicityNote && $publicityNote != '') 741 - <div class="info-row"> 742 - <span class="info-label">自由記述</span> 743 - <span class="info-value free-text-value">$!escapetool.xml($publicityNote)</span> 744 - </div> 745 - #end 746 - </div> 747 - </div> 748 - #end 749 - 750 - ## --- 外部連携 --- 751 - #set($hasExternal = ($externalCooperation && $externalCooperation != '') || ($externalOrgName && $externalOrgName != '') || ($socialParticipation && !$socialParticipation.isEmpty())) 752 - #if($hasExternal) 753 - <div class="seitokai-subsection"> 754 - <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> 755 - <div class="seitokai-subsection-content"> 756 - #if($externalCooperation && $externalCooperation != '') 757 - <div class="info-row"> 758 - <span class="info-label">他校の生徒会との連携</span> 759 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($externalCooperation)</span></span> 760 - </div> 761 - #end 762 - #if($externalOrgName && $externalOrgName != '') 763 - <div class="info-row"> 764 - <span class="info-label">参加している生徒会団体の名前</span> 765 - <span class="info-value">$!escapetool.xml($externalOrgName)</span> 766 - </div> 767 - #end 768 - #if($socialParticipation && !$socialParticipation.isEmpty()) 769 - <div class="info-row"> 770 - <span class="info-label">社会参加・地域連携・ボランティア</span> 771 - <span class="info-value"> 772 - <div class="selection-display"> 773 - #foreach($sp2 in $socialParticipation) 774 - <span class="selection-item">$!escapetool.xml($sp2.trim())</span> 775 - #end 776 - </div> 777 - </span> 778 - </div> 779 - #end 780 - </div> 781 - </div> 782 - #end 783 - 784 - ## --- 年間主要行事 --- 785 - #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]]) 786 - #set($hasAnyEvent = false) 787 - #foreach($m in $months) 788 - #if($m.get(1) && $m.get(1) != '') #set($hasAnyEvent = true) #end 789 - #end 790 - #if($hasAnyEvent) 791 - <div class="seitokai-subsection"> 792 - <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> 793 - <div class="seitokai-subsection-content"> 794 - <table class="wiki-table school-info-table" style="margin:0"> 795 - #foreach($m in $months) 796 - #if($m.get(1) && $m.get(1) != '') 797 - <tr><td style="width:60px;font-weight:600;white-space:nowrap">$m.get(0)</td><td>$!escapetool.xml($m.get(1))</td></tr> 798 - #end 799 - #end 800 - </table> 801 - </div> 802 - </div> 803 - #end 804 - 805 805 ## --- 生徒会の課題意識 --- 806 806 #if($challenges && $challenges != '') 807 807 #set($canViewChallenges = true) ... ... @@ -810,7 +810,7 @@ 810 810 #end 811 811 #if($canViewChallenges) 812 812 <div class="seitokai-subsection"> 813 - <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> 814 814 <div class="seitokai-subsection-content"> 815 815 <div class="challenge-text">$!escapetool.xml($challenges)</div> 816 816 </div> ... ... @@ -834,11 +834,6 @@ 834 834 <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> 835 835 <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr> 836 836 </table> 837 - #set($infoEditDate = $!doc.getValue('lastInfoEditedDate')) 838 - #set($infoEditBy = $!doc.getValue('lastInfoEditedBy')) 839 - #if($infoEditDate && $infoEditDate != '') 840 - <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> 841 - #end 842 842 </div> 843 843 844 844 {{/html}} ... ... @@ -1196,7 +1196,7 @@ 1196 1196 #end 1197 1197 </div> 1198 1198 #if($postVis != 'public') 1199 - <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> 1200 1200 #end 1201 1201 ## 固定/編集/削除/通報/非表示ボタン（横並び） 1202 1202 #set($postAuthorRef = $!post.getValue('authorRef')) ... ... @@ -1220,9 +1220,7 @@ 1220 1220 #end 1221 1221 #if($showEditDeleteBtn) 1222 1222 #if($xcontext.user == $postAuthorRef) 1223 - #set($editImages = $!post.getValue('images')) 1224 - #set($editFiles = $!post.getValue('files')) 1225 - <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="この投稿を編集"> 1226 1226 <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> 編集 1227 1227 </button> 1228 1228 #end ... ... @@ -1284,7 +1284,7 @@ 1284 1284 1285 1285 #if($xcontext.user != "XWiki.XWikiGuest") 1286 1286 <div class="thread-add-post"> 1287 - #if($isSchoolMember || $is AlumniOfSchool || $isViewerAdmin)1047 + #if($isSchoolMember || $isViewerAdmin) 1288 1288 <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add"> 1289 1289 ＋ 活動報告を追加 1290 1290 </a> ... ... @@ -1455,130 +1455,37 @@ 1455 1455 } 1456 1456 1457 1457 // 投稿の編集（インライン編集フォームを開く） 1458 -function openEditPost(btn) { 1218 +function openEditPost(btn, schoolPage, postObjNum, currentContent) { 1459 1459 var postEl = btn.closest('.thread-post'); 1460 1460 if (!postEl) return; 1221 + // 既存の編集フォームがあれば閉じる 1461 1461 var existing = postEl.querySelector('.post-edit-form'); 1462 1462 if (existing) { existing.remove(); return; } 1463 1463 var bodyEl = postEl.querySelector('.thread-post-body'); 1464 1464 if (!bodyEl) return; 1465 - 1466 - var schoolPage = btn.getAttribute('data-school'); 1467 - var postObjNum = btn.getAttribute('data-obj'); 1468 - var currentContent = btn.getAttribute('data-content') || ''; 1469 - var currentImages = btn.getAttribute('data-images') || ''; 1470 - var currentFiles = btn.getAttribute('data-files') || ''; 1471 - var postType = btn.getAttribute('data-post-type') || 'report'; 1472 - 1473 1473 var form = document.createElement('div'); 1474 1474 form.className = 'post-edit-form'; 1475 - form.setAttribute('data-school', schoolPage); 1476 - form.setAttribute('data-obj', postObjNum); 1477 - 1478 - var html = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&').replace(/</g,'<').replace(/>/g,'>') + '</textarea>'; 1479 - 1480 - // コメント以外は添付ファイル編集を表示 1481 - if (postType !== 'comment') { 1482 - // 既存画像 1483 - html += '<div class="edit-attachments">'; 1484 - if (currentImages.trim()) { 1485 - html += '<div class="edit-attach-section"><span class="edit-attach-label">画像</span>'; 1486 - var imgs = currentImages.trim().split('\n'); 1487 - for (var i = 0; i < imgs.length; i++) { 1488 - var img = imgs[i].trim(); 1489 - if (!img) continue; 1490 - html += '<div class="edit-attach-item" data-name="' + img.replace(/"/g,'"') + '">' + 1491 - '<img src="/xwiki/bin/download/' + schoolPage.replace(/\./g,'/') + '/' + encodeURIComponent(img) + '" class="edit-attach-thumb" />' + 1492 - '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' + 1493 - '<input type="hidden" name="keepImages" value="' + img.replace(/"/g,'"') + '" />' + 1494 - '</div>'; 1495 - } 1496 - html += '</div>'; 1497 - } 1498 - // 既存ファイル 1499 - if (currentFiles.trim()) { 1500 - html += '<div class="edit-attach-section"><span class="edit-attach-label">ファイル</span>'; 1501 - var files = currentFiles.trim().split('\n'); 1502 - for (var j = 0; j < files.length; j++) { 1503 - var f = files[j].trim(); 1504 - if (!f) continue; 1505 - var displayName = f; 1506 - if (/^file_\d{14}_\d+_/.test(f)) displayName = f.replace(/^file_\d{14}_\d+_/, ''); 1507 - html += '<div class="edit-attach-item" data-name="' + f.replace(/"/g,'"') + '">' + 1508 - '<span class="edit-attach-fname">' + displayName.replace(/</g,'<').replace(/>/g,'>') + '</span>' + 1509 - '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' + 1510 - '<input type="hidden" name="keepFiles" value="' + f.replace(/"/g,'"') + '" />' + 1511 - '</div>'; 1512 - } 1513 - html += '</div>'; 1514 - } 1515 - // 新規追加 1516 - html += '<div class="edit-attach-add">' + 1517 - '<label class="form-label-sm">画像を追加（最大4枚まで）</label>' + 1518 - '<input type="file" name="editNewImages" accept="image/*" multiple class="form-file-input-sm" />' + 1519 - '<div class="form-hint">JPEG / PNG / GIF / WebP、各5MBまで</div>' + 1520 - '<label class="form-label-sm" style="margin-top:8px;">ファイルを追加（最大2つまで）</label>' + 1521 - '<input type="file" name="editNewFiles" accept=".pdf,.docx,.xlsx,.pptx" multiple class="form-file-input-sm" />' + 1522 - '<div class="form-hint">PDF / Word / Excel / PowerPoint、各10MBまで</div>' + 1523 - '</div>'; 1524 - html += '</div>'; 1525 - } 1526 - 1527 - 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">' + 1528 1528 '<button type="button" class="btn-cancel-edit" onclick="this.closest(\'.post-edit-form\').remove()">キャンセル</button>' + 1529 - '<button type="button" class="btn-save" onclick="saveEditPost( this)">保存</button>' +1231 + '<button type="button" class="btn-save" onclick="saveEditPost(\'' + schoolPage + '\', ' + postObjNum + ')">保存</button>' + 1530 1530 '</div>'; 1531 - 1532 - form.innerHTML = html; 1533 1533 bodyEl.parentNode.insertBefore(form, bodyEl.nextSibling); 1534 1534 form.querySelector('textarea').focus(); 1535 1535 } 1536 1536 1537 -function removeEditAttach(btn) { 1538 - var item = btn.closest('.edit-attach-item'); 1539 - if (item) item.remove(); 1540 -} 1541 - 1542 1542 // 投稿の編集を保存 1543 -function saveEditPost(btn) { 1544 - var formEl = btn.closest('.post-edit-form'); 1545 - if (!formEl) return; 1546 - var schoolPage = formEl.getAttribute('data-school'); 1547 - var postObjNum = formEl.getAttribute('data-obj'); 1548 - var textarea = formEl.querySelector('textarea'); 1238 +function saveEditPost(schoolPage, postObjNum) { 1239 + var textarea = document.getElementById('editContent_' + postObjNum); 1549 1549 if (!textarea) return; 1550 1550 var newContent = textarea.value.trim(); 1551 1551 if (!newContent) { alert('投稿内容を入力してください'); return; } 1552 - 1553 1553 var csrfEl = document.querySelector('input[name="form_token"]'); 1554 1554 var csrfToken = csrfEl ? csrfEl.value : ''; 1555 - 1556 - var fd = new FormData(); 1557 - fd.append('schoolPage', schoolPage); 1558 - fd.append('postObj', postObjNum); 1559 - fd.append('newContent', newContent); 1560 - fd.append('form_token', csrfToken); 1561 - 1562 - // 残す画像・ファイル 1563 - formEl.querySelectorAll('input[name="keepImages"]').forEach(function(el) { fd.append('keepImages', el.value); }); 1564 - formEl.querySelectorAll('input[name="keepFiles"]').forEach(function(el) { fd.append('keepFiles', el.value); }); 1565 - 1566 - // 新規画像 1567 - var newImgInput = formEl.querySelector('input[name="editNewImages"]'); 1568 - if (newImgInput && newImgInput.files) { 1569 - for (var i = 0; i < newImgInput.files.length; i++) { fd.append('editNewImages', newImgInput.files[i]); } 1570 - } 1571 - // 新規ファイル 1572 - var newFileInput = formEl.querySelector('input[name="editNewFiles"]'); 1573 - if (newFileInput && newFileInput.files) { 1574 - for (var j = 0; j < newFileInput.files.length; j++) { fd.append('editNewFiles', newFileInput.files[j]); } 1575 - } 1576 - 1577 - btn.disabled = true; 1578 - btn.textContent = '保存中...'; 1579 - 1580 1580 var xhr = new XMLHttpRequest(); 1581 1581 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); 1582 1582 xhr.onload = function() { 1583 1583 try { 1584 1584 var res = JSON.parse(xhr.responseText); ... ... @@ -1586,13 +1586,12 @@ 1586 1586 showToast('投稿を更新しました', 'success'); 1587 1587 setTimeout(function() { location.reload(); }, 800); 1588 1588 } else { 1589 - btn.disabled = false; btn.textContent = '保存'; 1590 1590 alert('編集に失敗しました: ' + (res.error || '')); 1591 1591 } 1592 - } catch(e) { btn.disabled = false; btn.textContent = '保存'; alert('編集に失敗しました'); }1258 + } catch(e) { alert('編集に失敗しました'); } 1593 1593 }; 1594 - xhr.onerror = function() { btn.disabled = false; btn.textContent = '保存'; alert('通信エラーが発生しました'); };1595 - xhr.send( fd);1260 + xhr.onerror = function() { alert('通信エラーが発生しました'); }; 1261 + xhr.send(editPostData); 1596 1596 } 1597 1597 1598 1598 // 投稿の削除（確認ダイアログ付き）