Changes for page 学校ページ テンプレート
Last modified by Super Admin on 2026/04/05 18:59
From version
37.1
edited by Super Admin
on 2026/03/10 14:41
on 2026/03/10 14:41
Change comment:
There is no comment for this version
To version
48.1
edited by Super Admin
on 2026/03/13 21:13
on 2026/03/13 21:13
Change comment:
There is no comment for this version
Summary
Details
- Page properties
-
- Content
-
... ... @@ -65,9 +65,7 @@ 65 65 #set($seitokaiYoutube = $doc.getValue('seitokaiYoutube')) 66 66 #set($seitokaiOtherSns = $doc.getValue('seitokaiOtherSns')) 67 67 68 -## --- 年度アーカイブ --- 69 -#set($pageFiscalYear = $!doc.getValue('fiscalYear')) 70 -## 現在の年度を計算(4月始まり) 68 +## --- 現在の年度を計算(4月始まり) --- 71 71 #set($nowFY = $datetool.date) 72 72 #set($currentFYMonth = $mathtool.toInteger($datetool.format('MM', $nowFY))) 73 73 #set($currentFYYear = $mathtool.toInteger($datetool.format('yyyy', $nowFY))) ... ... @@ -76,10 +76,6 @@ 76 76 #else 77 77 #set($currentFiscalYear = $mathtool.sub($currentFYYear, 1)) 78 78 #end 79 -## fiscalYear 未設定時はデフォルトとして現在の年度を使う 80 -#if(!$pageFiscalYear || $pageFiscalYear == '') 81 - #set($pageFiscalYear = $currentFiscalYear.toString()) 82 -#end 83 83 84 84 ## --- 公開範囲フィールド --- 85 85 #set($visibilityOrgChart = $!doc.getValue('visibilityOrgChart')) ... ... @@ -106,10 +106,47 @@ 106 106 #end 107 107 #end 108 108 103 +## --- 学校ページ非表示チェック --- 104 +#set($schoolHidden = $doc.getValue('hidden')) 105 +#if($schoolHidden == 1) 106 + #if($isViewerAdmin) 107 + ## 管理者: 黄色バナー + ページ内容は通常表示(プレビュー) 108 +<div class="school-hidden-banner admin"> 109 + <svg class="ico" viewBox="0 0 24 24"><path d="M17.94 17.94A10.07 10.07 0 0112 20c-7 0-11-8-11-8a18.45 18.45 0 015.06-5.94M9.9 4.24A9.12 9.12 0 0112 4c7 0 11 8 11 8a18.5 18.5 0 01-2.16 3.19m-6.72-1.07a3 3 0 01-4.24-4.24"/><line x1="1" y1="1" x2="23" y2="23"/></svg> 110 + <div> 111 + <strong>このページは非表示になっています</strong>(管理者のみ閲覧可能) 112 + #set($hBy = $!doc.getValue('hiddenBy')) 113 + #set($hAt = $!doc.getValue('hiddenAt')) 114 + #set($hReason = $!doc.getValue('hiddenReason')) 115 + <div class="school-hidden-detail"> 116 + 非表示: $!escapetool.xml($hAt) / $!escapetool.xml($hBy) 117 + #if($hReason && $hReason != '') ・ 理由: $!escapetool.xml($hReason)#end 118 + </div> 119 + <a href="$xwiki.getURL('SeitokaiAdmin.SchoolManagement', 'view')" style="color:#92400e;text-decoration:underline">学校ページ管理へ</a> 120 + </div> 121 +</div> 122 + #else 123 + ## 一般ユーザー・ゲスト: 非公開メッセージを表示して停止 124 +<div class="school-hidden-public"> 125 + <svg class="ico" viewBox="0 0 24 24" style="width:2.5em;height:2.5em"><path d="M17.94 17.94A10.07 10.07 0 0112 20c-7 0-11-8-11-8a18.45 18.45 0 015.06-5.94M9.9 4.24A9.12 9.12 0 0112 4c7 0 11 8 11 8a18.5 18.5 0 01-2.16 3.19m-6.72-1.07a3 3 0 01-4.24-4.24"/><line x1="1" y1="1" x2="23" y2="23"/></svg> 126 + <h2>このページは現在公開されていません</h2> 127 + <p>このページは管理者により非公開に設定されています。</p> 128 + <a href="$xwiki.getURL('Schools.WebHome', 'view')" class="btn-back-list">学校一覧に戻る</a> 129 +</div> 130 +{{/html}} 131 +{{/velocity}} 132 +#stop 133 + #end 134 +#end 135 + 109 109 ## --- 投稿固定/解除処理 --- 110 110 #set($pinAction = $!request.action) 111 -#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || $viewerAccountType == 'verified') && $services.csrf.isTokenValid($request.form_token)) 112 - #set($postObjNum = $mathtool.toInteger($!request.postObj)) 138 +#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token)) 139 + #set($pinPostObjStr = $!request.postObj) 140 + #if(!$pinPostObjStr.matches('^\d+$')) 141 + ## 不正な値 → 無視 142 + #else 143 + #set($postObjNum = $mathtool.toInteger($pinPostObjStr)) 113 113 #set($postObj = $doc.getObject('SeitokaiCode.ActivityPostClass', $postObjNum)) 114 114 #if($postObj) 115 115 #if($pinAction == 'pin') ... ... @@ -129,12 +129,15 @@ 129 129 $response.sendRedirect($doc.getURL('view')) 130 130 #stop 131 131 #end 163 + #end## /matches 132 132 #end 133 133 134 134 ## --- 特色ある活動 選定/解除処理 --- 135 135 #set($featAction = $!request.action) 136 -#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || $viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $services.csrf.isTokenValid($request.form_token)) 137 - #set($actObjNum = $mathtool.toInteger($!request.actObj)) 168 +#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token)) 169 + #set($featActObjStr = $!request.actObj) 170 + #if($featActObjStr.matches('^\d+$')) 171 + #set($actObjNum = $mathtool.toInteger($featActObjStr)) 138 138 #set($actObj = $doc.getObject('SeitokaiCode.ActivityClass', $actObjNum)) 139 139 #if($actObj) 140 140 #if($featAction == 'feature') ... ... @@ -166,6 +166,7 @@ 166 166 $response.sendRedirect($doc.getURL('view')) 167 167 #stop 168 168 #end 203 + #end## /matches 169 169 #end 170 170 171 171 ## --- ユーザー情報取得 --- ... ... @@ -226,7 +226,7 @@ 226 226 227 227 ## --- 学校名見出し(XWikiデフォルトタイトルを非表示にし、学校名を表示) --- 228 228 #if($schoolName && $schoolName != '') 229 -<style> #document-title { display: none; }</style>264 +<style>.document-header { display: none !important; }</style> 230 230 <h1 class="school-page-title">$!escapetool.xml($schoolName)</h1> 231 231 #end 232 232 ... ... @@ -244,7 +244,7 @@ 244 244 ## --- ① 学校基本情報 + 連絡先(左右グリッド・折りたたみ対応) --- 245 245 <div class="school-info-grid"> 246 246 <div class="school-info-card collapsed" id="card-basic-info"> 247 - <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> 282 + <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> 248 248 <table class="wiki-table school-info-table"> 249 249 <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr> 250 250 <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr> ... ... @@ -253,7 +253,7 @@ 253 253 <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr> 254 254 <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr> 255 255 <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr> 256 - <tr><th>課程</th><td>#if($schoolSystem && $schoolSystem !='' &&$schoolSystem!='[]')$!escapetool.xml($!schoolSystem)#end</td></tr>291 + <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr> 257 257 <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> 258 258 </table> 259 259 #set($infoEditDate = $!doc.getValue('lastInfoEditedDate')) ... ... @@ -264,7 +264,7 @@ 264 264 </div> 265 265 266 266 <div class="school-info-card collapsed" id="card-contact"> 267 - <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> 302 + <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> 268 268 <table class="wiki-table school-info-table"> 269 269 <tr><th>問い合わせ先</th><td>#if($contactInfo && $contactInfo != '')$!escapetool.xml($contactInfo)#else<span class="text-placeholder">未登録</span>#end</td></tr> 270 270 <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> ... ... @@ -311,7 +311,7 @@ 311 311 312 312 ## --- ③④⑤ 日常の活動・選挙・定例活動 --- 313 313 <div class="school-section-grid"> 314 - #if($dailyActivities && $dailyActivities != '')349 + #if($dailyActivities && !$dailyActivities.isEmpty()) 315 315 <div class="school-section-card"> 316 316 <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> 317 317 <div class="card-inner"> ... ... @@ -318,7 +318,7 @@ 318 318 <p class="activity-hint">活動時間の多い順に上位3つ</p> 319 319 <div class="tag-container"> 320 320 #set($daIdx = 1) 321 - #foreach($da in $dailyActivities .split(","))356 + #foreach($da in $dailyActivities) 322 322 <span class="tag tag-accent">${daIdx}. $!escapetool.xml($da.trim())</span> 323 323 #set($daIdx = $daIdx + 1) 324 324 #end ... ... @@ -369,7 +369,7 @@ 369 369 #end 370 370 371 371 ## --- ⑦ 予算 --- 372 - #set($hasBudget = ($budgetProcess && $budgetProcess != '') || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))407 + #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != '')) 373 373 #if($hasBudget) 374 374 ## 公開範囲チェック 375 375 #set($canViewBudget = true) ... ... @@ -380,12 +380,12 @@ 380 380 <div class="school-section-card"> 381 381 <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> 382 382 <div class="card-inner"> 383 - #if($budgetProcess && $budgetProcess != '')418 + #if($budgetProcess && !$budgetProcess.isEmpty()) 384 384 <div class="info-row"> 385 385 <span class="info-label">作成過程の生徒関与</span> 386 386 <span class="info-value"> 387 387 <div class="selection-display"> 388 - #foreach($bp in $budgetProcess .split(","))423 + #foreach($bp in $budgetProcess) 389 389 <span class="selection-item">$!escapetool.xml($bp.trim())</span> 390 390 #end 391 391 </div> ... ... @@ -404,12 +404,12 @@ 404 404 <span class="info-value">$!escapetool.xml($!budgetScale)</span> 405 405 </div> 406 406 #end 407 - #if($budgetAllocation && $budgetAllocation != '')442 + #if($budgetAllocation && !$budgetAllocation.isEmpty()) 408 408 <div class="info-row"> 409 409 <span class="info-label">主な予算配分</span> 410 410 <span class="info-value"> 411 411 <div class="selection-display"> 412 - #foreach($ba in $budgetAllocation .split(","))447 + #foreach($ba in $budgetAllocation) 413 413 <span class="selection-item">$!escapetool.xml($ba.trim())</span> 414 414 #end 415 415 </div> ... ... @@ -442,12 +442,12 @@ 442 442 <span class="info-label">見直しの有無(3年以内)</span> 443 443 <span class="info-value"><span class="tag tag-primary tag-sm">$!escapetool.xml($!ruleReviewStatus)</span></span> 444 444 </div> 445 - #if($ruleReviewContent && $ruleReviewContent != '')480 + #if($ruleReviewContent && !$ruleReviewContent.isEmpty()) 446 446 <div class="info-row"> 447 447 <span class="info-label">見直しの内容</span> 448 448 <span class="info-value"> 449 449 <div class="selection-display"> 450 - #foreach($rc in $ruleReviewContent .split(","))485 + #foreach($rc in $ruleReviewContent) 451 451 <span class="selection-item">$!escapetool.xml($rc.trim())</span> 452 452 #end 453 453 </div> ... ... @@ -454,12 +454,12 @@ 454 454 </span> 455 455 </div> 456 456 #end 457 - #if($ruleReviewProposer && $ruleReviewProposer != '')492 + #if($ruleReviewProposer && !$ruleReviewProposer.isEmpty()) 458 458 <div class="info-row"> 459 459 <span class="info-label">見直しの提案者</span> 460 460 <span class="info-value"> 461 461 <div class="selection-display"> 462 - #foreach($rp in $ruleReviewProposer .split(","))497 + #foreach($rp in $ruleReviewProposer) 463 463 <span class="selection-item">$!escapetool.xml($rp.trim())</span> 464 464 #end 465 465 </div> ... ... @@ -466,12 +466,12 @@ 466 466 </span> 467 467 </div> 468 468 #end 469 - #if($ruleReviewImplementer && $ruleReviewImplementer != '')504 + #if($ruleReviewImplementer && !$ruleReviewImplementer.isEmpty()) 470 470 <div class="info-row"> 471 471 <span class="info-label">見直しの実施者</span> 472 472 <span class="info-value"> 473 473 <div class="selection-display"> 474 - #foreach($ri in $ruleReviewImplementer .split(","))509 + #foreach($ri in $ruleReviewImplementer) 475 475 <span class="selection-item">$!escapetool.xml($ri.trim())</span> 476 476 #end 477 477 </div> ... ... @@ -633,7 +633,7 @@ 633 633 <div class="activity-thread" data-fiscal-year="$!escapetool.xml($actFY)"> 634 634 <div class="activity-thread-header"> 635 635 <div class="activity-thread-title"> 636 - <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>671 + <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> 637 637 <span class="activity-meta">$!escapetool.xml($!actCommittee) | $!escapetool.xml($!actPeriod) #if($actFY != 'unknown')| $!escapetool.xml($actFY)年度#end</span> 638 638 </div> 639 639 <div class="thread-meta-row"> ... ... @@ -763,9 +763,6 @@ 763 763 #elseif($postUserRole == 'graduate') 764 764 <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> 765 765 #end 766 - #if($postGrade && $postGrade != '') 767 - <span class="badge badge-grade badge-sm">$postGrade</span> 768 - #end 769 769 </span> 770 770 <span class="thread-post-date">$!postDate</span> 771 771 #set($postEdited = $!post.getValue('edited')) ... ... @@ -915,10 +915,10 @@ 915 915 916 916 #if($xcontext.user != "XWiki.XWikiGuest") 917 917 <div class="thread-add-post"> 918 - <a href="/bin/ view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add">950 + <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=report" class="btn-thread-add"> 919 919 + 活動報告を追加 920 920 </a> 921 - <a href="/bin/ view/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment">953 + <a href="/bin/SeitokaiCode/ActivityPostForm?schoolPage=${doc.fullName}&activityIndex=${actIdx}&schoolCode=$!escapetool.url($schoolCode)&postType=comment" class="btn-thread-comment"> 922 922 <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> コメントを書く 923 923 </a> 924 924 </div> ... ... @@ -940,7 +940,7 @@ 940 940 #if($xcontext.user != "XWiki.XWikiGuest") 941 941 {{html clean="false"}} 942 942 <div class="activity-add-section"> 943 - <a href="/bin/ view/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$!escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity">975 + <a href="/bin/SeitokaiCode/ActivityForm?schoolPage=${doc.fullName}&schoolCode=$!escapetool.url($schoolCode)" class="btn btn-primary btn-add-activity"> 944 944 <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> 活動を追加 945 945 </a> 946 946 </div> ... ... @@ -947,59 +947,6 @@ 947 947 {{/html}} 948 948 #end 949 949 950 -## --- 年度アーカイブ セクション --- 951 -{{html clean="false"}} 952 -<div class="school-section-card school-archive-card"> 953 - <h2 class="archive-section-title"> 954 - <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> 955 - 年度アーカイブ 956 - </h2> 957 - <div class="archive-meta"> 958 - 現在のページ: <strong>${pageFiscalYear}年度</strong> 959 - #set($lyud = $!doc.getValue('lastYearUpdateDate')) 960 - #if($lyud && $lyud != '') 961 - | 最終年度更新: $!escapetool.xml($lyud) ($!escapetool.xml($!doc.getValue('lastYearUpdateBy'))) 962 - #end 963 - </div> 964 - 965 - ## 過去アーカイブの検索 966 - #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)) 967 - #set($archivePages = $archiveQuery.execute()) 968 - 969 - #if($archivePages && $archivePages.size() > 0) 970 - <div class="archive-card-field-lg"> 971 - <div class="archive-list-label">過去の年度アーカイブ</div> 972 - <div class="archive-list"> 973 - #foreach($archPage in $archivePages) 974 - #set($archPageDoc = $xwiki.getDocument($archPage)) 975 - #set($archPageObj = $archPageDoc.getObject('SeitokaiCode.SchoolClass')) 976 - #if($archPageObj) 977 - #set($archPageFY = $!archPageObj.getValue('fiscalYear')) 978 - <a href="$archPageDoc.getURL('view')" class="archive-link"> 979 - <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> 980 - ${archPageFY}年度 981 - </a> 982 - #end 983 - #end 984 - </div> 985 - </div> 986 - #else 987 - <div class="archive-empty">過去のアーカイブはまだありません</div> 988 - #end 989 - 990 - ## 新年度に移行ボタン(承認済み・管理者のみ) 991 - #if($viewerAccountType == 'admin' || $viewerAccountType == 'verified') 992 - <div class="archive-action"> 993 - <a href="/bin/view/SeitokaiCode/YearArchiveAction?schoolPage=${doc.fullName}" class="btn-accent"> 994 - <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> 995 - ${pageFiscalYear}年度をアーカイブして新年度に移行 996 - </a> 997 - <div class="archive-action-hint">現在の学校情報を${pageFiscalYear}年度として保存し、新しい年度に移行します。</div> 998 - </div> 999 - #end 1000 -</div> 1001 -{{/html}} 1002 - 1003 1003 ## --- 年度タブ切り替え JavaScript --- 1004 1004 {{html clean="false"}} 1005 1005 <script> ... ... @@ -1022,9 +1022,6 @@ 1022 1022 var defaultTab = document.querySelector('.activity-fy-tab.active'); 1023 1023 if (defaultTab) { defaultTab.click(); } 1024 1024 // 保存成功時のトースト通知 1025 - if (window.location.search.indexOf('archived=1') !== -1) { 1026 - showToast('年度アーカイブを作成しました', 'success'); 1027 - } 1028 1028 if (window.location.search.indexOf('saved=1') !== -1) { 1029 1029 showToast('学校情報を保存しました', 'success'); 1030 1030 // URLパラメータをクリーンアップ(リロード時に再表示されないよう) ... ... @@ -1060,6 +1060,9 @@ 1060 1060 var card = document.getElementById(cardId); 1061 1061 if (!card) return; 1062 1062 card.classList.toggle('collapsed'); 1039 + var isCollapsed = card.classList.contains('collapsed'); 1040 + var h2 = card.querySelector('h2[role="button"]'); 1041 + if (h2) h2.setAttribute('aria-expanded', !isCollapsed); 1063 1063 } 1064 1064 1065 1065 // 投稿の編集(インライン編集フォームを開く) ... ... @@ -1091,7 +1091,9 @@ 1091 1091 var csrfEl = document.querySelector('input[name="form_token"]'); 1092 1092 var csrfToken = csrfEl ? csrfEl.value : ''; 1093 1093 var xhr = new XMLHttpRequest(); 1094 - xhr.open('GET', '/bin/view/SeitokaiCode/EditPost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken), true); 1073 + xhr.open('POST', '/bin/SeitokaiCode/EditPost?outputSyntax=plain', true); 1074 + xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'); 1075 + var editPostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&newContent=' + encodeURIComponent(newContent) + '&form_token=' + encodeURIComponent(csrfToken); 1095 1095 xhr.onload = function() { 1096 1096 try { 1097 1097 var res = JSON.parse(xhr.responseText); ... ... @@ -1104,7 +1104,7 @@ 1104 1104 } catch(e) { alert('編集に失敗しました'); } 1105 1105 }; 1106 1106 xhr.onerror = function() { alert('通信エラーが発生しました'); }; 1107 - xhr.send(); 1088 + xhr.send(editPostData); 1108 1108 } 1109 1109 1110 1110 // 投稿の削除(確認ダイアログ付き) ... ... @@ -1111,7 +1111,9 @@ 1111 1111 function confirmDeletePost(schoolPage, postObjNum, token) { 1112 1112 if (!confirm('この投稿を削除しますか?\\n削除後は「この投稿は削除されました」と表示されます。')) return; 1113 1113 var xhr = new XMLHttpRequest(); 1114 - xhr.open('GET', '/bin/view/SeitokaiCode/DeletePost?outputSyntax=plain&schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token), true); 1095 + xhr.open('POST', '/bin/SeitokaiCode/DeletePost?outputSyntax=plain', true); 1096 + xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded'); 1097 + var deletePostData = 'schoolPage=' + encodeURIComponent(schoolPage) + '&postObj=' + postObjNum + '&form_token=' + encodeURIComponent(token); 1115 1115 xhr.onload = function() { 1116 1116 try { 1117 1117 var res = JSON.parse(xhr.responseText); ... ... @@ -1124,7 +1124,7 @@ 1124 1124 } catch(e) { alert('削除に失敗しました'); } 1125 1125 }; 1126 1126 xhr.onerror = function() { alert('通信エラーが発生しました'); }; 1127 - xhr.send(); 1110 + xhr.send(deletePostData); 1128 1128 } 1129 1129 </script> 1130 1130 {{/html}}