Changes for page 学校ページ テンプレート
Last modified by Super Admin on 2026/04/05 18:59
From version 
82.1 
82.1
edited by Super Admin
on 2026/03/19 23:16
on 2026/03/19 23:16
Change comment:
There is no comment for this version
To version 94.1
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,6 +35,7 @@ 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 39 ## --- 生徒会組織 --- 40 40 #set($orgChart = $doc.getValue('orgChart')) ... ... @@ -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,16 +353,15 @@ 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 368 ## --- 生徒会組織 --- ... ... @@ -374,7 +374,7 @@ 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> ... ... @@ -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}} ... ... @@ -954,7 +954,7 @@ 954 954 #end 955 955 </div> 956 956 #if($postVis != 'public') 957 - <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> 958 958 #end 959 959 ## 固定/編集/削除/通報/非表示ボタン（横並び） 960 960 #set($postAuthorRef = $!post.getValue('authorRef')) ... ... @@ -978,7 +978,9 @@ 978 978 #end 979 979 #if($showEditDeleteBtn) 980 980 #if($xcontext.user == $postAuthorRef) 981 - <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="この投稿を編集"> 982 982 <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> 編集 983 983 </button> 984 984 #end ... ... @@ -1040,7 +1040,7 @@ 1040 1040 1041 1041 #if($xcontext.user != "XWiki.XWikiGuest") 1042 1042 <div class="thread-add-post"> 1043 - #if($isSchoolMember || $isViewerAdmin) 1273 + #if($isSchoolMember || $isAlumniOfSchool || $isViewerAdmin) 1044 1044 <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add"> 1045 1045 ＋ 活動報告を追加 1046 1046 </a> ... ... @@ -1211,37 +1211,130 @@ 1211 1211 } 1212 1212 1213 1213 // 投稿の編集（インライン編集フォームを開く） 1214 -function openEditPost(btn , schoolPage, postObjNum, currentContent) {1444 +function openEditPost(btn) { 1215 1215 var postEl = btn.closest('.thread-post'); 1216 1216 if (!postEl) return; 1217 - // 既存の編集フォームがあれば閉じる 1218 1218 var existing = postEl.querySelector('.post-edit-form'); 1219 1219 if (existing) { existing.remove(); return; } 1220 1220 var bodyEl = postEl.querySelector('.thread-post-body'); 1221 1221 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 + 1222 1222 var form = document.createElement('div'); 1223 1223 form.className = 'post-edit-form'; 1224 - form.innerHTML = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&').replace(/</g,'<').replace(/>/g,'>') + '</textarea>' + 1225 - '<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">' + 1226 1226 '<button type="button" class="btn-cancel-edit" onclick="this.closest(\'.post-edit-form\').remove()">キャンセル</button>' + 1227 - '<button type="button" class="btn-save" onclick="saveEditPost( \'' + schoolPage + '\', ' + postObjNum + ')">保存</button>' +1515 + '<button type="button" class="btn-save" onclick="saveEditPost(this)">保存</button>' + 1228 1228 '</div>'; 1517 + 1518 + form.innerHTML = html; 1229 1229 bodyEl.parentNode.insertBefore(form, bodyEl.nextSibling); 1230 1230 form.querySelector('textarea').focus(); 1231 1231 } 1232 1232 1523 +function removeEditAttach(btn) { 1524 + var item = btn.closest('.edit-attach-item'); 1525 + if (item) item.remove(); 1526 +} 1527 + 1233 1233 // 投稿の編集を保存 1234 -function saveEditPost(schoolPage, postObjNum) { 1235 - 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'); 1236 1236 if (!textarea) return; 1237 1237 var newContent = textarea.value.trim(); 1238 1238 if (!newContent) { alert('投稿内容を入力してください'); return; } 1538 + 1239 1239 var csrfEl = document.querySelector('input[name="form_token"]'); 1240 1240 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 + 1241 1241 var xhr = new XMLHttpRequest(); 1242 1242 xhr.open('POST', '/bin/get/SeitokaiCode/EditPost?outputSyntax=plain', true); 1243 - xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'); 1244 - var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken); 1245 1245 xhr.onload = function() { 1246 1246 try { 1247 1247 var res = JSON.parse(xhr.responseText); ... ... @@ -1249,12 +1249,13 @@ 1249 1249 showToast('投稿を更新しました', 'success'); 1250 1250 setTimeout(function() { location.reload(); }, 800); 1251 1251 } else { 1575 + btn.disabled = false; btn.textContent = '保存'; 1252 1252 alert('編集に失敗しました: ' + (res.error || '')); 1253 1253 } 1254 - } catch(e) { alert('編集に失敗しました'); } 1578 + } catch(e) { btn.disabled = false; btn.textContent = '保存'; alert('編集に失敗しました'); } 1255 1255 }; 1256 - xhr.onerror = function() { alert('通信エラーが発生しました'); }; 1257 - xhr.send( editPostData);1580 + xhr.onerror = function() { btn.disabled = false; btn.textContent = '保存'; alert('通信エラーが発生しました'); }; 1581 + xhr.send(fd); 1258 1258 } 1259 1259 1260 1260 // 投稿の削除（確認ダイアログ付き）