Changes for page Per Year
From version 94.1
edited by Andrea Omicini
on 29/10/2021 16:16
on 29/10/2021 16:16
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 ... ... @@ -72,20 +72,20 @@ 72 72 ### END USER & CYCLE 73 73 ## 74 74 ## title 75 ->#if( $oneRole ){{thesisCycle short='no'}}$selecteCycle{{/thesisCycle}}#else{{stringEngIta eng="Theses" ita="Tesi"/}}#end / #if( $oneYear )$selectedYear#else$firstYear—$lastYear#end#if( $oneUser ) / $userFirstName **$userLastName**#end{{id name='top'/}} 78 +>#if( $oneRole ){{thesisCycle short='no'}}$selecteCycle{{/thesisCycle}}#else{{stringEngIta eng="Theses" ita="Tesi"/}}#end / #if( $oneYear )$selectedYear#else$firstYear–$lastYear#end#if( $oneUser ) / $userFirstName **$userLastName**#end{{id name='top'/}} 79 +## index 80 +#if( !$oneYear ) 81 +(% 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))) 82 +###elseif( $oneUser && !$oneCycle ) 83 +#elseif( !$oneCycle ) 84 +(% 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))) 85 +#end{{id name='index'/}} 76 76 77 77 #stop 78 78 79 - 80 -## index 81 -#if( !$oneStatus ) 82 -(% style="font-size: smaller; padding:1em 1.5em 0.25em 1.5em; background-color:$theme.highlightColor" %)(((#foreach( $status in $allThesisStatuses )#if ($velocityCount > 1) | #end[[{{thesisStatus plural="true" uppercase="false"}}$status{{/thesisStatus}}>>||anchor="$status"]]#end))) 83 -#elseif( $oneUser && !$oneRole ) 84 -(% style="font-size: smaller; padding:1em 1.5em 0.25em 1.5em; background-color:$theme.highlightColor" %)(((#foreach( $role in $allThesisRoles )#if ($velocityCount > 1) | #end [[{{thesisRole}}$role{{/thesisRole}}>>||anchor="$role"]]#end))) 85 -#end{{id name='index'/}} 86 86 ## search theses 87 87 #set( $thesisNo = 0 ) 88 -#foreach( $ statusin $allThesisStatuses)91 +#foreach( $year in $yearList ) 89 89 #if( !$oneStatus || $selectedStatus == $status ) 90 90 #set( $thesisStatusNo = 0 ) 91 91 #if( !$oneStatus )