Changes for page 学校ページ テンプレート
Last modified by Super Admin on 2026/04/05 18:59
From version 
97.1 
97.1
edited by Super Admin
on 2026/03/20 18:10
on 2026/03/20 18:10
Change comment:
There is no comment for this version
To version 79.1
79.1
edited by Super Admin
on 2026/03/19 15:43
on 2026/03/19 15:43
Change comment:
There is no comment for this version
Summary
Details
-
Page properties
-
- Content
-
... ... @@ -35,9 +35,8 @@ 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')) 39 39 40 -## --- 生徒会組織 ---39 +## --- 組織図 --- 41 41 #set($orgChart = $doc.getValue('orgChart')) 42 42 #set($orgChartImage = $doc.getValue('orgChartImage')) 43 43 ... ... @@ -57,7 +57,7 @@ 57 57 #set($budgetAllocation = $doc.getValue('budgetAllocation')) 58 58 #set($budgetNote = $doc.getValue('budgetNote')) 59 59 60 -## --- 校則 ・生徒会会則の見直し ---59 +## --- 校則の見直し --- 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))306 +#if(!$isGuest && ($isViewerAdmin || $isSchoolMember)) 353 353 #set($canEditSchool = true) 354 354 #end 355 355 #if($canEditSchool) ... ... @@ -399,18 +399,19 @@ 399 399 </div> 400 400 #end 401 401 </div> 402 - #if($schoolDescription && $schoolDescription.trim() != '') 403 - <div class="free-note" style="margin-top:var(--sp-4);">$!escapetool.xml($schoolDescription)</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> 404 404 #end 405 - 406 406 </div> 407 407 408 -## --- ② 生徒会情報（折りたたみカード） --- 363 +## --- ② 生徒会基本情報（折りたたみカード） --- 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> 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> 411 411 <div class="seitokai-info-body"> 412 412 413 - ## --- 生徒会組織 ---368 + ## --- 組織図 --- 414 414 #set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != '')) 415 415 #if($hasOrgContent) 416 416 #set($canViewOrgChart = true) ... ... @@ -419,33 +419,30 @@ 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>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> 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> 426 426 #end 427 - #if($orgChart && $orgChart != '') <div class="free-note">$!escapetool.xml($orgChart)</div>#end382 + #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end 428 428 </div> 429 429 </div> 430 430 #else 431 - <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 生徒会組織は #if($visibilityOrgChart == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>386 + <div class="visibility-restricted-notice"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="11" width="18" height="11" rx="2"/><path d="M7 11V7a5 5 0 0110 0v4"/></svg> 組織図は #if($visibilityOrgChart == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div> 432 432 #end 433 433 #end 434 434 435 435 ## --- 日常の活動 --- 436 436 #if($dailyActivities && !$dailyActivities.isEmpty()) 437 - #set($canViewDA = true) 438 - #if($visibilityDailyActivities == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewDA = false) 439 - #elseif($visibilityDailyActivities == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewDA = false) 440 - #end 441 - #if($canViewDA) 442 442 <div class="seitokai-subsection"> 443 - <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> 日常の活動 #if($visibilityDailyActivities != '' && $visibilityDailyActivities != 'public')<span class="visibility-badge visibility-${visibilityDailyActivities}">#if($visibilityDailyActivities == '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"><pathd="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>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> 444 444 <div class="seitokai-subsection-content"> 445 - <p class="activity-hint">活動時間 が多い3つ</p>395 + <p class="activity-hint">活動時間の多い順に上位3つ</p> 446 446 <div class="tag-container"> 397 + #set($daIdx = 1) 447 447 #foreach($da in $dailyActivities) 448 - <span class="tag tag-accent">$!escapetool.xml($da.trim())</span> 399 + <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span> 400 + #set($daIdx = $daIdx + 1) 449 449 #end 450 450 </div> 451 451 #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '') ... ... @@ -453,20 +453,12 @@ 453 453 #end 454 454 </div> 455 455 </div> 456 - #else 457 - <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($visibilityDailyActivities == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div> 458 - #end 459 459 #end 460 460 461 461 ## --- 選挙 --- 462 462 #if($electionExists && $electionExists != '') 463 - #set($canViewEL = true) 464 - #if($visibilityElection == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewEL = false) 465 - #elseif($visibilityElection == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewEL = false) 466 - #end 467 - #if($canViewEL) 468 468 <div class="seitokai-subsection"> 469 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="3" width="18" height="18" rx="2"/><path d="M7 13l3 3 7-7"/></svg> 選挙 #if($visibilityElection != '' && $visibilityElection != 'public')<span class="visibility-badge visibility-${visibilityElection}">#if($visibilityElection == '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"><pathd="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>413 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="3" width="18" height="18" rx="2"/><path d="M7 13l3 3 7-7"/></svg> 選挙</h3> 470 470 <div class="seitokai-subsection-content"> 471 471 <div class="info-row"> 472 472 <span class="info-label">役員選挙</span> ... ... @@ -483,20 +483,12 @@ 483 483 #end 484 484 </div> 485 485 </div> 486 - #else 487 - <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($visibilityElection == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div> 488 - #end 489 489 #end 490 490 491 491 ## --- 定例活動 --- 492 492 #if($meetingFrequency && $meetingFrequency != '') 493 - #set($canViewMT = true) 494 - #if($visibilityMeeting == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewMT = false) 495 - #elseif($visibilityMeeting == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewMT = false) 496 - #end 497 - #if($canViewMT) 498 498 <div class="seitokai-subsection"> 499 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="4" width="18" height="18" rx="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> 定例活動 #if($visibilityMeeting != '' && $visibilityMeeting != 'public')<span class="visibility-badge visibility-${visibilityMeeting}">#if($visibilityMeeting == '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"><pathd="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>435 + <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="4" width="18" height="18" rx="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> 500 500 <div class="seitokai-subsection-content"> 501 501 <div class="info-row"> 502 502 <span class="info-label">役員定例会の頻度</span> ... ... @@ -507,9 +507,6 @@ 507 507 #end 508 508 </div> 509 509 </div> 510 - #else 511 - <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($visibilityMeeting == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div> 512 - #end 513 513 #end 514 514 515 515 ## --- 予算 --- ... ... @@ -521,7 +521,7 @@ 521 521 #end 522 522 #if($canViewBudget) 523 523 <div class="seitokai-subsection"> 524 - <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>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> 525 525 <div class="seitokai-subsection-content"> 526 526 #if($budgetProcess && !$budgetProcess.isEmpty()) 527 527 <div class="info-row"> ... ... @@ -528,13 +528,8 @@ 528 528 <span class="info-label">作成過程の生徒関与</span> 529 529 <span class="info-value"> 530 530 <div class="selection-display"> 531 - #set($allBpOpts = ["各部・委員会等への予算希望額調査","予算額調整（折衝等）","生徒会予算案の作成","生徒総会での議決","生徒関与なし","その他"]) 532 - #foreach($bpOpt in $allBpOpts) 533 - #if($budgetProcess.contains($bpOpt)) 534 - <span class="selection-item">$!escapetool.xml($bpOpt)</span> 535 - #else 536 - <span class="selection-item selection-item-off">$!escapetool.xml($bpOpt)</span> 537 - #end 464 + #foreach($bp in $budgetProcess) 465 + <span class="selection-item">$!escapetool.xml($bp.trim())</span> 538 538 #end 539 539 </div> 540 540 </span> ... ... @@ -574,7 +574,7 @@ 574 574 #end 575 575 #end 576 576 577 - ## --- 校則 ・生徒会会則の見直し ---505 + ## --- 校則の見直し --- 578 578 #if($ruleReviewStatus && $ruleReviewStatus != '') 579 579 #set($canViewRuleReview = true) 580 580 #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewRuleReview = false) ... ... @@ -582,13 +582,12 @@ 582 582 #end 583 583 #if($canViewRuleReview) 584 584 <div class="seitokai-subsection"> 585 - <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>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> 586 586 <div class="seitokai-subsection-content"> 587 587 <div class="info-row"> 588 588 <span class="info-label">見直しの有無（3年以内）</span> 589 589 <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span> 590 590 </div> 591 - #if($ruleReviewStatus != '実施なし') 592 592 #if($ruleReviewContent && !$ruleReviewContent.isEmpty()) 593 593 <div class="info-row"> 594 594 <span class="info-label">見直しの内容</span> ... ... @@ -625,7 +625,6 @@ 625 625 </span> 626 626 </div> 627 627 #end 628 - #end 629 629 #if($ruleReviewSystem && $ruleReviewSystem != '') 630 630 <div class="info-row"> 631 631 <span class="info-label">見直しの仕組み</span> ... ... @@ -635,237 +635,10 @@ 635 635 </div> 636 636 </div> 637 637 #else 638 - <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>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> 639 639 #end 640 640 #end 641 641 642 - ## --- 活動環境 --- 643 - #set($hasActivityEnv = ($activityPlace && !$activityPlace.isEmpty()) || ($activityRoomEquipment && $activityRoomEquipment != '') || ($activityRoomImage && $activityRoomImage != '') || ($ictUsage && !$ictUsage.isEmpty())) 644 - #if($hasActivityEnv) 645 - #set($canViewAE = true) 646 - #if($visibilityActivityEnv == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAE = false) 647 - #elseif($visibilityActivityEnv == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAE = false) 648 - #end 649 - #if($canViewAE) 650 - <div class="seitokai-subsection"> 651 - <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> 生徒会の活動環境 #if($visibilityActivityEnv != '' && $visibilityActivityEnv != 'public')<span class="visibility-badge visibility-${visibilityActivityEnv}">#if($visibilityActivityEnv == '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> 652 - <div class="seitokai-subsection-content"> 653 - #if($activityPlace && !$activityPlace.isEmpty()) 654 - <div class="info-row"> 655 - <span class="info-label">普段の活動場所</span> 656 - <span class="info-value"> 657 - <div class="selection-display"> 658 - #foreach($ap in $activityPlace) 659 - <span class="selection-item">$!escapetool.xml($ap.trim())</span> 660 - #end 661 - </div> 662 - </span> 663 - </div> 664 - #end 665 - #if($activityRoomEquipment && $activityRoomEquipment != '') 666 - <div class="info-row"> 667 - <span class="info-label">生徒会室の設備</span> 668 - <span class="info-value free-text-value">$!escapetool.xml($activityRoomEquipment)</span> 669 - </div> 670 - #end 671 - #if($activityRoomImage && $activityRoomImage != '') 672 - <div class="info-row"> 673 - <span class="info-label">活動場所の写真</span> 674 - <span class="info-value"><div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($activityRoomImage)" alt="活動場所の写真" class="org-chart-img" /></div></span> 675 - </div> 676 - #end 677 - #if($ictUsage && !$ictUsage.isEmpty()) 678 - <div class="info-row"> 679 - <span class="info-label">ICT活用している場面</span> 680 - <span class="info-value"> 681 - <div class="selection-display"> 682 - #foreach($iu in $ictUsage) 683 - <span class="selection-item">$!escapetool.xml($iu.trim())</span> 684 - #end 685 - </div> 686 - </span> 687 - </div> 688 - #end 689 - </div> 690 - </div> 691 - #else 692 - <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($visibilityActivityEnv == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div> 693 - #end 694 - #end 695 - 696 - ## --- 生徒総会 --- 697 - #set($hasAssembly = ($assemblyFormat && $assemblyFormat != '') || ($assemblyCount && $assemblyCount > 0) || ($assemblyAgenda && !$assemblyAgenda.isEmpty()) || ($assemblyTopics && !$assemblyTopics.isEmpty()) || ($assemblyNote && $assemblyNote != '')) 698 - #if($hasAssembly) 699 - #set($canViewAS = true) 700 - #if($visibilityAssembly == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAS = false) 701 - #elseif($visibilityAssembly == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAS = false) 702 - #end 703 - #if($canViewAS) 704 - <div class="seitokai-subsection"> 705 - <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> 生徒総会 #if($visibilityAssembly != '' && $visibilityAssembly != 'public')<span class="visibility-badge visibility-${visibilityAssembly}">#if($visibilityAssembly == '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> 706 - <div class="seitokai-subsection-content"> 707 - #if($assemblyFormat && $assemblyFormat != '') 708 - <div class="info-row"> 709 - <span class="info-label">開催方式</span> 710 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($assemblyFormat)</span></span> 711 - </div> 712 - #end 713 - #if($assemblyCount && $assemblyCount > 0) 714 - <div class="info-row"> 715 - <span class="info-label">開催回数（年）</span> 716 - <span class="info-value">$!escapetool.xml($assemblyCount)回</span> 717 - </div> 718 - #end 719 - #if($assemblyAgenda && !$assemblyAgenda.isEmpty()) 720 - <div class="info-row"> 721 - <span class="info-label">議案の集め方</span> 722 - <span class="info-value"> 723 - <div class="selection-display"> 724 - #foreach($aa in $assemblyAgenda) 725 - <span class="selection-item">$!escapetool.xml($aa.trim())</span> 726 - #end 727 - </div> 728 - </span> 729 - </div> 730 - #end 731 - #if($assemblyTopics && !$assemblyTopics.isEmpty()) 732 - <div class="info-row"> 733 - <span class="info-label">扱う内容</span> 734 - <span class="info-value"> 735 - <div class="selection-display"> 736 - #foreach($at in $assemblyTopics) 737 - <span class="selection-item">$!escapetool.xml($at.trim())</span> 738 - #end 739 - </div> 740 - </span> 741 - </div> 742 - #end 743 - #if($assemblyNote && $assemblyNote != '') 744 - <div class="info-row"> 745 - <span class="info-label">自由記述</span> 746 - <span class="info-value free-text-value">$!escapetool.xml($assemblyNote)</span> 747 - </div> 748 - #end 749 - </div> 750 - </div> 751 - #else 752 - <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($visibilityAssembly == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div> 753 - #end 754 - #end 755 - 756 - ## --- 広報 --- 757 - #set($hasPublicity = ($publicityMethod && !$publicityMethod.isEmpty()) || ($publicityFrequency && $publicityFrequency != '') || ($publicityNote && $publicityNote != '')) 758 - #if($hasPublicity) 759 - #set($canViewPB = true) 760 - #if($visibilityPublicity == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewPB = false) 761 - #elseif($visibilityPublicity == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPB = false) 762 - #end 763 - #if($canViewPB) 764 - <div class="seitokai-subsection"> 765 - <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> 広報 #if($visibilityPublicity != '' && $visibilityPublicity != 'public')<span class="visibility-badge visibility-${visibilityPublicity}">#if($visibilityPublicity == '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> 766 - <div class="seitokai-subsection-content"> 767 - #if($publicityMethod && !$publicityMethod.isEmpty()) 768 - <div class="info-row"> 769 - <span class="info-label">方法</span> 770 - <span class="info-value"> 771 - <div class="selection-display"> 772 - #foreach($pm in $publicityMethod) 773 - <span class="selection-item">$!escapetool.xml($pm.trim())</span> 774 - #end 775 - </div> 776 - </span> 777 - </div> 778 - #end 779 - #if($publicityFrequency && $publicityFrequency != '') 780 - <div class="info-row"> 781 - <span class="info-label">頻度</span> 782 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($publicityFrequency)</span></span> 783 - </div> 784 - #end 785 - #if($publicityNote && $publicityNote != '') 786 - <div class="info-row"> 787 - <span class="info-label">自由記述</span> 788 - <span class="info-value free-text-value">$!escapetool.xml($publicityNote)</span> 789 - </div> 790 - #end 791 - </div> 792 - </div> 793 - #else 794 - <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($visibilityPublicity == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div> 795 - #end 796 - #end 797 - 798 - ## --- 外部連携 --- 799 - #set($hasExternal = ($externalCooperation && $externalCooperation != '') || ($externalOrgName && $externalOrgName != '') || ($socialParticipation && !$socialParticipation.isEmpty())) 800 - #if($hasExternal) 801 - #set($canViewEX = true) 802 - #if($visibilityExternal == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewEX = false) 803 - #elseif($visibilityExternal == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewEX = false) 804 - #end 805 - #if($canViewEX) 806 - <div class="seitokai-subsection"> 807 - <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> 外部連携 #if($visibilityExternal != '' && $visibilityExternal != 'public')<span class="visibility-badge visibility-${visibilityExternal}">#if($visibilityExternal == '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> 808 - <div class="seitokai-subsection-content"> 809 - #if($externalCooperation && $externalCooperation != '') 810 - <div class="info-row"> 811 - <span class="info-label">他校の生徒会との連携</span> 812 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($externalCooperation)</span></span> 813 - </div> 814 - #end 815 - #if($externalOrgName && $externalOrgName != '') 816 - <div class="info-row"> 817 - <span class="info-label">参加している生徒会団体の名前</span> 818 - <span class="info-value">$!escapetool.xml($externalOrgName)</span> 819 - </div> 820 - #end 821 - #if($socialParticipation && !$socialParticipation.isEmpty()) 822 - <div class="info-row"> 823 - <span class="info-label">社会参加・地域連携・ボランティア</span> 824 - <span class="info-value"> 825 - <div class="selection-display"> 826 - #foreach($sp2 in $socialParticipation) 827 - <span class="selection-item">$!escapetool.xml($sp2.trim())</span> 828 - #end 829 - </div> 830 - </span> 831 - </div> 832 - #end 833 - </div> 834 - </div> 835 - #else 836 - <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($visibilityExternal == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div> 837 - #end 838 - #end 839 - 840 - ## --- 年間主要行事 --- 841 - #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]]) 842 - #set($hasAnyEvent = false) 843 - #foreach($m in $months) 844 - #if($m.get(1) && $m.get(1) != '') #set($hasAnyEvent = true) #end 845 - #end 846 - #if($hasAnyEvent) 847 - #set($canViewAN = true) 848 - #if($visibilityAnnualEvents == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAN = false) 849 - #elseif($visibilityAnnualEvents == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAN = false) 850 - #end 851 - #if($canViewAN) 852 - <div class="seitokai-subsection"> 853 - <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> 年間主要行事 #if($visibilityAnnualEvents != '' && $visibilityAnnualEvents != 'public')<span class="visibility-badge visibility-${visibilityAnnualEvents}">#if($visibilityAnnualEvents == '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> 854 - <div class="seitokai-subsection-content"> 855 - <table class="wiki-table school-info-table" style="margin:0"> 856 - #foreach($m in $months) 857 - #if($m.get(1) && $m.get(1) != '') 858 - <tr><td style="width:60px;font-weight:600;white-space:nowrap">$m.get(0)</td><td>$!escapetool.xml($m.get(1))</td></tr> 859 - #end 860 - #end 861 - </table> 862 - </div> 863 - </div> 864 - #else 865 - <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($visibilityAnnualEvents == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div> 866 - #end 867 - #end 868 - 869 869 ## --- 生徒会の課題意識 --- 870 870 #if($challenges && $challenges != '') 871 871 #set($canViewChallenges = true) ... ... @@ -874,7 +874,7 @@ 874 874 #end 875 875 #if($canViewChallenges) 876 876 <div class="seitokai-subsection"> 877 - <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>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> 878 878 <div class="seitokai-subsection-content"> 879 879 <div class="challenge-text">$!escapetool.xml($challenges)</div> 880 880 </div> ... ... @@ -898,11 +898,6 @@ 898 898 <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> 899 899 <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr> 900 900 </table> 901 - #set($infoEditDate = $!doc.getValue('lastInfoEditedDate')) 902 - #set($infoEditBy = $!doc.getValue('lastInfoEditedBy')) 903 - #if($infoEditDate && $infoEditDate != '') 904 - <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> 905 - #end 906 906 </div> 907 907 908 908 {{/html}} ... ... @@ -1053,7 +1053,7 @@ 1053 1053 #end 1054 1054 </div> 1055 1055 </div> 1056 - <div class="thread-meta-r ight">750 + <div class="thread-meta-row"> 1057 1057 <span class="thread-post-count">${reportCount}件の報告 ・ ${commentCount}件のコメント</span> 1058 1058 #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred') 1059 1059 #if($actFeatured == '1') ... ... @@ -1260,7 +1260,7 @@ 1260 1260 #end 1261 1261 </div> 1262 1262 #if($postVis != 'public') 1263 - <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>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> 1264 1264 #end 1265 1265 ## 固定/編集/削除/通報/非表示ボタン（横並び） 1266 1266 #set($postAuthorRef = $!post.getValue('authorRef')) ... ... @@ -1284,9 +1284,7 @@ 1284 1284 #end 1285 1285 #if($showEditDeleteBtn) 1286 1286 #if($xcontext.user == $postAuthorRef) 1287 - #set($editImages = $!post.getValue('images')) 1288 - #set($editFiles = $!post.getValue('files')) 1289 - <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="この投稿を編集"> 981 + <button type="button" class="btn-post-edit" onclick="openEditPost(this, '${doc.fullName}', $postObjNumED, '$!escapetool.javascript($!postContent)')" title="この投稿を編集"> 1290 1290 <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> 編集 1291 1291 </button> 1292 1292 #end ... ... @@ -1348,7 +1348,7 @@ 1348 1348 1349 1349 #if($xcontext.user != "XWiki.XWikiGuest") 1350 1350 <div class="thread-add-post"> 1351 - #if($isSchoolMember || $is AlumniOfSchool || $isViewerAdmin)1043 + #if($isSchoolMember || $isViewerAdmin) 1352 1352 <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add"> 1353 1353 ＋ 活動報告を追加 1354 1354 </a> ... ... @@ -1519,130 +1519,37 @@ 1519 1519 } 1520 1520 1521 1521 // 投稿の編集（インライン編集フォームを開く） 1522 -function openEditPost(btn) { 1214 +function openEditPost(btn, schoolPage, postObjNum, currentContent) { 1523 1523 var postEl = btn.closest('.thread-post'); 1524 1524 if (!postEl) return; 1217 + // 既存の編集フォームがあれば閉じる 1525 1525 var existing = postEl.querySelector('.post-edit-form'); 1526 1526 if (existing) { existing.remove(); return; } 1527 1527 var bodyEl = postEl.querySelector('.thread-post-body'); 1528 1528 if (!bodyEl) return; 1529 - 1530 - var schoolPage = btn.getAttribute('data-school'); 1531 - var postObjNum = btn.getAttribute('data-obj'); 1532 - var currentContent = btn.getAttribute('data-content') || ''; 1533 - var currentImages = btn.getAttribute('data-images') || ''; 1534 - var currentFiles = btn.getAttribute('data-files') || ''; 1535 - var postType = btn.getAttribute('data-post-type') || 'report'; 1536 - 1537 1537 var form = document.createElement('div'); 1538 1538 form.className = 'post-edit-form'; 1539 - form.setAttribute('data-school', schoolPage); 1540 - form.setAttribute('data-obj', postObjNum); 1541 - 1542 - var html = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&').replace(/</g,'<').replace(/>/g,'>') + '</textarea>'; 1543 - 1544 - // コメント以外は添付ファイル編集を表示 1545 - if (postType !== 'comment') { 1546 - // 既存画像 1547 - html += '<div class="edit-attachments">'; 1548 - if (currentImages.trim()) { 1549 - html += '<div class="edit-attach-section"><span class="edit-attach-label">画像</span>'; 1550 - var imgs = currentImages.trim().split('\n'); 1551 - for (var i = 0; i < imgs.length; i++) { 1552 - var img = imgs[i].trim(); 1553 - if (!img) continue; 1554 - html += '<div class="edit-attach-item" data-name="' + img.replace(/"/g,'"') + '">' + 1555 - '<img src="/xwiki/bin/download/' + schoolPage.replace(/\./g,'/') + '/' + encodeURIComponent(img) + '" class="edit-attach-thumb" />' + 1556 - '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' + 1557 - '<input type="hidden" name="keepImages" value="' + img.replace(/"/g,'"') + '" />' + 1558 - '</div>'; 1559 - } 1560 - html += '</div>'; 1561 - } 1562 - // 既存ファイル 1563 - if (currentFiles.trim()) { 1564 - html += '<div class="edit-attach-section"><span class="edit-attach-label">ファイル</span>'; 1565 - var files = currentFiles.trim().split('\n'); 1566 - for (var j = 0; j < files.length; j++) { 1567 - var f = files[j].trim(); 1568 - if (!f) continue; 1569 - var displayName = f; 1570 - if (/^file_\d{14}_\d+_/.test(f)) displayName = f.replace(/^file_\d{14}_\d+_/, ''); 1571 - html += '<div class="edit-attach-item" data-name="' + f.replace(/"/g,'"') + '">' + 1572 - '<span class="edit-attach-fname">' + displayName.replace(/</g,'<').replace(/>/g,'>') + '</span>' + 1573 - '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' + 1574 - '<input type="hidden" name="keepFiles" value="' + f.replace(/"/g,'"') + '" />' + 1575 - '</div>'; 1576 - } 1577 - html += '</div>'; 1578 - } 1579 - // 新規追加 1580 - html += '<div class="edit-attach-add">' + 1581 - '<label class="form-label-sm">画像を追加（最大4枚まで）</label>' + 1582 - '<input type="file" name="editNewImages" accept="image/*" multiple class="form-file-input-sm" />' + 1583 - '<div class="form-hint">JPEG / PNG / GIF / WebP、各5MBまで</div>' + 1584 - '<label class="form-label-sm" style="margin-top:8px;">ファイルを追加（最大2つまで）</label>' + 1585 - '<input type="file" name="editNewFiles" accept=".pdf,.docx,.xlsx,.pptx" multiple class="form-file-input-sm" />' + 1586 - '<div class="form-hint">PDF / Word / Excel / PowerPoint、各10MBまで</div>' + 1587 - '</div>'; 1588 - html += '</div>'; 1589 - } 1590 - 1591 - html += '<div class="post-edit-form-actions">' + 1224 + form.innerHTML = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&').replace(/</g,'<').replace(/>/g,'>') + '</textarea>' + 1225 + '<div class="post-edit-form-actions">' + 1592 1592 '<button type="button" class="btn-cancel-edit" onclick="this.closest(\'.post-edit-form\').remove()">キャンセル</button>' + 1593 - '<button type="button" class="btn-save" onclick="saveEditPost( this)">保存</button>' +1227 + '<button type="button" class="btn-save" onclick="saveEditPost(\'' + schoolPage + '\', ' + postObjNum + ')">保存</button>' + 1594 1594 '</div>'; 1595 - 1596 - form.innerHTML = html; 1597 1597 bodyEl.parentNode.insertBefore(form, bodyEl.nextSibling); 1598 1598 form.querySelector('textarea').focus(); 1599 1599 } 1600 1600 1601 -function removeEditAttach(btn) { 1602 - var item = btn.closest('.edit-attach-item'); 1603 - if (item) item.remove(); 1604 -} 1605 - 1606 1606 // 投稿の編集を保存 1607 -function saveEditPost(btn) { 1608 - var formEl = btn.closest('.post-edit-form'); 1609 - if (!formEl) return; 1610 - var schoolPage = formEl.getAttribute('data-school'); 1611 - var postObjNum = formEl.getAttribute('data-obj'); 1612 - var textarea = formEl.querySelector('textarea'); 1234 +function saveEditPost(schoolPage, postObjNum) { 1235 + var textarea = document.getElementById('editContent_' + postObjNum); 1613 1613 if (!textarea) return; 1614 1614 var newContent = textarea.value.trim(); 1615 1615 if (!newContent) { alert('投稿内容を入力してください'); return; } 1616 - 1617 1617 var csrfEl = document.querySelector('input[name="form_token"]'); 1618 1618 var csrfToken = csrfEl ? csrfEl.value : ''; 1619 - 1620 - var fd = new FormData(); 1621 - fd.append('schoolPage', schoolPage); 1622 - fd.append('postObj', postObjNum); 1623 - fd.append('newContent', newContent); 1624 - fd.append('form_token', csrfToken); 1625 - 1626 - // 残す画像・ファイル 1627 - formEl.querySelectorAll('input[name="keepImages"]').forEach(function(el) { fd.append('keepImages', el.value); }); 1628 - formEl.querySelectorAll('input[name="keepFiles"]').forEach(function(el) { fd.append('keepFiles', el.value); }); 1629 - 1630 - // 新規画像 1631 - var newImgInput = formEl.querySelector('input[name="editNewImages"]'); 1632 - if (newImgInput && newImgInput.files) { 1633 - for (var i = 0; i < newImgInput.files.length; i++) { fd.append('editNewImages', newImgInput.files[i]); } 1634 - } 1635 - // 新規ファイル 1636 - var newFileInput = formEl.querySelector('input[name="editNewFiles"]'); 1637 - if (newFileInput && newFileInput.files) { 1638 - for (var j = 0; j < newFileInput.files.length; j++) { fd.append('editNewFiles', newFileInput.files[j]); } 1639 - } 1640 - 1641 - btn.disabled = true; 1642 - btn.textContent = '保存中...'; 1643 - 1644 1644 var xhr = new XMLHttpRequest(); 1645 1645 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); 1646 1646 xhr.onload = function() { 1647 1647 try { 1648 1648 var res = JSON.parse(xhr.responseText); ... ... @@ -1650,13 +1650,12 @@ 1650 1650 showToast('投稿を更新しました', 'success'); 1651 1651 setTimeout(function() { location.reload(); }, 800); 1652 1652 } else { 1653 - btn.disabled = false; btn.textContent = '保存'; 1654 1654 alert('編集に失敗しました: ' + (res.error || '')); 1655 1655 } 1656 - } catch(e) { btn.disabled = false; btn.textContent = '保存'; alert('編集に失敗しました'); }1254 + } catch(e) { alert('編集に失敗しました'); } 1657 1657 }; 1658 - xhr.onerror = function() { btn.disabled = false; btn.textContent = '保存'; alert('通信エラーが発生しました'); };1659 - xhr.send( fd);1256 + xhr.onerror = function() { alert('通信エラーが発生しました'); }; 1257 + xhr.send(editPostData); 1660 1660 } 1661 1661 1662 1662 // 投稿の削除（確認ダイアログ付き）