Last modified by Super Admin on 2026/04/05 18:59

From version Icon 28.1 Icon
edited by Super Admin
on 2026/03/09 12:54
Change comment: There is no comment for this version
To version Icon 35.1 Icon
edited by Super Admin
on 2026/03/10 14:36
Change comment: There is no comment for this version

Summary

Details

Icon Page properties
Content
... ... @@ -171,7 +171,7 @@
171 171  ## --- ユーザー情報取得 ---
172 172  ## displayName: Wiki上の表示名(ニックネーム)。本名(firstName/lastName)は管理者のみ閲覧可能。
173 173  #set($lastAuthor = $doc.author)
174 -#set($lastAuthorDoc = $xwiki.getDocument("XWiki.${lastAuthor}"))
174 +#set($lastAuthorDoc = $xwiki.getDocument($lastAuthor))
175 175  #set($authorAccountType = '')
176 176  #set($authorUserRole = '')
177 177  #set($authorUserStatus = '')
... ... @@ -224,56 +224,20 @@
224 224   #end
225 225  #end
226 226  
227 -## --- 信頼性バッジ + ユーザー情報 ---
228 -<div class="seitokai-badge-container">
229 - ## 承認バッジ
230 - #if($authorAccountType == 'admin')
231 - <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>
232 - #elseif($authorAccountType == 'verified')
233 - <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>
234 - #elseif($authorAccountType == 'referred')
235 - <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>
236 - #else
237 - <span class="badge badge-general">一般</span>
238 - #end
239 - ## 役割バッジ
240 - #if($authorUserRole == 'student')
241 - <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>
242 - #set($authorIsOfficer = $!lastAuthorDoc.getValue('isOfficer'))
243 - #if($authorIsOfficer == 'true')
244 - <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>
245 - #end
246 - #elseif($authorUserRole == 'teacher')
247 - <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>
248 - #elseif($authorUserRole == 'graduate')
249 - <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>
250 - #end
251 - ## 学年(生徒のみ公開)
252 - #if($authorGrade && $authorGrade != '')
253 - <span class="badge badge-grade">$authorGrade</span>
254 - #end
255 - ## 在籍状態(卒業・休学等の場合のみ表示)
256 - #if($authorUserStatus == 'graduated')
257 - <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>
258 - #elseif($authorUserStatus == 'on_leave')
259 - <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>
260 - #elseif($authorUserStatus == 'transferred')
261 - <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>
262 - #end
263 - <span class="badge-info">最終編集: $!escapetool.xml($authorDisplayName) ($xwiki.formatDate($doc.date, "yyyy/MM/dd"))</span>
264 - ## 編集ボタン(権限があるユーザーのみ表示)
265 - #set($canEditSchool = false)
266 - #if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode))
267 - #set($canEditSchool = true)
268 - #end
269 - #if($canEditSchool)
270 - <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>
271 - #end
227 +## --- 編集ボタン(権限があるユーザーのみ表示) ---
228 +#set($canEditSchool = false)
229 +#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode))
230 + #set($canEditSchool = true)
231 +#end
232 +#if($canEditSchool)
233 +<div style="text-align:right; margin-bottom:12px;">
234 + <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>
272 272  </div>
236 +#end
273 273  
274 274  ## --- ① 学校基本情報 + 連絡先(左右グリッド・折りたたみ対応) ---
275 275  <div class="school-info-grid">
276 - <div class="school-info-card mobile-collapse" id="card-basic-info">
240 + <div class="school-info-card collapsed" id="card-basic-info">
277 277   <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>
278 278   <table class="wiki-table school-info-table">
279 279   <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
... ... @@ -293,7 +293,7 @@
293 293   #end
294 294   </div>
295 295  
296 - <div class="school-info-card mobile-collapse" id="card-contact">
260 + <div class="school-info-card collapsed" id="card-contact">
297 297   <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>
298 298   <table class="wiki-table school-info-table">
299 299   <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr>
... ... @@ -1046,16 +1046,15 @@
1046 1046   }
1047 1047   });
1048 1048  }
1049 -// ページ読み込み時にデフォルトで現在年度を表示
1013 +// ページ読み込み時の初期化
1050 1050  document.addEventListener('DOMContentLoaded', function() {
1015 + // ページタイトルを学校名に置換(デフォルトでは学校コードが表示されるため)
1016 + var titleEl = document.querySelector('#document-title h1');
1017 + var schoolNameVal = "$!escapetool.javascript($!schoolName)";
1018 + if (titleEl && schoolNameVal) { titleEl.textContent = schoolNameVal; }
1019 + // デフォルトで現在の年度を表示
1051 1051   var defaultTab = document.querySelector('.activity-fy-tab.active');
1052 1052   if (defaultTab) { defaultTab.click(); }
1053 - // モバイルでは基本情報・連絡先をデフォルト折りたたみ
1054 - if (window.innerWidth <= 768) {
1055 - document.querySelectorAll('.school-info-card.mobile-collapse').forEach(function(card) {
1056 - card.classList.add('collapsed');
1057 - });
1058 - }
1059 1059   // 保存成功時のトースト通知
1060 1060   if (window.location.search.indexOf('archived=1') !== -1) {
1061 1061   showToast('年度アーカイブを作成しました', 'success');
... ... @@ -1095,7 +1095,6 @@
1095 1095   var card = document.getElementById(cardId);
1096 1096   if (!card) return;
1097 1097   card.classList.toggle('collapsed');
1098 - card.classList.remove('mobile-collapse');
1099 1099  }
1100 1100  
1101 1101  // 投稿の編集(インライン編集フォームを開く)