Changes for page Per Year
From version 136.1
edited by Andrea Omicini
on 30/06/2023 16:54
on 30/06/2023 16:54
Change comment:
There is no comment for this version
To version 131.3
edited by Andrea Omicini
on 30/01/2023 12:15
on 30/01/2023 12:15
Change comment:
There is no comment for this version
Summary
-
Page properties (2 modified, 0 added, 0 removed)
Details
- Page properties
-
- Title
-
... ... @@ -1,1 +1,0 @@ 1 -$services.localization.render('peryear') - Content
-
... ... @@ -1,9 +1,9 @@ 1 -{{velocity}} 2 -#template('apice_theses.vm') 1 += {{italiano}}Per anno{{/italiano}}{{english}}Per Year{{/english}} = 2 + 3 +{{include reference="Theses.Environment" excludeFirstHeading="true"/}}{{velocity}} 4 +#set( $thesisMenu = true ) 3 3 #### HANDLE PARAMETERS / START 4 4 ## 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( $ thesisCycles.contains($cyclePar) )69 + #if( $allThesisCycles.contains($cyclePar) ) 70 70 ## 'cycle' parameter is an admissible thesis cycle value 71 71 #set( $cycleList = [$cyclePar]) 72 72 #set( $oneCycle = true ) ... ... @@ -78,7 +78,11 @@ 78 78 #end 79 79 #else 80 80 ## default: all cycles 81 - #set( $cycleList = $showcaseThesisCycles ) 81 + #if( $showPhDTheses ) 82 + #set( $cycleList = $allThesisCycles ) 83 + #else 84 + #set( $cycleList = $lowThesisCycles ) 85 + #end 82 82 #set( $oneCycle = false ) 83 83 #set( $cycle = "" ) 84 84 #end ... ... @@ -135,17 +135,6 @@ 135 135 ## 136 136 ## $oneUser, $apiceUser, $userString, $userFirstName, $userLastName, $oneCycle, $cycleList, $oneYear, $yearList are properly set 137 137 ## 138 -## handle inline / start 139 -## 140 -## default: false 141 -#set( $showInline = false ) 142 -## check $inlinePar 143 -#if( $inlinePar != "" && $trueStringList.contains($inlinePar.toLowerCase()) ) 144 - #set( $showInline = true ) 145 -#end 146 -## 147 -## handle inline / end 148 -## 149 149 #### HANDLE PARAMETERS / END 150 150 ## 151 151 ## query to structures ... ... @@ -167,7 +167,7 @@ 167 167 ## output results 168 168 ## page subtitle 169 169 {{id name="top"/}} 170 ->(%%)$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}(%%) 163 +>(%%)$itemNo #if( $itemNo == 1 )#if( $oneCycle ){{thesisCycle plural="false" uppercase="false"}}$cyclePar{{/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}(%%) 171 171 172 172 ## stop if no thesis is found 173 173 #if( $itemNo == 0 || $itemMap.keySet().size() == 0 ) ... ... @@ -179,17 +179,14 @@ 179 179 #if( $itemMap.keySet().size() > 1 ) 180 180 ## found more than one year 181 181 {{id name="index"/}} 182 -(% 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)))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))) 183 183 #end 184 184 ## theses displayed per year 185 185 #foreach( $year in $itemMap.keySet() ) 186 -(% 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#if( $showInline )&inline=true#end']] 187 -#foreach( $item in $itemMap[$year] ) 188 - #if( $showInline ) 189 - #if( $foreach.first ) 190 - #end 191 -* #else(% style="border-style:hidden hidden hidden hidden; font-style:normal" %)|#end{{thesis inline=$showInline linked='title'}}$item{{/thesis}} 192 - #end 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}} 182 +#end 193 193 #set( $itemYearNo = $itemMap[$year].size() ) 194 194 (% 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"]] 195 195 #end