Changes for page Per Year

From version 133.3
edited by Andrea Omicini
on 09/02/2023 00:42
Change comment: There is no comment for this version
To version 140.1
edited by Andrea Omicini
on 30/06/2023 17:02
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,7 +1,5 @@
1 -= {{italiano}}Per anno{{/italiano}}{{english}}Per Year{{/english}} =
2 -
3 -{{include reference="Main.Environment" excludeFirstHeading="true"/}}{{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  ##
7 7  ## inline display
... ... @@ -68,7 +68,7 @@
68 68  ## $oneCycle true if just one cycle to be shown
69 69  #if( $request.cycle && $request.cycle.trim() != "" )
70 70   #set( $cyclePar = $request.cycle.trim().toUpperCase() )
71 - #if( $allThesisCycles.contains($cyclePar) )
69 + #if( $thesisCycles.contains($cyclePar) )
72 72  ## 'cycle' parameter is an admissible thesis cycle value
73 73   #set( $cycleList = [$cyclePar])
74 74   #set( $oneCycle = true )
... ... @@ -80,11 +80,7 @@
80 80   #end
81 81  #else
82 82  ## default: all cycles
83 - #if( $showPhDTheses )
84 - #set( $cycleList = $allThesisCycles )
85 - #else
86 - #set( $cycleList = $lowThesisCycles )
87 - #end
81 + #set( $cycleList = $showcaseThesisCycles )
88 88   #set( $oneCycle = false )
89 89   #set( $cycle = "" )
90 90  #end
... ... @@ -141,17 +141,6 @@
141 141  ##
142 142  ## $oneUser, $apiceUser, $userString, $userFirstName, $userLastName, $oneCycle, $cycleList, $oneYear, $yearList are properly set
143 143  ##
144 -## handle inline / start
145 -##
146 -## default: false
147 -#set( $showInline = false )
148 -## check $inlinePar
149 -#if( $inlinePar != "" && $trueStringList.contains($inlinePar.toLowerCase()) )
150 - #set( $showInline = true )
151 -#end
152 -##
153 -## handle inline / end
154 -##
155 155  #### HANDLE PARAMETERS / END
156 156  ##
157 157  ## query to structures
... ... @@ -173,7 +173,7 @@
173 173  ## output results
174 174  ## page subtitle
175 175  {{id name="top"/}}
176 ->(%%)$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}(%%)
177 177  
178 178  ## stop if no thesis is found
179 179  #if( $itemNo == 0 || $itemMap.keySet().size() == 0 )
... ... @@ -188,15 +188,18 @@
188 188  (% 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)))
189 189  #end
190 190  ## theses displayed per year
174 +##
175 +#template('apice_thesis_macros.vm')
176 +##
191 191  #foreach( $year in $itemMap.keySet() )
192 192  (% 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']]
179 +{{html wiki="true" clean="false"}}
193 193  #foreach( $item in $itemMap[$year] )
194 - #if( $showInline )#if( $foreach.first )
195 -
196 -#end* #else(% style="border-style:hidden hidden hidden hidden; font-style:normal" %)|#end{{thesis inline=$showInline linked='title'}}$item{{/thesis}}
197 - #end
181 +* #thesislinked($item)
182 +#end
183 +{{/html}}
198 198   #set( $itemYearNo = $itemMap[$year].size() )
199 -(% 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"]]
185 +(% 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"]]
200 200  #end
201 201  {{/velocity}}
202 202  {{id name="bottom"/}}