Changes for page Per Year
From version 108.1
edited by Andrea Omicini
on 30/10/2021 17:24
on 30/10/2021 17:24
Change comment:
There is no comment for this version
To version 103.1
edited by Andrea Omicini
on 30/10/2021 17:07
on 30/10/2021 17:07
Change comment:
There is no comment for this version
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -1,24 +1,15 @@ 1 1 {{include reference="Theses.Environment"/}}{{include reference="Environment"/}}{{velocity}} 2 2 #set( $thesisMenu = true ) 3 -## get environment variables & derived 3 +#set( $oneYear = false ) 4 +#set( $selectedYear = '' ) 5 +### START YEAR 6 +## year parameter 7 +#set( $yearPar = $mathtool.toInteger($request.year) ) 8 +#set( $fromPar = $mathtool.toInteger($request.from) ) 9 +#set( $toPar = $mathtool.toInteger($request.to) ) 4 4 #set( $firstYear = $mathtool.toInteger($firstYearTh) ) 5 5 #set( $lastYear = $mathtool.toInteger($lastYearTh) ) 6 6 #set( $yearList = [$lastYear..$firstYear] ) 7 -### START YEAR 8 -## defaults 9 -#set( $oneYear = false ) 10 -#set( $selectedYear = '' ) 11 -## year parameters 12 -#if( $request.year ) 13 - #set( $yearPar = $mathtool.toInteger($request.year) ) 14 -#end 15 -#if( $request.from ) 16 - #set( $fromPar = $mathtool.toInteger($request.from) ) 17 -#end 18 -#if( $request.to ) 19 - #set( $toPar = $mathtool.toInteger($request.to) ) 20 -#end 21 -##set years 22 22 #if( $yearPar > 0 ) 23 23 #set( $oneYear = true ) 24 24 #set( $firstYear = $yearPar ) ... ... @@ -46,15 +46,12 @@ 46 46 ### END YEAR 47 47 ## 48 48 ### START USER & CYCLE 40 +#set( $userNamePar = $request.user.trim() ) 49 49 ## default values 50 50 #set( $oneUser = false ) 51 -#set( $ selectedUser='')43 +#set( $oneCycle = false ) 52 52 #set( $userFirstName = "" ) 53 53 #set( $userLastName = "" ) 54 -## user parameter 55 -#if( $request.user ) 56 - #set( $userNamePar = $request.user.trim() ) 57 -#end 58 58 #if( $userName || $userNamePar ) 59 59 ## a user is specified for all roles 60 60 #if( !$userName ) ... ... @@ -71,17 +71,15 @@ 71 71 {{warning}} $selectedUser is not an {{apice/}} user{{/warning}} 72 72 #stop 73 73 #end 62 +##user selected and existing user page 63 + #set( $cyclePar = $request.cycle.trim().toUpperCase() ) 64 + #set( $selectedCycle = '' ) 65 + #if( $cyclePar != '' && $allThesisCycles.contains($cyclePar) ) 66 + #set( $oneCycle = true ) 67 + #set( $selectedCycle = $cyclePar ) 68 + #end 74 74 #end 75 -##if user selected, existing user page 76 -#set( $oneCycle = false ) 77 -#set( $selectedCycle = '' ) 78 -#set( $cyclePar = $request.cycle.trim().toUpperCase() ) 79 -#if( $cyclePar != '' && $allThesisCycles.contains($cyclePar) ) 80 - #set( $oneCycle = true ) 81 - #set( $selectedCycle = $cyclePar ) 82 -#end 83 83 ## $oneUser and $oneCycle set properly 84 -$yearList 85 85 #if( $oneYear ) 86 86 $selectedYear 87 87 #end ... ... @@ -90,12 +90,11 @@ 90 90 #end 91 91 #if( $oneCycle ) 92 92 $selectedCycle 93 - {{thesisCycle short='no'}}$selectedCycle{{/thesisCycle}} 94 94 #end 95 95 ### END USER & CYCLE 96 96 ## 97 97 ## title 98 ->#if( $one Cycle ){{thesisCycle 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'/}}83 +>#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'/}} 99 99 ## index 100 100 #if( !$oneYear ) 101 101 (% 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)))