Changes for page 学校ページ テンプレート

Summary

• Page properties (1 modified, 0 added, 0 removed)

Details

Page properties

Content

...	...	@@ -68,6 +68,7 @@
68	68	#set($activityPlace = $doc.getValue('activityPlace'))
69	69	#set($activityRoomEquipment = $doc.getValue('activityRoomEquipment'))
70	70	#set($activityRoomImage = $doc.getValue('activityRoomImage'))
	71	+#set($ictTools = $doc.getValue('ictTools'))
71	71	#set($ictUsage = $doc.getValue('ictUsage'))
72	72
73	73	## --- 生徒総会 ---
...	...	@@ -125,6 +125,14 @@
125	125	#set($visibilityBudget = $!doc.getValue('visibilityBudget'))
126	126	#set($visibilityRuleReview = $!doc.getValue('visibilityRuleReview'))
127	127	#set($visibilityChallenges = $!doc.getValue('visibilityChallenges'))
	129	+#set($visibilityDailyActivities = $!doc.getValue('visibilityDailyActivities'))
	130	+#set($visibilityElection = $!doc.getValue('visibilityElection'))
	131	+#set($visibilityMeeting = $!doc.getValue('visibilityMeeting'))
	132	+#set($visibilityActivityEnv = $!doc.getValue('visibilityActivityEnv'))
	133	+#set($visibilityAssembly = $!doc.getValue('visibilityAssembly'))
	134	+#set($visibilityPublicity = $!doc.getValue('visibilityPublicity'))
	135	+#set($visibilityExternal = $!doc.getValue('visibilityExternal'))
	136	+#set($visibilityAnnualEvents = $!doc.getValue('visibilityAnnualEvents'))
128	128	## デフォルト値（未設定なら全体公開）
129	129	#if(!$visibilityOrgChart || $visibilityOrgChart == '') #set($visibilityOrgChart = 'public') #end
130	130	#if(!$visibilityBudget || $visibilityBudget == '') #set($visibilityBudget = 'public') #end
...	...	@@ -136,6 +136,7 @@
136	136	#set($isGuest = $viewerUser == 'XWiki.XWikiGuest')
137	137	#set($isViewerAdmin = false)
138	138	#set($viewerSchoolCode = '')
	148	+#set($viewerSecondaryGraduated = false)
139	139	#if(!$isGuest)
140	140	#set($viewerDoc = $xwiki.getDocument($viewerUser))
141	141	#set($viewerAccountType = $!viewerDoc.getValue('accountType'))
...	...	@@ -145,6 +145,24 @@
145	145	#if($viewerAccountType == 'admin')
146	146	#set($isViewerAdmin = true)
147	147	#end
	158	+ ## 第2所属校の在学年数超過チェック
	159	+ #set($viewerSecEnrollYear = $!viewerDoc.getValue('secondaryEnrollmentYear'))
	160	+ #if($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecEnrollYear && $viewerSecEnrollYear != '')
	161	+ #set($vNow = $datetool.date)
	162	+ #set($vCurYear = $mathtool.toInteger($datetool.format('yyyy', $vNow)))
	163	+ #set($vCurMonth = $mathtool.toInteger($datetool.format('MM', $vNow)))
	164	+ #if($vCurMonth >= 4)#set($vSchoolYear = $vCurYear)#else#set($vSchoolYear = $mathtool.sub($vCurYear, 1))#end
	165	+ #set($vSecEnroll = $mathtool.toInteger($viewerSecEnrollYear))
	166	+ #set($vSecMax = 3)
	167	+ #if($viewerSecondarySchoolCode.length() >= 2)
	168	+ #set($vSecType = $viewerSecondarySchoolCode.substring(0, 2))
	169	+ #if($vSecType == 'C2')#set($vSecMax = 9)#elseif($vSecType == 'D2')#set($vSecMax = 6)#end
	170	+ #end
	171	+ #set($vSecGrade = $mathtool.add($mathtool.sub($vSchoolYear, $vSecEnroll), 1))
	172	+ #if($vSecGrade > $vSecMax)
	173	+ #set($viewerSecondaryGraduated = true)
	174	+ #end
	175	+ #end
