Changes for page 学校ページ テンプレート
Last modified by Super Admin on 2026/04/05 18:59
From version
72.1
edited by Super Admin
on 2026/03/18 23:33
on 2026/03/18 23:33
Change comment:
There is no comment for this version
To version
49.1
edited by Super Admin
on 2026/03/13 21:55
on 2026/03/13 21:55
Change comment:
There is no comment for this version
Summary
Details
- Page properties
-
- Content
-
... ... @@ -1,11 +1,5 @@ 1 1 {{velocity}} 2 2 ## ===== 学校ページ テンプレート ===== 3 -## ゲストが ?sheet= 付きURL(編集フォーム等)に直接アクセスした場合、ログインページへリダイレクト 4 -#if($xcontext.user == 'XWiki.XWikiGuest' && $request.sheet && $request.sheet != '') 5 - #set($currentUrl = $doc.getURL('view', "sheet=${request.sheet}")) 6 - $response.sendRedirect("/bin/login/XWiki/XWikiLogin?srid=$escapetool.url($currentUrl)") 7 - #stop 8 -#end 9 9 {{html clean="false"}} 10 10 ## メンテナンスバナー({{include}}ではなくインラインで記述し、<p>タグ挿入を回避) 11 11 #set($bannerDoc = $xwiki.getDocument('SeitokaiAdmin.MaintenanceBanner')) ... ... @@ -101,42 +101,11 @@ 101 101 #set($viewerDoc = $xwiki.getDocument($viewerUser)) 102 102 #set($viewerAccountType = $!viewerDoc.getValue('accountType')) 103 103 #set($viewerSchoolCode = $!viewerDoc.getValue('schoolCode')) 104 - #set($viewerSecondarySchoolCode = $!viewerDoc.getValue('secondarySchoolCode')) 105 - #set($viewerUserRole = $!viewerDoc.getValue('userRole')) 106 106 #if($viewerAccountType == 'admin') 107 107 #set($isViewerAdmin = true) 108 108 #end 109 109 #end 110 110 111 -## --- 関連校(中高一貫校)情報 --- 112 -#set($affiliatedSchoolCode = $!doc.getValue('affiliatedSchoolCode')) 113 -#set($affiliatedSchoolName = $!doc.getValue('affiliatedSchoolName')) 114 -#set($isAffiliated = false) 115 -#if($affiliatedSchoolCode && $affiliatedSchoolCode != '') 116 - #if($viewerSchoolCode == $affiliatedSchoolCode) 117 - #set($isAffiliated = true) 118 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode) 119 - #set($isAffiliated = true) 120 - #end 121 -#end 122 - 123 -## --- 校内判定(卒業生を除外、secondarySchoolCodeも含む) --- 124 -#set($isSchoolMember = false) 125 -#if(!$isGuest && $viewerUserRole != 'graduate') 126 - #if($viewerSchoolCode == $schoolCode || $isAffiliated) 127 - #set($isSchoolMember = true) 128 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode) 129 - #set($isSchoolMember = true) 130 - #end 131 -#end 132 -## 卒業生の母校判定(投稿バッジ用) 133 -#set($isAlumniOfSchool = false) 134 -#if(!$isGuest && $viewerUserRole == 'graduate') 135 - #if($viewerSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $viewerSchoolCode == $affiliatedSchoolCode)) 136 - #set($isAlumniOfSchool = true) 137 - #end 138 -#end 139 - 140 140 ## --- 学校ページ非表示チェック --- 141 141 #set($schoolHidden = $doc.getValue('hidden')) 142 142 #if($schoolHidden == 1) ... ... @@ -170,7 +170,7 @@ 170 170 171 171 ## --- 投稿固定/解除処理 --- 172 172 #set($pinAction = $!request.action) 173 -#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $i sSchoolMember)) && $services.csrf.isTokenValid($request.form_token))136 +#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token)) 174 174 #set($pinPostObjStr = $!request.postObj) 175 175 #if(!$pinPostObjStr.matches('^\d+$')) 176 176 ## 不正な値 → 無視 ... ... @@ -200,7 +200,7 @@ 200 200 201 201 ## --- 特色ある活動 選定/解除処理 --- 202 202 #set($featAction = $!request.action) 203 -#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $i sSchoolMember)) && $services.csrf.isTokenValid($request.form_token))166 +#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token)) 204 204 #set($featActObjStr = $!request.actObj) 205 205 #if($featActObjStr.matches('^\d+$')) 206 206 #set($actObjNum = $mathtool.toInteger($featActObjStr)) ... ... @@ -302,7 +302,7 @@ 302 302 303 303 ## --- 編集ボタン(権限があるユーザーのみ表示) --- 304 304 #set($canEditSchool = false) 305 -#if(!$isGuest && ($isViewerAdmin || $i sSchoolMember))268 +#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode)) 306 306 #set($canEditSchool = true) 307 307 #end 308 308 #if($canEditSchool) ... ... @@ -311,293 +311,305 @@ 311 311 </div> 312 312 #end 313 313 314 -## --- 関連校(中高一貫校)バナー --- 315 -#if($affiliatedSchoolCode && $affiliatedSchoolCode != '') 316 - #set($affiliatedPageRef = "Schools.${affiliatedSchoolCode}.WebHome") 317 - #set($affiliatedPageExists = $xwiki.exists($affiliatedPageRef)) 318 -<div class="affiliated-school-banner"> 319 - <svg class="ico" viewBox="0 0 24 24" stroke-width="1.5"><path d="M2 20h20"/><path d="M5 20V10l7-5 7 5v10"/><path d="M9 20v-5h6v5"/></svg> 320 - <div> 321 - <strong>中高一貫校</strong>: 322 - #if($affiliatedPageExists) 323 - <a href="$xwiki.getURL($affiliatedPageRef, 'view')">$!escapetool.xml($affiliatedSchoolName)</a> 324 - #else 325 - $!escapetool.xml($affiliatedSchoolName) 277 +## --- ① 学校基本情報 + 連絡先(左右グリッド・折りたたみ対応) --- 278 +<div class="school-info-grid"> 279 + <div class="school-info-card collapsed" id="card-basic-info"> 280 + <h2 role="button" tabindex="0" aria-expanded="false" onclick="toggleInfoCard('card-basic-info')" onkeydown="if(event.key==='Enter'||event.key===' '){event.preventDefault();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> 281 + <table class="wiki-table school-info-table"> 282 + <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr> 283 + <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr> 284 + <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr> 285 + <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr> 286 + <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr> 287 + <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr> 288 + <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr> 289 + <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr> 290 + <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> 291 + </table> 292 + #set($infoEditDate = $!doc.getValue('lastInfoEditedDate')) 293 + #set($infoEditBy = $!doc.getValue('lastInfoEditedBy')) 294 + #if($infoEditDate && $infoEditDate != '') 295 + <div class="info-last-updated"><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> 基本情報の最終更新: $!escapetool.xml($infoEditBy) — $!escapetool.xml($infoEditDate)</div> 326 326 #end 327 - と連携しています 328 328 </div> 298 + 299 + <div class="school-info-card collapsed" id="card-contact"> 300 + <h2 role="button" tabindex="0" aria-expanded="false" onclick="toggleInfoCard('card-contact')" onkeydown="if(event.key==='Enter'||event.key===' '){event.preventDefault();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> 301 + <table class="wiki-table school-info-table"> 302 + <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr> 303 + <tr><th>生徒会Web</th><td>#if($seitokaiWebsite && $seitokaiWebsite != '')<a href="$!escapetool.xml($seitokaiWebsite)" target="_blank" rel="noopener"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M2 12h20"/><path d="M12 2a15.3 15.3 0 014 10 15.3 15.3 0 01-4 10 15.3 15.3 0 01-4-10 15.3 15.3 0 014-10z"/></svg> $!escapetool.xml($seitokaiWebsite)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr> 304 + <tr><th>X (Twitter)</th><td>#if($seitokaiTwitter && $seitokaiTwitter != '')<a href="https://x.com/$!escapetool.url($seitokaiTwitter)" target="_blank" rel="noopener">𝕏 @$!escapetool.xml($seitokaiTwitter)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr> 305 + <tr><th>Instagram</th><td>#if($seitokaiInstagram && $seitokaiInstagram != '')<a href="https://instagram.com/$!escapetool.url($seitokaiInstagram)" target="_blank" rel="noopener"><svg class="ico" viewBox="0 0 24 24"><path d="M23 19a2 2 0 01-2 2H3a2 2 0 01-2-2V8a2 2 0 012-2h4l2-3h6l2 3h4a2 2 0 012 2z"/><circle cx="12" cy="13" r="4"/></svg> @$!escapetool.xml($seitokaiInstagram)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr> 306 + <tr><th>YouTube</th><td>#if($seitokaiYoutube && $seitokaiYoutube != '')<a href="$!escapetool.xml($seitokaiYoutube)" target="_blank" rel="noopener"><svg class="ico" viewBox="0 0 24 24"><polygon points="5 3 19 12 5 21 5 3"/></svg> YouTubeチャンネル</a>#else<span class="text-placeholder">未登録</span>#end</td></tr> 307 + <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr> 308 + </table> 309 + </div> 329 329 </div> 330 -#end 331 331 332 -## --- ① 学校基本情報 --- 333 -<div class="school-info-card collapsed" id="card-basic-info"> 334 - <h2 role="button" tabindex="0" aria-expanded="false" onclick="toggleInfoCard('card-basic-info')" onkeydown="if(event.key==='Enter'||event.key===' '){event.preventDefault();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> 335 - <table class="wiki-table school-info-table"> 336 - <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr> 337 - <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr> 338 - <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr> 339 - <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr> 340 - <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr> 341 - <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr> 342 - <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr> 343 - <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr> 344 - <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> 345 - </table> 346 - #set($infoEditDate = $!doc.getValue('lastInfoEditedDate')) 347 - #set($infoEditBy = $!doc.getValue('lastInfoEditedBy')) 348 - #if($infoEditDate && $infoEditDate != '') 349 - <div class="info-last-updated"><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> 基本情報の最終更新: $!escapetool.xml($infoEditBy) — $!escapetool.xml($infoEditDate)</div> 350 - #end 312 +## --- 生徒会情報アコーディオン --- 313 +<div class="school-section-divider"> 314 + <button class="shortcut-btn shortcut-btn-secondary" onclick="var sec=document.getElementById('seitokai-info-section');sec.classList.toggle('open');this.querySelector('.shortcut-arrow').textContent=sec.classList.contains('open')?'▲':'▼';"> 315 + <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> 316 + 生徒会情報を見る <span class="shortcut-arrow">▼</span> 317 + </button> 351 351 </div> 352 352 353 -## --- ② 生徒会基本情報(折りたたみカード) --- 354 -<div class="school-info-card" id="card-seitokai-info"> 355 - <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> 356 - <div class="seitokai-info-body"> 320 +<div id="seitokai-info-section" class="seitokai-info-accordion"> 357 357 358 - ## --- 組織図 --- 359 - #set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != '')) 360 - #if($hasOrgContent) 361 - #set($canViewOrgChart = true) 362 - #if($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewOrgChart = false) 363 - #elseif($visibilityOrgChart == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewOrgChart = false) 364 - #end 365 - #if($canViewOrgChart) 366 - <div class="seitokai-subsection"> 367 - <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> 368 - <div class="seitokai-subsection-content"> 369 - #if($orgChartImage && $orgChartImage != '') 370 - <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div> 371 - #end 372 - #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end 373 - </div> 374 - </div> 375 - #else 376 - <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> 377 - #end 322 +## --- ② 組織図 --- 323 +#set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != '')) 324 +#if($hasOrgContent) 325 + ## 公開範囲チェック 326 + #set($canViewOrgChart = true) 327 + #if($visibilityOrgChart == 'members' && $isGuest) #set($canViewOrgChart = false) 328 + #elseif($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewOrgChart = false) 329 + #end 330 + #if($canViewOrgChart) 331 +<h2 class="section-title"><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"/><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 == '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</h2> 332 +<div class="school-section-card"> 333 + <div class="card-inner"> 334 + #if($orgChartImage && $orgChartImage != '') 335 + <div class="school-org-img-wrap"><img src="$doc.getAttachmentURL($orgChartImage)" alt="組織図" class="org-chart-img" /></div> 378 378 #end 337 + #if($orgChart && $orgChart != '')$!escapetool.xml($orgChart)#end 338 + </div> 339 +</div> 340 + #else 341 +<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 == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div> 342 + #end 343 +#end 379 379 380 - ## --- 日常の活動 --- 381 - #if($dailyActivities && !$dailyActivities.isEmpty()) 382 - <div class="seitokai-subsection"> 383 - <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> 384 - <div class="seitokai-subsection-content"> 385 - <p class="activity-hint">活動時間の多い順に上位3つ</p> 386 - <div class="tag-container"> 387 - #set($daIdx = 1) 388 - #foreach($da in $dailyActivities) 389 - <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span> 390 - #set($daIdx = $daIdx + 1) 391 - #end 392 - </div> 393 - #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '') 394 - <div class="free-note">$!escapetool.xml($dailyActivitiesNote)</div> 345 +## --- ③④⑤ 日常の活動・選挙・定例活動 --- 346 +<div class="school-section-grid"> 347 + #if($dailyActivities && !$dailyActivities.isEmpty()) 348 + <div class="school-section-card"> 349 + <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> 350 + <div class="card-inner"> 351 + <p class="activity-hint">活動時間の多い順に上位3つ</p> 352 + <div class="tag-container"> 353 + #set($daIdx = 1) 354 + #foreach($da in $dailyActivities) 355 + <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span> 356 + #set($daIdx = $daIdx + 1) 395 395 #end 396 396 </div> 359 + #if($dailyActivitiesNote && $dailyActivitiesNote.trim() != '') 360 + <div class="free-note">$!escapetool.xml($dailyActivitiesNote)</div> 361 + #end 397 397 </div> 398 - #end 363 + </div> 364 + #end 399 399 400 - ## --- 選挙 --- 401 - #if($electionExists && $electionExists != '') 402 - <div class="seitokai-subsection"> 403 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="3" width="18" height="18" rx="2"/><path d="M7 13l3 3 7-7"/></svg> 選挙</h3> 404 - <div class="seitokai-subsection-content"> 405 - <div class="info-row"> 406 - <span class="info-label">役員選挙</span> 407 - <span class="info-value">$!escapetool.xml($!electionExists)</span> 408 - </div> 409 - #if($electionType && $electionType != '') 410 - <div class="info-row"> 411 - <span class="info-label">直近の選挙方式</span> 412 - <span class="info-value">$!escapetool.xml($!electionType)</span> 413 - </div> 414 - #end 415 - #if($electionNote && $electionNote.trim() != '') 416 - <div class="free-note">$!escapetool.xml($electionNote)</div> 417 - #end 366 + #if($electionExists && $electionExists != '') 367 + <div class="school-section-card"> 368 + <h3><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="3" width="18" height="18" rx="2"/><path d="M7 13l3 3 7-7"/></svg> 選挙</h3> 369 + <div class="card-inner"> 370 + <div class="info-row"> 371 + <span class="info-label">役員選挙</span> 372 + <span class="info-value">$!escapetool.xml($!electionExists)</span> 418 418 </div> 374 + #if($electionType && $electionType != '') 375 + <div class="info-row"> 376 + <span class="info-label">直近の選挙方式</span> 377 + <span class="info-value">$!escapetool.xml($!electionType)</span> 378 + </div> 379 + #end 380 + #if($electionNote && $electionNote.trim() != '') 381 + <div class="free-note">$!escapetool.xml($electionNote)</div> 382 + #end 419 419 </div> 420 - #end 384 + </div> 385 + #end 386 +</div> 421 421 422 - ## --- 定例活動 --- 423 - #if($meetingFrequency && $meetingFrequency != '') 424 - <div class="seitokai-subsection"> 425 - <h3 class="seitokai-subsection-title"><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="4" width="18" height="18" rx="2"/><line x1="16" y1="2" x2="16" y2="6"/><line x1="8" y1="2" x2="8" y2="6"/><line x1="3" y1="10" x2="21" y2="10"/></svg> 定例活動</h3> 426 - <div class="seitokai-subsection-content"> 427 - <div class="info-row"> 428 - <span class="info-label">役員定例会の頻度</span> 429 - <span class="info-value">$!escapetool.xml($!meetingFrequency)</span> 430 - </div> 431 - #if($regularActivitiesNote && $regularActivitiesNote.trim() != '') 432 - <div class="free-note">$!escapetool.xml($regularActivitiesNote)</div> 433 - #end 388 +<div class="school-section-grid"> 389 + #if($meetingFrequency && $meetingFrequency != '') 390 + <div class="school-section-card"> 391 + <h3><svg class="ico" viewBox="0 0 24 24"><rect x="3" y="4" width="18" height="18" rx="2"/><line x1="16" y1="2" x2="16" y2="6"/><line x1="8" y1="2" x2="8" y2="6"/><line x1="3" y1="10" x2="21" y2="10"/></svg> 定例活動</h3> 392 + <div class="card-inner"> 393 + <div class="info-row"> 394 + <span class="info-label">役員定例会の頻度</span> 395 + <span class="info-value">$!escapetool.xml($!meetingFrequency)</span> 434 434 </div> 397 + #if($regularActivitiesNote && $regularActivitiesNote.trim() != '') 398 + <div class="free-note">$!escapetool.xml($regularActivitiesNote)</div> 399 + #end 435 435 </div> 436 - #end 401 + </div> 402 + #end 437 437 438 - ## --- 予算 --- 439 - #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != '')) 440 - #if($hasBudget) 441 - #set($canViewBudget = true) 442 - #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewBudget = false) 443 - #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false) 404 + ## --- ⑦ 予算 --- 405 + #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != '')) 406 + #if($hasBudget) 407 + ## 公開範囲チェック 408 + #set($canViewBudget = true) 409 + #if($visibilityBudget == 'members' && $isGuest) #set($canViewBudget = false) 410 + #elseif($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewBudget = false) 411 + #end 412 + #if($canViewBudget) 413 + <div class="school-section-card"> 414 + <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> 415 + <div class="card-inner"> 416 + #if($budgetProcess && !$budgetProcess.isEmpty()) 417 + <div class="info-row"> 418 + <span class="info-label">作成過程の生徒関与</span> 419 + <span class="info-value"> 420 + <div class="selection-display"> 421 + #foreach($bp in $budgetProcess) 422 + <span class="selection-item">$!escapetool.xml($bp.trim())</span> 423 + #end 424 + </div> 425 + </span> 426 + </div> 444 444 #end 445 - #if($canViewBudget) 446 - <div class="seitokai-subsection"> 447 - <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> 448 - <div class="seitokai-subsection-content"> 449 - #if($budgetProcess && !$budgetProcess.isEmpty()) 450 - <div class="info-row"> 451 - <span class="info-label">作成過程の生徒関与</span> 452 - <span class="info-value"> 453 - <div class="selection-display"> 454 - #foreach($bp in $budgetProcess) 455 - <span class="selection-item">$!escapetool.xml($bp.trim())</span> 456 - #end 457 - </div> 458 - </span> 459 - </div> 460 - #end 461 - #if($studentFee && $studentFee != '') 462 - <div class="info-row"> 463 - <span class="info-label">生徒会費(年額)</span> 464 - <span class="info-value">$!escapetool.xml($!studentFee)</span> 465 - </div> 466 - #end 467 - #if($budgetScale && $budgetScale != '') 468 - <div class="info-row"> 469 - <span class="info-label">予算規模</span> 470 - <span class="info-value">$!escapetool.xml($!budgetScale)</span> 471 - </div> 472 - #end 473 - #if($budgetAllocation && !$budgetAllocation.isEmpty()) 474 - <div class="info-row"> 475 - <span class="info-label">主な予算配分</span> 476 - <span class="info-value"> 477 - <div class="selection-display"> 478 - #foreach($ba in $budgetAllocation) 479 - <span class="selection-item">$!escapetool.xml($ba.trim())</span> 480 - #end 481 - </div> 482 - </span> 483 - </div> 484 - #end 485 - #if($budgetNote && $budgetNote.trim() != '') 486 - <div class="free-note">$!escapetool.xml($budgetNote)</div> 487 - #end 428 + #if($studentFee && $studentFee != '') 429 + <div class="info-row"> 430 + <span class="info-label">生徒会費(年額)</span> 431 + <span class="info-value">$!escapetool.xml($!studentFee)</span> 488 488 </div> 489 - </div> 490 - #else 491 - <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($visibilityBudget == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div> 492 492 #end 434 + #if($budgetScale && $budgetScale != '') 435 + <div class="info-row"> 436 + <span class="info-label">予算規模</span> 437 + <span class="info-value">$!escapetool.xml($!budgetScale)</span> 438 + </div> 439 + #end 440 + #if($budgetAllocation && !$budgetAllocation.isEmpty()) 441 + <div class="info-row"> 442 + <span class="info-label">主な予算配分</span> 443 + <span class="info-value"> 444 + <div class="selection-display"> 445 + #foreach($ba in $budgetAllocation) 446 + <span class="selection-item">$!escapetool.xml($ba.trim())</span> 447 + #end 448 + </div> 449 + </span> 450 + </div> 451 + #end 452 + #if($budgetNote && $budgetNote.trim() != '') 453 + <div class="free-note">$!escapetool.xml($budgetNote)</div> 454 + #end 455 + </div> 456 + </div> 457 + #else 458 + <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($visibilityBudget == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div> 493 493 #end 460 + #end 461 +</div> 494 494 495 - ## --- 校則の見直し --- 496 - #if($ruleReviewStatus && $ruleReviewStatus != '') 497 - #set($canViewRuleReview = true) 498 - #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewRuleReview = false) 499 - #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false) 500 - #end 501 - #if($canViewRuleReview) 502 - <div class="seitokai-subsection"> 503 - <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> 504 - <div class="seitokai-subsection-content"> 505 - <div class="info-row"> 506 - <span class="info-label">見直しの有無(3年以内)</span> 507 - <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span> 463 +## --- ⑧ 校則の見直し --- 464 +#if($ruleReviewStatus && $ruleReviewStatus != '') 465 + ## 公開範囲チェック 466 + #set($canViewRuleReview = true) 467 + #if($visibilityRuleReview == 'members' && $isGuest) #set($canViewRuleReview = false) 468 + #elseif($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewRuleReview = false) 469 + #end 470 + #if($canViewRuleReview) 471 +<h2 class="section-title"><svg class="ico ico-md" 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 == '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</h2> 472 +<div class="school-section-card"> 473 + <div class="card-inner"> 474 + <div class="info-row"> 475 + <span class="info-label">見直しの有無(3年以内)</span> 476 + <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span> 477 + </div> 478 + #if($ruleReviewContent && !$ruleReviewContent.isEmpty()) 479 + <div class="info-row"> 480 + <span class="info-label">見直しの内容</span> 481 + <span class="info-value"> 482 + <div class="selection-display"> 483 + #foreach($rc in $ruleReviewContent) 484 + <span class="selection-item">$!escapetool.xml($rc.trim())</span> 485 + #end 508 508 </div> 509 - #if($ruleReviewContent && !$ruleReviewContent.isEmpty()) 510 - <div class="info-row"> 511 - <span class="info-label">見直しの内容</span> 512 - <span class="info-value"> 513 - <div class="selection-display"> 514 - #foreach($rc in $ruleReviewContent) 515 - <span class="selection-item">$!escapetool.xml($rc.trim())</span> 516 - #end 517 - </div> 518 - </span> 487 + </span> 488 + </div> 489 + #end 490 + #if($ruleReviewProposer && !$ruleReviewProposer.isEmpty()) 491 + <div class="info-row"> 492 + <span class="info-label">見直しの提案者</span> 493 + <span class="info-value"> 494 + <div class="selection-display"> 495 + #foreach($rp in $ruleReviewProposer) 496 + <span class="selection-item">$!escapetool.xml($rp.trim())</span> 497 + #end 519 519 </div> 520 - #end521 - #if($ruleReviewProposer && !$ruleReviewProposer.isEmpty())522 - <div class="info-row">523 - <spanclass="info-label">見直しの提案者</span>524 - <spanclass="info-value">525 - <divclass="selection-display">526 - #foreach($rpin$ruleReviewProposer)527 - <spanclass="selection-item">$!escapetool.xml($rp.trim())</span>528 - #end529 - < /div>530 - </span>499 + </span> 500 + </div> 501 + #end 502 + #if($ruleReviewImplementer && !$ruleReviewImplementer.isEmpty()) 503 + <div class="info-row"> 504 + <span class="info-label">見直しの実施者</span> 505 + <span class="info-value"> 506 + <div class="selection-display"> 507 + #foreach($ri in $ruleReviewImplementer) 508 + <span class="selection-item">$!escapetool.xml($ri.trim())</span> 509 + #end 531 531 </div> 532 - #end 533 - #if($ruleReviewImplementer && !$ruleReviewImplementer.isEmpty()) 534 - <div class="info-row"> 535 - <span class="info-label">見直しの実施者</span> 536 - <span class="info-value"> 537 - <div class="selection-display"> 538 - #foreach($ri in $ruleReviewImplementer) 539 - <span class="selection-item">$!escapetool.xml($ri.trim())</span> 540 - #end 541 - </div> 542 - </span> 543 - </div> 544 - #end 545 - #if($ruleReviewSystem && $ruleReviewSystem != '') 546 - <div class="info-row"> 547 - <span class="info-label">見直しの仕組み</span> 548 - <span class="info-value">$!escapetool.xml($!ruleReviewSystem)</span> 549 - </div> 550 - #end 551 - </div> 511 + </span> 552 552 </div> 553 - #else 554 - <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($visibilityRuleReview == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div> 555 - #end 556 556 #end 557 - 558 - ## --- 生徒会の課題意識 --- 559 - #if($challenges && $challenges != '') 560 - #set($canViewChallenges = true) 561 - #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewChallenges = false) 562 - #elseif($visibilityChallenges == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewChallenges = false) 563 - #end 564 - #if($canViewChallenges) 565 - <div class="seitokai-subsection"> 566 - <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> 567 - <div class="seitokai-subsection-content"> 568 - <div class="challenge-text">$!escapetool.xml($challenges)</div> 569 - </div> 514 + #if($ruleReviewSystem && $ruleReviewSystem != '') 515 + <div class="info-row"> 516 + <span class="info-label">見直しの仕組み</span> 517 + <span class="info-value">$!escapetool.xml($!ruleReviewSystem)</span> 570 570 </div> 571 - #else 572 - <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($visibilityChallenges == 'school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div> 573 - #end 574 574 #end 520 + </div> 521 +</div> 522 + #else 523 +<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($visibilityRuleReview == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div> 524 + #end 525 +#end 575 575 576 - </div>## seitokai-info-body 終了 577 -</div>## card-seitokai-info 終了 527 +## --- ⑨ 課題 --- 528 +#if($challenges && $challenges != '') 529 + ## 公開範囲チェック 530 + #set($canViewChallenges = true) 531 + #if($visibilityChallenges == 'members' && $isGuest) #set($canViewChallenges = false) 532 + #elseif($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewChallenges = false) 533 + #end 534 + #if($canViewChallenges) 535 +<h2 class="section-title">生徒会の課題意識 #if($visibilityChallenges != 'public')<span class="visibility-badge visibility-${visibilityChallenges}">#if($visibilityChallenges == '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</h2> 536 +<div class="challenge-text">$!escapetool.xml($challenges)</div> 537 + #else 538 +<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($visibilityChallenges == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div> 539 + #end 540 +#end 578 578 579 -## --- ③ SNS・連絡先 --- 580 -<div class="school-info-card collapsed" id="card-contact"> 581 - <h2 role="button" tabindex="0" aria-expanded="false" onclick="toggleInfoCard('card-contact')" onkeydown="if(event.key==='Enter'||event.key===' '){event.preventDefault();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> 582 - <table class="wiki-table school-info-table"> 583 - <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr> 584 - <tr><th>生徒会Web</th><td>#if($seitokaiWebsite && $seitokaiWebsite != '')<a href="$!escapetool.xml($seitokaiWebsite)" target="_blank" rel="noopener"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M2 12h20"/><path d="M12 2a15.3 15.3 0 014 10 15.3 15.3 0 01-4 10 15.3 15.3 0 01-4-10 15.3 15.3 0 014-10z"/></svg> $!escapetool.xml($seitokaiWebsite)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr> 585 - <tr><th>X (Twitter)</th><td>#if($seitokaiTwitter && $seitokaiTwitter != '')<a href="https://x.com/$!escapetool.url($seitokaiTwitter)" target="_blank" rel="noopener">𝕏 @$!escapetool.xml($seitokaiTwitter)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr> 586 - <tr><th>Instagram</th><td>#if($seitokaiInstagram && $seitokaiInstagram != '')<a href="https://instagram.com/$!escapetool.url($seitokaiInstagram)" target="_blank" rel="noopener"><svg class="ico" viewBox="0 0 24 24"><path d="M23 19a2 2 0 01-2 2H3a2 2 0 01-2-2V8a2 2 0 012-2h4l2-3h6l2 3h4a2 2 0 012 2z"/><circle cx="12" cy="13" r="4"/></svg> @$!escapetool.xml($seitokaiInstagram)</a>#else<span class="text-placeholder">未登録</span>#end</td></tr> 587 - <tr><th>YouTube</th><td>#if($seitokaiYoutube && $seitokaiYoutube != '')<a href="$!escapetool.xml($seitokaiYoutube)" target="_blank" rel="noopener"><svg class="ico" viewBox="0 0 24 24"><polygon points="5 3 19 12 5 21 5 3"/></svg> YouTubeチャンネル</a>#else<span class="text-placeholder">未登録</span>#end</td></tr> 588 - <tr><th>その他SNS</th><td>#if($seitokaiOtherSns && $seitokaiOtherSns != '')$!escapetool.xml($seitokaiOtherSns)#else<span class="text-placeholder">未登録</span>#end</td></tr> 589 - </table> 590 -</div> 542 +</div>## seitokai-info-accordion 終了 591 591 592 592 {{/html}} 593 593 594 ----- 595 - 596 596 ## --- ⑩ 活動報告一覧(スレッド型・年度タブ付き) --- 597 597 = 活動報告 = 598 598 599 -## --- 年度タブ +投稿者ステータス凡例 ---549 +## --- 投稿者ステータス凡例(折りたたみ) --- 600 600 {{html clean="false"}} 551 +<div class="author-legend-wrapper"> 552 + <button class="author-legend-toggle" onclick="this.classList.toggle('open');this.nextElementSibling.classList.toggle('open')"><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> バッジの見方 <span class="chevron">▼</span></button> 553 + <div class="author-legend-body"> 554 + <div class="author-legend"> 555 + <span class="author-legend-title">投稿者の信頼度:</span> 556 + <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者</span> 557 + <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み</span> 558 + <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介</span> 559 + <span class="author-legend-item"><span class="bar bar-general"></span> 一般(未承認)</span> 560 + </div> 561 + <div class="author-legend"> 562 + <span class="author-legend-title">所属:</span> 563 + <span class="author-legend-item"><span class="badge badge-school-internal-confirmed badge-sm"><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> 校内(確認済)</span> 承認済み+同校</span> 564 + <span class="author-legend-item"><span class="badge badge-school-internal badge-sm"><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> 校内</span> 紹介+同校</span> 565 + <span class="author-legend-item"><span class="badge badge-school-external badge-sm"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M2 12h20"/><path d="M12 2a15.3 15.3 0 014 10 15.3 15.3 0 01-4 10 15.3 15.3 0 01-4-10 15.3 15.3 0 014-10z"/></svg> 他校</span> 他校所属</span> 566 + <span class="author-legend-item text-hint">※一般アカウントは所属未確認のため非表示</span> 567 + </div> 568 + <div class="author-legend"> 569 + <span class="author-legend-title">役割:</span> 570 + <span class="author-legend-item"><span class="badge badge-role-student badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M22 10v6M2 10l10-5 10 5-10 5z"/><path d="M6 12v5c0 2 4 3 6 3s6-1 6-3v-5"/></svg> 生徒</span></span> 571 + <span class="author-legend-item"><span class="badge badge-role-officer badge-sm"><svg class="ico" viewBox="0 0 24 24"><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> 役員</span></span> 572 + <span class="author-legend-item"><span class="badge badge-role-teacher badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M20 21v-2a4 4 0 00-4-4H8a4 4 0 00-4 4v2"/><circle cx="12" cy="7" r="4"/></svg> 教員</span></span> 573 + </div> 574 + </div> 575 +</div> 601 601 602 602 ## --- 年度タブ --- 603 603 ## 全活動から年度一覧を収集 ... ... @@ -619,49 +619,14 @@ 619 619 #end 620 620 ## ソート(降順にしたいが Velocity にはないので JS で制御) 621 621 622 -<div class="activity-toolbar"> 623 - <div class="activity-fy-tabs"> 624 - <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button> 625 - #foreach($fy in $fySet) 626 - #if($fy != $currentFYStr) 627 - <button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button> 628 - #end 597 +<div class="activity-fy-tabs"> 598 + <button class="activity-fy-tab active" onclick="switchActivityFY('$currentFYStr', this)">$currentFYStr 年度</button> 599 + #foreach($fy in $fySet) 600 + #if($fy != $currentFYStr) 601 + <button class="activity-fy-tab" onclick="switchActivityFY('$fy', this)">$fy 年度</button> 629 629 #end 630 - <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button> 631 - </div> 632 - <div class="activity-toolbar-right"> 633 - <button class="btn-view-toggle" id="btnViewToggle" onclick="toggleCompactView()" title="タイトルのみ表示"> 634 - <svg class="ico-list" viewBox="0 0 24 24" stroke="currentColor" fill="none" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><line x1="8" y1="6" x2="21" y2="6"/><line x1="8" y1="12" x2="21" y2="12"/><line x1="8" y1="18" x2="21" y2="18"/><line x1="3" y1="6" x2="3.01" y2="6"/><line x1="3" y1="12" x2="3.01" y2="12"/><line x1="3" y1="18" x2="3.01" y2="18"/></svg> 635 - <svg class="ico-detail" viewBox="0 0 24 24" stroke="currentColor" fill="none" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="3" width="7" height="7"/><rect x="14" y="3" width="7" height="7"/><rect x="3" y="14" width="7" height="7"/><rect x="14" y="14" width="7" height="7"/></svg> 636 - <span class="toggle-label">一覧表示</span> 637 - </button> 638 - </div> 639 - <div class="author-legend-wrapper"> 640 - <button class="author-legend-toggle" onclick="this.classList.toggle('open');this.nextElementSibling.classList.toggle('open')"><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> バッジの見方 <span class="chevron">▼</span></button> 641 - <div class="author-legend-body"> 642 - <div class="author-legend"> 643 - <span class="author-legend-title">投稿者の信頼度:</span> 644 - <span class="author-legend-item"><span class="bar bar-admin"></span> 管理者 <span class="text-hint">— 運営スタッフ</span></span> 645 - <span class="author-legend-item"><span class="bar bar-verified"></span> 承認済み <span class="text-hint">— 本人確認済みのユーザー</span></span> 646 - <span class="author-legend-item"><span class="bar bar-referred"></span> 紹介 <span class="text-hint">— 承認済みユーザーからの紹介</span></span> 647 - <span class="author-legend-item"><span class="bar bar-general"></span> 一般 <span class="text-hint">— 一般登録ユーザー</span></span> 648 - </div> 649 - <div class="author-legend"> 650 - <span class="author-legend-title">所属:</span> 651 - <span class="author-legend-item"><span class="badge badge-school-internal-confirmed badge-sm"><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> 校内(確認済)</span> <span class="text-hint">所属が確認されたこの学校のユーザー</span></span> 652 - <span class="author-legend-item"><span class="badge badge-school-internal badge-sm"><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> 校内</span> <span class="text-hint">この学校に所属登録しているユーザー</span></span> 653 - <span class="author-legend-item"><span class="badge badge-alumni badge-sm"><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> <span class="text-hint">この学校の卒業生</span></span> 654 - <span class="author-legend-item"><span class="badge badge-school-external badge-sm"><svg class="ico" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><path d="M2 12h20"/><path d="M12 2a15.3 15.3 0 014 10 15.3 15.3 0 01-4 10 15.3 15.3 0 01-4-10 15.3 15.3 0 014-10z"/></svg> 他校</span> <span class="text-hint">別の学校に所属しているユーザー</span></span> 655 - <span class="author-legend-item text-hint">※一般アカウントは所属バッジが表示されません</span> 656 - </div> 657 - <div class="author-legend"> 658 - <span class="author-legend-title">役割:</span> 659 - <span class="author-legend-item"><span class="badge badge-role-student badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M22 10v6M2 10l10-5 10 5-10 5z"/><path d="M6 12v5c0 2 4 3 6 3s6-1 6-3v-5"/></svg> 生徒</span></span> 660 - <span class="author-legend-item"><span class="badge badge-role-officer badge-sm"><svg class="ico" viewBox="0 0 24 24"><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> 役員</span> <span class="text-hint">生徒会役員</span></span> 661 - <span class="author-legend-item"><span class="badge badge-role-teacher badge-sm"><svg class="ico" viewBox="0 0 24 24"><path d="M20 21v-2a4 4 0 00-4-4H8a4 4 0 00-4 4v2"/><circle cx="12" cy="7" r="4"/></svg> 教員</span></span> 662 - </div> 663 - </div> 664 - </div> 603 + #end 604 + <button class="activity-fy-tab" onclick="switchActivityFY('all', this)">全期間</button> 665 665 </div> 666 666 667 667 {{/html}} ... ... @@ -728,12 +728,6 @@ 728 728 <div class="activity-thread-title"> 729 729 <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> 730 730 <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span> 731 - #set($actTagsList = $activity.getValue('tags')) 732 - #if($actTagsList && !$actTagsList.isEmpty()) 733 - #foreach($tagItem in $actTagsList) 734 - #if($tagItem && $tagItem.trim() != '')<span class="activity-tag-badge">$escapetool.xml($tagItem)</span>#end 735 - #end 736 - #end 737 737 </div> 738 738 <div class="thread-meta-row"> 739 739 <span class="thread-post-count">${reportCount}件の報告 ・ ${commentCount}件のコメント</span> ... ... @@ -795,12 +795,12 @@ 795 795 #set($postVis = $!post.getValue('visibility')) 796 796 #if(!$postVis || $postVis == '') #set($postVis = 'public') #end 797 797 #set($canViewPost = true) 798 - #if($postVis == 's chool' &&($isGuest|| (!$isViewerAdmin && !$isSchoolMember)))#set($canViewPost = false)799 - #elseif($postVis == 'school _trusted' && ($isGuest || (!$isViewerAdmin &&((!$isSchoolMember) || ($viewerAccountType !='verified' &&$viewerAccountType != 'referred')))))#set($canViewPost = false)732 + #if($postVis == 'members' && $isGuest) #set($canViewPost = false) 733 + #elseif($postVis == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode))) #set($canViewPost = false) 800 800 #end 801 801 #if(!$canViewPost) 802 802 <div class="thread-post visibility-restricted-post"> 803 - <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($postVis == ' school_trusted')校内の承認済み・紹介メンバー#else校内メンバー#end のみ閲覧可能です</div>737 + <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($postVis == 'members')登録ユーザー#else校内メンバー#end のみ閲覧可能です</div> 804 804 </div> 805 805 #else 806 806 ## 投稿者のアカウント種別に基づいたCSSクラス ... ... @@ -840,11 +840,8 @@ 840 840 <span class="badge badge-general badge-sm">一般</span> 841 841 #end 842 842 ## 所属バッジ(投稿者の学校コードとページの学校コードを比較) 843 - #set($postIsSchoolMatch = ($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode))) 844 844 #if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general') 845 - #if($postUserRole == 'graduate' && $postIsSchoolMatch) 846 - <span class="badge badge-alumni badge-sm"><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> 847 - #elseif($postIsSchoolMatch && $postUserRole != 'graduate') 778 + #if($postSchoolCode == $schoolCode) 848 848 #if($postAccountType == 'verified' || $postAccountType == 'admin') 849 849 <span class="badge badge-school-internal-confirmed badge-sm"><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> 校内(確認済)</span> 850 850 #else ... ... @@ -935,7 +935,7 @@ 935 935 #end 936 936 </div> 937 937 #if($postVis != 'public') 938 - <div class="visibility-badge visibility-${postVis} post-action-mt">#if($postVis == ' school_trusted')<svg class="ico" viewBox="0 0 24 24"><path d="M1222s8-48-10V5l-8-3-83v7c06810 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>869 + <div class="visibility-badge visibility-${postVis} post-action-mt">#if($postVis == '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</div> 939 939 #end 940 940 ## 固定/解除ボタン(承認済み・管理者のみ) 941 941 #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified') ... ... @@ -1049,35 +1049,6 @@ 1049 1049 ## --- 年度タブ切り替え JavaScript --- 1050 1050 {{html clean="false"}} 1051 1051 <script> 1052 -// コンパクト表示(タイトルのみ)トグル 1053 -function toggleCompactView() { 1054 - var container = document.querySelector('.xwiki-content') || document.body; 1055 - var isCompact = container.classList.toggle('activity-compact-view'); 1056 - var btn = document.getElementById('btnViewToggle'); 1057 - if (btn) { 1058 - btn.querySelector('.toggle-label').textContent = isCompact ? '詳細表示' : '一覧表示'; 1059 - btn.title = isCompact ? '詳細表示に戻す' : 'タイトルのみ表示'; 1060 - } 1061 - // コンパクトモードでは各スレッドヘッダーをクリックで個別展開可能にする 1062 - document.querySelectorAll('.activity-thread').forEach(function(thread) { 1063 - if (isCompact) { 1064 - thread.classList.remove('compact-expanded'); 1065 - } 1066 - }); 1067 -} 1068 - 1069 -// コンパクトモードで個別スレッドを展開/折りたたみ 1070 -function toggleThreadExpand(e) { 1071 - var container = document.querySelector('.xwiki-content') || document.body; 1072 - if (!container.classList.contains('activity-compact-view')) return; 1073 - // リンクやボタンのクリックはスルー 1074 - if (e.target.closest('a, button, .btn-featured-toggle')) return; 1075 - var thread = e.target.closest('.activity-thread'); 1076 - if (thread) { 1077 - thread.classList.toggle('compact-expanded'); 1078 - } 1079 -} 1080 - 1081 1081 function switchActivityFY(fy, btn) { 1082 1082 // タブのアクティブ状態を切り替え 1083 1083 document.querySelectorAll('.activity-fy-tab').forEach(function(t) { t.classList.remove('active'); }); ... ... @@ -1093,27 +1093,6 @@ 1093 1093 } 1094 1094 // ページ読み込み時の初期化 1095 1095 document.addEventListener('DOMContentLoaded', function() { 1096 - // 年度タブを降順にソート(「全期間」タブは末尾に固定) 1097 - var tabContainer = document.querySelector('.activity-fy-tabs'); 1098 - if (tabContainer) { 1099 - var tabs = Array.from(tabContainer.querySelectorAll('.activity-fy-tab')); 1100 - var allTab = null; 1101 - var fyTabs = []; 1102 - tabs.forEach(function(t) { 1103 - var onclickStr = t.getAttribute('onclick') || ''; 1104 - if (onclickStr.indexOf("'all'") !== -1) { allTab = t; } 1105 - else { fyTabs.push(t); } 1106 - }); 1107 - // 年度タブを数値の降順でソート 1108 - fyTabs.sort(function(a, b) { 1109 - var aYear = parseInt(a.textContent) || 0; 1110 - var bYear = parseInt(b.textContent) || 0; 1111 - return bYear - aYear; 1112 - }); 1113 - // DOM再配置 1114 - fyTabs.forEach(function(t) { tabContainer.appendChild(t); }); 1115 - if (allTab) { tabContainer.appendChild(allTab); } 1116 - } 1117 1117 // デフォルトで現在の年度を表示 1118 1118 var defaultTab = document.querySelector('.activity-fy-tab.active'); 1119 1119 if (defaultTab) { defaultTab.click(); } ... ... @@ -1125,30 +1125,6 @@ 1125 1125 window.history.replaceState({}, document.title, window.location.pathname); 1126 1126 } 1127 1127 } 1128 - // コンパクトモード: スレッドヘッダークリックで個別展開 1129 - document.querySelectorAll('.activity-thread-header').forEach(function(header) { 1130 - header.addEventListener('click', toggleThreadExpand); 1131 - }); 1132 - // 長文投稿の折りたたみ初期化(max-height: 12em 超で省略) 1133 - document.querySelectorAll('.thread-post-body').forEach(function(body) { 1134 - // pre-wrapのまま高さを測定し、max-height(12em ≒ ~200px)を超える場合に折りたたむ 1135 - var fullH = body.scrollHeight; 1136 - // 12em を px に変換(font-size × line-height × 行数 の近似値ではなくCSSと同じ値を取得) 1137 - body.classList.add('truncated'); 1138 - var maxH = body.clientHeight; // max-height: 12em 適用後の高さ 1139 - body.classList.remove('truncated'); 1140 - if (fullH > maxH + 30) { 1141 - body.classList.add('truncated'); 1142 - var btn = document.createElement('button'); 1143 - btn.className = 'btn-read-more'; 1144 - btn.textContent = '広げて読む ▼'; 1145 - btn.addEventListener('click', function() { 1146 - var isExpanded = body.classList.toggle('expanded'); 1147 - btn.textContent = isExpanded ? '折りたたむ ▲' : '広げて読む ▼'; 1148 - }); 1149 - body.parentNode.insertBefore(btn, body.nextSibling); 1150 - } 1151 - }); 1152 1152 }); 1153 1153 1154 1154 // トースト通知表示 ... ... @@ -1211,7 +1211,7 @@ 1211 1211 var csrfEl = document.querySelector('input[name="form_token"]'); 1212 1212 var csrfToken = csrfEl ? csrfEl.value : ''; 1213 1213 var xhr = new XMLHttpRequest(); 1214 - xhr.open('POST', '/bin/ get/SeitokaiCode/EditPost?outputSyntax=plain', true);1071 + xhr.open('POST', '/bin/SeitokaiCode/EditPost?outputSyntax=plain', true); 1215 1215 xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'); 1216 1216 var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken); 1217 1217 xhr.onload = function() { ... ... @@ -1233,7 +1233,7 @@ 1233 1233 function confirmDeletePost(schoolPage, postObjNum, token) { 1234 1234 if (!confirm('この投稿を削除しますか?\\n削除後は「この投稿は削除されました」と表示されます。')) return; 1235 1235 var xhr = new XMLHttpRequest(); 1236 - xhr.open('POST', '/bin/ get/SeitokaiCode/DeletePost?outputSyntax=plain', true);1093 + xhr.open('POST', '/bin/SeitokaiCode/DeletePost?outputSyntax=plain', true); 1237 1237 xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'); 1238 1238 var deletePostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token); 1239 1239 xhr.onload = function() {