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

Summary

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

Details

Page properties

Content

...	...	@@ -1,10 +1,21 @@
1	1	{{velocity}}
2	2	## ===== 学校ページ テンプレート =====
3		-## このテンプレートは学校ページの表示と入力フォームを制御します。
4		-
5		-## メンテナンスバナー
6		-{{include reference="SeitokaiCode.MaintenanceBannerInclude" /}}
7	7	{{html clean="false"}}
	4	+## メンテナンスバナー（{{include}}ではなくインラインで記述し、<p>タグ挿入を回避）
	5	+#set($bannerDoc = $xwiki.getDocument('SeitokaiAdmin.MaintenanceBanner'))
	6	+#set($bannerObj = $bannerDoc.getObject('SeitokaiCode.MaintenanceBannerClass'))
	7	+#if($bannerObj && $bannerObj.getValue('enabled') == 1)
	8	+#set($bannerMsg = $bannerObj.getValue('message'))
	9	+#set($bannerLevel = $bannerObj.getValue('level'))
	10	+#if(!$bannerLevel || $bannerLevel == '')#set($bannerLevel = 'warning')#end
	11	+<div class="maintenance-banner active maintenance-${bannerLevel}" id="maintenance-banner">
	12	+ <div class="maintenance-banner-inner">
	13	+ <span class="maintenance-icon">#if($bannerLevel == 'urgent')<svg class="ico-banner" viewBox="0 0 24 24"><path d="M10.29 3.86L1.82 18a2 2 0 001.71 3h16.94a2 2 0 001.71-3L13.71 3.86a2 2 0 00-3.42 0z"/><line x1="12" y1="9" x2="12" y2="13"/><line x1="12" y1="17" x2="12.01" y2="17"/></svg>#elseif($bannerLevel == 'info')<svg class="ico-banner" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><line x1="12" y1="16" x2="12" y2="12"/><line x1="12" y1="8" x2="12.01" y2="8"/></svg>#else<svg class="ico-banner" viewBox="0 0 24 24"><path d="M14.7 6.3a1 1 0 000 1.4l1.6 1.6a1 1 0 001.4 0l3.77-3.77a6 6 0 01-7.94 7.94l-6.91 6.91a2.12 2.12 0 01-3-3l6.91-6.91a6 6 0 017.94-7.94l-3.76 3.76z"/></svg>#end</span>
	14	+ <span class="maintenance-text">$!escapetool.xml($bannerMsg)</span>
	15	+ <button class="maintenance-close" onclick="document.getElementById('maintenance-banner').style.display='none'">&times;</button>
	16	+ </div>
	17	+</div>
	18	+#end
8	8	## --- 学校基本情報フィールド ---
9	9	#set($schoolCode = $doc.getValue('schoolCode'))
10	10	#set($schoolName = $doc.getValue('schoolName'))
...	...	@@ -54,9 +54,7 @@
54	54	#set($seitokaiYoutube = $doc.getValue('seitokaiYoutube'))
55	55	#set($seitokaiOtherSns = $doc.getValue('seitokaiOtherSns'))
56	56
57		-## --- 年度アーカイブ ---
58		-#set($pageFiscalYear = $!doc.getValue('fiscalYear'))
59		-## 現在の年度を計算（4月始まり）
	68	+## --- 現在の年度を計算（4月始まり） ---