148	148	#end
149	149
150	150	## --- 関連校（中高一貫校）情報 ---
...	...	@@ -154,7 +154,7 @@
154	154	#if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
155	155	#if($viewerSchoolCode == $affiliatedSchoolCode)
156	156	#set($isAffiliated = true)
157		- #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode)
	185	+ #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode && !$viewerSecondaryGraduated)
158	158	#set($isAffiliated = true)
159	159	#end
160	160	#end
...	...	@@ -164,7 +164,7 @@
164	164	#if(!$isGuest && $viewerUserRole != 'graduate')
165	165	#if($viewerSchoolCode == $schoolCode || $isAffiliated)
166	166	#set($isSchoolMember = true)
167		- #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode)
	195	+ #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode && !$viewerSecondaryGraduated)
168	168	#set($isSchoolMember = true)
169	169	#end
170	170	#end
...	...	@@ -426,8 +426,13 @@
426	426
427	427	## --- 日常の活動 ---
428	428	#if($dailyActivities && !$dailyActivities.isEmpty())
	457	+ #set($canViewDA = true)
	458	+ #if($visibilityDailyActivities == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewDA = false)
	459	+ #elseif($visibilityDailyActivities == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewDA = false)
	460	+ #end
	461	+ #if($canViewDA)
429	429	<div class="seitokai-subsection">
430		- <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>
	463	+ <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"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
431	431	<div class="seitokai-subsection-content">
432	432	<p class="activity-hint">活動時間が多い3つ</p>
433	433	<div class="tag-container">
...	...	@@ -440,12 +440,20 @@
440	440	#end
441	441	</div>
442	442	</div>
	476	+ #else
	477	+ <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>
	478	+ #end
443	443	#end
444	444
445	445	## --- 選挙 ---
446	446	#if($electionExists && $electionExists != '')
	483	+ #set($canViewEL = true)
	484	+ #if($visibilityElection == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewEL = false)
	485	+ #elseif($visibilityElection == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewEL = false)
	486	+ #end
	487	+ #if($canViewEL)
447	447	<div class="seitokai-subsection">
448		- <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>
	489	+ <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"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
449	449	<div class="seitokai-subsection-content">
450	450	<div class="info-row">
451	451	<span class="info-label">役員選挙</span>
...	...	@@ -462,12 +462,20 @@
462	462	#end
463	463	</div>
464	464	</div>
	506	+ #else
	507	+ <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>
	508	+ #end
465	465	#end
466	466
467	467	## --- 定例活動 ---
468	468	#if($meetingFrequency && $meetingFrequency != '')
	513	+ #set($canViewMT = true)
	514	+ #if($visibilityMeeting == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewMT = false)
	515	+ #elseif($visibilityMeeting == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewMT = false)
	516	+ #end
	517	+ #if($canViewMT)
469	469	<div class="seitokai-subsection">
470		- <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>
	519	+ <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"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 校内限定#end</span>#end</h3>
471	471	<div class="seitokai-subsection-content">
472	472	<div class="info-row">
473	473	<span class="info-label">役員定例会の頻度</span>
...	...	@@ -478,6 +478,9 @@
478	478	#end
479	479	</div>
480	480	</div>
	530	+ #else
	531	+ <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>
	532	+ #end
481	481	#end
482	482
483	483	## --- 予算 ---
...	...	@@ -608,15 +608,26 @@
608	608	#end
609	609
610	610	## --- 活動環境 ---
611		- #set($hasActivityEnv = ($activityPlace && $activityPlace != '') || ($activityRoomEquipment && $activityRoomEquipment != '') || ($activityRoomImage && $activityRoomImage != '') || ($ictUsage && !$ictUsage.isEmpty()))
	663	+ #set($hasActivityEnv = ($activityPlace && !$activityPlace.isEmpty()) || ($activityRoomEquipment && $activityRoomEquipment != '') || ($activityRoomImage && $activityRoomImage != '') || ($ictTools && !$ictTools.isEmpty()) || ($ictUsage && !$ictUsage.isEmpty()))
612	612	#if($hasActivityEnv)
	665	+ #set($canViewAE = true)
	666	+ #if($visibilityActivityEnv == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAE = false)
	667	+ #elseif($visibilityActivityEnv == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAE = false)
	668	+ #end
	669	+ #if($canViewAE)
613	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>
	671	+ <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>
