Changes for page Per A.Y.

From version 19.1
edited by Andrea Omicini
on 22/11/2021 01:13
Change comment: There is no comment for this version
To version 15.2
edited by Andrea Omicini
on 22/11/2021 00:53
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -58,9 +58,6 @@
58 58   #set( $tutorFirstName = "" )
59 59   #set( $tutorLastName = "" )
60 60  #end
61 -## professor takes precedence over tutor
62 -#if( $professorName != "" )#set( $tutorName = "" )#end
63 -## user takes precedence over both professor and tutor and gets them all
64 64  #if( $userName != "" )#set( $professorName = $userName )#set( $tutorName = $userName )#end
65 65  ##
66 66  #if( $firstYearCou )#set( $firstYear = $firstYearCou )#end
... ... @@ -102,10 +102,11 @@
102 102   #end
103 103  #end
104 104  
105 ->{{stringEngIta eng = "Courses" ita = "Corsi"/}} / **#if( $oneYear )$aYear#else$firstAYear–$lastAYear#end**#if( $userName != "" ) / $userFirstName $userLastName#elseif( $professorName != "" ) / $professorFirstName $professorLastName#elseif( $tutorName != "" ) / $tutorFirstName $tutorLastName (tutor)#end{{id name="top"/}}
106 -##
102 +>{{stringEngIta eng = "Courses" ita = "Corsi"/}} / #if( $oneYear )$aYear#else$firstAYear–$lastAYear#end#if( $userName != "" ) / $userFirstName $userLastName#elseif( $professorName != "" ) / $professorFirstName $professorLastName#elseif( $tutorName != "" ) / $tutorFirstName $tutorLastName (tutor)#end
103 +{{id name="top"/}}
104 +
107 107  #if( !$oneYear )
108 -(% style="font-size: smaller; padding:1em 1.5em 0.25em 1.5em; background-color:$theme.highlightColor" %)(((#foreach ($yearr in $yearList)#set($yearr1 = $yearr + 1)#set($ayearr = "$yearr/$yearr1")#if( $velocityCount > 1 ) | #end[[$ayearr>>$doc||anchor=$ayearr]]#end)))
106 +(% style="font-size: smaller" %)(((#foreach ($yearr in $yearList)#set($yearr1 = $yearr + 1)#set($ayearr = "$yearr/$yearr1")#if( $velocityCount > 1 ) | #end[[$ayearr>>$doc||anchor=$ayearr]]#end)))(%%)
109 109  #end
110 110  ##
111 111  #foreach( $yearr in $yearList)#set($yearr1 = $yearr + 1)#set($ayearr = $yearr + "/" + $yearr1 )
... ... @@ -114,15 +114,15 @@
114 114   #set( $courseFound = $xwiki.searchDocuments($sql) )
115 115   #set( $courseYearNo = $courseFound.size() )
116 116   #if( $$courseYearNo >0 )
117 - #if( !$oneYear )
118 -(% style="border-style:solid hidden hidden solid; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$year'/}}[[$year>>$doc||queryString='year=$year#if( $userName != "" )&user=$userName#elseif( $professorName != "" )&professor=$professorName#elseif( $tutorName != "" )&tutor=$tutorName#end']]
119 - #end
120 - #foreach( $courseDoc in $courseFound )
121 - #set( $name = $xwiki.getDocument($courseDoc).display("courseName"))
122 - #set( $nome = $xwiki.getDocument($courseDoc).display("nomeCorso"))
115 + #if(!$oneYear)
116 +
117 +=== $ayearr ===
118 +{{id name="$ayearr"/}}
119 +#end#foreach ($courseDoc in $courseFound)
120 + #set( $name = $xwiki.getDocument($courseDoc).display("courseName"))
121 + #set( $nome = $xwiki.getDocument($courseDoc).display("nomeCorso"))
123 123  * [[#if( $nome == "" )$name#elseif( $name == "" )$nome#elseif( $context.language.contains('it') )$nome#else$name#end>>$courseDoc]]
124 - #end
125 -(% style='font-style:oblique;font-size:smaller;text-align:right;color:gray;margin-top:-0.5em;margin-bottom:0em' %)((( ($courseFound.size() #if( $courseFound.size() > 1 ){{stringEngIta ita="corsi" eng="courses"/}}#else{{stringEngIta ita="corso" eng="course"/}}#end / $ayearr) [[[top]>>||anchor="top"]] )))(%%)
126 - #end
127 127  #end
124 +(% style='font-style:oblique;font-size:smaller;text-align:right;color:gray;margin-top:-0.5em;margin-bottom:0em' %)((( ($courseFound.size() #if( $courseFound.size() > 1 ){{stringEngIta ita="corsi" eng="courses"/}}#else{{stringEngIta ita="corso" eng="course"/}}#end / $ayearr) [[[top]>>||anchor="top"]] )))(%%)
125 +#end#end
128 128  {{/velocity}}