Last modified by Super Admin on 2026/04/05 18:59

From version Icon 93.1 Icon
edited by Super Admin
on 2026/03/20 10:33
Change comment: There is no comment for this version
To version Icon 87.1 Icon
edited by Super Admin
on 2026/03/20 02:07
Change comment: There is no comment for this version

Summary

Details

Icon 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'))
... ... @@ -304,7 +304,7 @@
304 304  
305 305  ## --- 編集ボタン(権限があるユーザーのみ表示) ---
306 306  #set($canEditSchool = false)
307 -#if(!$isGuest && ($isViewerAdmin || $isSchoolMember || $isAlumniOfSchool))
307 +#if(!$isGuest && ($isViewerAdmin || $isSchoolMember))
308 308   #set($canEditSchool = true)
309 309  #end
310 310  #if($canEditSchool)
... ... @@ -360,9 +360,9 @@
360 360  
361 361  </div>
362 362  
363 -## --- ② 生徒会情報(折りたたみカード) ---
363 +## --- ② 生徒会基本情報(折りたたみカード) ---
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>
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>
366 366   <div class="seitokai-info-body">
367 367  
368 368   ## --- 生徒会組織 ---
... ... @@ -459,13 +459,8 @@
459 459   <span class="info-label">作成過程の生徒関与</span>
460 460   <span class="info-value">
461 461   <div class="selection-display">
462 - #set($allBpOpts = ["各部・委員会等への予算希望額調査","予算額調整(折衝等)","生徒会予算案の作成","生徒総会での議決","生徒関与なし","その他"])
463 - #foreach($bpOpt in $allBpOpts)
464 - #if($budgetProcess.contains($bpOpt))
465 - <span class="selection-item">$!escapetool.xml($bpOpt)</span>
466 - #else
467 - <span class="selection-item selection-item-off">$!escapetool.xml($bpOpt)</span>
468 - #end
462 + #foreach($bp in $budgetProcess)
463 + <span class="selection-item">$!escapetool.xml($bp.trim())</span>
469 469   #end
470 470   </div>
471 471   </span>
... ... @@ -505,7 +505,7 @@
505 505   #end
506 506   #end
507 507  
508 - ## --- 校則・生徒会会則の見直し ---
503 + ## --- 校則の見直し ---
509 509   #if($ruleReviewStatus && $ruleReviewStatus != '')
510 510   #set($canViewRuleReview = true)
511 511   #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewRuleReview = false)
... ... @@ -513,13 +513,12 @@
513 513   #end
514 514   #if($canViewRuleReview)
515 515   <div class="seitokai-subsection">
516 - <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>
511 + <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 517   <div class="seitokai-subsection-content">
518 518   <div class="info-row">
519 519   <span class="info-label">見直しの有無(3年以内)</span>
520 520   <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
521 521   </div>
522 - #if($ruleReviewStatus != '実施なし')
523 523   #if($ruleReviewContent && !$ruleReviewContent.isEmpty())
524 524   <div class="info-row">
525 525   <span class="info-label">見直しの内容</span>
... ... @@ -556,7 +556,6 @@
556 556   </span>
557 557   </div>
558 558   #end
559 - #end
560 560   #if($ruleReviewSystem && $ruleReviewSystem != '')
561 561   <div class="info-row">
562 562   <span class="info-label">見直しの仕組み</span>
... ... @@ -566,7 +566,7 @@
566 566   </div>
567 567   </div>
568 568   #else
569 - <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>
562 + <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>
570 570   #end
571 571   #end
572 572  
... ... @@ -1052,7 +1052,7 @@
1052 1052  
1053 1053   #if($xcontext.user != "XWiki.XWikiGuest")
1054 1054   <div class="thread-add-post">
1055 - #if($isSchoolMember || $isAlumniOfSchool || $isViewerAdmin)
1048 + #if($isSchoolMember || $isViewerAdmin)
1056 1056   <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
1057 1057   + 活動報告を追加
1058 1058   </a>