Changes for page Supervisors

From version 111.1
edited by Andrea Omicini
on 06/07/2023 19:17
Change comment: There is no comment for this version
To version 99.1
edited by Andrea Omicini
on 30/06/2023 00:44
Change comment: There is no comment for this version

Summary

Details

Page properties
Title
... ... @@ -1,1 +1,1 @@
1 -#if($request.tag)$services.localization.render('supervisor').toLowerCase() : #if($request.tag.contains('XWiki.'))$xwiki.getUserName($request.tag,false)#else$request.tag#end#else$services.localization.render('supervisors')#end
1 +#if($request.tag)$services.localization.render('supervisor').toLowerCase() : $xwiki.getUserName($request.tag,false)#else$services.localization.render('supervisors')#end
Content
... ... @@ -1,14 +1,13 @@
1 1  {{velocity}}
2 2  {{html clean="false" wiki="true"}}
3 -#template('apice_macros.vm')
4 -#setobjectspace("Theses")
5 -#template('apice_thesis_macros.vm')
3 +#template('apice_theses.vm')
4 +##
6 6  #### tag parameter possibly brings name to be used as tag
7 7  #if( !$request.tag )
8 8  ## no tag parameter --> just the cloud
9 9  ## set query
10 10   #set( $query = ", BaseObject as objThesis, LargeStringProperty as propSupervisors, StringProperty as propStatus, DateProperty as propEnddate
11 - where objThesis.name = doc.fullName and objThesis.className = '${mainSpace}.Class' and objThesis.name <> '${objectPool}.Template' and propSupervisors.id.id = objThesis.id and propStatus.id.id = objThesis.id and propEnddate.id.id = objThesis.id and propSupervisors.name = 'supervisors' and propSupervisors.value <> '' and propStatus.name = 'status' and lower(propStatus.value) = 'completed' and propEnddate.name = 'end' order by propEnddate.value desc" )
10 + where objThesis.name = doc.fullName and objThesis.className = '${objectSpace}.${objectClass}' and objThesis.name <> '${objectSpace}.${objectTemplate}' and propSupervisors.id.id = objThesis.id and propStatus.id.id = objThesis.id and prop2.id.id = objThesis.id and propSupervisors.name = 'supervisors' and propSupervisors.value <> '' and propStatus.name = 'status' and lower(propStatus.value) = 'completed' and propEnddate.name = 'end' order by propEnddate.value desc" )
12 12  ## execute query
13 13   #set( $itemFound = $xwiki.searchDocuments($query) )
14 14   #set( $itemFoundNo = $itemFound.size() )
... ... @@ -56,8 +56,7 @@
56 56   #elseif( $nameItemNo == 2 )#set( $tagSize = "100%" )
57 57   #else#set( $tagSize = "90%" )
58 58   #end
59 - #set( $urlEscapedName = $escapetool.url($name) )
60 -<span style='font-size:$tagSize; white-space: nowrap'>&ensp;[[#if( $name.startsWith("XWiki.") )$xwiki.getUserName($name,false)#else$name#end>>$doc||queryString="tag=$urlEscapedName"]]</span><sub class='textprimary' style="font-size: .75em">$nameItemNo</sub>&ensp;
58 +<span style='font-size:$tagSize; white-space: nowrap'>&ensp;[[#if( $name.startsWith("XWiki.") )$xwiki.getUserName($name,false)#else$name#end>>$doc]]</span><sub class='textprimary' style="font-size: .75em">$nameItemNo</sub>&ensp;
61 61   #end
62 62  </div>
63 63  ## cloud bottom
... ... @@ -70,29 +70,20 @@
70 70  ##
71 71  #### TAG PAGE / START
72 72   #set( $query = ", BaseObject as objThesis, LargeStringProperty as propSupervisors, StringProperty as propStatus, DateProperty as propEnddate
73 - where objThesis.name = doc.fullName and objThesis.className = '${mainSpace}.Class' and objThesis.name <> '${objectPool}.Template' and propSupervisors.id.id = objThesis.id and propStatus.id.id = objThesis.id and propEnddate.id.id = objThesis.id and propSupervisors.name = 'supervisors' and propSupervisors.value like '%$request.tag%' and propStatus.name = 'status' and lower(propStatus.value) = 'completed' and propEnddate.name = 'end' order by propEnddate.value desc" )
71 + where objThesis.name = doc.fullName and objThesis.className = '${objectSpace}.${objectClass}' and objThesis.name <> '${objectSpace}.${objectTemplate}' and propSupervisors.id.id = objThesis.id and propStatus.id.id = objThesis.id and propEnddate.id.id = objThesis.id and propSupervisors.name = 'supervisors' and propSupervisors.value like '%$request.tag%' and propStatus.name = 'status' and lower(propStatus.value) = 'completed' and propEnddate.name = 'end' order by propEnddate.value desc" )
74 74  ## execute query
75 75   #set( $itemFound = $xwiki.searchDocuments($query) )
76 - #set( $itemNo = $itemFound.size() )
74 + #set( $itemFoundNo = $itemFound.size() )
77 77  ## subtitle
78 -<div class="mainheader">
79 - $itemNo
80 - #if( $itemNo > 1)
81 - $services.localization.render('theses').toLowerCase()
82 - #else
83 - $services.localization.render('thesis').toLowerCase()
84 - #end
85 -</div>
86 -## thesis list
76 +>$itemFoundNo #if( $itemFoundNo == 1 ){{stringEngIta eng="$objectEngSingular.toLowerCase()" ita="$objectItaSingular.toLowerCase()"/}}#else{{stringEngIta eng="$objectEngPlural.toLowerCase()" ita="$objectItaPlural.toLowerCase()"/}}#end#if( $request.user ) / {{namesFromUsers linked='false'}}$request.user{{/namesFromUsers}}#end#if( $request.name && $request.surname ) / {{namesFromUsers linked='false'}}$request.name $request.surname{{/namesFromUsers}}#end
77 +## talk list
78 +(((
87 87   #foreach( $item in $itemFound )
88 -<div>
89 -[[image:icon:book]] #thesislinked($item)
90 -</div>
80 +[[image:icon:book]] {{thesis linked="title"}}$item{{/thesis}}
91 91   #end
82 +)))
92 92  ## thesis list bottom
93 -<div class="menuqualifier" style="text-align: right">
94 -[ [[{{stringEngIta eng="supervisor cloud" ita="nuvola relatori" /}}>>$doc.name]] / $services.localization.render('theses').toLowerCase() ]
95 -</div>
84 +(% style='font-style:oblique;font-size:smaller;text-align:right;color:$theme.textSecondaryColor' %)((([ [[{{stringEngIta eng="supervisor cloud" ita="nuvola supervisori" /}}>>$doc||]] / {{stringEngIta eng = "$objectEngPlural.toLowerCase()" ita = "$objectItaPlural.toLowerCase()"/}} ])))(%%)
96 96  #end
97 97  {{/html}}
98 98  {{/velocity}}{{pageDisplay sort="objectservice"/}}