Changes for page Per Year

From version 132.1
edited by Andrea Omicini
on 30/01/2023 13:13
Change comment: There is no comment for this version
To version 139.1
edited by Andrea Omicini
on 30/06/2023 17:01
Change comment: There is no comment for this version

Summary

Details

Page properties
Title
... ... @@ -1,0 +1,1 @@
1 +$services.localization.render('peryear')
Content
... ... @@ -1,9 +1,9 @@
1 -= {{italiano}}Per anno{{/italiano}}{{english}}Per Year{{/english}} =
2 -
3 -{{include reference="Theses.Environment" excludeFirstHeading="true"/}}{{velocity}}
4 -#set( $thesisMenu = true )
1 +{{velocity}}
2 +#template('apice_theses.vm')
5 5  #### HANDLE PARAMETERS / START
6 6  ##
5 +## inline display
6 +#set( $inlinePar = $request.inline.trim() )
7 7  ## who
8 8  #set( $userNamePar = $request.user.trim() )
9 9  #set( $firstNamePar = $request.name.trim() )
... ... @@ -66,7 +66,7 @@
66 66  ## $oneCycle true if just one cycle to be shown
67 67  #if( $request.cycle && $request.cycle.trim() != "" )
68 68   #set( $cyclePar = $request.cycle.trim().toUpperCase() )
69 - #if( $allThesisCycles.contains($cyclePar) )
69 + #if( $thesisCycles.contains($cyclePar) )
70 70  ## 'cycle' parameter is an admissible thesis cycle value
71 71   #set( $cycleList = [$cyclePar])
72 72   #set( $oneCycle = true )
... ... @@ -78,11 +78,7 @@
78 78   #end
79 79  #else
80 80  ## default: all cycles
81 - #if( $showPhDTheses )
82 - #set( $cycleList = $allThesisCycles )
83 - #else
84 - #set( $cycleList = $lowThesisCycles )
85 - #end
81 + #set( $cycleList = $showcaseThesisCycles )
86 86   #set( $oneCycle = false )
87 87   #set( $cycle = "" )
88 88  #end
... ... @@ -160,7 +160,7 @@
160 160  ## output results
161 161  ## page subtitle
162 162  {{id name="top"/}}
163 ->(%%)$itemNo #if( $itemNo == 1 )#if( $oneCycle ){{thesisCycle plural="false" uppercase="false"}}$cycle{{/thesisCycle}}#else{{stringEngIta eng="$objectEngSingular.toLowerCase()" ita="$objectItaSingular.toLowerCase()"/}}#end#{else}#if( $oneCycle ){{thesisCycle plural="true" uppercase="false"}}$cycle{{/thesisCycle}}#else{{stringEngIta eng="$objectEngPlural.toLowerCase()" ita="$objectItaPlural.toLowerCase()"/}}#end#{end} / #if( $oneYear )$year#else$firstYear–$lastYear#{end}#if( $oneUser ) / $userFirstName $userLastName#{end}(%%)
159 +>(%%)$itemNo #if( $itemNo == 1 )#if( $oneCycle ){{thesisCycle plural="false" uppercase="false"}}$cycle{{/thesisCycle}}#else$services.localization.render('thesis').toLowerCase()#end#{else}#if( $oneCycle ){{thesisCycle plural="true" uppercase="false"}}$cycle{{/thesisCycle}}#else$services.localization.render('theses').toLowerCase()#end#{end} / #if( $oneYear )$year#else$firstYear–$lastYear#{end}#if( $oneUser ) / $userFirstName $userLastName#{end}(%%)
164 164  
165 165  ## stop if no thesis is found
166 166  #if( $itemNo == 0 || $itemMap.keySet().size() == 0 )
... ... @@ -172,16 +172,19 @@
172 172  #if( $itemMap.keySet().size() > 1 )
173 173  ## found more than one year
174 174  {{id name="index"/}}
175 -(% 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>>||anchor=$year]]#end)))
171 +(% 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)))
176 176  #end
177 177  ## theses displayed per year
174 +##
175 +#template('apice_thesis_macros.vm')
176 +##
178 178  #foreach( $year in $itemMap.keySet() )
179 179  (% 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']]
180 -(% style="border-style:hidden hidden hidden hidden; font-style:normal" %)#foreach( $item in $itemMap[$year] )
181 -|{{thesis inline='false' linked='title'}}$item{{/thesis}}
179 +#foreach( $item in $itemMap[$year] )
180 +* #thesislinked($item)
182 182  #end
183 183   #set( $itemYearNo = $itemMap[$year].size() )
184 -(% 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 ){{stringEngIta eng=$objectEngSingular.toLowerCase() ita=$objectItaSingular.toLowerCase()/}}#else{{stringEngIta eng=$objectEngPlural.toLowerCase() ita=$objectItaPlural.toLowerCase()/}}#end#end / $year) [[[{{stringEngIta eng='top' ita='in cima'/}}]>>||anchor="top"]] [[[{{stringEngIta eng='bottom' ita='in fondo'/}}]>>||anchor="bottom"]]
183 +(% 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"]]
185 185  #end
186 186  {{/velocity}}
187 187  {{id name="bottom"/}}