60	60	#set($nowFY = $datetool.date)
61	61	#set($currentFYMonth = $mathtool.toInteger($datetool.format('MM', $nowFY)))
62	62	#set($currentFYYear = $mathtool.toInteger($datetool.format('yyyy', $nowFY)))
...	...	@@ -65,10 +65,6 @@
65	65	#else
66	66	#set($currentFiscalYear = $mathtool.sub($currentFYYear, 1))
67	67	#end
68		-## fiscalYear 未設定時はデフォルトとして現在の年度を使う
69		-#if(!$pageFiscalYear || $pageFiscalYear == '')
70		- #set($pageFiscalYear = $currentFiscalYear.toString())
71		-#end
72	72
73	73	## --- 公開範囲フィールド ---
74	74	#set($visibilityOrgChart = $!doc.getValue('visibilityOrgChart'))
...	...	@@ -97,8 +97,12 @@
97	97
98	98	## --- 投稿固定/解除処理 ---
99	99	#set($pinAction = $!request.action)
100		-#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || $viewerAccountType == 'verified') && $services.csrf.isTokenValid($request.form_token))
101		- #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))
102	102	#set($postObj = $doc.getObject('SeitokaiCode.ActivityPostClass', $postObjNum))
103	103	#if($postObj)
104	104	#if($pinAction == 'pin')
...	...	@@ -118,12 +118,15 @@
118	118	$response.sendRedirect($doc.getURL('view'))
119	119	#stop
120	120	#end
	130	+ #end## /matches
121	121	#end
122	122
123	123	## --- 特色ある活動 選定/解除処理 ---
124	124	#set($featAction = $!request.action)
125		-#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $services.csrf.isTokenValid($request.form_token))
126		- #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))
127	127	#set($actObj = $doc.getObject('SeitokaiCode.ActivityClass', $actObjNum))
128	128	#if($actObj)
129	129	#if($featAction == 'feature')
...	...	@@ -155,12 +155,13 @@
155	155	$response.sendRedirect($doc.getURL('view'))
156	156	#stop
157	157	#end
	170	+ #end## /matches
158	158	#end
159	159
160	160	## --- ユーザー情報取得 ---
161	161	## displayName: Wiki上の表示名（ニックネーム）。本名(firstName/lastName)は管理者のみ閲覧可能。
162	162	#set($lastAuthor = $doc.author)
163		-#set($lastAuthorDoc = $xwiki.getDocument("XWiki.${lastAuthor}"))
	176	+#set($lastAuthorDoc = $xwiki.getDocument($lastAuthor))
