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

Summary

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

Details

Page properties

Content

...	...	@@ -378,7 +378,7 @@
378	378	#end
379	379	#if($canViewOrgChart)
380	380	<div class="seitokai-subsection">
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>
	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>
382	382	<div class="seitokai-subsection-content">
383	383	#if($orgChartImage && $orgChartImage != '')
384	384	<div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div>
...	...	@@ -396,12 +396,10 @@
396	396	<div class="seitokai-subsection">
397	397	<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>
398	398	<div class="seitokai-subsection-content">
399		- <p class="activity-hint">活動時間の多い順に上位3つ</p>
	399	+ <p class="activity-hint">活動時間が多い3つ</p>
400	400	<div class="tag-container">
401		- #set($daIdx = 1)
402	402	#foreach($da in $dailyActivities)
403		- <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span>
404		- #set($daIdx = $daIdx + 1)
	402	+ <span class="tag tag-accent">$!escapetool.xml($da.trim())</span>
405	405	#end
406	406	</div>
407	407	#if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '')
...	...	@@ -458,7 +458,7 @@
458	458	#end
459	459	#if($canViewBudget)
460	460	<div class="seitokai-subsection">
461		- <h3 class="seitokai-subsection-title"><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 == '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>
	459	+ <h3 class="seitokai-subsection-title"><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 == '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>
462	462	<div class="seitokai-subsection-content">
463	463	#if($budgetProcess && !$budgetProcess.isEmpty())
464	464	<div class="info-row">
...	...	@@ -514,7 +514,7 @@
514	514	#end
515	515	#if($canViewRuleReview)
516	516	<div class="seitokai-subsection">
517		- <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>
	515	+ <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>
518	518	<div class="seitokai-subsection-content">
519	519	<div class="info-row">
520	520	<span class="info-label">見直しの有無（3年以内）</span>
...	...	@@ -577,7 +577,7 @@
577	577	#end
578	578	#if($canViewChallenges)
579	579	<div class="seitokai-subsection">
580		- <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M12 16v-4"/><path d="M12 8h.01"/></svg> 生徒会の課題意識 #if($visibilityChallenges != 'public')<span class="visibility-badge visibility-${visibilityChallenges}">#if($visibilityChallenges == '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>
	578	+ <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M12 16v-4"/><path d="M12 8h.01"/></svg> 生徒会の課題意識 #if($visibilityChallenges != 'public')<span class="visibility-badge visibility-${visibilityChallenges}">#if($visibilityChallenges == '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>
581	581	<div class="seitokai-subsection-content">
582	582	<div class="challenge-text">$!escapetool.xml($challenges)</div>
583	583	</div>
...	...	@@ -958,7 +958,7 @@
958	958	#end
959	959	</div>
960	960	#if($postVis != 'public')
961		- <div class="visibility-badge visibility-${postVis} post-action-mt">#if($postVis == '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</div>
	959	+ <div class="visibility-badge visibility-${postVis} post-action-mt">#if($postVis == '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</div>
962	962	#end
963	963	## 固定/編集/削除/通報/非表示ボタン（横並び）
964	964	#set($postAuthorRef = $!post.getValue('authorRef'))
...	...	@@ -982,7 +982,9 @@
982	982	#end
983	983	#if($showEditDeleteBtn)
984	984	#if($xcontext.user == $postAuthorRef)
985		- <button type="button" class="btn-post-edit" onclick="openEditPost(this, '${doc.fullName}', $postObjNumED, '$!escapetool.javascript($!postContent)')" title="この投稿を編集">
	983	+ #set($editImages = $!post.getValue('images'))
	984	+ #set($editFiles = $!post.getValue('files'))
	985	+ <button type="button" class="btn-post-edit" data-school="${doc.fullName}" data-obj="$postObjNumED" data-content="$!escapetool.xml($!postContent)" data-images="$!escapetool.xml($!editImages)" data-files="$!escapetool.xml($!editFiles)" data-post-type="$!post.getValue('postType')" onclick="openEditPost(this)" title="この投稿を編集">
