GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Event upgraded to microformats2

Browse Source
This commit is contained in:
Mikael Nordfeldth 2014-06-23 14:18:59 +02:00
parent 658c6ab9a8
commit 703443f152
5 changed files with 45 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/Event/EventPlugin.php
View File

@ -311,7 +311,7 @@ class EventPlugin extends MicroappPlugin
function onEndShowScripts($action)
{
$action->script($this->path('event.js'));
$action->script($this->path('js/event.js'));
}
function onEndShowStyles($action)

31
plugins/Event/classes/Happening.php
View File

@ -149,16 +149,17 @@ class Happening extends Managed_DataObject
$location,
$description);
// TRANS: Rendered event description. %1$s is a title, %2$s is start time, %3$s is start time,
// TRANS: Rendered microformats2 tagged event description.
// TRANS: %1$s is a title, %2$s is start time, %3$s is start time,
// TRANS: %4$s is end time, %5$s is end time, %6$s is location, %7$s is description.
// TRANS: Class names should not be translated.
$rendered = sprintf(_m('<span class="vevent">'.
'<span class="summary">%1$s</span> '.
'<abbr class="dtstart" title="%2$s">%3$s</a> - '.
'<abbr class="dtend" title="%4$s">%5$s</a> '.
'(<span class="location">%6$s</span>): '.
'<span class="description">%7$s</span> '.
'</span>'),
$rendered = sprintf(_m('<div class="h-event">'.
'<p class="p-name p-summary">%1$s</p> '.
'<time class="dt-start" datetime="%2$s">%3$s</time> - '.
'<time class="dt-end" datetime="%4$s">%5$s</time> '.
'(<span class="p-location">%6$s</span>): '.
'<div class="p-description">%7$s</div> '.
'</div>'),
htmlspecialchars($title),
htmlspecialchars(common_date_iso8601($ev->start_time)),
htmlspecialchars(common_exact_date($ev->start_time)),
@ -187,6 +188,20 @@ class Happening extends Managed_DataObject
return $saved;
}
/**
* Returns the profile's canonical url, not necessarily a uri/unique id
*
* @return string $url
*/
public function getUrl()
{
if (empty($this->url) ||
!filter_var($this->url, FILTER_VALIDATE_URL)) {
throw new InvalidUrlException($this->url);
}
return $this->url;
}
function getNotice()
{
return Notice::getKV('uri', $this->uri);

6
plugins/Event/css/event.css
View File

@ -6,8 +6,6 @@
.event-notice-count { float: right; }
.event-info { float: left; }
.event-title { margin-left: 0px; }
#content .event .h-entry { margin-left: 0px; }
#content .event .e-content { margin-left: 0px; }
.ui-autocomplete {
max-height: 100px;
overflow-y: auto;
@ -37,7 +35,7 @@ li.rsvp-list .entities li .u-photo {
float: none !important;
}
.notice .vevent div {
.notice .h-event div {
margin-bottom: 8px;
}
@ -94,7 +92,7 @@ li.rsvp-list .entities li .u-photo {
background: linear-gradient(top, #fb6104 0%,#fc8035 100%);
}
#wrap .vevent form.processing input.submit {
#wrap .h-event form.processing input.submit {
text-indent: 0;
background: #ff9d63;
}

0
plugins/Event/event.js → plugins/Event/js/event.js
View File

47
plugins/Event/lib/eventlistitem.php
View File

@ -66,16 +66,14 @@ class EventListItem extends NoticeListItemAdapter
return;
}
$out->elementStart('div', 'vevent event e-content'); // VEVENT IN
// e-content since we're part of a h-entry
$out->elementStart('div', 'h-event e-content'); // VEVENT IN
$out->elementStart('h3', 'summary'); // VEVENT/H3 IN
$out->elementStart('h3', 'p-summary p-name'); // VEVENT/H3 IN
if (!empty($event->url)) {
$out->element('a',
array('href' => $event->url,
'class' => 'event-title entry-title summary'),
$event->title);
} else {
try {
$out->element('a', array('href' => $event->getUrl()), $event->title);
} catch (InvalidUrlException $e) {
$out->text($event->title);
}
@ -114,19 +112,15 @@ class EventListItem extends NoticeListItemAdapter
// TRANS: Field label for event description.
$out->element('strong', null, _m('Time:'));
$out->element('abbr', array('class' => 'dtstart',
'title' => common_date_iso8601($event->start_time)),
$out->element('time', array('class' => 'dt-start',
'datetime' => common_date_iso8601($event->start_time)),
$startDateStr . ' ' . $startTimeStr);
$out->text(' – ');
if ($startDateStr == $endDateStr) {
$out->element('span', array('class' => 'dtend',
'title' => common_date_iso8601($event->end_time)),
$endTimeStr);
} else {
$out->element('span', array('class' => 'dtend',
'title' => common_date_iso8601($event->end_time)),
$endDateStr . ' ' . $endTimeStr);
}
$out->element('time', array('class' => 'dt-end',
'datetime' => common_date_iso8601($event->end_time)),
$startDateStr == $endDateStr
? "$endDatestr $endTimeStr"
: $endTimeStr);
$out->elementEnd('div'); // VEVENT/EVENT-TIMES OUT
@ -134,7 +128,7 @@ class EventListItem extends NoticeListItemAdapter
$out->elementStart('div', 'event-location');
// TRANS: Field label for event description.
$out->element('strong', null, _m('Location:'));
$out->element('span', 'location', $event->location);
$out->element('span', 'p-location', $event->location);
$out->elementEnd('div');
}
@ -142,22 +136,21 @@ class EventListItem extends NoticeListItemAdapter
$out->elementStart('div', 'event-description');
// TRANS: Field label for event description.
$out->element('strong', null, _m('Description:'));
$out->element('span', 'description', $event->description);
$out->element('div', 'p-description', $event->description);
$out->elementEnd('div');
}
$rsvps = $event->getRSVPs();
$out->elementStart('div', 'event-rsvps');
// TRANS: Field label for event description.
$out->text(_('Attending:'));
// TRANS: Field label for event description.
$out->element('strong', null, _m('Attending:'));
$out->elementStart('ul', 'attending-list');
foreach ($rsvps as $verb => $responses) {
$out->elementStart('li', 'rsvp-list');
switch ($verb)
{
switch ($verb) {
case RSVP::POSITIVE:
$out->text(_('Yes:'));
break;
@ -173,9 +166,7 @@ class EventListItem extends NoticeListItemAdapter
$ids[] = $response->profile_id;
}
$ids = array_slice($ids, 0, ProfileMiniList::MAX_PROFILES + 1);
$profiles = Profile::pivotGet('id', $ids);
$profile = new ArrayWrapper(array_values($profiles));
$minilist = new ProfileMiniList($profile, $out);
$minilist = new ProfileMiniList(Profile::multiGet('id', $ids), $out);
$minilist->show();
$out->elementEnd('li');