From 47cd5f311cebb25335d986faff52f363f7320184 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Wed, 16 Mar 2011 15:22:15 -0400 Subject: [PATCH 1/3] my code-to-verb logic was ab0rken; fixed --- plugins/Event/RSVP.php | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/plugins/Event/RSVP.php b/plugins/Event/RSVP.php index 8bb2d2855d..fad87aabc8 100644 --- a/plugins/Event/RSVP.php +++ b/plugins/Event/RSVP.php @@ -161,6 +161,8 @@ class RSVP extends Managed_DataObject $rsvp->event_id = $event->id; $rsvp->response = self::codeFor($verb); + common_debug("Got value {$rsvp->response} for verb {$verb}"); + if (array_key_exists('created', $options)) { $rsvp->created = $options['created']; } else { @@ -209,16 +211,36 @@ class RSVP extends Managed_DataObject function codeFor($verb) { - return ($verb == RSVP::POSITIVE) ? 'Y' : - ($verb == RSVP::NEGATIVE) ? 'N' : - ($verb == RSVP::POSSIBLE) ? '?' : null; + switch ($verb) { + case RSVP::POSITIVE: + return 'Y'; + break; + case RSVP::NEGATIVE: + return 'N'; + break; + case RSVP::POSSIBLE: + return '?'; + break; + default: + throw new Exception("Unknown verb {$verb}"); + } } static function verbFor($code) { - return ($code == 'Y') ? RSVP::POSITIVE : - ($code == 'N') ? RSVP::NEGATIVE : - ($code == '?') ? RSVP::POSSIBLE : null; + switch ($code) { + case 'Y': + return RSVP::POSITIVE; + break; + case 'N': + return RSVP::NEGATIVE; + break; + case '?': + return RSVP::POSSIBLE; + break; + default: + throw new Exception("Unknown code {$code}"); + } } function getNotice() From ba2a246951e5ab9884b0969a6955bae14d6c772d Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Wed, 16 Mar 2011 17:13:34 -0400 Subject: [PATCH 2/3] slightly better formatting on events --- plugins/Event/EventPlugin.php | 60 ++++++++++++++++++++++++++--------- plugins/Event/event.css | 9 ++++++ 2 files changed, 54 insertions(+), 15 deletions(-) create mode 100644 plugins/Event/event.css diff --git a/plugins/Event/EventPlugin.php b/plugins/Event/EventPlugin.php index 4159641d08..1a43bac348 100644 --- a/plugins/Event/EventPlugin.php +++ b/plugins/Event/EventPlugin.php @@ -297,7 +297,7 @@ class EventPlugin extends MicroappPlugin } // @fixme we have to start the name/avatar and open this div - $out->elementStart('div', array('class' => 'event-info entry-content')); // EVENT-INFO.ENTRY-CONTENT IN + $out->elementStart('div', array('class' => 'event-info')); // EVENT-INFO.ENTRY-CONTENT IN $profile = $notice->getProfile(); $avatar = $profile->getAvatar(AVATAR_MINI_SIZE); @@ -336,7 +336,7 @@ class EventPlugin extends MicroappPlugin assert(!empty($event)); assert(!empty($profile)); - $out->elementStart('div', 'vevent'); // VEVENT IN + $out->elementStart('div', 'vevent event'); // VEVENT IN $out->elementStart('h3'); // VEVENT/H3 IN @@ -351,39 +351,63 @@ class EventPlugin extends MicroappPlugin $out->elementEnd('h3'); // VEVENT/H3 OUT + $startDate = strftime("%x", $event->start_time); + $startTime = strftime("%R", $event->start_time); + + $endDate = strftime("%x", $event->end_time); + $endTime = strftime("%R", $event->end_time); + // FIXME: better dates $out->elementStart('div', 'event-times'); // VEVENT/EVENT-TIMES IN - $out->element('abbr', array('class' => 'dtstart', - 'title' => common_date_iso8601($event->start_time)), - common_exact_date($event->start_time)); - $out->text(' - '); - $out->element('span', array('class' => 'dtend', - 'title' => common_date_iso8601($event->end_time)), - common_exact_date($event->end_time)); - $out->elementEnd('div'); // VEVENT/EVENT-TIMES OUT - if (!empty($event->description)) { - $out->element('div', 'description', $event->description); + $out->element('strong', null, _('Time:')); + + $out->element('abbr', array('class' => 'dtstart', + 'title' => common_date_iso8601()), + $startDate . ' ' . $startTime); + $out->text(' - '); + if ($startDate == $endDate) { + $out->element('span', array('class' => 'dtend', + 'title' => common_date_iso8601($event->end_time)), + $endTime); + } else { + $out->element('span', array('class' => 'dtend', + 'title' => common_date_iso8601($event->end_time)), + $endDate . ' ' . $endTime); } + $out->elementEnd('div'); // VEVENT/EVENT-TIMES OUT + if (!empty($event->location)) { - $out->element('div', 'location', $event->location); + $out->elementStart('div', 'event-location'); + $out->element('strong', null, _('Location: ')); + $out->element('span', 'location', $event->location); + $out->elementEnd('div'); + } + + if (!empty($event->description)) { + $out->elementStart('div', 'event-description'); + $out->element('strong', null, _('Description: ')); + $out->element('span', 'description', $event->description); + $out->elementEnd('div'); } $rsvps = $event->getRSVPs(); - $out->element('div', 'event-rsvps', + $out->elementStart('div', 'event-rsvps'); + $out->element('strong', null, _('Attending: ')); + $out->element('span', 'event-rsvps', sprintf(_('Yes: %d No: %d Maybe: %d'), count($rsvps[RSVP::POSITIVE]), count($rsvps[RSVP::NEGATIVE]), count($rsvps[RSVP::POSSIBLE]))); + $out->elementEnd('div'); $user = common_current_user(); if (!empty($user)) { $rsvp = $event->getRSVP($user->getProfile()); - common_log(LOG_DEBUG, "RSVP is: " . ($rsvp ? $rsvp->id : 'none')); if (empty($rsvp)) { $form = new RSVPForm($event, $out); @@ -440,4 +464,10 @@ class EventPlugin extends MicroappPlugin { $action->inlineScript('$(document).ready(function() { $("#startdate").datepicker(); $("#enddate").datepicker(); });'); } + + function onEndShowStyles($action) + { + $action->cssLink($this->path('event.css')); + return true; + } } diff --git a/plugins/Event/event.css b/plugins/Event/event.css new file mode 100644 index 0000000000..a922bb5791 --- /dev/null +++ b/plugins/Event/event.css @@ -0,0 +1,9 @@ +.event-tags li { display: inline; } +.event-mentions li { display: inline; } +.event-avatar { float: left; } +.event-notice-count { float: right; } +.event-info { float: left; } +.event-title { margin-left: 0px; } +#content .event .entry-title { margin-left: 0px; } +#content .event .entry-content { margin-left: 0px; } + From 29a4bb4d9159ef337b3a80615c8a9f9f70f3b9bd Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Wed, 16 Mar 2011 17:51:27 -0400 Subject: [PATCH 3/3] better formatting for RSVPs --- plugins/Event/EventPlugin.php | 6 ++- plugins/Event/RSVP.php | 93 +++++++++++++++++++++++++++++++++-- theme/rebase/css/display.css | 4 ++ 3 files changed, 97 insertions(+), 6 deletions(-) diff --git a/plugins/Event/EventPlugin.php b/plugins/Event/EventPlugin.php index 1a43bac348..038e110627 100644 --- a/plugins/Event/EventPlugin.php +++ b/plugins/Event/EventPlugin.php @@ -324,7 +324,11 @@ class EventPlugin extends MicroappPlugin function showRSVPNotice($notice, $out) { - $out->raw($notice->rendered); + $rsvp = RSVP::fromNotice($notice); + + $out->elementStart('div', 'rsvp'); + $out->raw($rsvp->asHTML()); + $out->elementEnd('div'); return; } diff --git a/plugins/Event/RSVP.php b/plugins/Event/RSVP.php index fad87aabc8..7b61cc34ad 100644 --- a/plugins/Event/RSVP.php +++ b/plugins/Event/RSVP.php @@ -180,12 +180,9 @@ class RSVP extends Managed_DataObject // XXX: come up with something sexier - $content = sprintf(_('RSVPed %s for an event.'), - ($verb == RSVP::POSITIVE) ? _('positively') : - ($verb == RSVP::NEGATIVE) ? _('negatively') : - _('possibly')); + $content = $rsvp->asString(); - $rendered = $content; + $rendered = $rsvp->asHTML(); $options = array_merge(array('object_type' => $verb), $options); @@ -276,4 +273,90 @@ class RSVP extends Managed_DataObject return $rsvps; } + + function getProfile() + { + $profile = Profile::staticGet('id', $this->profile_id); + if (empty($profile)) { + throw new Exception("No profile with ID {$this->profile_id}"); + } + return $profile; + } + + function getEvent() + { + $event = Happening::staticGet('id', $this->event_id); + if (empty($event)) { + throw new Exception("No event with ID {$this->event_id}"); + } + return $event; + } + + function asHTML() + { + return self::toHTML($this->getProfile(), + $this->getEvent(), + $this->response); + } + + function asString() + { + return self::toString($this->getProfile(), + $this->getEvent(), + $this->response); + } + + static function toHTML($profile, $event, $response) + { + $fmt = null; + + $notice = $event->getNotice(); + + switch ($response) { + case 'Y': + $fmt = _("%2s is attending %4s."); + break; + case 'N': + $fmt = _("%2s is not attending %4s."); + break; + case '?': + $fmt = _("%2s might attend %4s."); + break; + default: + throw new Exception("Unknown response code {$response}"); + break; + } + + return sprintf($fmt, + htmlspecialchars($profile->profileurl), + htmlspecialchars($profile->getBestName()), + htmlspecialchars($notice->bestUrl()), + htmlspecialchars($event->title)); + } + + static function toString($profile, $event, $response) + { + $fmt = null; + + $notice = $event->getNotice(); + + switch ($response) { + case 'Y': + $fmt = _("%1s is attending %2s."); + break; + case 'N': + $fmt = _("%1s is not attending %2s."); + break; + case '?': + $fmt = _("%1s might attend %2s.>"); + break; + default: + throw new Exception("Unknown response code {$response}"); + break; + } + + return sprintf($fmt, + $profile->getBestName(), + $event->title); + } } diff --git a/theme/rebase/css/display.css b/theme/rebase/css/display.css index ee88b312a7..6c3c9e6296 100644 --- a/theme/rebase/css/display.css +++ b/theme/rebase/css/display.css @@ -451,6 +451,10 @@ address .poweredby { overflow:visible; } +.notice .automatic { +font-style:italic; +} + #showstream h1 { display:none; }