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

Summary

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

Details

Page properties

Content

...	...	@@ -65,9 +65,7 @@
65	65	#set($seitokaiYoutube = $doc.getValue('seitokaiYoutube'))
66	66	#set($seitokaiOtherSns = $doc.getValue('seitokaiOtherSns'))
67	67
68		-## --- 年度アーカイブ ---
69		-#set($pageFiscalYear = $!doc.getValue('fiscalYear'))
70		-## 現在の年度を計算（4月始まり）
	68	+## --- 現在の年度を計算（4月始まり） ---
71	71	#set($nowFY = $datetool.date)
72	72	#set($currentFYMonth = $mathtool.toInteger($datetool.format('MM', $nowFY)))
73	73	#set($currentFYYear = $mathtool.toInteger($datetool.format('yyyy', $nowFY)))
...	...	@@ -76,10 +76,6 @@
76	76	#else
77	77	#set($currentFiscalYear = $mathtool.sub($currentFYYear, 1))
78	78	#end
79		-## fiscalYear 未設定時はデフォルトとして現在の年度を使う
80		-#if(!$pageFiscalYear || $pageFiscalYear == '')
81		- #set($pageFiscalYear = $currentFiscalYear.toString())
82		-#end
83	83
84	84	## --- 公開範囲フィールド ---
85	85	#set($visibilityOrgChart = $!doc.getValue('visibilityOrgChart'))
...	...	@@ -108,8 +108,12 @@
108	108
109	109	## --- 投稿固定/解除処理 ---
110	110	#set($pinAction = $!request.action)
111		-#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || $viewerAccountType == 'verified') && $services.csrf.isTokenValid($request.form_token))
112		- #set($postObjNum = $mathtool.toInteger($!request.postObj))
	105	+#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token))
	106	+ #set($pinPostObjStr = $!request.postObj)
	107	+ #if(!$pinPostObjStr.matches('^\d+$'))
	108	+ ## 不正な値 → 無視
	109	+ #else
	110	+ #set($postObjNum = $mathtool.toInteger($pinPostObjStr))
113	113	#set($postObj = $doc.getObject('SeitokaiCode.ActivityPostClass', $postObjNum))
114	114	#if($postObj)
115	115	#if($pinAction == 'pin')
...	...	@@ -129,12 +129,15 @@
129	129	$response.sendRedirect($doc.getURL('view'))
130	130	#stop
131	131	#end
	130	+ #end## /matches
132	132	#end
133	133
134	134	## --- 特色ある活動 選定/解除処理 ---
135	135	#set($featAction = $!request.action)
136		-#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $services.csrf.isTokenValid($request.form_token))
137		- #set($actObjNum = $mathtool.toInteger($!request.actObj))
	135	+#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token))
	136	+ #set($featActObjStr = $!request.actObj)
	137	+ #if($featActObjStr.matches('^\d+$'))
	138	+ #set($actObjNum = $mathtool.toInteger($featActObjStr))
138	138	#set($actObj = $doc.getObject('SeitokaiCode.ActivityClass', $actObjNum))
139	139	#if($actObj)
140	140	#if($featAction == 'feature')
...	...	@@ -166,6 +166,7 @@
166	166	$response.sendRedirect($doc.getURL('view'))
167	167	#stop
168	168	#end
	170	+ #end## /matches
169	169	#end
170	170
171	171	## --- ユーザー情報取得 ---
...	...	@@ -224,6 +224,12 @@
224	224	#end
225	225	#end
226	226
	229	+## --- 学校名見出し（XWikiデフォルトタイトルを非表示にし、学校名を表示） ---
	230	+#if($schoolName && $schoolName != '')
	231	+<style>.document-header { display: none !important; }</style>
	232	+<h1 class="school-page-title">$!escapetool.xml($schoolName)</h1>
	233	+#end
	234	+
227	227	## --- 編集ボタン（権限があるユーザーのみ表示） ---
228	228	#set($canEditSchool = false)
229	229	#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode))
...	...	@@ -247,7 +247,7 @@
247	247	<tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
248	248	<tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
249	249	<tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
250		- <tr><th>課程</th><td>#if($schoolSystem && $schoolSystem != '' && $schoolSystem != '[]')$!escapetool.xml($!schoolSystem)#end</td></tr>
	258	+ <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
