Changes for page Per Year

From version 152.1
edited by Andrea Omicini
on 30/06/2023 21:20
Change comment: There is no comment for this version
To version 155.1
edited by Andrea Omicini
on 30/06/2023 21:31
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,7 +1,7 @@
1 1  {{velocity}}
2 2  {{html wiki="true" clean="false"}}
3 3  #template('apice_boolean.vm')
4 -#### HANDLE PARAMETERS / START
4 +#### 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
28 +##
29 +## 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 -#### HANDLE PARAMETERS / END
51 +## CYCLES / END
51 51  ##
53 +#### SET PARAMETERS / END
54 +##
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)))
109 +<div class="mainselectbar" id="index">
110 + #foreach( $year in $itemMap.keySet() )
111 + #if( !$foreach.first )
112 + &ensp;&bull;&ensp;
113 + #end
114 + [[$year>>||anchor="$year"]]
115 + #end
116 +</div>
108 108  #end
109 109  ## theses displayed per year
110 110  ##
... ... @@ -111,14 +111,23 @@
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']]
123 +## year top / start
124 +<div class="mainselectseparator">
125 + <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")>
126 + $year
127 + </a>
128 +</div>
129 +## year top / end
130 +##
131 +## 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>
120 - #set( $itemYearNo = $itemMap[$year].size() )
137 +<div> #set( $itemYearNo = $itemMap[$year].size() )
121 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"]]
139 +</div>
122 122  #end
123 123  {{/html}}
124 124  {{/velocity}}