Skip to Content
Last modified by Super Admin on 2026/04/05 18:59
From version Icon 77.1 Icon
edited by Super Admin
on 2026/03/19 15:12
Change comment: There is no comment for this version
To version Icon 84.1 Icon
edited by Super Admin
on 2026/03/20 01:38
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')
... ... @@ -976,7 +976,9 @@
976 976   #end
977 977   #if($showEditDeleteBtn)
978 978   #if($xcontext.user == $postAuthorRef)
979 - <button type="button" class="btn-post-edit" onclick="openEditPost(this, '${doc.fullName}', $postObjNumED, '$!escapetool.javascript($!postContent)')" title="この投稿を編集">
985 + #set($editImages = $!post.getValue('images'))
986 + #set($editFiles = $!post.getValue('files'))
987 + <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="この投稿を編集">
980 980   <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> 編集
981 981   </button>
982 982   #end
... ... @@ -1209,37 +1209,130 @@
1209 1209  }
1210 1210  
1211 1211  // 投稿の編集（インライン編集フォームを開く）
1212 -function openEditPost(btn, schoolPage, postObjNum, currentContent) {
1220 +function openEditPost(btn) {
1213 1213   var postEl = btn.closest('.thread-post');
1214 1214   if (!postEl) return;
1215 - // 既存の編集フォームがあれば閉じる
1216 1216   var existing = postEl.querySelector('.post-edit-form');
1217 1217   if (existing) { existing.remove(); return; }
1218 1218   var bodyEl = postEl.querySelector('.thread-post-body');
1219 1219   if (!bodyEl) return;
1227 +
1228 + var schoolPage = btn.getAttribute('data-school');
1229 + var postObjNum = btn.getAttribute('data-obj');
1230 + var currentContent = btn.getAttribute('data-content') || '';
1231 + var currentImages = btn.getAttribute('data-images') || '';
1232 + var currentFiles = btn.getAttribute('data-files') || '';
1233 + var postType = btn.getAttribute('data-post-type') || 'report';
1234 +
1220 1220   var form = document.createElement('div');
1221 1221   form.className = 'post-edit-form';
1222 - form.innerHTML = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>' +
1223 - '<div class="post-edit-form-actions">' +
1237 + form.setAttribute('data-school', schoolPage);
1238 + form.setAttribute('data-obj', postObjNum);
1239 +
1240 + var html = '<textarea id="editContent_' + postObjNum + '">' + currentContent.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</textarea>';
1241 +
1242 + // コメント以外は添付ファイル編集を表示
1243 + if (postType !== 'comment') {
1244 + // 既存画像
1245 + html += '<div class="edit-attachments">';
1246 + if (currentImages.trim()) {
1247 + html += '<div class="edit-attach-section"><span class="edit-attach-label">画像</span>';
1248 + var imgs = currentImages.trim().split('\n');
1249 + for (var i = 0; i < imgs.length; i++) {
1250 + var img = imgs[i].trim();
1251 + if (!img) continue;
1252 + html += '<div class="edit-attach-item" data-name="' + img.replace(/"/g,'&quot;') + '">' +
1253 + '<img src="/xwiki/bin/download/' + schoolPage.replace(/\./g,'/') + '/' + encodeURIComponent(img) + '" class="edit-attach-thumb" />' +
1254 + '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1255 + '<input type="hidden" name="keepImages" value="' + img.replace(/"/g,'&quot;') + '" />' +
1256 + '</div>';
1257 + }
1258 + html += '</div>';
1259 + }
1260 + // 既存ファイル
1261 + if (currentFiles.trim()) {
1262 + html += '<div class="edit-attach-section"><span class="edit-attach-label">ファイル</span>';
1263 + var files = currentFiles.trim().split('\n');
1264 + for (var j = 0; j < files.length; j++) {
1265 + var f = files[j].trim();
1266 + if (!f) continue;
1267 + var displayName = f;
1268 + if (/^file_\d{14}_\d+_/.test(f)) displayName = f.replace(/^file_\d{14}_\d+_/, '');
1269 + html += '<div class="edit-attach-item" data-name="' + f.replace(/"/g,'&quot;') + '">' +
1270 + '<span class="edit-attach-fname">' + displayName.replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</span>' +
1271 + '<button type="button" class="edit-attach-remove" onclick="removeEditAttach(this)" title="削除">✕</button>' +
1272 + '<input type="hidden" name="keepFiles" value="' + f.replace(/"/g,'&quot;') + '" />' +
1273 + '</div>';
1274 + }
1275 + html += '</div>';
1276 + }
1277 + // 新規追加
1278 + html += '<div class="edit-attach-add">' +
1279 + '<label class="form-label-sm">画像を追加（最大4枚まで）</label>' +
1280 + '<input type="file" name="editNewImages" accept="image/*" multiple class="form-file-input-sm" />' +
1281 + '<div class="form-hint">JPEG / PNG / GIF / WebP、各5MBまで</div>' +
1282 + '<label class="form-label-sm" style="margin-top:8px;">ファイルを追加（最大2つまで）</label>' +
1283 + '<input type="file" name="editNewFiles" accept=".pdf,.docx,.xlsx,.pptx" multiple class="form-file-input-sm" />' +
1284 + '<div class="form-hint">PDF / Word / Excel / PowerPoint、各10MBまで</div>' +
1285 + '</div>';
1286 + html += '</div>';
1287 + }
1288 +
1289 + html += '<div class="post-edit-form-actions">' +
1224 1224   '<button type="button" class="btn-cancel-edit" onclick="this.closest(\'.post-edit-form\').remove()">キャンセル</button>' +
1225 - '<button type="button" class="btn-save" onclick="saveEditPost(\'' + schoolPage + '\', ' + postObjNum + ')">保存</button>' +
1291 + '<button type="button" class="btn-save" onclick="saveEditPost(this)">保存</button>' +
1226 1226   '</div>';
1293 +
1294 + form.innerHTML = html;
1227 1227   bodyEl.parentNode.insertBefore(form, bodyEl.nextSibling);
1228 1228   form.querySelector('textarea').focus();
1229 1229  }
1230 1230  
1299 +function removeEditAttach(btn) {
1300 + var item = btn.closest('.edit-attach-item');
1301 + if (item) item.remove();
1302 +}
1303 +
1231 1231  // 投稿の編集を保存
1232 -function saveEditPost(schoolPage, postObjNum) {
1233 - var textarea = document.getElementById('editContent_' + postObjNum);
1305 +function saveEditPost(btn) {
1306 + var formEl = btn.closest('.post-edit-form');
1307 + if (!formEl) return;
1308 + var schoolPage = formEl.getAttribute('data-school');
1309 + var postObjNum = formEl.getAttribute('data-obj');
1310 + var textarea = formEl.querySelector('textarea');
1234 1234   if (!textarea) return;
1235 1235   var newContent = textarea.value.trim();
1236 1236   if (!newContent) { alert('投稿内容を入力してください'); return; }
1314 +
1237 1237   var csrfEl = document.querySelector('input[name="form_token"]');
1238 1238   var csrfToken = csrfEl ? csrfEl.value : '';
1317 +
1318 + var fd = new FormData();
1319 + fd.append('schoolPage', schoolPage);
1320 + fd.append('postObj', postObjNum);
1321 + fd.append('newContent', newContent);
1322 + fd.append('form_token', csrfToken);
1323 +
1324 + // 残す画像・ファイル
1325 + formEl.querySelectorAll('input[name="keepImages"]').forEach(function(el) { fd.append('keepImages', el.value); });
1326 + formEl.querySelectorAll('input[name="keepFiles"]').forEach(function(el) { fd.append('keepFiles', el.value); });
1327 +
1328 + // 新規画像
1329 + var newImgInput = formEl.querySelector('input[name="editNewImages"]');
1330 + if (newImgInput && newImgInput.files) {
1331 + for (var i = 0; i < newImgInput.files.length; i++) { fd.append('editNewImages', newImgInput.files[i]); }
1332 + }
1333 + // 新規ファイル
1334 + var newFileInput = formEl.querySelector('input[name="editNewFiles"]');
1335 + if (newFileInput && newFileInput.files) {
1336 + for (var j = 0; j < newFileInput.files.length; j++) { fd.append('editNewFiles', newFileInput.files[j]); }
1337 + }
1338 +
1339 + btn.disabled = true;
1340 + btn.textContent = '保存中...';
1341 +
1239 1239   var xhr = new XMLHttpRequest();
1240 1240   xhr.open('POST', '/bin/get/SeitokaiCode/EditPost?outputSyntax=plain', true);
1241 - xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
1242 - var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken);
1243 1243   xhr.onload = function() {
1244 1244   try {
1245 1245   var res = JSON.parse(xhr.responseText);
... ... @@ -1247,12 +1247,13 @@
1247 1247   showToast('投稿を更新しました', 'success');
1248 1248   setTimeout(function() { location.reload(); }, 800);
1249 1249   } else {
1351 + btn.disabled = false; btn.textContent = '保存';
1250 1250   alert('編集に失敗しました: ' + (res.error || ''));
1251 1251   }
1252 - } catch(e) { alert('編集に失敗しました'); }
1354 + } catch(e) { btn.disabled = false; btn.textContent = '保存'; alert('編集に失敗しました'); }
1253 1253   };
1254 - xhr.onerror = function() { alert('通信エラーが発生しました'); };
1255 - xhr.send(editPostData);
1356 + xhr.onerror = function() { btn.disabled = false; btn.textContent = '保存'; alert('通信エラーが発生しました'); };
1357 + xhr.send(fd);
1256 1256  }
1257 1257  
1258 1258  // 投稿の削除（確認ダイアログ付き）