Skip to Content
Last modified by Super Admin on 2026/04/05 18:59
From version Icon 73.1 Icon
edited by Super Admin
on 2026/03/18 23:46
Change comment: There is no comment for this version
To version Icon 69.1 Icon
edited by Super Admin
on 2026/03/18 11:44
Change comment: There is no comment for this version

Summary

Details

Icon 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'))
... ... @@ -34,7 +34,6 @@
34 34  #set($schoolLevel = $doc.getValue('schoolLevel'))
35 35  #set($schoolSystem = $doc.getValue('schoolSystem'))
36 36  #set($website = $doc.getValue('website'))
37 -#set($schoolPhoto = $doc.getValue('schoolPhoto'))
38 38  
39 39  ## --- 組織図 ---
40 40  #set($orgChart = $doc.getValue('orgChart'))
... ... @@ -102,8 +102,6 @@
102 102   #set($viewerDoc = $xwiki.getDocument($viewerUser))
103 103   #set($viewerAccountType = $!viewerDoc.getValue('accountType'))
104 104   #set($viewerSchoolCode = $!viewerDoc.getValue('schoolCode'))
105 - #set($viewerSecondarySchoolCode = $!viewerDoc.getValue('secondarySchoolCode'))
106 - #set($viewerUserRole = $!viewerDoc.getValue('userRole'))
107 107   #if($viewerAccountType == 'admin')
108 108   #set($isViewerAdmin = true)
109 109   #end
... ... @@ -113,31 +113,10 @@
113 113  #set($affiliatedSchoolCode = $!doc.getValue('affiliatedSchoolCode'))
114 114  #set($affiliatedSchoolName = $!doc.getValue('affiliatedSchoolName'))
115 115  #set($isAffiliated = false)
116 -#if($affiliatedSchoolCode && $affiliatedSchoolCode != '')
117 - #if($viewerSchoolCode == $affiliatedSchoolCode)
118 - #set($isAffiliated = true)
119 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $affiliatedSchoolCode)
120 - #set($isAffiliated = true)
121 - #end
107 +#if($affiliatedSchoolCode && $affiliatedSchoolCode != '' && $viewerSchoolCode == $affiliatedSchoolCode)
108 + #set($isAffiliated = true)
122 122  #end
123 123  
124 -## --- 校内判定（卒業生を除外、secondarySchoolCodeも含む） ---
125 -#set($isSchoolMember = false)
126 -#if(!$isGuest && $viewerUserRole != 'graduate')
127 - #if($viewerSchoolCode == $schoolCode || $isAffiliated)
128 - #set($isSchoolMember = true)
129 - #elseif($viewerSecondarySchoolCode && $viewerSecondarySchoolCode != '' && $viewerSecondarySchoolCode == $schoolCode)
130 - #set($isSchoolMember = true)
131 - #end
132 -#end
133 -## 卒業生の母校判定（投稿バッジ用）
134 -#set($isAlumniOfSchool = false)
135 -#if(!$isGuest && $viewerUserRole == 'graduate')
136 - #if($viewerSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $viewerSchoolCode == $affiliatedSchoolCode))
137 - #set($isAlumniOfSchool = true)
138 - #end
139 -#end
140 -
141 141  ## --- 学校ページ非表示チェック ---
142 142  #set($schoolHidden = $doc.getValue('hidden'))
143 143  #if($schoolHidden == 1)
... ... @@ -171,7 +171,7 @@
171 171  
172 172  ## --- 投稿固定/解除処理 ---
173 173  #set($pinAction = $!request.action)
174 -#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && $isSchoolMember)) && $services.csrf.isTokenValid($request.form_token))
144 +#if(($pinAction == 'pin' || $pinAction == 'unpin') && ($viewerAccountType == 'admin' || ($viewerAccountType == 'verified' && ($viewerSchoolCode == $schoolCode || $isAffiliated))) && $services.csrf.isTokenValid($request.form_token))
175 175   #set($pinPostObjStr = $!request.postObj)
176 176   #if(!$pinPostObjStr.matches('^\d+$'))
177 177   ## 不正な値 → 無視
... ... @@ -201,7 +201,7 @@
201 201  
202 202  ## --- 特色ある活動 選定/解除処理 ---
203 203  #set($featAction = $!request.action)
204 -#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $isSchoolMember)) && $services.csrf.isTokenValid($request.form_token))
174 +#if(($featAction == 'feature' || $featAction == 'unfeature') && ($viewerAccountType == 'admin' || (($viewerAccountType == 'verified' || $viewerAccountType == 'referred') && $viewerSchoolCode == $schoolCode)) && $services.csrf.isTokenValid($request.form_token))
205 205   #set($featActObjStr = $!request.actObj)
206 206   #if($featActObjStr.matches('^\d+$'))
207 207   #set($actObjNum = $mathtool.toInteger($featActObjStr))
... ... @@ -303,7 +303,7 @@
303 303  
304 304  ## --- 編集ボタン（権限があるユーザーのみ表示） ---
305 305  #set($canEditSchool = false)
306 -#if(!$isGuest && ($isViewerAdmin || $isSchoolMember))
276 +#if(!$isGuest && ($isViewerAdmin || $viewerSchoolCode == $schoolCode || $isAffiliated))
307 307   #set($canEditSchool = true)
308 308  #end
309 309  #if($canEditSchool)
... ... @@ -333,26 +333,17 @@
333 333  ## --- ① 学校基本情報 ---
334 334  <div class="school-info-card collapsed" id="card-basic-info">
335 335   <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>
336 - <div class="school-basic-info-layout">
337 - <div class="school-basic-info-table">
338 - <table class="wiki-table school-info-table">
339 - <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
340 - <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
341 - <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
342 - <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
343 - <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
344 - <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
345 - <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
346 - <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
347 - <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>
348 - </table>
349 - </div>
350 - #if($schoolPhoto && $schoolPhoto != '')
351 - <div class="school-photo-area">
352 - <img src="$doc.getAttachmentURL($schoolPhoto)" alt="$!escapetool.xml($schoolName)" class="school-photo" />
353 - </div>
354 - #end
355 - </div>
306 + <table class="wiki-table school-info-table">
307 + <tr><th>学校コード</th><td>$!escapetool.xml($!schoolCode)</td></tr>
308 + <tr><th>学校名</th><td>$!escapetool.xml($!schoolName)</td></tr>
309 + <tr><th>所在地</th><td>$!escapetool.xml($!prefecture) #if($city && $city != '')$!escapetool.xml($city)#end</td></tr>
310 + <tr><th>学級数・生徒数</th><td>#if($classCount && $classCount != '')${classCount}学級#end #if($studentCount && $studentCount != '')/ 約${studentCount}名#end</td></tr>
311 + <tr><th>共学・別学</th><td>$!escapetool.xml($!coeducation)</td></tr>
312 + <tr><th>設置者</th><td>$!escapetool.xml($!establishment)</td></tr>
313 + <tr><th>学校種</th><td>$!escapetool.xml($!schoolLevel)</td></tr>
314 + <tr><th>課程</th><td>#if($schoolSystem && !$schoolSystem.isEmpty())#foreach($ss in $schoolSystem)#if($foreach.count > 1) / #end$!escapetool.xml($ss)#end#end</td></tr>
315 + <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>
316 + </table>
356 356   #set($infoEditDate = $!doc.getValue('lastInfoEditedDate'))
357 357   #set($infoEditBy = $!doc.getValue('lastInfoEditedBy'))
358 358   #if($infoEditDate && $infoEditDate != '')
... ... @@ -369,8 +369,8 @@
369 369   #set($hasOrgContent = ($orgChart && $orgChart != '') || ($orgChartImage && $orgChartImage != ''))
370 370   #if($hasOrgContent)
371 371   #set($canViewOrgChart = true)
372 - #if($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewOrgChart = false)
373 - #elseif($visibilityOrgChart == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewOrgChart = false)
333 + #if($visibilityOrgChart == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewOrgChart = false)
334 + #elseif($visibilityOrgChart == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewOrgChart = false)
374 374   #end
375 375   #if($canViewOrgChart)
376 376   <div class="seitokai-subsection">
... ... @@ -449,8 +449,8 @@
449 449   #set($hasBudget = ($budgetProcess && !$budgetProcess.isEmpty()) || ($studentFee && $studentFee != '') || ($budgetScale && $budgetScale != ''))
450 450   #if($hasBudget)
451 451   #set($canViewBudget = true)
452 - #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewBudget = false)
453 - #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false)
413 + #if($visibilityBudget == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewBudget = false)
414 + #elseif($visibilityBudget == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewBudget = false)
454 454   #end
455 455   #if($canViewBudget)
456 456   <div class="seitokai-subsection">
... ... @@ -505,8 +505,8 @@
505 505   ## --- 校則の見直し ---
506 506   #if($ruleReviewStatus && $ruleReviewStatus != '')
507 507   #set($canViewRuleReview = true)
508 - #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewRuleReview = false)
509 - #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false)
469 + #if($visibilityRuleReview == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewRuleReview = false)
470 + #elseif($visibilityRuleReview == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewRuleReview = false)
510 510   #end
511 511   #if($canViewRuleReview)
512 512   <div class="seitokai-subsection">
... ... @@ -568,8 +568,8 @@
568 568   ## --- 生徒会の課題意識 ---
569 569   #if($challenges && $challenges != '')
570 570   #set($canViewChallenges = true)
571 - #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewChallenges = false)
572 - #elseif($visibilityChallenges == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewChallenges = false)
532 + #if($visibilityChallenges == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewChallenges = false)
533 + #elseif($visibilityChallenges == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewChallenges = false)
573 573   #end
574 574   #if($canViewChallenges)
575 575   <div class="seitokai-subsection">
... ... @@ -660,7 +660,6 @@
660 660   <span class="author-legend-title">所属:</span>
661 661   <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>
662 662   <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>
663 - <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>
664 664   <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>
665 665   <span class="author-legend-item text-hint">※一般アカウントは所属バッジが表示されません</span>
666 666   </div>
... ... @@ -805,8 +805,8 @@
805 805   #set($postVis = $!post.getValue('visibility'))
806 806   #if(!$postVis || $postVis == '') #set($postVis = 'public') #end
807 807   #set($canViewPost = true)
808 - #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && !$isSchoolMember))) #set($canViewPost = false)
809 - #elseif($postVis == 'school_trusted' && ($isGuest || (!$isViewerAdmin && ((!$isSchoolMember) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPost = false)
768 + #if($postVis == 'school' && ($isGuest || (!$isViewerAdmin && $viewerSchoolCode != $schoolCode && !$isAffiliated))) #set($canViewPost = false)
769 + #elseif($postVis == 'school_trusted' && ($isGuest || (!$isViewerAdmin && (($viewerSchoolCode != $schoolCode && !$isAffiliated) || ($viewerAccountType != 'verified' && $viewerAccountType != 'referred'))))) #set($canViewPost = false)
810 810   #end
811 811   #if(!$canViewPost)
812 812   <div class="thread-post visibility-restricted-post">
... ... @@ -850,11 +850,8 @@
850 850   <span class="badge badge-general badge-sm">一般</span>
851 851   #end
852 852   ## 所属バッジ（投稿者の学校コードとページの学校コードを比較）
853 - #set($postIsSchoolMatch = ($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode)))
854 854   #if($postSchoolCode && $postSchoolCode != '' && $postAccountType != 'general')
855 - #if($postUserRole == 'graduate' && $postIsSchoolMatch)
856 - <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>
857 - #elseif($postIsSchoolMatch && $postUserRole != 'graduate')
814 + #if($postSchoolCode == $schoolCode || ($affiliatedSchoolCode != '' && $postSchoolCode == $affiliatedSchoolCode))
858 858   #if($postAccountType == 'verified' || $postAccountType == 'admin')
859 859   <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>
860 860   #else
... ... @@ -1103,27 +1103,6 @@
1103 1103  }
1104 1104  // ページ読み込み時の初期化
1105 1105  document.addEventListener('DOMContentLoaded', function() {
1106 - // 年度タブを降順にソート（「全期間」タブは末尾に固定）
1107 - var tabContainer = document.querySelector('.activity-fy-tabs');
1108 - if (tabContainer) {
1109 - var tabs = Array.from(tabContainer.querySelectorAll('.activity-fy-tab'));
1110 - var allTab = null;
1111 - var fyTabs = [];
1112 - tabs.forEach(function(t) {
1113 - var onclickStr = t.getAttribute('onclick') || '';
1114 - if (onclickStr.indexOf("'all'") !== -1) { allTab = t; }
1115 - else { fyTabs.push(t); }
1116 - });
1117 - // 年度タブを数値の降順でソート
1118 - fyTabs.sort(function(a, b) {
1119 - var aYear = parseInt(a.textContent) || 0;
1120 - var bYear = parseInt(b.textContent) || 0;
1121 - return bYear - aYear;
1122 - });
1123 - // DOM再配置
1124 - fyTabs.forEach(function(t) { tabContainer.appendChild(t); });
1125 - if (allTab) { tabContainer.appendChild(allTab); }
1126 - }
1127 1127   // デフォルトで現在の年度を表示
1128 1128   var defaultTab = document.querySelector('.activity-fy-tab.active');
1129 1129   if (defaultTab) { defaultTab.click(); }