Changes for page Forthcoming

Summary

• Page properties (1 modified, 0 added, 0 removed)

Details

Page properties

Content

...	...	@@ -1,35 +1,22 @@
1		-{{velocity}}
2		-{{html wiki="true" clean="false"}}
3		-#template('apice_events.vm')
4		-#template('apice_macros.vm')
5		-#isuserspace()
	1	+{{include reference="Events.Environment" excludeFirstHeading="true"/}}{{velocity}}
6	6	##
7		-#if( $isUserSpace )
8		- #userspace()
9		-## user forthcoming events
10		- #set( $query = ", BaseObject as objEvent, BaseObject as objRole, LargeStringProperty as propWho, DateProperty as propDate
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 " )
12		-#else
	3	+#if( !$userName || $userName == "" || !$userSpace || $userSpace == "" || !$userFullname || $userFullname == "" )
13	13	## overall forthcoming events
14	14	#set( $query = ", BaseObject objEvent, DateProperty as propDate
15	15	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 " )
	7	+#else
	8	+ #set( $query = ", BaseObject as objEvent, BaseObject as objRole, LargeStringProperty as propWho, DateProperty as propDate
	9	+ 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 " )
16	16	#end
17	17	## execute query
18	18	#set( $eventsFound = $xwiki.searchDocuments($query) )
19	19	##
20	20	#if( $eventsFound.size() > 0 )
21		-<div class"mainheader">
22		-$services.localization.render('forthcomingevents').toLowerCase()
23		-</div>
24		-#template('apice_event_macros.vm')
25		-<div>
	15	+>$services.localization.render('forthcomingevents').toLowerCase()
	16	+
26	26	#foreach($event in $eventsFound)
27		- #if( !$foreach.first )
28		- <span class="menumainbody">&ensp;&bull;&ensp;</span>
29		- #end
30		- #eventlinked($event) <span class="textsecondary">(#eventyears($event))</span>
31		- #end
32		-</div>
	18	+ #set( $eventDoc = $xwiki.getDocument($event) )
	19	+#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
	20	+(%%)
33	33	#end
34		-{{/html}}
35		-{{/velocity}}{{pageDisplay sort="objectservice"/}}
	22	+{{/velocity}}{{setMoreAdmin/}}{{noShortcuts/}}{{noTagFooter/}}{{yesObjectNew/}}