615	615	<div class="seitokai-subsection-content">
616		- #if($activityPlace && $activityPlace != '')
	673	+ #if($activityPlace && !$activityPlace.isEmpty())
617	617	<div class="info-row">
618	618	<span class="info-label">普段の活動場所</span>
619		- <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($activityPlace)</span></span>
	676	+ <span class="info-value">
	677	+ <div class="selection-display">
	678	+ #foreach($ap in $activityPlace)
	679	+ <span class="selection-item">$!escapetool.xml($ap.trim())</span>
	680	+ #end
	681	+ </div>
	682	+ </span>
620	620	</div>
621	621	#end
622	622	#if($activityRoomEquipment && $activityRoomEquipment != '')
...	...	@@ -631,6 +631,40 @@
631	631	<span class="info-value"><div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($activityRoomImage)" alt="活動場所の写真" class="org-chart-img" /></div></span>
632	632	</div>
633	633	#end
	697	+ #if($ictTools && !$ictTools.isEmpty())
	698	+ <div class="info-row">
	699	+ <span class="info-label">利用しているICTツール</span>
	700	+ <span class="info-value">
	701	+ #set($ictCatDisplay = [
	702	+ ["連絡ツール", ["メール","LINE","LINE WORKS","Discord","Slack","Microsoft Teams","Google Chat","InstagramのDM","XのDM","その他（連絡）"]],
	703	+ ["ドキュメント作成・共有", ["Googleドキュメント","Googleスプレッドシート","Googleスライド","Googleドライブ","Word","Excel","PowerPoint","OneDrive","SharePoint","Notion","Pages","Numbers","Keynote","Dropbox","Box","その他（ドキュメント）"]],
	704	+ ["タスク管理", ["Googleカレンダー","Google ToDoリスト","Trello","Asana","Excel等スプレッドシート","その他（タスク管理）"]],
	705	+ ["ビデオ会議ツール", ["Zoom","Google Meet","その他（ビデオ会議）"]],
	706	+ ["アンケート", ["Googleフォーム","Microsoft Forms","その他（アンケート）"]],
	707	+ ["デザイン・クリエイティブ", ["Canva","各種Adobe","CapCut","LumaFusion","AviUtl","ibisPaint","その他（デザイン）"]],
	708	+ ["その他", ["独自のWebシステム・自作アプリ"]]
	709	+ ])
	710	+ #foreach($catD in $ictCatDisplay)
	711	+ #set($catHasItems = false)
	712	+ #foreach($t in $catD.get(1))
	713	+ #if($ictTools.contains($t)) #set($catHasItems = true) #end
	714	+ #end
	715	+ #if($catHasItems)
	716	+ <div style="margin-bottom:6px">
	717	+ <span style="font-size:0.8em;font-weight:600;color:var(--text-mid)">$catD.get(0):</span>
	718	+ <div class="selection-display" style="margin-top:2px">
	719	+ #foreach($t in $catD.get(1))
	720	+ #if($ictTools.contains($t))
	721	+ <span class="selection-item">$!escapetool.xml($t)</span>
	722	+ #end
	723	+ #end
	724	+ </div>
	725	+ </div>
	726	+ #end
	727	+ #end
	728	+ </span>
	729	+ </div>
	730	+ #end
634	634	#if($ictUsage && !$ictUsage.isEmpty())
635	635	<div class="info-row">
636	636	<span class="info-label">ICT活用している場面</span>
...	...	@@ -645,13 +645,21 @@
645	645	#end
646	646	</div>
647	647	</div>
	745	+ #else
	746	+ <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>
	747	+ #end
648	648	#end
649	649
650	650	## --- 生徒総会 ---
651	651	#set($hasAssembly = ($assemblyFormat && $assemblyFormat != '') || ($assemblyCount && $assemblyCount > 0) || ($assemblyAgenda && !$assemblyAgenda.isEmpty()) || ($assemblyTopics && !$assemblyTopics.isEmpty()) || ($assemblyNote && $assemblyNote != ''))
652	652	#if($hasAssembly)
	753	+ #set($canViewAS = true)
	754	+ #if($visibilityAssembly == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAS = false)
	755	+ #elseif($visibilityAssembly == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAS = false)
	756	+ #end
	757	+ #if($canViewAS)
653	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>
	759	+ <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>