251	251	<tr><th>公式サイト</th><td>#if($website && $website != '')<a href="$!escapetool.xml($website)" target="_blank" rel="noopener">$!escapetool.xml($website)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr>
252	252	</table>
253	253	#set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
...	...	@@ -305,7 +305,7 @@
305	305
306	306	## --- ③④⑤ 日常の活動・選挙・定例活動 ---
307	307	<div class="school-section-grid">
308		- #if($dailyActivities && $dailyActivities != '')
	316	+ #if($dailyActivities && !$dailyActivities.isEmpty())
309	309	<div class="school-section-card">
310	310	<h3><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>
311	311	<div class="card-inner">
...	...	@@ -312,7 +312,7 @@
312	312	<p class="activity-hint">活動時間の多い順に上位3つ</p>
313	313	<div class="tag-container">
314	314	#set($daIdx = 1)
315		- #foreach($da in $dailyActivities.split(","))
	323	+ #foreach($da in $dailyActivities)
316	316	<span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
317	317	#set($daIdx = $daIdx + 1)
318	318	#end
...	...	@@ -363,7 +363,7 @@
363	363	#end
364	364
365	365	## --- ⑦ 予算 ---
366		- #set($hasBudget = ($budgetProcess && $budgetProcess != '') || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
	374	+ #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
367	367	#if($hasBudget)
368	368	## 公開範囲チェック
369	369	#set($canViewBudget = true)
...	...	@@ -374,12 +374,12 @@
374	374	<div class="school-section-card">
375	375	<h3><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 == 'members')<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> 登録者限定#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>
376	376	<div class="card-inner">
377		- #if($budgetProcess && $budgetProcess != '')
	385	+ #if($budgetProcess && !$budgetProcess.isEmpty())
378	378	<div class="info-row">
379	379	<span class="info-label">作成過程の生徒関与</span>
380	380	<span class="info-value">
381	381	<div class="selection-display">
382		- #foreach($bp in $budgetProcess.split(","))
	390	+ #foreach($bp in $budgetProcess)
383	383	<span class="selection-item">$!escapetool.xml($bp.trim())</span>
384	384	#end
385	385	</div>
...	...	@@ -398,12 +398,12 @@
398	398	<span class="info-value">$!escapetool.xml($!budgetScale)</span>
399	399	</div>
400	400	#end
401		- #if($budgetAllocation && $budgetAllocation != '')
	409	+ #if($budgetAllocation && !$budgetAllocation.isEmpty())
402	402	<div class="info-row">
403	403	<span class="info-label">主な予算配分</span>
404	404	<span class="info-value">
405	405	<div class="selection-display">
406		- #foreach($ba in $budgetAllocation.split(","))
	414	+ #foreach($ba in $budgetAllocation)
407	407	<span class="selection-item">$!escapetool.xml($ba.trim())</span>
408	408	#end
409	409	</div>
...	...	@@ -436,12 +436,12 @@
436	436	<span class="info-label">見直しの有無（3年以内）</span>
437	437	<span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
438	438	</div>
439		- #if($ruleReviewContent && $ruleReviewContent != '')
	447	+ #if($ruleReviewContent && !$ruleReviewContent.isEmpty())
440	440	<div class="info-row">
441	441	<span class="info-label">見直しの内容</span>
442	442	<span class="info-value">
443	443	<div class="selection-display">
444		- #foreach($rc in $ruleReviewContent.split(","))
	452	+ #foreach($rc in $ruleReviewContent)
445	445	<span class="selection-item">$!escapetool.xml($rc.trim())</span>
446	446	#end
447	447	</div>
...	...	@@ -448,12 +448,12 @@
448	448	</span>
449	449	</div>
450	450	#end
451		- #if($ruleReviewProposer && $ruleReviewProposer != '')
	459	+ #if($ruleReviewProposer && !$ruleReviewProposer.isEmpty())
452	452	<div class="info-row">
453	453	<span class="info-label">見直しの提案者</span>
454	454	<span class="info-value">
455	455	<div class="selection-display">
456		- #foreach($rp in $ruleReviewProposer.split(","))
	464	+ #foreach($rp in $ruleReviewProposer)
