Changes for page 学校ページ テンプレート
Last modified by Super Admin on 2026/04/05 18:59
From version
36.1
edited by Super Admin
on 2026/03/10 14:40
on 2026/03/10 14:40
Change comment:
There is no comment for this version
To version
47.1
edited by Super Admin
on 2026/03/13 16:19
on 2026/03/13 16:19
Change comment:
There is no comment for this version
Summary
Details
- Page properties
-
- Content
-
... ... @@ -1,13 +1,5 @@ 1 1 {{velocity}} 2 2 ## ===== 学校ページ テンプレート ===== 3 -## ページタイトルを学校名に設定({{html}}ブロックの前で実行する必要あり) 4 -#set($__titleObj = $doc.getObject('SeitokaiCode.SchoolClass')) 5 -#if($__titleObj) 6 - #set($__titleName = $__titleObj.getValue('schoolName')) 7 - #if($__titleName && $__titleName != '') 8 - $doc.setTitle($__titleName) 9 - #end 10 -#end 11 11 {{html clean="false"}} 12 12 ## メンテナンスバナー({{include}}ではなくインラインで記述し、<p>タグ挿入を回避) 13 13 #set($bannerDoc = $xwiki.getDocument('SeitokaiAdmin.MaintenanceBanner')) ... ... @@ -73,9 +73,7 @@ 73 73 #set($seitokaiYoutube = $doc.getValue('seitokaiYoutube')) 74 74 #set($seitokaiOtherSns = $doc.getValue('seitokaiOtherSns')) 75 75 76 -## --- 年度アーカイブ --- 77 -#set($pageFiscalYear = $!doc.getValue('fiscalYear')) 78 -## 現在の年度を計算(4月始まり) 68 +## --- 現在の年度を計算(4月始まり) --- 79 79 #set($nowFY = $datetool.date) 80 80 #set($currentFYMonth = $mathtool.toInteger($datetool.format('MM', $nowFY))) 81 81 #set($currentFYYear = $mathtool.toInteger($datetool.format('yyyy', $nowFY))) ... ... @@ -84,10 +84,6 @@ 84 84 #else 85 85 #set($currentFiscalYear = $mathtool.sub($currentFYYear, 1)) 86 86 #end 87 -## fiscalYear 未設定時はデフォルトとして現在の年度を使う 88 -#if(!$pageFiscalYear || $pageFiscalYear == '') 89 - #set($pageFiscalYear = $currentFiscalYear.toString()) 90 -#end 91 91 92 92 ## --- 公開範囲フィールド --- 93 93 #set($visibilityOrgChart = $!doc.getValue('visibilityOrgChart')) ... ... @@ -116,8 +116,12 @@ 116 116 117 117 ## --- 投稿固定/解除処理 --- 118 118 #set($pinAction = $!request.action) 119 -#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || $viewerAccountType == 'verified') && $services.csrf.isTokenValid($request.form_token)) 120 - #set($postObjNum = $mathtool.toInteger($!request.postObj)) 105 +#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token)) 106 + #set($pinPostObjStr = $!request.postObj) 107 + #if(!$pinPostObjStr.matches('^\d+$')) 108 + ## 不正な値 → 無視 109 + #else 110 + #set($postObjNum = $mathtool.toInteger($pinPostObjStr)) 121 121 #set($postObj = $doc.getObject('SeitokaiCode.ActivityPostClass', $postObjNum)) 122 122 #if($postObj) 123 123 #if($pinAction == 'pin') ... ... @@ -137,12 +137,15 @@ 137 137 $response.sendRedirect($doc.getURL('view')) 138 138 #stop 139 139 #end 130 + #end## /matches 140 140 #end 141 141 142 142 ## --- 特色ある活動 選定/解除処理 --- 143 143 #set($featAction = $!request.action) 144 -#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $services.csrf.isTokenValid($request.form_token)) 145 - #set($actObjNum = $mathtool.toInteger($!request.actObj)) 135 +#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token)) 136 + #set($featActObjStr = $!request.actObj) 137 + #if($featActObjStr.matches('^\d+$')) 138 + #set($actObjNum = $mathtool.toInteger($featActObjStr)) 146 146 #set($actObj = $doc.getObject('SeitokaiCode.ActivityClass', $actObjNum)) 147 147 #if($actObj) 148 148 #if($featAction == 'feature') ... ... @@ -174,6 +174,7 @@ 174 174 $response.sendRedirect($doc.getURL('view')) 175 175 #stop 176 176 #end 170 + #end## /matches 177 177 #end 178 178 179 179 ## --- ユーザー情報取得 --- ... ... @@ -232,6 +232,12 @@ 232 232 #end 233 233 #end 234 234 229 +## --- 学校名見出し(XWikiデフォルトタイトルを非表示にし、学校名を表示) --- 230 +#if($schoolName && $schoolName != '') 231 +<style>.document-header { display: none !important; }</style> 232 +<h1 class="school-page-title">$!escapetool.xml($schoolName)</h1> 233 +#end 234 + 235 235 ## --- 編集ボタン(権限があるユーザーのみ表示) --- 236 236 #set($canEditSchool = false) 237 237 #if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode)) ... ... @@ -246,7 +246,7 @@ 246 246 ## --- ① 学校基本情報 + 連絡先(左右グリッド・折りたたみ対応) --- 247 247 <div class="school-info-grid"> 248 248 <div class="school-info-card collapsed" id="card-basic-info"> 249 - <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> 249 + <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> 250 250 <table class="wiki-table school-info-table"> 251 251 <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr> 252 252 <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr> ... ... @@ -255,7 +255,7 @@ 255 255 <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr> 256 256 <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr> 257 257 <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr> 258 - <tr><th>課程</th><td>#if($schoolSystem && $schoolSystem !='' &&$schoolSystem!='[]')$!escapetool.xml($!schoolSystem)#end</td></tr>258 + <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr> 259 259 <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> 260 260 </table> 261 261 #set($infoEditDate = $!doc.getValue('lastInfoEditedDate')) ... ... @@ -266,7 +266,7 @@ 266 266 </div> 267 267 268 268 <div class="school-info-card collapsed" id="card-contact"> 269 - <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> 269 + <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> 270 270 <table class="wiki-table school-info-table"> 271 271 <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr> 272 272 <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> ... ... @@ -313,7 +313,7 @@ 313 313 314 314 ## --- ③④⑤ 日常の活動・選挙・定例活動 --- 315 315 <div class="school-section-grid"> 316 - #if($dailyActivities && $dailyActivities != '')316 + #if($dailyActivities && !$dailyActivities.isEmpty()) 317 317 <div class="school-section-card"> 318 318 <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> 319 319 <div class="card-inner"> ... ... @@ -320,7 +320,7 @@ 320 320 <p class="activity-hint">活動時間の多い順に上位3つ</p> 321 321 <div class="tag-container"> 322 322 #set($daIdx = 1) 323 - #foreach($da in $dailyActivities .split(","))323 + #foreach($da in $dailyActivities) 324 324 <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span> 325 325 #set($daIdx = $daIdx + 1) 326 326 #end ... ... @@ -371,7 +371,7 @@ 371 371 #end 372 372 373 373 ## --- ⑦ 予算 --- 374 - #set($hasBudget = ($budgetProcess && $budgetProcess != '') || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))374 + #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != '')) 375 375 #if($hasBudget) 376 376 ## 公開範囲チェック 377 377 #set($canViewBudget = true) ... ... @@ -382,12 +382,12 @@ 382 382 <div class="school-section-card"> 383 383 <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> 384 384 <div class="card-inner"> 385 - #if($budgetProcess && $budgetProcess != '')385 + #if($budgetProcess && !$budgetProcess.isEmpty()) 386 386 <div class="info-row"> 387 387 <span class="info-label">作成過程の生徒関与</span> 388 388 <span class="info-value"> 389 389 <div class="selection-display"> 390 - #foreach($bp in $budgetProcess .split(","))390 + #foreach($bp in $budgetProcess) 391 391 <span class="selection-item">$!escapetool.xml($bp.trim())</span> 392 392 #end 393 393 </div> ... ... @@ -406,12 +406,12 @@ 406 406 <span class="info-value">$!escapetool.xml($!budgetScale)</span> 407 407 </div> 408 408 #end 409 - #if($budgetAllocation && $budgetAllocation != '')409 + #if($budgetAllocation && !$budgetAllocation.isEmpty()) 410 410 <div class="info-row"> 411 411 <span class="info-label">主な予算配分</span> 412 412 <span class="info-value"> 413 413 <div class="selection-display"> 414 - #foreach($ba in $budgetAllocation .split(","))414 + #foreach($ba in $budgetAllocation) 415 415 <span class="selection-item">$!escapetool.xml($ba.trim())</span> 416 416 #end 417 417 </div> ... ... @@ -444,12 +444,12 @@ 444 444 <span class="info-label">見直しの有無(3年以内)</span> 445 445 <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span> 446 446 </div> 447 - #if($ruleReviewContent && $ruleReviewContent != '')447 + #if($ruleReviewContent && !$ruleReviewContent.isEmpty()) 448 448 <div class="info-row"> 449 449 <span class="info-label">見直しの内容</span> 450 450 <span class="info-value"> 451 451 <div class="selection-display"> 452 - #foreach($rc in $ruleReviewContent .split(","))452 + #foreach($rc in $ruleReviewContent) 453 453 <span class="selection-item">$!escapetool.xml($rc.trim())</span> 454 454 #end 455 455 </div> ... ... @@ -456,12 +456,12 @@ 456 456 </span> 457 457 </div> 458 458 #end 459 - #if($ruleReviewProposer && $ruleReviewProposer != '')459 + #if($ruleReviewProposer && !$ruleReviewProposer.isEmpty()) 460 460 <div class="info-row"> 461 461 <span class="info-label">見直しの提案者</span> 462 462 <span class="info-value"> 463 463 <div class="selection-display"> 464 - #foreach($rp in $ruleReviewProposer .split(","))464 + #foreach($rp in $ruleReviewProposer) 465 465 <span class="selection-item">$!escapetool.xml($rp.trim())</span> 466 466 #end 467 467 </div> ... ... @@ -468,12 +468,12 @@ 468 468 </span> 469 469 </div> 470 470 #end 471 - #if($ruleReviewImplementer && $ruleReviewImplementer != '')471 + #if($ruleReviewImplementer && !$ruleReviewImplementer.isEmpty()) 472 472 <div class="info-row"> 473 473 <span class="info-label">見直しの実施者</span> 474 474 <span class="info-value"> 475 475 <div class="selection-display"> 476 - #foreach($ri in $ruleReviewImplementer .split(","))476 + #foreach($ri in $ruleReviewImplementer) 477 477 <span class="selection-item">$!escapetool.xml($ri.trim())</span> 478 478 #end 479 479 </div> ... ... @@ -635,7 +635,7 @@ 635 635 <div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)"> 636 636 <div class="activity-thread-header"> 637 637 <div class="activity-thread-title"> 638 - <h3 #if($actFeatured == '1')class="featured-title"#end>$!escapetool.xml($!actTitle) #if($actFeatured == '1')<svg class="ico ico-fixed-14" viewBox="0 0 24 24" fill="currentColor" stroke="none" class="ico-star-offset"><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>638 + <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> 639 639 <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span> 640 640 </div> 641 641 <div class="thread-meta-row"> ... ... @@ -765,9 +765,6 @@ 765 765 #elseif($postUserRole == 'graduate') 766 766 <span class="badge badge-role-graduate 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> 767 767 #end 768 - #if($postGrade && $postGrade != '') 769 - <span class="badge badge-grade badge-sm">$postGrade</span> 770 - #end 771 771 </span> 772 772 <span class="thread-post-date">$!postDate</span> 773 773 #set($postEdited = $!post.getValue('edited')) ... ... @@ -917,10 +917,10 @@ 917 917 918 918 #if($xcontext.user != "XWiki.XWikiGuest") 919 919 <div class="thread-add-post"> 920 - <a href="/bin/ view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">917 + <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add"> 921 921 + 活動報告を追加 922 922 </a> 923 - <a href="/bin/ view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">920 + <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment"> 924 924 <svg class="ico" viewBox="0 0 24 24"><path d="M21 15a2 2 0 01-2 2H7l-4 4V5a2 2 0 012-2h14a2 2 0 012 2z"/></svg> コメントを書く 925 925 </a> 926 926 </div> ... ... @@ -942,7 +942,7 @@ 942 942 #if($xcontext.user != "XWiki.XWikiGuest") 943 943 {{html clean="false"}} 944 944 <div class="activity-add-section"> 945 - <a href="/bin/ view/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$!escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity">942 + <a href="/bin/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$!escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity"> 946 946 <svg class="ico" viewBox="0 0 24 24" stroke-width="2.5"><line x1="12" y1="5" x2="12" y2="19"/><line x1="5" y1="12" x2="19" y2="12"/></svg> 活動を追加 947 947 </a> 948 948 </div> ... ... @@ -949,59 +949,6 @@ 949 949 {{/html}} 950 950 #end 951 951 952 -## --- 年度アーカイブ セクション --- 953 -{{html clean="false"}} 954 -<div class="school-section-card school-archive-card"> 955 - <h2 class="archive-section-title"> 956 - <svg class="ico ico-md" viewBox="0 0 24 24"><path d="M19 21H5a2 2 0 01-2-2V5a2 2 0 012-2h11l5 5v11a2 2 0 01-2 2z"/><polyline points="17 21 17 13 7 13 7 21"/><polyline points="7 3 7 8 15 8"/></svg> 957 - 年度アーカイブ 958 - </h2> 959 - <div class="archive-meta"> 960 - 現在のページ: <strong>${pageFiscalYear}年度</strong> 961 - #set($lyud = $!doc.getValue('lastYearUpdateDate')) 962 - #if($lyud && $lyud != '') 963 - | 最終年度更新: $!escapetool.xml($lyud) ($!escapetool.xml($!doc.getValue('lastYearUpdateBy'))) 964 - #end 965 - </div> 966 - 967 - ## 過去アーカイブの検索 968 - #set($archiveQuery = $services.query.hql("where doc.fullName like :pattern and doc.fullName like '%Archive_%' order by doc.fullName desc").bindValue("pattern", "${doc.fullName}.Archive_%").setLimit(20)) 969 - #set($archivePages = $archiveQuery.execute()) 970 - 971 - #if($archivePages && $archivePages.size() > 0) 972 - <div class="archive-card-field-lg"> 973 - <div class="archive-list-label">過去の年度アーカイブ</div> 974 - <div class="archive-list"> 975 - #foreach($archPage in $archivePages) 976 - #set($archPageDoc = $xwiki.getDocument($archPage)) 977 - #set($archPageObj = $archPageDoc.getObject('SeitokaiCode.SchoolClass')) 978 - #if($archPageObj) 979 - #set($archPageFY = $!archPageObj.getValue('fiscalYear')) 980 - <a href="$archPageDoc.getURL('view')" class="archive-link"> 981 - <svg class="ico" viewBox="0 0 24 24"><path d="M19 21H5a2 2 0 01-2-2V5a2 2 0 012-2h11l5 5v11a2 2 0 01-2 2z"/><polyline points="17 21 17 13 7 13 7 21"/><polyline points="7 3 7 8 15 8"/></svg> 982 - ${archPageFY}年度 983 - </a> 984 - #end 985 - #end 986 - </div> 987 - </div> 988 - #else 989 - <div class="archive-empty">過去のアーカイブはまだありません</div> 990 - #end 991 - 992 - ## 新年度に移行ボタン(承認済み・管理者のみ) 993 - #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified') 994 - <div class="archive-action"> 995 - <a href="/bin/view/SeitokaiCode/YearArchiveAction?schoolPage=${doc.fullName}" class="btn-accent"> 996 - <svg class="ico" viewBox="0 0 24 24" stroke-width="2.5"><path d="M19 21H5a2 2 0 01-2-2V5a2 2 0 012-2h11l5 5v11a2 2 0 01-2 2z"/><polyline points="17 21 17 13 7 13 7 21"/><polyline points="7 3 7 8 15 8"/></svg> 997 - ${pageFiscalYear}年度をアーカイブして新年度に移行 998 - </a> 999 - <div class="archive-action-hint">現在の学校情報を${pageFiscalYear}年度として保存し、新しい年度に移行します。</div> 1000 - </div> 1001 - #end 1002 -</div> 1003 -{{/html}} 1004 - 1005 1005 ## --- 年度タブ切り替え JavaScript --- 1006 1006 {{html clean="false"}} 1007 1007 <script> ... ... @@ -1024,9 +1024,6 @@ 1024 1024 var defaultTab = document.querySelector('.activity-fy-tab.active'); 1025 1025 if (defaultTab) { defaultTab.click(); } 1026 1026 // 保存成功時のトースト通知 1027 - if (window.location.search.indexOf('archived=1') !== -1) { 1028 - showToast('年度アーカイブを作成しました', 'success'); 1029 - } 1030 1030 if (window.location.search.indexOf('saved=1') !== -1) { 1031 1031 showToast('学校情報を保存しました', 'success'); 1032 1032 // URLパラメータをクリーンアップ(リロード時に再表示されないよう) ... ... @@ -1062,6 +1062,9 @@ 1062 1062 var card = document.getElementById(cardId); 1063 1063 if (!card) return; 1064 1064 card.classList.toggle('collapsed'); 1006 + var isCollapsed = card.classList.contains('collapsed'); 1007 + var h2 = card.querySelector('h2[role="button"]'); 1008 + if (h2) h2.setAttribute('aria-expanded', !isCollapsed); 1065 1065 } 1066 1066 1067 1067 // 投稿の編集(インライン編集フォームを開く) ... ... @@ -1093,7 +1093,9 @@ 1093 1093 var csrfEl = document.querySelector('input[name="form_token"]'); 1094 1094 var csrfToken = csrfEl ? csrfEl.value : ''; 1095 1095 var xhr = new XMLHttpRequest(); 1096 - xhr.open('GET', '/bin/view/SeitokaiCode/EditPost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken), true); 1040 + xhr.open('POST', '/bin/SeitokaiCode/EditPost?outputSyntax=plain', true); 1041 + xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'); 1042 + var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken); 1097 1097 xhr.onload = function() { 1098 1098 try { 1099 1099 var res = JSON.parse(xhr.responseText); ... ... @@ -1106,7 +1106,7 @@ 1106 1106 } catch(e) { alert('編集に失敗しました'); } 1107 1107 }; 1108 1108 xhr.onerror = function() { alert('通信エラーが発生しました'); }; 1109 - xhr.send(); 1055 + xhr.send(editPostData); 1110 1110 } 1111 1111 1112 1112 // 投稿の削除(確認ダイアログ付き) ... ... @@ -1113,7 +1113,9 @@ 1113 1113 function confirmDeletePost(schoolPage, postObjNum, token) { 1114 1114 if (!confirm('この投稿を削除しますか?\\n削除後は「この投稿は削除されました」と表示されます。')) return; 1115 1115 var xhr = new XMLHttpRequest(); 1116 - xhr.open('GET', '/bin/view/SeitokaiCode/DeletePost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token), true); 1062 + xhr.open('POST', '/bin/SeitokaiCode/DeletePost?outputSyntax=plain', true); 1063 + xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'); 1064 + var deletePostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token); 1117 1117 xhr.onload = function() { 1118 1118 try { 1119 1119 var res = JSON.parse(xhr.responseText); ... ... @@ -1126,7 +1126,7 @@ 1126 1126 } catch(e) { alert('削除に失敗しました'); } 1127 1127 }; 1128 1128 xhr.onerror = function() { alert('通信エラーが発生しました'); }; 1129 - xhr.send(); 1077 + xhr.send(deletePostData); 1130 1130 } 1131 1131 </script> 1132 1132 {{/html}}