Changes for page Per Year

Summary

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

Details

Page properties

Content

...	...	@@ -1,12 +1,13 @@
	1	+
	2	+1. List item
	3	+1. List item
	4	+1. List item
1	1	{{velocity}}
	6	+{{html wiki="true" clean="false"}}
2	2	#template('apice_boolean.vm')
3		-#### HANDLE PARAMETERS / START
	8	+#### SET PARAMETERS / START
4	4	#template('apice_theses.vm')
5	5	#template('apice_user_param.vm')
6		-## YEARS / START
7		-#set( $yearPar = $request.year.trim() )
8		-#set( $firstYearPar = $request.from.trim() )
9		-#set( $lastYearPar = $request.to.trim() )
10	10	## years / personal
11	11	#if( $isUserSpace )
12	12	#set( $query = ", BaseObject as objPersonalThesis, LargeStringProperty as propUser
...	...	@@ -27,44 +27,9 @@
27	27	## years / parameters takes precedence
28	28	#set( $firstYear = $firstYearThesis )
29	29	#set( $lastYear = $lastYearThesis )
30		-#if( $yearPar )
31		- #set( $yearInt = $numbertool.toNumber($yearPar) )
32		- #if( $yearInt > 0 )
33		- #set( $firstYear = $yearInt )
34		- #set( $lastYear = $yearInt )
35		- #end
36		-#end
37		-#if( $firstYearPar )
38		- #set( $yearInt = $numbertool.toNumber($firstYearPar) )
39		- #if( $yearInt > 0 )
40		- #set( $firstYear = $yearInt )
41		- #end
42		-#end
43		-#if( $lastYearPar )
44		- #set( $yearInt = $numbertool.toNumber($lastYearPar) )
45		- #if( $yearInt > 0 )
46		- #set( $lastYear = $yearInt )
47		- #end
48		-#end
49		-#if( $lastYear < $firstYear )
50		-## swap
51		- #set( $yearTemp = $lastYear )
52		- #set( $lastYear = $firstYear )
53		- #set( $firstYear = $yearTemp )
54		-#end
55		-## invariant: $lastYear >= $firstYear
56		-#if( $lastYear > $firstYear )
57		- #set( $year = -1 )
58		- #set( $yearList = [$lastYear..$firstYear] )
59		- #set( $oneYear = false )
60		-#else
61		-## $lastYear = $firstYear
62		- #set( $year = $lastYear )
63		- #set( $yearList = [$year] )
64		- #set( $oneYear = true )
65		-#end
66		-## YEARS / END
67		-#### handle cycle
	31	+#template('apice_year_param.vm')
	32	+##
	33	+## CYCLES / START
68	68	## $cycleList gets the list of cycles to be shown
69	69	## $oneCycle true if just one cycle to be shown
70	70	#if( $request.cycle && $request.cycle.trim() != "" )
...	...	@@ -86,8 +86,10 @@
86	86	#set( $cycle = "" )
87	87	#end
88	88	## INVARIANT: $oneCycle and $cycleList are correctly and coherently initialised
89		-#### HANDLE PARAMETERS / END
	55	+## CYCLES / END
90	90	##
	57	+#### SET PARAMETERS / END
	58	+##
91	91	## DATA STRUCTURES / START
92	92	#set( $itemMap = {} )
93	93	#set( $itemNo = 0 )
...	...	@@ -142,8 +142,14 @@
142	142	## page index
143	143	#if( $itemMap.keySet().size() > 1 )
144	144	## found more than one year
145		-{{id name="index"/}}
146		-(% style="font-size:smaller; text-align:right; padding:1em 1.5em 0.25em 1.5em; background-color:$theme.highlightColor" %)(((#foreach( $year in $itemMap.keySet() )#if( !$foreach.first ) | #end[[$year>>$doc||anchor=$year]]#end)))
	113	+<div class="mainselectbar" id="index">
	114	+ #foreach( $year in $itemMap.keySet() )
	115	+ #if( !$foreach.first )
	116	+ &ensp;&bull;&ensp;
	117	+ #end
	118	+ [[$year>>||anchor="$year"]]
	119	+ #end
	120	+</div>
147	147	#end
148	148	## theses displayed per year
149	149	##
...	...	@@ -150,16 +150,29 @@
150	150	#template('apice_thesis_macros.vm')
151	151	##
152	152	#foreach( $year in $itemMap.keySet() )
153		-(% style="border-style:solid hidden hidden solid; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$year'/}}[[$year>>$doc||style="text-decoration:none; color:$theme.textPrimaryColor" queryString='year=$year#if( $oneUser )#if( $apiceUser )&user=$userName#{else}&name=$userFirstName&surname=$userLastName#end#end#if( $oneCycle )&cycle=$cycle#end']]
154		-{{html wiki="true" clean="false"}}
	127	+## year top / start
	128	+<div class="mainselectseparator">
	129	+ <a class="mainselectseparatorlink" id="$year" href=$xwiki.getURL($doc,"view","year=$year#if( $apiceUser )&user=$userName#elseif( $oneUser )&name=$userFirstName&surname=$userLastName#end#if( $oneCycle )&cycle=$cycle#end")>
	130	+ $year
	131	+ </a>
	132	+</div>
	133	+## year top / end
	134	+##
	135	+## year display / start
155	155	<div style="font-style: normal"><ul>
156	156	#foreach( $item in $itemMap[$year] )
157	157	<li>#thesislinked($item)</li>
158	158	#end
159	159	</ul></div>
160		-{{/html}}
	141	+## year display / end
	142	+##
	143	+## year bottom / start
	144	+<div #if( $foreach.last )id="bottom"#end class="mainselectbottom">
161	161	#set( $itemYearNo = $itemMap[$year].size() )
162		-(% style="border-style:hidden solid solid hidden; border-color:$theme.borderColor; text-align:right; font-style:oblique; font-size:smaller" %)|($itemYearNo #if( $oneCycle )#if( $itemYearNo == 1 ){{thesisCycle plural="false" uppercase="false"}}$cycle{{/thesisCycle}}#{else}{{thesisCycle plural="true" uppercase="false"}}$cycle{{/thesisCycle}}#end#else#if( $itemYearNo == 1 )$services.localization.render('thesis').toLowerCase()#else$services.localization.render('theses').toLowerCase()#end#end / $year) [[[{{stringEngIta eng='top' ita='in cima'/}}]>>||anchor="top"]] [[[{{stringEngIta eng='bottom' ita='in fondo'/}}]>>||anchor="bottom"]]
	146	+$itemYearNo #if( $oneCycle )#if( $itemYearNo == 1 ){{thesisCycle plural="false" uppercase="false"}}$cycle{{/thesisCycle}}#{else}{{thesisCycle plural="true" uppercase="false"}}$cycle{{/thesisCycle}}#end#else#if( $itemYearNo == 1 )$services.localization.render('thesis').toLowerCase()#else$services.localization.render('theses').toLowerCase()#end#end / $year &bull; #anchorlinks()
	147	+## year bottom / end
	148	+</div>
163	163	#end
164		-{{/velocity}}
165		-{{id name="bottom"/}}
	150	+## DISPLAY / END
	151	+{{/html}}
	152	+{{/velocity}}{{pageDisplay sort="objectservice"/}}