Changes for page 学校一覧
Last modified by Super Admin on 2026/03/23 10:15
From version
23.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
To version
10.1
edited by Super Admin
on 2026/03/06 22:09
on 2026/03/06 22:09
Change comment:
There is no comment for this version
Summary
Details
- Page properties
-
- Content
-
... ... @@ -3,53 +3,35 @@ 3 3 ## ソート: 更新順(デフォルト)/ 都道府県順 4 4 ## カード形式で表示し、活動数・投稿数・最終更新日を表示 5 5 6 -## --- 閲覧者情報(非表示校フィルタ用) --- 7 -#set($listViewerUser = $xcontext.user) 8 -#set($isListAdmin = false) 9 -#if($listViewerUser != 'XWiki.XWikiGuest') 10 - #set($listViewerDoc = $xwiki.getDocument($listViewerUser)) 11 - #set($listViewerAccountType = $!listViewerDoc.getValue('accountType')) 12 - #if($listViewerAccountType == 'admin') 13 - #set($isListAdmin = true) 14 - #end 15 -#end 16 - 17 17 #set($sortParam = $!request.sort) 18 18 #if(!$sortParam || $sortParam == '') 19 19 #set($sortParam = 'updated') 20 20 #end 21 21 22 -## ソート順に応じたXWQLクエリ(非表示校フィルタ付き) 23 -#if($isListAdmin) 24 - ## 管理者: 全校表示 25 - #if($sortParam == 'pref') 26 - #set($query = $services.query.xwql("from doc.object(SeitokaiCode.SchoolClass) as school order by school.prefecture, school.schoolName")) 27 - #else 28 - #set($query = $services.query.xwql("from doc.object(SeitokaiCode.SchoolClass) as school order by doc.date desc")) 29 - #end 11 +## ソート順に応じたXWQLクエリ 12 +#if($sortParam == 'pref') 13 + #set($query = $services.query.xwql("from doc.object(SeitokaiCode.SchoolClass) as school order by school.prefecture, school.schoolName")) 30 30 #else 31 - ## 一般: 非表示校を除外 32 - #if($sortParam == 'pref') 33 - #set($query = $services.query.xwql("from doc.object(SeitokaiCode.SchoolClass) as school where (school.hidden != 1 or school.hidden is null) order by school.prefecture, school.schoolName")) 34 - #else 35 - #set($query = $services.query.xwql("from doc.object(SeitokaiCode.SchoolClass) as school where (school.hidden != 1 or school.hidden is null) order by doc.date desc")) 36 - #end 15 + ## 更新順: ドキュメントの最終更新日でソート(降順) 16 + #set($query = $services.query.xwql("from doc.object(SeitokaiCode.SchoolClass) as school order by doc.date desc")) 37 37 #end 38 38 #set($results = $query.execute()) 39 39 40 40 {{html clean="false"}} 41 -<h1 class="home-section-title">登録されている学校</h1> 42 -<div class="sort-header">43 - <div class="school-count">21 +<h1 class="home-section-title" style="font-size:1.4em;margin-bottom:20px;">登録されている学校</h1> 22 +<div style="display:flex;justify-content:space-between;align-items:center;margin-bottom:20px;flex-wrap:wrap;gap:10px;"> 23 + <div style="font-size:0.9em;color:#64748b;"> 44 44 $results.size() 校が登録されています 45 45 </div> 46 - <div class="sort-toggle-group">26 + <div style="display:flex;gap:4px;background:#f1f5f9;border-radius:8px;padding:3px;"> 47 47 <a href="$doc.getURL('view', 'sort=updated')" 48 - class="sort-toggle #if($sortParam == 'updated')active#end"> 28 + style="padding:6px 14px;border-radius:6px;font-size:0.84em;font-weight:600;text-decoration:none;display:inline-flex;align-items:center;gap:4px; 29 + #if($sortParam == 'updated')background:#fff;color:#1e293b;box-shadow:0 1px 3px rgba(0,0,0,0.1);#else color:#64748b;#end"> 49 49 <svg class="ico ico-fixed-14" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><polyline points="12 6 12 12 16 14"/></svg> 更新順 50 50 </a> 51 51 <a href="$doc.getURL('view', 'sort=pref')" 52 - class="sort-toggle #if($sortParam == 'pref')active#end"> 33 + style="padding:6px 14px;border-radius:6px;font-size:0.84em;font-weight:600;text-decoration:none;display:inline-flex;align-items:center;gap:4px; 34 + #if($sortParam == 'pref')background:#fff;color:#1e293b;box-shadow:0 1px 3px rgba(0,0,0,0.1);#else color:#64748b;#end"> 53 53 <svg class="ico ico-fixed-14" viewBox="0 0 24 24"><path d="M21 10c0 7-9 13-9 13s-9-6-9-13a9 9 0 0118 0z"/><circle cx="12" cy="10" r="3"/></svg> 都道府県順 54 54 </a> 55 55 </div> ... ... @@ -62,7 +62,7 @@ 62 62 #set($currentPref = '') 63 63 64 64 {{html clean="false"}} 65 -<div class="school-card-grid">47 +<div style="display:grid;grid-template-columns:repeat(auto-fill, minmax(320px, 1fr));gap:16px;"> 66 66 #foreach($docName in $results) 67 67 #set($schoolDoc = $xwiki.getDocument($docName)) 68 68 #set($schoolObj = $schoolDoc.getObject('SeitokaiCode.SchoolClass')) ... ... @@ -93,38 +93,39 @@ 93 93 ## 都道府県グループヘッダー(都道府県順の場合) 94 94 #if($sortParam == 'pref' && $sPref != $currentPref) 95 95 #set($currentPref = $sPref) 96 - <div class="pref-group-header">97 - <span class="pref-group-label"><svg class="ico ico-fixed-16" viewBox="0 0 24 24"><path d="M21 10c0 7-9 13-9 13s-9-6-9-13a9 9 0 0118 0z"/><circle cx="12" cy="10" r="3"/></svg> $!escapetool.xml($currentPref)</span>78 + <div style="grid-column:1/-1;margin-top:12px;padding:8px 0;border-bottom:2px solid #e2e8f0;"> 79 + <span style="font-size:1.05em;font-weight:700;color:#1e293b;display:inline-flex;align-items:center;gap:4px;"><svg class="ico ico-fixed-16" viewBox="0 0 24 24"><path d="M21 10c0 7-9 13-9 13s-9-6-9-13a9 9 0 0118 0z"/><circle cx="12" cy="10" r="3"/></svg> $!escapetool.xml($currentPref)</span> 98 98 </div> 99 99 #end 100 100 101 - #set($sHidden = $!schoolObj.getValue('hidden')) 102 - <a href="$schoolDoc.getURL('view')" class="school-card #if($sHidden == 1)school-card-hidden#end"> 103 - <div class="school-card-body"> 104 - <div class="school-card-header-row"> 105 - <div class="school-card-name">$!escapetool.xml($sName)</div> 106 - #if($sHidden == 1) 107 - <span class="badge-hidden">非表示</span> 108 - #end 83 + <a href="$schoolDoc.getURL('view')" style="text-decoration:none;color:inherit;display:block;background:#fff;border:1px solid #e5e7eb;border-radius:12px;overflow:hidden;transition:box-shadow 0.2s,transform 0.1s;" 84 + onmouseover="this.style.boxShadow='0 4px 12px rgba(0,0,0,0.08)';this.style.transform='translateY(-1px)'" 85 + onmouseout="this.style.boxShadow='';this.style.transform=''"> 86 + <div style="padding:16px 20px;"> 87 + <div style="display:flex;align-items:center;gap:8px;margin-bottom:4px;flex-wrap:wrap;"> 88 + <div style="font-weight:700;font-size:0.95em;color:#1e293b;">$!escapetool.xml($sName)</div> 109 109 #if($sEst) 110 - <span class="school-card-badge #if($sEst == '公立')public#elseif($sEst == '私立')private#else national#end">$!escapetool.xml($sEst)</span> 90 + <span style="font-size:0.72em;padding:2px 8px;border-radius:4px;font-weight:600; 91 + #if($sEst == '公立')background:#dbeafe;color:#1d4ed8; 92 + #elseif($sEst == '私立')background:#fce7f3;color:#be185d; 93 + #else background:#f3e8ff;color:#7c3aed;#end">$!escapetool.xml($sEst)</span> 111 111 #end 112 112 </div> 113 - <div class="school-card-meta">96 + <div style="font-size:0.82em;color:#94a3b8;margin-bottom:8px;"> 114 114 $!escapetool.xml($sPref) $!escapetool.xml($sCity) 115 115 #if($sCoed) ・ $!escapetool.xml($sCoed)#end 116 - #if($sSystem && !$sSystem.isEmpty())・#foreach($__sys in $sSystem)#if($foreach.count > 1)・#end$!escapetool.xml($__sys)#end#end99 + #if($sSystem) ・ $!escapetool.xml($sSystem)#end 117 117 </div> 118 118 ## 特色ある活動バッジ 119 119 #if($featuredCount > 0) 120 - <div class="school-card-featured-wrap">121 - <span class="badge-featured"><svg class="ico ico-fixed-14" 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> 特色ある活動 ${featuredCount}件</span>103 + <div style="display:flex;gap:4px;flex-wrap:wrap;margin-bottom:8px;"> 104 + <span style="font-size:0.72em;padding:2px 8px;background:#fef3c7;color:#92400e;border-radius:4px;font-weight:600;display:inline-flex;align-items:center;gap:3px;"><svg class="ico ico-fixed-14" 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> 特色ある活動 ${featuredCount}件</span> 122 122 </div> 123 123 #end 124 - <div class="school-card-stats">125 - <span><svg class="ico ico-fixed-14" 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> 活動 <s panclass="num">$actCount</span>件</span>126 - <span><svg class="ico ico-fixed-14" 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> 投稿 <s panclass="num">$postCount</span>件</span>127 - <span><svg class="ico ico-fixed-14" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><polyline points="12 6 12 12 16 14"/></svg> 更新 $lastUpdate</span> 107 + <div style="display:flex;gap:14px;font-size:0.8em;color:#94a3b8;"> 108 + <span style="display:inline-flex;align-items:center;gap:3px;"><svg class="ico ico-fixed-14" 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> 活動 <strong style="color:#334155;">$actCount</strong>件</span> 109 + <span style="display:inline-flex;align-items:center;gap:3px;"><svg class="ico ico-fixed-14" 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> 投稿 <strong style="color:#334155;">$postCount</strong>件</span> 110 + <span style="display:inline-flex;align-items:center;gap:3px;"><svg class="ico ico-fixed-14" viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><polyline points="12 6 12 12 16 14"/></svg> 更新 $lastUpdate</span> 128 128 </div> 129 129 </div> 130 130 </a>