Changes for page Per Year
From version 96.1
edited by Andrea Omicini
on 30/10/2021 16:03
on 30/10/2021 16:03
Change comment:
There is no comment for this version
To version 96.2
edited by Andrea Omicini
on 30/10/2021 16:11
on 30/10/2021 16:11
Change comment:
There is no comment for this version
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -1,6 +1,7 @@ 1 1 {{include reference="Theses.Environment"/}}{{include reference="Environment"/}}{{velocity}} 2 2 #set( $thesisMenu = true ) 3 3 #set( $oneYear = false ) 4 +#set( $selectedYear = '' ) 4 4 ### START YEAR 5 5 ## year parameter 6 6 #set( $yearPar = $mathtool.toInteger($request.year) ) ... ... @@ -12,7 +12,8 @@ 12 12 #if( $yearPar > 0 ) 13 13 #set( $oneYear = true ) 14 14 #set( $firstYear = $yearPar ) 15 - #set( $lastYear = $toPar ) 16 + #set( $lastYear = $yearPar ) 17 + #set( $selectedYear = $yearPar ) 16 16 #set( $yearList = [$yearPar] ) 17 17 #else 18 18 #if( $fromPar != '' && ($fromPar > $firstYear) ) ... ... @@ -25,6 +25,7 @@ 25 25 #end 26 26 #if( $lastYear <= $firstYear ) 27 27 #set( $oneYear = true ) 30 + #set( $lastYear = $firstYear ) 28 28 #set( $selectedYear = $firstYear ) 29 29 #set( $yearList = [$firstYear] ) 30 30 #else ... ... @@ -76,7 +76,8 @@ 76 76 ## index 77 77 #if( !$oneYear ) 78 78 (% 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))) 79 -#elseif( $oneUser && !$oneCycle ) 82 +###elseif( $oneUser && !$oneCycle ) 83 +#elseif( !$oneCycle ) 80 80 (% 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))) 81 81 #end{{id name='index'/}} 82 82 ... ... @@ -84,7 +84,7 @@ 84 84 85 85 ## search theses 86 86 #set( $thesisNo = 0 ) 87 -#foreach( $ statusin $allThesisStatuses)91 +#foreach( $year in $yearList ) 88 88 #if( !$oneStatus || $selectedStatus == $status ) 89 89 #set( $thesisStatusNo = 0 ) 90 90 #if( !$oneStatus )