457	457	<span class="selection-item">$!escapetool.xml($rp.trim())</span>
458	458	#end
459	459	</div>
...	...	@@ -460,12 +460,12 @@
460	460	</span>
461	461	</div>
462	462	#end
463		- #if($ruleReviewImplementer && $ruleReviewImplementer != '')
	471	+ #if($ruleReviewImplementer && !$ruleReviewImplementer.isEmpty())
464	464	<div class="info-row">
465	465	<span class="info-label">見直しの実施者</span>
466	466	<span class="info-value">
467	467	<div class="selection-display">
468		- #foreach($ri in $ruleReviewImplementer.split(","))
	476	+ #foreach($ri in $ruleReviewImplementer)
469	469	<span class="selection-item">$!escapetool.xml($ri.trim())</span>
470	470	#end
471	471	</div>
...	...	@@ -909,10 +909,10 @@
909	909
910	910	#if($xcontext.user != "XWiki.XWikiGuest")
911	911	<div class="thread-add-post">
912		- <a href="/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
	920	+ <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">
913	913	＋ 活動報告を追加
914	914	</a>
915		- <a href="/bin/view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
	923	+ <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">
916	916	<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> コメントを書く
917	917	</a>
918	918	</div>
...	...	@@ -934,7 +934,7 @@
934	934	#if($xcontext.user != "XWiki.XWikiGuest")
935	935	{{html clean="false"}}
936	936	<div class="activity-add-section">
937		- <a href="/bin/view/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$!escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity">
	945	+ <a href="/bin/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$!escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity">
938	938	<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> 活動を追加
939	939	</a>
940	940	</div>
...	...	@@ -941,59 +941,6 @@
941	941	{{/html}}
942	942	#end
943	943
944		-## --- 年度アーカイブ セクション ---
945		-{{html clean="false"}}
946		-<div class="school-section-card school-archive-card">
947		- <h2 class="archive-section-title">
948		- <svg class="ico ico-md" viewBox="0 0 24 24"><path d="M19 21H5a2 2 0 01-2-2V5a2 2 0 012-2h11l5 5v11a2 2 0 01-2 2z"/><polyline points="17 21 17 13 7 13 7 21"/><polyline points="7 3 7 8 15 8"/></svg>
949		- 年度アーカイブ
950		- </h2>
951		- <div class="archive-meta">
952		- 現在のページ: <strong>${pageFiscalYear}年度</strong>
953		- #set($lyud = $!doc.getValue('lastYearUpdateDate'))
954		- #if($lyud && $lyud != '')
955		- | 最終年度更新: $!escapetool.xml($lyud) ($!escapetool.xml($!doc.getValue('lastYearUpdateBy')))
956		- #end
957		- </div>
958		-
959		- ## 過去アーカイブの検索
960		- #set($archiveQuery = $services.query.hql("where doc.fullName like :pattern and doc.fullName like '%Archive_%' order by doc.fullName desc").bindValue("pattern", "${doc.fullName}.Archive_%").setLimit(20))
961		- #set($archivePages = $archiveQuery.execute())
962		-
963		- #if($archivePages && $archivePages.size() > 0)
964		- <div class="archive-card-field-lg">
965		- <div class="archive-list-label">過去の年度アーカイブ</div>
966		- <div class="archive-list">
967		- #foreach($archPage in $archivePages)
968		- #set($archPageDoc = $xwiki.getDocument($archPage))
969		- #set($archPageObj = $archPageDoc.getObject('SeitokaiCode.SchoolClass'))
970		- #if($archPageObj)
971		- #set($archPageFY = $!archPageObj.getValue('fiscalYear'))
972		- <a href="$archPageDoc.getURL('view')" class="archive-link">
973		- <svg class="ico" viewBox="0 0 24 24"><path d="M19 21H5a2 2 0 01-2-2V5a2 2 0 012-2h11l5 5v11a2 2 0 01-2 2z"/><polyline points="17 21 17 13 7 13 7 21"/><polyline points="7 3 7 8 15 8"/></svg>
974		- ${archPageFY}年度
975		- </a>
976		- #end
977		- #end
978		- </div>
979		- </div>
980		- #else
981		- <div class="archive-empty">過去のアーカイブはまだありません</div>
982		- #end
983		-
984		- ## 新年度に移行ボタン（承認済み・管理者のみ）
985		- #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
986		- <div class="archive-action">
987		- <a href="/bin/view/SeitokaiCode/YearArchiveAction?schoolPage=${doc.fullName}" class="btn-accent">
988		- <svg class="ico" viewBox="0 0 24 24" stroke-width="2.5"><path d="M19 21H5a2 2 0 01-2-2V5a2 2 0 012-2h11l5 5v11a2 2 0 01-2 2z"/><polyline points="17 21 17 13 7 13 7 21"/><polyline points="7 3 7 8 15 8"/></svg>
989		- ${pageFiscalYear}年度をアーカイブして新年度に移行
990		- </a>
991		- <div class="archive-action-hint">現在の学校情報を${pageFiscalYear}年度として保存し、新しい年度に移行します。</div>
992		- </div>
993		- #end
994		-</div>
995		-{{/html}}
996		-
997	997	## --- 年度タブ切り替え JavaScript ---
998	998	{{html clean="false"}}
999	999	<script>
...	...	@@ -1010,14 +1010,12 @@
1010	1010	}
1011	1011	});
1012	1012	}
1013		-// ページ読み込み時にデフォルトで現在の年度を表示
	968	+// ページ読み込み時の初期化
