Changes for page 学校一覧

Summary

• Page properties (1 modified, 0 added, 0 removed)

Details

Page properties

Content

...	...	@@ -30,23 +30,12 @@
30	30	#else
31	31	## 一般: 非表示校を除外
32	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"))
	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	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"))
	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	36	#end
37	37	#end
38	38	#set($results = $query.execute())
39		-## サンプル高等学校を常に先頭に表示
40		-#set($samplePageName = 'Schools.D100000000001.WebHome')
41		-#set($sortedResults = [])
42		-#foreach($r in $results)
43		- #if($r == $samplePageName)
44		- #set($discard = $sortedResults.add(0, $r))
45		- #else
46		- #set($discard = $sortedResults.add($r))
47		- #end
48		-#end
49		-#set($results = $sortedResults)
50	50
51	51	{{html clean="false"}}
52	52	<h1 class="home-section-title">登録されている学校</h1>
...	...	@@ -63,11 +63,6 @@
63	63	class="sort-toggle #if($sortParam == 'pref')active#end">
64	64	<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> 都道府県順
65	65	</a>
66		- #if($listViewerUser != 'XWiki.XWikiGuest')
67		- <a href="/bin/SeitokaiCode/CreateSchool" class="sort-toggle" style="margin-left:var(--sp-2); color:var(--primary); border-color:var(--primary);">
68		- <svg class="ico ico-fixed-14" viewBox="0 0 24 24"><line x1="12" y1="5" x2="12" y2="19"/><line x1="5" y1="12" x2="19" y2="12"/></svg> 学校を追加
69		- </a>
70		- #end
71	71	</div>
72	72	</div>
73	73	{{/html}}
...	...	@@ -95,15 +95,13 @@
95	95	#set($actCount = $schoolDoc.getObjects('SeitokaiCode.ActivityClass').size())
96	96	## 投稿数をカウント（全活動の投稿合計）
97	97	#set($postCount = $schoolDoc.getObjects('SeitokaiCode.ActivityPostClass').size())
98		- ## 特色ある活動の数とタイトルを収集
	82	+ ## 特色ある活動の数をカウント
99	99	#set($schoolActivities = $schoolDoc.getObjects('SeitokaiCode.ActivityClass'))
100	100	#set($featuredCount = 0)
101		- #set($featuredTitles = [])
102	102	#if($schoolActivities)
103	103	#foreach($sa in $schoolActivities)
104	104	#if($!sa.getValue('featured') == '1')
105	105	#set($featuredCount = $featuredCount + 1)
106		- #set($discard = $featuredTitles.add($!sa.getValue('title')))
107	107	#end
108	108	#end
109	109	#end
...	...	@@ -133,12 +133,10 @@
133	133	#if($sCoed) ・ $!escapetool.xml($sCoed)#end
134	134	#if($sSystem && !$sSystem.isEmpty()) ・ #foreach($__sys in $sSystem)#if($foreach.count > 1)・#end$!escapetool.xml($__sys)#end#end
135	135	</div>
136		- ## 特色ある活動タイトル
	118	+ ## 特色ある活動バッジ
137	137	#if($featuredCount > 0)
138		- <div class="school-card-featured-titles">
139		- #foreach($ft in $featuredTitles)
140		- <span class="featured-title-item"><svg class="ico ico-fixed-12" 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> $!escapetool.xml($ft)</span>
141		- #end
	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>
142	142	</div>
143	143	#end
144	144	<div class="school-card-stats">