164	164	#set($authorAccountType = '')
165	165	#set($authorUserRole = '')
166	166	#set($authorUserStatus = '')
...	...	@@ -213,48 +213,26 @@
213	213	#end
214	214	#end
215	215
216		-## --- 信頼性バッジ + ユーザー情報 ---
217		-<div class="seitokai-badge-container">
218		- ## 承認バッジ
219		- #if($authorAccountType == 'admin')
220		- <span class="badge badge-admin"><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> 管理者</span>
221		- #elseif($authorAccountType == 'verified')
222		- <span class="badge badge-verified"><svg class="ico" viewBox="0 0 24 24" stroke-width="2.5"><path d="M20 6L9 17l-5-5"/></svg> 承認済み</span>
223		- #elseif($authorAccountType == 'referred')
224		- <span class="badge badge-referred"><svg class="ico" viewBox="0 0 24 24"><path d="M10 13a5 5 0 007.54.54l3-3a5 5 0 00-7.07-7.07l-1.72 1.71"/><path d="M14 11a5 5 0 00-7.54-.54l-3 3a5 5 0 007.07 7.07l1.71-1.71"/></svg> 紹介</span>
225		- #else
226		- <span class="badge badge-general">一般</span>
227		- #end
228		- ## 役割バッジ
229		- #if($authorUserRole == 'student')
230		- <span class="badge badge-role-student"><svg class="ico" viewBox="0 0 24 24"><path d="M22 10l-10-5L2 10l10 5 10-5z"/><path d="M6 12v5c0 1.66 2.69 3 6 3s6-1.34 6-3v-5"/></svg> 生徒</span>
231		- #set($authorIsOfficer = $!lastAuthorDoc.getValue('isOfficer'))
232		- #if($authorIsOfficer == 'true')
233		- <span class="badge badge-role-officer"><svg class="ico" viewBox="0 0 24 24"><path d="M12 2l3.09 6.26L22 9.27l-5 4.87 1.18 6.88L12 17.77l-6.18 3.25L7 14.14 2 9.27l6.91-1.01L12 2z"/></svg> 役員</span>
234		- #end
235		- #elseif($authorUserRole == 'teacher')
236		- <span class="badge badge-role-teacher"><svg class="ico" viewBox="0 0 24 24"><path d="M4 19.5A2.5 2.5 0 016.5 17H20"/><path d="M6.5 2H20v20H6.5A2.5 2.5 0 014 19.5v-15A2.5 2.5 0 016.5 2z"/></svg> 教員</span>
237		- #elseif($authorUserRole == 'graduate')
238		- <span class="badge badge-role-graduate"><svg class="ico" viewBox="0 0 24 24"><path d="M22 10l-10-5L2 10l10 5 10-5z"/><path d="M6 12v5c0 1.66 2.69 3 6 3s6-1.34 6-3v-5"/></svg> 卒業生</span>
239		- #end
240		- ## 学年（生徒のみ公開）
241		- #if($authorGrade && $authorGrade != '')
242		- <span class="badge badge-grade">$authorGrade</span>
243		- #end
244		- ## 在籍状態（卒業・休学等の場合のみ表示）
245		- #if($authorUserStatus == 'graduated')
246		- <span class="badge badge-status-graduated"><svg class="ico" viewBox="0 0 24 24"><path d="M22 10l-10-5L2 10l10 5 10-5z"/><path d="M6 12v5c0 1.66 2.69 3 6 3s6-1.34 6-3v-5"/></svg> 卒業済み</span>
247		- #elseif($authorUserStatus == 'on_leave')
248		- <span class="badge badge-status-onleave"><svg class="ico" viewBox="0 0 24 24" fill="currentColor"><rect x="6" y="4" width="4" height="16" rx="1"/><rect x="14" y="4" width="4" height="16" rx="1"/></svg> 休学中</span>
249		- #elseif($authorUserStatus == 'transferred')
250		- <span class="badge badge-status-transferred"><svg class="ico" viewBox="0 0 24 24"><polyline points="23 4 23 10 17 10"/><polyline points="1 20 1 14 7 14"/><path d="M3.51 9a9 9 0 0114.85-3.36L23 10M1 14l4.64 4.36A9 9 0 0020.49 15"/></svg> 転校済み</span>
251		- #end
252		- <span class="badge-info">最終編集: $!escapetool.xml($authorDisplayName) ($xwiki.formatDate($doc.date, "yyyy/MM/dd"))</span>
	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	+
	235	+## --- 編集ボタン（権限があるユーザーのみ表示） ---
	236	+#set($canEditSchool = false)
	237	+#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode))
	238	+ #set($canEditSchool = true)
	239	+#end
	240	+#if($canEditSchool)
	241	+<div style="text-align:right; margin-bottom:12px;">
	242	+ <a href="$doc.getURL('view', 'sheet=SeitokaiCode.SchoolEditForm')" class="btn-school-edit"><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> 基本情報を編集</a>
253	253	</div>
	244	+#end
254	254
255	255	## --- ① 学校基本情報 + 連絡先（左右グリッド・折りたたみ対応） ---
256	256	<div class="school-info-grid">
257		- <div class="school-info-card mobile-collapse" id="card-basic-info">
	248	+ <div class="school-info-card collapsed" id="card-basic-info">
258	258	<h2 onclick="toggleInfoCard('card-basic-info')"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M4 19.5A2.5 2.5 0 016.5 17H20"/><path d="M6.5 2H20v20H6.5A2.5 2.5 0 014 19.5v-15A2.5 2.5 0 016.5 2z"/></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>
259	259	<table class="wiki-table school-info-table">
260	260	<tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
...	...	@@ -264,7 +264,7 @@
264	264	<tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
265	265	<tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
266	266	<tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
267		- <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>
268	268	<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>
269	269	</table>
270	270	#set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
...	...	@@ -274,7 +274,7 @@
274	274	#end
275	275	</div>
276	276
277		- <div class="school-info-card mobile-collapse" id="card-contact">
	268	+ <div class="school-info-card collapsed" id="card-contact">
