Changes for page Forthcoming

From version 58.1
edited by Andrea Omicini
on 16/06/2023 13:09
Change comment: There is no comment for this version
To version 46.7
edited by Andrea Omicini
on 06/05/2023 16:21
Change comment: There is no comment for this version

Summary

Details

Page properties
Title
... ... @@ -1,1 +1,0 @@
1 -$services.localization.render('forthcoming')
Default language
... ... @@ -1,0 +1,1 @@
1 +en
Content
... ... @@ -1,11 +1,11 @@
1 -{{velocity}}
2 -{{html wiki="true" clean="false"}}
3 -#template('apice_events.vm')
1 += {{italiano}}In arrivo{{/italiano}}{{english}}Forthcoming{{/english}} =
2 +
3 +{{include reference="Events.Environment" excludeFirstHeading="true"/}}{{velocity}}
4 4  ##
5 5  #if( !$userName || $userName == "" || !$userSpace || $userSpace == "" || !$userFullname || $userFullname == "" )
6 6  ## overall forthcoming events
7 7   #set( $query = ", BaseObject objEvent, DateProperty as propDate
8 - where doc.fullName = objEvent.name and objEvent.className = '${objectSpace}.${objectClass}' and objEvent.name <> '${objectPool}.${objectTemplate}' and propDate.id.id = objEvent.id and propDate.name = 'start_date' and propDate.value > current_date() order by propDate.value asc " )
8 + where doc.fullName = objEvent.name and objEvent.className = '${objectSpace}.${objectClass}' and objEvent.name <> '${objectPool}.${objectTemplate}' and propDate.id.id = objEvent.id and propDate.name = 'start_date' and propDate.value > current_date() order by date(prop.value) asc " )
9 9  #else
10 10   #set( $query = ", BaseObject as objEvent, BaseObject as objRole, LargeStringProperty as propWho, DateProperty as propDate
11 11   where objEvent.name = doc.fullName and objEvent.className = '${objectSpace}.${objectClass}' and objEvent.name <> '${objectPool}.${objectTemplate}' and propDate.id.id = objEvent.id and propDate.name = 'start_date' and propDate.value > current_date() and objRole.name = doc.fullName and objRole.className = '${objectSpace}.Roles.${objectClass}' and propWho.id.id = objRole.id and propWho.name = 'who' and propWho.value like '%$userName%' order by propDate.value asc " )
... ... @@ -14,17 +14,11 @@
14 14  #set( $eventsFound = $xwiki.searchDocuments($query) )
15 15  ##
16 16  #if( $eventsFound.size() > 0 )
17 ->$services.localization.render('forthcomingevents').toLowerCase()
17 +>{{stringEngIta eng="forthcoming events" ita="eventi in arrivo"/}}
18 18  
19 -#template('apice_event_macros.vm')
20 -<div>
21 21   #foreach($event in $eventsFound)
22 - #if( !$foreach.first )
23 - <span class="menumainbody">&ensp;&bull;&ensp;</span>
24 - #end
25 - #eventlinked($event) <span class="textsecondary">(#eventyears($event))</span>
26 - #end
27 -</div>
20 + #set( $eventDoc = $xwiki.getDocument($event) )
21 +#if( !$foreach.first ){{themeTextSecondary}}•{{/themeTextSecondary}} #end#if( $eventDoc.getValue('sort') != 'special issue' ){{event short="true"}}$eventDoc{{/event}}#{else}{{event short="title" linked="title"}}$eventDoc{{/event}}#end #end
22 +(%%)
28 28  #end
29 -{{/html}}
30 -{{/velocity}}{{pageDisplay sort="objectservice"/}}
24 +{{/velocity}}{{noShortcuts/}}