655	655	<div class="seitokai-subsection-content">
656	656	#if($assemblyFormat && $assemblyFormat != '')
657	657	<div class="info-row">
...	...	@@ -697,13 +697,21 @@
697	697	#end
698	698	</div>
699	699	</div>
	805	+ #else
	806	+ <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>
	807	+ #end
700	700	#end
701	701
702	702	## --- 広報 ---
703	703	#set($hasPublicity = ($publicityMethod && !$publicityMethod.isEmpty()) || ($publicityFrequency && $publicityFrequency != '') || ($publicityNote && $publicityNote != ''))
704	704	#if($hasPublicity)
	813	+ #set($canViewPB = true)
	814	+ #if($visibilityPublicity == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewPB = false)
	815	+ #elseif($visibilityPublicity == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPB = false)
	816	+ #end
	817	+ #if($canViewPB)
705	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>
	819	+ <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>
707	707	<div class="seitokai-subsection-content">
708	708	#if($publicityMethod && !$publicityMethod.isEmpty())
709	709	<div class="info-row">
...	...	@@ -731,13 +731,21 @@
731	731	#end
732	732	</div>
733	733	</div>
	847	+ #else
	848	+ <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>
	849	+ #end
734	734	#end
735	735
736	736	## --- 外部連携 ---
737	737	#set($hasExternal = ($externalCooperation && $externalCooperation != '') || ($externalOrgName && $externalOrgName != '') || ($socialParticipation && !$socialParticipation.isEmpty()))
738	738	#if($hasExternal)
	855	+ #set($canViewEX = true)
	856	+ #if($visibilityExternal == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewEX = false)
	857	+ #elseif($visibilityExternal == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewEX = false)
	858	+ #end
	859	+ #if($canViewEX)
739	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>
	861	+ <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>
741	741	<div class="seitokai-subsection-content">
742	742	#if($externalCooperation && $externalCooperation != '')
743	743	<div class="info-row">
...	...	@@ -765,6 +765,9 @@
765	765	#end
766	766	</div>
767	767	</div>
	889	+ #else
	890	+ <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>
	891	+ #end
768	768	#end
769	769
770	770	## --- 年間主要行事 ---
...	...	@@ -774,8 +774,13 @@
774	774	#if($m.get(1) && $m.get(1) != '') #set($hasAnyEvent = true) #end
775	775	#end
776	776	#if($hasAnyEvent)
	901	+ #set($canViewAN = true)
	902	+ #if($visibilityAnnualEvents == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewAN = false)
	903	+ #elseif($visibilityAnnualEvents == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewAN = false)
	904	+ #end
	905	+ #if($canViewAN)
777	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>
	907	+ <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>
779	779	<div class="seitokai-subsection-content">
780	780	<table class="wiki-table school-info-table" style="margin:0">
781	781	#foreach($m in $months)
...	...	@@ -786,6 +786,9 @@
786	786	</table>
787	787	</div>
788	788	</div>
	918	+ #else
	919	+ <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>
	920	+ #end
789	789	#end
790	790
791	791	## --- 生徒会の課題意識 ---
...	...	@@ -1271,11 +1271,11 @@
1271	1271	#if($xcontext.user != "XWiki.XWikiGuest")
1272	1272	<div class="thread-add-post">
1273	1273	#if($isSchoolMember || $isAlumniOfSchool || $isViewerAdmin)
1274		- <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
	1406	+ <a href="/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
1275	1275	＋ 活動報告を追加
1276	1276	</a>
1277	1277	#end
1278		- <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
	1410	+ <a href="/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
1279	1279	<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> コメントを書く
1280	1280	</a>
1281	1281	</div>
...	...	@@ -1297,7 +1297,7 @@
1297	1297	#if($xcontext.user != "XWiki.XWikiGuest")
1298	1298	{{html clean="false"}}
1299	1299	<div class="activity-add-section">
1300		- <a href="/bin/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$!escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity">
	1432	+ <a href="/bin/view/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$!escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity">
1301	1301	<svg class="ico" viewBox="0 0 24 24" stroke-width="2.5"><line x1="12" y1="5" x2="12" y2="19"/><line x1="5" y1="12" x2="19" y2="12"/></svg> 活動を追加
1302	1302	</a>
1303	1303	</div>