278	278	<h2 onclick="toggleInfoCard('card-contact')"><span><svg class="ico ico-md" viewBox="0 0 24 24"><path d="M22 16.92v3a2 2 0 01-2.18 2 19.79 19.79 0 01-8.63-3.07 19.5 19.5 0 01-6-6 19.79 19.79 0 01-3.07-8.67A2 2 0 014.11 2h3a2 2 0 012 1.72c.127.96.361 1.903.7 2.81a2 2 0 01-.45 2.11L8.09 9.91a16 16 0 006 6l1.27-1.27a2 2 0 012.11-.45c.907.339 1.85.573 2.81.7A2 2 0 0122 16.92z"/></svg> 連絡先・SNS</span><span class="collapse-toggle"><span class="collapse-label-open">たたむ</span><span class="collapse-label-closed">開く</span> <span class="collapse-arrow">▼</span></span></h2>
279	279	<table class="wiki-table school-info-table">
280	280	<tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr>
...	...	@@ -322,7 +322,7 @@
322	322
323	323	## --- ③④⑤ 日常の活動・選挙・定例活動 ---
324	324	<div class="school-section-grid">
325		- #if($dailyActivities && $dailyActivities != '')
	316	+ #if($dailyActivities && !$dailyActivities.isEmpty())
326	326	<div class="school-section-card">
327	327	<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>
328	328	<div class="card-inner">
...	...	@@ -329,7 +329,7 @@
329	329	<p class="activity-hint">活動時間の多い順に上位3つ</p>
330	330	<div class="tag-container">
331	331	#set($daIdx = 1)
332		- #foreach($da in $dailyActivities.split(","))
	323	+ #foreach($da in $dailyActivities)
333	333	<span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
334	334	#set($daIdx = $daIdx + 1)
335	335	#end
...	...	@@ -380,7 +380,7 @@
380	380	#end
381	381
382	382	## --- ⑦ 予算 ---
383		- #set($hasBudget = ($budgetProcess && $budgetProcess != '') || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
	374	+ #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
384	384	#if($hasBudget)
385	385	## 公開範囲チェック
386	386	#set($canViewBudget = true)
...	...	@@ -391,12 +391,12 @@
391	391	<div class="school-section-card">
392	392	<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>
393	393	<div class="card-inner">
394		- #if($budgetProcess && $budgetProcess != '')
	385	+ #if($budgetProcess && !$budgetProcess.isEmpty())
395	395	<div class="info-row">
396	396	<span class="info-label">作成過程の生徒関与</span>
397	397	<span class="info-value">
398	398	<div class="selection-display">
399		- #foreach($bp in $budgetProcess.split(","))
	390	+ #foreach($bp in $budgetProcess)
400	400	<span class="selection-item">$!escapetool.xml($bp.trim())</span>
401	401	#end
402	402	</div>
...	...	@@ -415,12 +415,12 @@
415	415	<span class="info-value">$!escapetool.xml($!budgetScale)</span>
416	416	</div>
417	417	#end
418		- #if($budgetAllocation && $budgetAllocation != '')
	409	+ #if($budgetAllocation && !$budgetAllocation.isEmpty())
419	419	<div class="info-row">
420	420	<span class="info-label">主な予算配分</span>
421	421	<span class="info-value">
422	422	<div class="selection-display">
423		- #foreach($ba in $budgetAllocation.split(","))
	414	+ #foreach($ba in $budgetAllocation)
424	424	<span class="selection-item">$!escapetool.xml($ba.trim())</span>
425	425	#end
426	426	</div>
...	...	@@ -453,12 +453,12 @@
453	453	<span class="info-label">見直しの有無（3年以内）</span>
454	454	<span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span>
455	455	</div>
456		- #if($ruleReviewContent && $ruleReviewContent != '')
	447	+ #if($ruleReviewContent && !$ruleReviewContent.isEmpty())
457	457	<div class="info-row">
458	458	<span class="info-label">見直しの内容</span>
459	459	<span class="info-value">
460	460	<div class="selection-display">
461		- #foreach($rc in $ruleReviewContent.split(","))
	452	+ #foreach($rc in $ruleReviewContent)
