Changes for page Per Year

From version 132.4
edited by Andrea Omicini
on 09/02/2023 00:35
Change comment: There is no comment for this version
To version 131.3
edited by Andrea Omicini
on 30/01/2023 12:15
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,11 +1,9 @@
1 1  = {{italiano}}Per anno{{/italiano}}{{english}}Per Year{{/english}} =
2 2  
3 -{{include reference="Main.Environment" excludeFirstHeading="true"/}}{{include reference="Theses.Environment" excludeFirstHeading="true"/}}{{velocity}}
3 +{{include reference="Theses.Environment" excludeFirstHeading="true"/}}{{velocity}}
4 4  #set( $thesisMenu = true )
5 5  #### HANDLE PARAMETERS / START
6 6  ##
7 -## inline display
8 -#set( $inlinePar = $request.inline.trim() )
9 9  ## who
10 10  #set( $userNamePar = $request.user.trim() )
11 11  #set( $firstNamePar = $request.name.trim() )
... ... @@ -141,17 +141,6 @@
141 141  ##
142 142  ## $oneUser, $apiceUser, $userString, $userFirstName, $userLastName, $oneCycle, $cycleList, $oneYear, $yearList are properly set
143 143  ##
144 -## handle inline / start
145 -##
146 -## default: false
147 -#set( $showInline = false )
148 -## check $inlinePar
149 -#if( $inlinePar != "" && $trueStringList.contains($inlinePar.toLowerCase()) )
150 - #set( $showInline = true )
151 -#end
152 -##
153 -## handle inline / end
154 -##
155 155  #### HANDLE PARAMETERS / END
156 156  ##
157 157  ## query to structures
... ... @@ -173,7 +173,7 @@
173 173  ## output results
174 174  ## page subtitle
175 175  {{id name="top"/}}
176 ->(%%)$itemNo #if( $itemNo == 1 )#if( $oneCycle ){{thesisCycle plural="false" uppercase="false"}}$cycle{{/thesisCycle}}#else{{stringEngIta eng="$objectEngSingular.toLowerCase()" ita="$objectItaSingular.toLowerCase()"/}}#end#{else}#if( $oneCycle ){{thesisCycle plural="true" uppercase="false"}}$cycle{{/thesisCycle}}#else{{stringEngIta eng="$objectEngPlural.toLowerCase()" ita="$objectItaPlural.toLowerCase()"/}}#end#{end} / #if( $oneYear )$year#else$firstYear–$lastYear#{end}#if( $oneUser ) / $userFirstName $userLastName#{end}(%%)
163 +>(%%)$itemNo #if( $itemNo == 1 )#if( $oneCycle ){{thesisCycle plural="false" uppercase="false"}}$cyclePar{{/thesisCycle}}#else{{stringEngIta eng="$objectEngSingular.toLowerCase()" ita="$objectItaSingular.toLowerCase()"/}}#end#{else}#if( $oneCycle ){{thesisCycle plural="true" uppercase="false"}}$cycle{{/thesisCycle}}#else{{stringEngIta eng="$objectEngPlural.toLowerCase()" ita="$objectItaPlural.toLowerCase()"/}}#end#{end} / #if( $oneYear )$year#else$firstYear–$lastYear#{end}#if( $oneUser ) / $userFirstName $userLastName#{end}(%%)
177 177  
178 178  ## stop if no thesis is found
179 179  #if( $itemNo == 0 || $itemMap.keySet().size() == 0 )
... ... @@ -185,16 +185,14 @@
185 185  #if( $itemMap.keySet().size() > 1 )
186 186  ## found more than one year
187 187  {{id name="index"/}}
188 -(% 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)))
175 +(% 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>>||anchor=$year]]#end)))
189 189  #end
190 190  ## theses displayed per year
191 191  #foreach( $year in $itemMap.keySet() )
192 192  (% 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']]
193 193  (% style="border-style:hidden hidden hidden hidden; font-style:normal" %)#foreach( $item in $itemMap[$year] )
194 - #if( $showInline )#if( $foreach.first )
195 -
196 -#end* #else|#end{{thesis inline=$showInline linked='title'}}$item{{/thesis}}
197 - #end
181 +|{{thesis inline='false' linked='title'}}$item{{/thesis}}
182 +#end
198 198   #set( $itemYearNo = $itemMap[$year].size() )
199 199  (% 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 ){{stringEngIta eng=$objectEngSingular.toLowerCase() ita=$objectItaSingular.toLowerCase()/}}#else{{stringEngIta eng=$objectEngPlural.toLowerCase() ita=$objectItaPlural.toLowerCase()/}}#end#end / $year) [[[{{stringEngIta eng='top' ita='in cima'/}}]>>||anchor="top"]] [[[{{stringEngIta eng='bottom' ita='in fondo'/}}]>>||anchor="bottom"]]
200 200  #end