Changes for page Per Year
From version 127.3
edited by Andrea Omicini
on 21/06/2022 10:59
on 21/06/2022 10:59
Change comment:
There is no comment for this version
To version 126.2
edited by Andrea Omicini
on 10/03/2022 13:41
on 10/03/2022 13:41
Change comment:
There is no comment for this version
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -6,9 +6,6 @@ 6 6 #set( $firstYear = $mathtool.toInteger($firstYearThesis) ) 7 7 #set( $lastYear = $mathtool.toInteger($lastYearThesis) ) 8 8 #set( $yearList = [$lastYear..$firstYear] ) 9 -#set( $yearPar = 0 ) 10 -#set( $fromPar = 0 ) 11 -#set( $toPar = 0 ) 12 12 ### START YEAR 13 13 ## defaults 14 14 #set( $oneYear = false ) ... ... @@ -31,11 +31,11 @@ 31 31 #set( $selectedYear = $yearPar ) 32 32 #set( $yearList = [$yearPar] ) 33 33 #else 34 - #if( $fromPar != '' && $fromPar > 0 &&($fromPar > $firstYear) )31 + #if( $fromPar != '' && ($fromPar > $firstYear) ) 35 35 #set( $firstYear = $fromPar ) 36 36 #set( $yearList = [$lastYear..$firstYear] ) 37 37 #end 38 - #if( $toPar != '' && $toPar > 0 &&($toPar < $lastYear) )35 + #if( $toPar != '' && ($toPar < $lastYear) ) 39 39 #set( $lastYear = $toPar ) 40 40 #set( $yearList = [$lastYear..$firstYear] ) 41 41 #end ... ... @@ -94,11 +94,6 @@ 94 94 #set( $selectedCycle = $cyclePar ) 95 95 #end 96 96 ## $selectedCycle and $oneCycle set properly 97 -#if( $showPhDTheses ) 98 - #set( $cycles = $allThesisCycles ) 99 -#else 100 - #set( $cycles = $lowThesisCycles ) 101 -#end 102 102 ### END CYCLE 103 103 ## 104 104 ## title ... ... @@ -108,7 +108,7 @@ 108 108 (% 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))) 109 109 ###elseif( $oneUser && !$oneCycle ) 110 110 #elseif( !$oneCycle ) 111 -(% 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)))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))) 112 112 #end{{id name='index'/}} 113 113 ## search theses 114 114 #set( $thesisNo = 0 ) ... ... @@ -118,7 +118,7 @@ 118 118 (% 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']] 119 119 #end 120 120 ## some selected year or year list / now $year 121 - #foreach( $cycle in $ cycles )113 + #foreach( $cycle in $allThesisCycles ) 122 122 #set( $thesisYearCycleNo = 0 ) 123 123 #if( !$oneCycle || $selectedCycle == $cycle ) 124 124 ## some selected cycle or all cycles / now $cycle