Skip to Content
Last modified by Super Admin on 2026/04/05 18:59
From version Icon 76.1 Icon
edited by Super Admin
on 2026/03/19 13:11
Change comment: There is no comment for this version
To version Icon 83.1 Icon
edited by Super Admin
on 2026/03/19 23:49
Change comment: There is no comment for this version

Summary

Details

Icon Page properties
Content
... ... @@ -35,8 +35,9 @@
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 -## --- 組織図 ---
40 +## --- 生徒会組織 ---
40 40  #set($orgChart = $doc.getValue('orgChart'))
41 41  #set($orgChartImage = $doc.getValue('orgChartImage'))
42 42  
... ... @@ -353,6 +353,9 @@
353 353   </div>
354 354   #end
355 355   </div>
357 + #if($schoolDescription && $schoolDescription.trim() != '')
358 + <div class="free-note" style="margin-top:var(--sp-4);">$!escapetool.xml($schoolDescription)</div>
359 + #end
356 356   #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
357 357   #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
358 358   #if($infoEditDate && $infoEditDate != '')
... ... @@ -365,7 +365,7 @@
365 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 - ## --- 組織図 ---
372 + ## --- 生徒会組織 ---
369 369   #set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
370 370   #if($hasOrgContent)
371 371   #set($canViewOrgChart = true)
... ... @@ -374,16 +374,16 @@
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>
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>
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>
381 381   #end
382 - #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end
386 + #if($orgChart && $orgChart != '')<div class="free-note">$!escapetool.xml($orgChart)</div>#end
383 383   </div>
384 384   </div>
385 385   #else
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>
390 + <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>
387 387   #end
388 388   #end
389 389  
... ... @@ -736,16 +736,18 @@
736 736  <div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)">
737 737   <div class="activity-thread-header">
738 738   <div class="activity-thread-title">
739 - <h3 #if($actFeatured == '1')class="featured-title"#end>$!escapetool.xml($!actTitle) #if($actFeatured == '1')<svg class="ico ico-fixed-14 ico-star-offset" viewBox="0 0 24 24" fill="currentColor" stroke="none"><polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"/></svg>#end</h3>
740 - <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
741 - #set($actTagsList = $activity.getValue('tags'))
742 - #if($actTagsList && !$actTagsList.isEmpty())
743 - #foreach($tagItem in $actTagsList)
744 - #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end
743 + <h3 #if($actFeatured == '1')class="featured-title"#end>#if($actFeatured == '1')<svg class="ico ico-fixed-14 ico-star-offset" viewBox="0 0 24 24" fill="currentColor" stroke="none"><polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"/></svg> #end$!escapetool.xml($!actTitle)</h3>
744 + <div class="activity-meta-line">
745 + <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span>
746 + #set($actTagsList = $activity.getValue('tags'))
747 + #if($actTagsList && !$actTagsList.isEmpty())
748 + #foreach($tagItem in $actTagsList)
749 + #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end
750 + #end
745 745   #end
746 - #end
752 + </div>
747 747   </div>
748 - <div class="thread-meta-row">
754 + <div class="thread-meta-right">
749 749   <span class="thread-post-count">${reportCount}件の報告 ・ ${commentCount}件のコメント</span>
750 750   #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred')
751 751   #if($actFeatured == '1')
... ... @@ -1038,9 +1038,11 @@
1038 1038  
1039 1039   #if($xcontext.user != "XWiki.XWikiGuest")
1040 1040   <div class="thread-add-post">
1047 + #if($isSchoolMember || $isViewerAdmin)
1041 1041   <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
1042 1042   ＋ 活動報告を追加
1043 1043   </a>
1051 + #end
1044 1044   <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
1045 1045   <svg class="ico" viewBox="0 0 24 24"><path d="M21 15a2 2 0 01-2 2H7l-4 4V5a2 2 0 012-2h14a2 2 0 012 2z"/></svg> コメントを書く
1046 1046   </a>