Changes for page Per Year
From version 125.1
edited by Andrea Omicini
on 10/03/2022 12:33
on 10/03/2022 12:33
Change comment:
There is no comment for this version
To version 127.1
edited by Andrea Omicini
on 11/03/2022 15:56
on 11/03/2022 15:56
Change comment:
There is no comment for this version
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -3,8 +3,8 @@ 3 3 {{include reference="Theses.Environment" excludeFirstHeading="true"/}}{{velocity}} 4 4 #set( $thesisMenu = true ) 5 5 ## get environment variables & derived 6 -#set( $firstYear = $mathtool.toInteger($firstYearTh) ) 7 -#set( $lastYear = $mathtool.toInteger($lastYearTh) ) 6 +#set( $firstYear = $mathtool.toInteger($firstYearThesis) ) 7 +#set( $lastYear = $mathtool.toInteger($lastYearThesis) ) 8 8 #set( $yearList = [$lastYear..$firstYear] ) 9 9 ### START YEAR 10 10 ## defaults ... ... @@ -91,16 +91,21 @@ 91 91 #set( $selectedCycle = $cyclePar ) 92 92 #end 93 93 ## $selectedCycle and $oneCycle set properly 94 +#if( $showPhDTheses ) 95 + #set( $cycles = $allThesisCycles ) 96 +#else 97 + #set( $cycles = $lowThesisCycles ) 98 +#end 94 94 ### END CYCLE 95 95 ## 96 96 ## title 97 ->#if( $oneCycle ){{thesisCycle uppercase='yes' short='no'}}$selectedCycle{{/thesisCycle}}#else{{stringEngIta eng="Theses" ita="Tesi"/}}#end / #if( $oneYear )$selectedYear#else$firstYear–$lastYear#end#if( $oneUser ) / **$userFirstName $userLastName**#end{{id name='top'/}}102 +>#if( $oneCycle ){{thesisCycle uppercase='yes' short='no'}}$selectedCycle{{/thesisCycle}}#else{{stringEngIta eng="Theses" ita="Tesi"/}}#end / #if( $oneYear )**$selectedYear**#else**$firstYear–$lastYear**#end#if( $oneUser ) / $userFirstName $userLastName#end{{id name='top'/}} 98 98 ## index 99 99 #if( !$oneYear ) 100 100 (% style="font-size: smaller; padding:1em 1.5em 0.25em 1.5em; background-color:$theme.highlightColor" %)(((#foreach( $year in $yearList )#if ($velocityCount > 1) | #end[[$year>>||anchor="$year"]]#end))) 101 101 ###elseif( $oneUser && !$oneCycle ) 102 102 #elseif( !$oneCycle ) 103 -(% style="font-size: smaller; padding:1em 1.5em 0.25em 1.5em; background-color:$theme.highlightColor" %)(((#foreach( $cycle in $ allThesisCycles )#if ($velocityCount > 1) | #end [[{{thesisCycle}}$cycle{{/thesisCycle}}>>||anchor="$cycle"]]#end)))108 +(% style="font-size: smaller; padding:1em 1.5em 0.25em 1.5em; background-color:$theme.highlightColor" %)(((#foreach( $cycle in $cycles )#if ($velocityCount > 1) | #end [[{{thesisCycle}}$cycle{{/thesisCycle}}>>||anchor="$cycle"]]#end))) 104 104 #end{{id name='index'/}} 105 105 ## search theses 106 106 #set( $thesisNo = 0 ) ... ... @@ -110,7 +110,7 @@ 110 110 (% style="border-style:solid hidden hidden solid; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$year'/}}[[$year>>$doc.name||queryString='year=$year#if( $oneCycle )&cycle=$selectedCycle#end']] 111 111 #end 112 112 ## some selected year or year list / now $year 113 - #foreach( $cycle in $ allThesisCycles )118 + #foreach( $cycle in $cycles ) 114 114 #set( $thesisYearCycleNo = 0 ) 115 115 #if( !$oneCycle || $selectedCycle == $cycle ) 116 116 ## some selected cycle or all cycles / now $cycle