986	986	<svg class="ico ico-fixed-14" 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> 編集
987	987	</button>
988	988	#end
...	...	@@ -1215,37 +1215,130 @@
1215	1215	}
1216	1216
1217	1217	// 投稿の編集（インライン編集フォームを開く）
1218		-function openEditPost(btn, schoolPage, postObjNum, currentContent) {
	1218	+function openEditPost(btn) {
1219	1219	var postEl = btn.closest('.thread-post');
1220	1220	if (!postEl) return;
1221		- // 既存の編集フォームがあれば閉じる
1222	1222	var existing = postEl.querySelector('.post-edit-form');
1223	1223	if (existing) { existing.remove(); return; }
1224	1224	var bodyEl = postEl.querySelector('.thread-post-body');
1225	1225	if (!bodyEl) return;
	1225	+
	1226	+ var schoolPage = btn.getAttribute('data-school');
	1227	+ var postObjNum = btn.getAttribute('data-obj');
	1228	+ var currentContent = btn.getAttribute('data-content') || '';
	1229	+ var currentImages = btn.getAttribute('data-images') || '';
	1230	+ var currentFiles = btn.getAttribute('data-files') || '';
	1231	+ var postType = btn.getAttribute('data-post-type') || 'report';
	1232	+
1226	1226	var form = document.createElement('div');
1227	1227	form.className = 'post-edit-form';
1228		- form.innerHTML = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>' +
1229		- '<div class="post-edit-form-actions">' +
	1235	+ form.setAttribute('data-school', schoolPage);
	1236	+ form.setAttribute('data-obj', postObjNum);
	1237	+
	1238	+ var html = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>';
	1239	+
	1240	+ // コメント以外は添付ファイル編集を表示
	1241	+ if (postType !== 'comment') {
	1242	+ // 既存画像
	1243	+ html += '<div class="edit-attachments">';
	1244	+ if (currentImages.trim()) {
	1245	+ html += '<div class="edit-attach-section"><span class="edit-attach-label">画像</span>';
	1246	+ var imgs = currentImages.trim().split('\n');
	1247	+ for (var i = 0; i < imgs.length; i++) {
	1248	+ var img = imgs[i].trim();
	1249	+ if (!img) continue;
	1250	+ html += '<div class="edit-attach-item" data-name="' + img.replace(/"/g,'&quot;') + '">' +
	1251	+ '<img src="/xwiki/bin/download/' + schoolPage.replace(/\./g,'/') + '/' + encodeURIComponent(img) + '" class="edit-attach-thumb" />' +
	1252	+ '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
	1253	+ '<input type="hidden" name="keepImages" value="' + img.replace(/"/g,'&quot;') + '" />' +
	1254	+ '</div>';
	1255	+ }
	1256	+ html += '</div>';
	1257	+ }
	1258	+ // 既存ファイル
	1259	+ if (currentFiles.trim()) {
	1260	+ html += '<div class="edit-attach-section"><span class="edit-attach-label">ファイル</span>';
	1261	+ var files = currentFiles.trim().split('\n');
	1262	+ for (var j = 0; j < files.length; j++) {
	1263	+ var f = files[j].trim();
	1264	+ if (!f) continue;
	1265	+ var displayName = f;
	1266	+ if (/^file_\d{14}_\d+_/.test(f)) displayName = f.replace(/^file_\d{14}_\d+_/, '');
	1267	+ html += '<div class="edit-attach-item" data-name="' + f.replace(/"/g,'&quot;') + '">' +
	1268	+ '<span class="edit-attach-fname">' + displayName.replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</span>' +
	1269	+ '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
	1270	+ '<input type="hidden" name="keepFiles" value="' + f.replace(/"/g,'&quot;') + '" />' +
	1271	+ '</div>';
	1272	+ }
	1273	+ html += '</div>';
	1274	+ }
	1275	+ // 新規追加
	1276	+ html += '<div class="edit-attach-add">' +
	1277	+ '<label class="form-label-sm">画像を追加（最大4枚まで）</label>' +
	1278	+ '<input type="file" name="editNewImages" accept="image/*" multiple class="form-file-input-sm" />' +
	1279	+ '<div class="form-hint">JPEG / PNG / GIF / WebP、各5MBまで</div>' +
	1280	+ '<label class="form-label-sm" style="margin-top:8px;">ファイルを追加（最大2つまで）</label>' +
	1281	+ '<input type="file" name="editNewFiles" accept=".pdf,.docx,.xlsx,.pptx" multiple class="form-file-input-sm" />' +
	1282	+ '<div class="form-hint">PDF / Word / Excel / PowerPoint、各10MBまで</div>' +
	1283	+ '</div>';
	1284	+ html += '</div>';
	1285	+ }
	1286	+
	1287	+ html += '<div class="post-edit-form-actions">' +
1230	1230	'<button type="button" class="btn-cancel-edit" onclick="this.closest(\'.post-edit-form\').remove()">キャンセル</button>' +
1231		- '<button type="button" class="btn-save" onclick="saveEditPost(\'' + schoolPage + '\', ' + postObjNum + ')">保存</button>' +
	1289	+ '<button type="button" class="btn-save" onclick="saveEditPost(this)">保存</button>' +
1232	1232	'</div>';
	1291	+
	1292	+ form.innerHTML = html;
1233	1233	bodyEl.parentNode.insertBefore(form, bodyEl.nextSibling);
1234	1234	form.querySelector('textarea').focus();
1235	1235	}
1236	1236
	1297	+function removeEditAttach(btn) {
	1298	+ var item = btn.closest('.edit-attach-item');
	1299	+ if (item) item.remove();
	1300	+}
	1301	+
1237	1237	// 投稿の編集を保存
1238		-function saveEditPost(schoolPage, postObjNum) {
1239		- var textarea = document.getElementById('editContent_' + postObjNum);
	1303	+function saveEditPost(btn) {
	1304	+ var formEl = btn.closest('.post-edit-form');
	1305	+ if (!formEl) return;
	1306	+ var schoolPage = formEl.getAttribute('data-school');
	1307	+ var postObjNum = formEl.getAttribute('data-obj');
	1308	+ var textarea = formEl.querySelector('textarea');
1240	1240	if (!textarea) return;
1241	1241	var newContent = textarea.value.trim();
1242	1242	if (!newContent) { alert('投稿内容を入力してください'); return; }
	1312	+
1243	1243	var csrfEl = document.querySelector('input[name="form_token"]');
1244	1244	var csrfToken = csrfEl ? csrfEl.value : '';
	1315	+
	1316	+ var fd = new FormData();
	1317	+ fd.append('schoolPage', schoolPage);
	1318	+ fd.append('postObj', postObjNum);
	1319	+ fd.append('newContent', newContent);
	1320	+ fd.append('form_token', csrfToken);
	1321	+
	1322	+ // 残す画像・ファイル
	1323	+ formEl.querySelectorAll('input[name="keepImages"]').forEach(function(el) { fd.append('keepImages', el.value); });
	1324	+ formEl.querySelectorAll('input[name="keepFiles"]').forEach(function(el) { fd.append('keepFiles', el.value); });
	1325	+
	1326	+ // 新規画像
	1327	+ var newImgInput = formEl.querySelector('input[name="editNewImages"]');
	1328	+ if (newImgInput && newImgInput.files) {
	1329	+ for (var i = 0; i < newImgInput.files.length; i++) { fd.append('editNewImages', newImgInput.files[i]); }
	1330	+ }
	1331	+ // 新規ファイル
	1332	+ var newFileInput = formEl.querySelector('input[name="editNewFiles"]');
	1333	+ if (newFileInput && newFileInput.files) {
	1334	+ for (var j = 0; j < newFileInput.files.length; j++) { fd.append('editNewFiles', newFileInput.files[j]); }
	1335	+ }
	1336	+
	1337	+ btn.disabled = true;
	1338	+ btn.textContent = '保存中...';
	1339	+
1245	1245	var xhr = new XMLHttpRequest();
1246	1246	xhr.open('POST', '/bin/get/SeitokaiCode/EditPost?outputSyntax=plain', true);
1247		- xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1248		- var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken);
1249	1249	xhr.onload = function() {
1250	1250	try {
1251	1251	var res = JSON.parse(xhr.responseText);
...	...	@@ -1253,12 +1253,13 @@
1253	1253	showToast('投稿を更新しました', 'success');
1254	1254	setTimeout(function() { location.reload(); }, 800);
1255	1255	} else {
	1349	+ btn.disabled = false; btn.textContent = '保存';
1256	1256	alert('編集に失敗しました: ' + (res.error || ''));
1257	1257	}
1258		- } catch(e) { alert('編集に失敗しました'); }
	1352	+ } catch(e) { btn.disabled = false; btn.textContent = '保存'; alert('編集に失敗しました'); }
1259	1259	};
1260		- xhr.onerror = function() { alert('通信エラーが発生しました'); };
1261		- xhr.send(editPostData);
	1354	+ xhr.onerror = function() { btn.disabled = false; btn.textContent = '保存'; alert('通信エラーが発生しました'); };
	1355	+ xhr.send(fd);
1262	1262	}
1263	1263
1264	1264	// 投稿の削除（確認ダイアログ付き）