Changes for page Per Year
From version 152.1
edited by Andrea Omicini
on 30/06/2023 21:20
on 30/06/2023 21:20
Change comment:
There is no comment for this version
To version 156.1
edited by Andrea Omicini
on 30/06/2023 21:36
on 30/06/2023 21:36
Change comment:
There is no comment for this version
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -1,7 +1,11 @@ 1 + 2 +1. List item 3 +1. List item 4 +1. List item 1 1 {{velocity}} 2 2 {{html wiki="true" clean="false"}} 3 3 #template('apice_boolean.vm') 4 -#### HANDLE PARAMETERS / START8 +#### SET PARAMETERS / START 5 5 #template('apice_theses.vm') 6 6 #template('apice_user_param.vm') 7 7 ## years / personal ... ... @@ -25,7 +25,8 @@ 25 25 #set( $firstYear = $firstYearThesis ) 26 26 #set( $lastYear = $lastYearThesis ) 27 27 #template('apice_year_param.vm') 28 -#### handle cycle 32 +## 33 +## CYCLES / START 29 29 ## $cycleList gets the list of cycles to be shown 30 30 ## $oneCycle true if just one cycle to be shown 31 31 #if( $request.cycle && $request.cycle.trim() != "" ) ... ... @@ -47,8 +47,10 @@ 47 47 #set( $cycle = "" ) 48 48 #end 49 49 ## INVARIANT: $oneCycle and $cycleList are correctly and coherently initialised 50 -## ##HANDLEPARAMETERS / END55 +## CYCLES / END 51 51 ## 57 +#### SET PARAMETERS / END 58 +## 52 52 ## DATA STRUCTURES / START 53 53 #set( $itemMap = {} ) 54 54 #set( $itemNo = 0 ) ... ... @@ -103,8 +103,14 @@ 103 103 ## page index 104 104 #if( $itemMap.keySet().size() > 1 ) 105 105 ## found more than one year 106 -{{id name="index"/}} 107 -(% style="font-size:smaller; text-align:right; padding:1em 1.5em 0.25em 1.5em; background-color:$theme.highlightColor" %)(((#foreach( $year in $itemMap.keySet() )#if( !$foreach.first ) | #end[[$year>>$doc||anchor=$year]]#end))) 113 +<div class="mainselectbar" id="index"> 114 + #foreach( $year in $itemMap.keySet() ) 115 + #if( !$foreach.first ) 116 +  •  117 + #end 118 + [[$year>>||anchor="$year"]] 119 + #end 120 +</div> 108 108 #end 109 109 ## theses displayed per year 110 110 ## ... ... @@ -111,15 +111,29 @@ 111 111 #template('apice_thesis_macros.vm') 112 112 ## 113 113 #foreach( $year in $itemMap.keySet() ) 114 -(% style="border-style:solid hidden hidden solid; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$year'/}}[[$year>>$doc||style="text-decoration:none; color:$theme.textPrimaryColor" queryString='year=$year#if( $oneUser )#if( $apiceUser )&user=$userName#{else}&name=$userFirstName&surname=$userLastName#end#end#if( $oneCycle )&cycle=$cycle#end']] 127 +## year top / start 128 +<div class="mainselectseparator"> 129 + <a class="mainselectseparatorlink" id="$year" href=$xwiki.getURL($doc,"view","year=$year#if( $apiceUser )&user=$userName#elseif( $oneUser )&name=$userFirstName&surname=$userLastName#end#if( $oneCycle )&cycle=$cycle#end")> 130 + $year 131 + </a> 132 +</div> 133 +## year top / end 134 +## 135 +## year display / start 115 115 <div style="font-style: normal"><ul> 116 116 #foreach( $item in $itemMap[$year] ) 117 117 <li>#thesislinked($item)</li> 118 118 #end 119 119 </ul></div> 141 +## year display / end 142 +## 143 +## year bottom / start 144 +<div #if( $foreach.last )id="bottom"#end class="mainselectbottom"> 120 120 #set( $itemYearNo = $itemMap[$year].size() ) 121 -(% style="border-style:hidden solid solid hidden; border-color:$theme.borderColor; text-align:right; font-style:oblique; font-size:smaller" %)|($itemYearNo #if( $oneCycle )#if( $itemYearNo == 1 ){{thesisCycle plural="false" uppercase="false"}}$cycle{{/thesisCycle}}#{else}{{thesisCycle plural="true" uppercase="false"}}$cycle{{/thesisCycle}}#end#else#if( $itemYearNo == 1 )$services.localization.render('thesis').toLowerCase()#else$services.localization.render('theses').toLowerCase()#end#end / $year) [[[{{stringEngIta eng='top' ita='in cima'/}}]>>||anchor="top"]] [[[{{stringEngIta eng='bottom' ita='in fondo'/}}]>>||anchor="bottom"]] 146 +$itemYearNo #if( $oneCycle )#if( $itemYearNo == 1 ){{thesisCycle plural="false" uppercase="false"}}$cycle{{/thesisCycle}}#{else}{{thesisCycle plural="true" uppercase="false"}}$cycle{{/thesisCycle}}#end#else#if( $itemYearNo == 1 )$services.localization.render('thesis').toLowerCase()#else$services.localization.render('theses').toLowerCase()#end#end / $year • #anchorlinks() 147 +## year bottom / end 148 +</div> 122 122 #end 150 +## DISPLAY / END 123 123 {{/html}} 124 -{{/velocity}} 125 -{{id name="bottom"/}} 152 +{{/velocity}}{{pageDisplay sort="objectservice"/}}