462	462	<span class="selection-item">$!escapetool.xml($rc.trim())</span>
463	463	#end
464	464	</div>
...	...	@@ -465,12 +465,12 @@
465	465	</span>
466	466	</div>
467	467	#end
468		- #if($ruleReviewProposer && $ruleReviewProposer != '')
	459	+ #if($ruleReviewProposer && !$ruleReviewProposer.isEmpty())
469	469	<div class="info-row">
470	470	<span class="info-label">見直しの提案者</span>
471	471	<span class="info-value">
472	472	<div class="selection-display">
473		- #foreach($rp in $ruleReviewProposer.split(","))
	464	+ #foreach($rp in $ruleReviewProposer)
474	474	<span class="selection-item">$!escapetool.xml($rp.trim())</span>
475	475	#end
476	476	</div>
...	...	@@ -477,12 +477,12 @@
477	477	</span>
478	478	</div>
479	479	#end
480		- #if($ruleReviewImplementer && $ruleReviewImplementer != '')
	471	+ #if($ruleReviewImplementer && !$ruleReviewImplementer.isEmpty())
481	481	<div class="info-row">
482	482	<span class="info-label">見直しの実施者</span>
483	483	<span class="info-value">
484	484	<div class="selection-display">
485		- #foreach($ri in $ruleReviewImplementer.split(","))
	476	+ #foreach($ri in $ruleReviewImplementer)
486	486	<span class="selection-item">$!escapetool.xml($ri.trim())</span>
487	487	#end
488	488	</div>
...	...	@@ -926,10 +926,10 @@
926	926
927	927	#if($xcontext.user != "XWiki.XWikiGuest")
928	928	<div class="thread-add-post">
929		- <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">
930	930	＋ 活動報告を追加
931	931	</a>
932		- <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">
933	933	<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> コメントを書く
934	934	</a>
935	935	</div>
...	...	@@ -951,7 +951,7 @@
951	951	#if($xcontext.user != "XWiki.XWikiGuest")
952	952	{{html clean="false"}}
953	953	<div class="activity-add-section">
954		- <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">
955	955	<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> 活動を追加
956	956	</a>
957	957	</div>
...	...	@@ -958,59 +958,6 @@
958	958	{{/html}}
959	959	#end
960	960
961		-## --- 年度アーカイブ セクション ---
962		-{{html clean="false"}}
963		-<div class="school-section-card school-archive-card">
964		- <h2 class="archive-section-title">
965		- <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>
966		- 年度アーカイブ
967		- </h2>
968		- <div class="archive-meta">
969		- 現在のページ: <strong>${pageFiscalYear}年度</strong>
970		- #set($lyud = $!doc.getValue('lastYearUpdateDate'))
971		- #if($lyud && $lyud != '')
972		- | 最終年度更新: $!escapetool.xml($lyud) ($!escapetool.xml($!doc.getValue('lastYearUpdateBy')))
973		- #end
974		- </div>
975		-
976		- ## 過去アーカイブの検索
977		- #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))
978		- #set($archivePages = $archiveQuery.execute())
979		-
980		- #if($archivePages && $archivePages.size() > 0)
981		- <div class="archive-card-field-lg">
982		- <div class="archive-list-label">過去の年度アーカイブ</div>
983		- <div class="archive-list">
984		- #foreach($archPage in $archivePages)
985		- #set($archPageDoc = $xwiki.getDocument($archPage))
986		- #set($archPageObj = $archPageDoc.getObject('SeitokaiCode.SchoolClass'))
987		- #if($archPageObj)
988		- #set($archPageFY = $!archPageObj.getValue('fiscalYear'))
989		- <a href="$archPageDoc.getURL('view')" class="archive-link">
990		- <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>
991		- ${archPageFY}年度
992		- </a>
993		- #end
994		- #end
995		- </div>
996		- </div>
997		- #else
998		- <div class="archive-empty">過去のアーカイブはまだありません</div>
999		- #end
1000		-
1001		- ## 新年度に移行ボタン（承認済み・管理者のみ）
1002		- #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified')
1003		- <div class="archive-action">
1004		- <a href="/bin/view/SeitokaiCode/YearArchiveAction?schoolPage=${doc.fullName}" class="btn-accent">
1005		- <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>
1006		- ${pageFiscalYear}年度をアーカイブして新年度に移行
1007		- </a>
1008		- <div class="archive-action-hint">現在の学校情報を${pageFiscalYear}年度として保存し、新しい年度に移行します。</div>
1009		- </div>
1010		- #end
1011		-</div>
1012		-{{/html}}
1013		-
1014	1014	## --- 年度タブ切り替え JavaScript ---
1015	1015	{{html clean="false"}}
1016	1016	<script>
...	...	@@ -1027,20 +1027,12 @@
1027	1027	}
1028	1028	});
1029	1029	}
1030		-// ページ読み込み時にデフォルトで現在の年度を表示
	968	+// ページ読み込み時の初期化
