Changes for page Per Year

Summary

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

Details

Page properties

Content

...	...	@@ -1,13 +5,13 @@
1		-
2		-1. List item
3		-1. List item
4		-1. List item
5	5	{{velocity}}
6	6	{{html wiki="true" clean="false"}}
7	7	#template('apice_boolean.vm')
8		-#### SET PARAMETERS / START
	4	+#### HANDLE PARAMETERS / START
9	9	#template('apice_theses.vm')
10	10	#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,9 +28,44 @@
28	28	## years / parameters takes precedence
29	29	#set( $firstYear = $firstYearThesis )
30	30	#set( $lastYear = $lastYearThesis )
31		-#template('apice_year_param.vm')
32		-##
33		-## CYCLES / START
	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
34	34	## $cycleList gets the list of cycles to be shown
35	35	## $oneCycle true if just one cycle to be shown
36	36	#if( $request.cycle && $request.cycle.trim() != "" )
...	...	@@ -52,10 +52,8 @@
52	52	#set( $cycle = "" )
53	53	#end
54	54	## INVARIANT: $oneCycle and $cycleList are correctly and coherently initialised
55		-## CYCLES / END
	90	+#### HANDLE PARAMETERS / END
56	56	##
57		-#### SET PARAMETERS / END
58		-##
59	59	## DATA STRUCTURES / START
60	60	#set( $itemMap = {} )
61	61	#set( $itemNo = 0 )
...	...	@@ -110,14 +110,8 @@
110	110	## page index
111	111	#if( $itemMap.keySet().size() > 1 )
112	112	## found more than one year
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>
	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)))
121	121	#end
122	122	## theses displayed per year
123	123	##
...	...	@@ -124,29 +124,15 @@
124	124	#template('apice_thesis_macros.vm')
125	125	##
126	126	#foreach( $year in $itemMap.keySet() )
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
	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']]
136	136	<div style="font-style: normal"><ul>
137	137	#foreach( $item in $itemMap[$year] )
138	138	<li>#thesislinked($item)</li>
139	139	#end
140	140	</ul></div>
141		-## year display / end
142		-##
143		-## year bottom / start
144		-<div #if( $foreach.last )id="bottom"#end class="mainselectbottom">
145	145	#set( $itemYearNo = $itemMap[$year].size() )
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>
	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"]]
149	149	#end
150		-## DISPLAY / END
151	151	{{/html}}
152		-{{/velocity}}{{pageDisplay sort="objectservice"/}}
	164	+{{/velocity}}
	165	+{{id name="bottom"/}}