1014	1014	document.addEventListener('DOMContentLoaded', function() {
	970	+ // デフォルトで現在の年度を表示
1015	1015	var defaultTab = document.querySelector('.activity-fy-tab.active');
1016	1016	if (defaultTab) { defaultTab.click(); }
1017	1017	// 保存成功時のトースト通知
1018		- if (window.location.search.indexOf('archived=1') !== -1) {
1019		- showToast('年度アーカイブを作成しました', 'success');
1020		- }
1021	1021	if (window.location.search.indexOf('saved=1') !== -1) {
1022	1022	showToast('学校情報を保存しました', 'success');
1023	1023	// URLパラメータをクリーンアップ（リロード時に再表示されないよう）
...	...	@@ -1084,7 +1084,9 @@
1084	1084	var csrfEl = document.querySelector('input[name="form_token"]');
1085	1085	var csrfToken = csrfEl ? csrfEl.value : '';
1086	1086	var xhr = new XMLHttpRequest();
1087		- xhr.open('GET', '/bin/view/SeitokaiCode/EditPost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken), true);
	1040	+ xhr.open('POST', '/bin/SeitokaiCode/EditPost?outputSyntax=plain', true);
	1041	+ xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
	1042	+ var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken);
1088	1088	xhr.onload = function() {
1089	1089	try {
1090	1090	var res = JSON.parse(xhr.responseText);
...	...	@@ -1097,7 +1097,7 @@
1097	1097	} catch(e) { alert('編集に失敗しました'); }
1098	1098	};
1099	1099	xhr.onerror = function() { alert('通信エラーが発生しました'); };
1100		- xhr.send();
	1055	+ xhr.send(editPostData);
1101	1101	}
1102	1102
1103	1103	// 投稿の削除（確認ダイアログ付き）
...	...	@@ -1104,7 +1104,9 @@
1104	1104	function confirmDeletePost(schoolPage, postObjNum, token) {
1105	1105	if (!confirm('この投稿を削除しますか？\\n削除後は「この投稿は削除されました」と表示されます。')) return;
1106	1106	var xhr = new XMLHttpRequest();
1107		- xhr.open('GET', '/bin/view/SeitokaiCode/DeletePost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token), true);
	1062	+ xhr.open('POST', '/bin/SeitokaiCode/DeletePost?outputSyntax=plain', true);
	1063	+ xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
	1064	+ var deletePostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token);
1108	1108	xhr.onload = function() {
1109	1109	try {
1110	1110	var res = JSON.parse(xhr.responseText);
...	...	@@ -1117,7 +1117,7 @@
1117	1117	} catch(e) { alert('削除に失敗しました'); }
1118	1118	};
1119	1119	xhr.onerror = function() { alert('通信エラーが発生しました'); };
1120		- xhr.send();
	1077	+ xhr.send(deletePostData);
1121	1121	}
1122	1122	</script>
1123	1123	{{/html}}