Changes for page Per Year

Summary

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

Details

Page properties

Content

...	...	@@ -1,13 +1,9 @@
1	1	{{velocity}}
2	2	{{html wiki="true" clean="false"}}
3	3	#template('apice_boolean.vm')
4		-#### HANDLE PARAMETERS / START
	4	+#### SET PARAMETERS / START
5	5	#template('apice_theses.vm')
6	6	#template('apice_user_param.vm')
7		-## YEARS / START
8		-#set( $yearPar = $request.year.trim() )
9		-#set( $firstYearPar = $request.from.trim() )
10		-#set( $lastYearPar = $request.to.trim() )
11	11	## years / personal
12	12	#if( $isUserSpace )
13	13	#set( $query = ", BaseObject as objPersonalThesis, LargeStringProperty as propUser
...	...	@@ -28,44 +28,9 @@
28	28	## years / parameters takes precedence
29	29	#set( $firstYear = $firstYearThesis )
30	30	#set( $lastYear = $lastYearThesis )
31		-#if( $yearPar )
32		- #set( $yearInt = $numbertool.toNumber($yearPar) )
33		- #if( $yearInt > 0 )
34		- #set( $firstYear = $yearInt )
35		- #set( $lastYear = $yearInt )
36		- #end
37		-#end
38		-#if( $firstYearPar )
39		- #set( $yearInt = $numbertool.toNumber($firstYearPar) )
40		- #if( $yearInt > 0 )
41		- #set( $firstYear = $yearInt )
42		- #end
43		-#end
44		-#if( $lastYearPar )
45		- #set( $yearInt = $numbertool.toNumber($lastYearPar) )
46		- #if( $yearInt > 0 )
47		- #set( $lastYear = $yearInt )
48		- #end
49		-#end
50		-#if( $lastYear < $firstYear )
51		-## swap
52		- #set( $yearTemp = $lastYear )
53		- #set( $lastYear = $firstYear )
54		- #set( $firstYear = $yearTemp )
55		-#end
56		-## invariant: $lastYear >= $firstYear
57		-#if( $lastYear > $firstYear )
58		- #set( $year = -1 )
59		- #set( $yearList = [$lastYear..$firstYear] )
60		- #set( $oneYear = false )
61		-#else
62		-## $lastYear = $firstYear
63		- #set( $year = $lastYear )
64		- #set( $yearList = [$year] )
65		- #set( $oneYear = true )
66		-#end
67		-## YEARS / END
68		-#### handle cycle
	27	+#template('apice_year_param.vm')
	28	+##
	29	+## CYCLES / START
69	69	## $cycleList gets the list of cycles to be shown
70	70	## $oneCycle true if just one cycle to be shown
71	71	#if( $request.cycle && $request.cycle.trim() != "" )
...	...	@@ -87,8 +87,10 @@
87	87	#set( $cycle = "" )
88	88	#end
89	89	## INVARIANT: $oneCycle and $cycleList are correctly and coherently initialised
90		-#### HANDLE PARAMETERS / END
	51	+## CYCLES / END
91	91	##
	53	+#### SET PARAMETERS / END
	54	+##
92	92	## DATA STRUCTURES / START
93	93	#set( $itemMap = {} )
94	94	#set( $itemNo = 0 )
...	...	@@ -143,8 +143,14 @@
143	143	## page index
144	144	#if( $itemMap.keySet().size() > 1 )
145	145	## found more than one year
146		-{{id name="index"/}}
147		-(% 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)))
	109	+<div class="mainselectbar" id="index">
	110	+ #foreach( $year in $itemMap.keySet() )
	111	+ #if( !$foreach.first )
	112	+ &ensp;&bull;&ensp;
	113	+ #end
	114	+ [[$year>>||anchor="$year"]]
	115	+ #end
	116	+</div>
148	148	#end
149	149	## theses displayed per year
150	150	##
...	...	@@ -151,14 +151,23 @@
151	151	#template('apice_thesis_macros.vm')
152	152	##
153	153	#foreach( $year in $itemMap.keySet() )
154		-(% 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']]
	123	+## year top / start
	124	+<div class="mainselectseparator">
	125	+ <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")>
	126	+ $year
	127	+ </a>
	128	+</div>
	129	+## year top / end
	130	+##
	131	+## 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		- #set( $itemYearNo = $itemMap[$year].size() )
	137	+<div> #set( $itemYearNo = $itemMap[$year].size() )
161	161	(% 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"]]
	139	+</div>
162	162	#end
163	163	{{/html}}
164	164	{{/velocity}}