1031	1031	document.addEventListener('DOMContentLoaded', function() {
	970	+ // デフォルトで現在の年度を表示
1032	1032	var defaultTab = document.querySelector('.activity-fy-tab.active');
1033	1033	if (defaultTab) { defaultTab.click(); }
1034		- // モバイルでは基本情報・連絡先をデフォルト折りたたみ
1035		- if (window.innerWidth <= 768) {
1036		- document.querySelectorAll('.school-info-card.mobile-collapse').forEach(function(card) {
1037		- card.classList.add('collapsed');
1038		- });
1039		- }
1040	1040	// 保存成功時のトースト通知
1041		- if (window.location.search.indexOf('archived=1') !== -1) {
1042		- showToast('年度アーカイブを作成しました', 'success');
1043		- }
1044	1044	if (window.location.search.indexOf('saved=1') !== -1) {
1045	1045	showToast('学校情報を保存しました', 'success');
1046	1046	// URLパラメータをクリーンアップ（リロード時に再表示されないよう）
...	...	@@ -1076,7 +1076,6 @@
1076	1076	var card = document.getElementById(cardId);
1077	1077	if (!card) return;
1078	1078	card.classList.toggle('collapsed');
1079		- card.classList.remove('mobile-collapse');
1080	1080	}
1081	1081
1082	1082	// 投稿の編集（インライン編集フォームを開く）
...	...	@@ -1108,7 +1108,9 @@
1108	1108	var csrfEl = document.querySelector('input[name="form_token"]');
1109	1109	var csrfToken = csrfEl ? csrfEl.value : '';
1110	1110	var xhr = new XMLHttpRequest();
1111		- 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);
1112	1112	xhr.onload = function() {
1113	1113	try {
1114	1114	var res = JSON.parse(xhr.responseText);
...	...	@@ -1121,7 +1121,7 @@
1121	1121	} catch(e) { alert('編集に失敗しました'); }
1122	1122	};
1123	1123	xhr.onerror = function() { alert('通信エラーが発生しました'); };
1124		- xhr.send();
	1055	+ xhr.send(editPostData);
1125	1125	}
1126	1126
1127	1127	// 投稿の削除（確認ダイアログ付き）
...	...	@@ -1128,7 +1128,9 @@
1128	1128	function confirmDeletePost(schoolPage, postObjNum, token) {
1129	1129	if (!confirm('この投稿を削除しますか？\\n削除後は「この投稿は削除されました」と表示されます。')) return;
1130	1130	var xhr = new XMLHttpRequest();
1131		- 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);
1132	1132	xhr.onload = function() {
1133	1133	try {
1134	1134	var res = JSON.parse(xhr.responseText);
...	...	@@ -1141,7 +1141,7 @@
1141	1141	} catch(e) { alert('削除に失敗しました'); }
1142	1142	};
1143	1143	xhr.onerror = function() { alert('通信エラーが発生しました'); };
1144		- xhr.send();
	1077	+ xhr.send(deletePostData);
1145	1145	}
1146	1146	</script>
1147	1147	{{/html}}