Changes for page Per Year

From version 156.1
edited by Andrea Omicini
on 30/06/2023 21:36
Change comment: There is no comment for this version
To version 150.1
edited by Andrea Omicini
on 30/06/2023 21:14
Change comment: There is no comment for this version

Summary

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,8 @@
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 +#template('apice_years_param.vm')
32 +#### 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
54 +#### 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>
110 +{{id name="index"/}}
111 +(% 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
118 +(% 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>
125 +(% 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"/}}
128 +{{/velocity}}
129 +{{id name="bottom"/}}