@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
Document calendar summary icons
Summary:
Fixes T11809. Ref
- Explicitly document the summary icon hints -- I don't think these are too hard to figure out (and maybe this stuff should just go in the tooltips) but we can start here.
- Use color + shape to distinguish between "cancelled" and "declined", not just color (for users with vision accessibility issues).
- Translate a "minute(s)" string into sensible English.
- Use RSVP status on the month view green circle thing.
Test Plan:
- Read docs.
- Looked at month view.
- Read reminder mail.
- Viewed month view mobile view.
Reviewers: chad
Reviewed By: chad
Maniphest Tasks: T11809
Differential Revision: https://secure.phabricator.com/D16872
+30
-13
+3
-1
src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php
+3
-1
src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php
···
368
368
$epoch_min = $event->getStartDateTimeEpoch();
369
369
$epoch_max = $event->getEndDateTimeEpoch();
370
370
371
+
$is_invited = $event->isRSVPInvited($viewer->getPHID());
372
+
371
373
$event_view = id(new AphrontCalendarEventView())
372
374
->setHostPHID($event->getHostPHID())
373
375
->setEpochRange($epoch_min, $epoch_max)
···
376
378
->setURI($event->getURI())
377
379
->setIsAllDay($event->getIsAllDay())
378
380
->setIcon($event->getDisplayIcon($viewer))
379
-
->setViewerIsInvited($event->getIsUserInvited($viewer->getPHID()))
381
+
->setViewerIsInvited($is_invited)
380
382
->setIconColor($event->getDisplayIconColor($viewer));
381
383
382
384
$month_view->addEvent($event_view);
+1
-11
src/applications/calendar/storage/PhabricatorCalendarEvent.php
+1
-11
src/applications/calendar/storage/PhabricatorCalendarEvent.php
···
538
538
return $is_attending;
539
539
}
540
540
541
-
public function getIsUserInvited($phid) {
542
-
$uninvited_status = PhabricatorCalendarEventInvitee::STATUS_UNINVITED;
543
-
$declined_status = PhabricatorCalendarEventInvitee::STATUS_DECLINED;
544
-
$status = $this->getUserInviteStatus($phid);
545
-
if ($status == $uninvited_status || $status == $declined_status) {
546
-
return false;
547
-
}
548
-
return true;
549
-
}
550
-
551
541
public function getIsGhostEvent() {
552
542
return $this->isGhostEvent;
553
543
}
···
655
645
case PhabricatorCalendarEventInvitee::STATUS_INVITED:
656
646
return 'fa-user-plus';
657
647
case PhabricatorCalendarEventInvitee::STATUS_DECLINED:
658
-
return 'fa-times';
648
+
return 'fa-times-circle';
659
649
}
660
650
}
661
651
}
+2
-1
src/applications/people/controller/PhabricatorPeopleProfileViewController.php
+2
-1
src/applications/people/controller/PhabricatorPeopleProfileViewController.php
···
194
194
->withDateRange($range_start, $range_end)
195
195
->withInvitedPHIDs(array($user->getPHID()))
196
196
->withIsCancelled(false)
197
+
->needRSVPs(array($viewer->getPHID()))
197
198
->execute();
198
199
199
200
$event_views = array();
200
201
foreach ($events as $event) {
201
-
$viewer_is_invited = $event->getIsUserInvited($viewer->getPHID());
202
+
$viewer_is_invited = $event->isRSVPInvited($viewer->getPHID());
202
203
203
204
$can_edit = PhabricatorPolicyFilter::hasCapability(
204
205
$viewer,
+16
src/docs/user/userguide/calendar.diviner
+16
src/docs/user/userguide/calendar.diviner
···
37
37
You can click through to a user's profile to see more details about their
38
38
availability.
39
39
40
+
Status Icons
41
+
============
42
+
43
+
On the month and day views, Calendar shows an icon next to each event to
44
+
indicate status. The icons are:
45
+
46
+
- {icon user-plus, color=green} **Invited, Individual**: You're personally
47
+
invited to the event.
48
+
- {icon users, color=green} **Invited, Group**: A project you are a member
49
+
of is invited to the event.
50
+
- {icon check-circle, color=green} **Attending**: You're attending the event.
51
+
- {icon times-circle, color=grey} **Declined**: You've declined the event.
52
+
- {icon times, color=red} **Cancelled**: The event has been cancelled.
53
+
54
+
If you don't have any special relationship to the event and the event does not
55
+
have any special status, an event-specific icon is shown instead.
40
56
41
57
Importing Events
42
58
================
+8
src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php
+8
src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php
···
1580
1580
'Restart %s build?',
1581
1581
'Restart %s builds?',
1582
1582
),
1583
+
1584
+
'%s is starting in %s minute(s), at %s.' => array(
1585
+
array(
1586
+
'%s is starting in one minute, at %3$s.',
1587
+
'%s is starting in %s minutes, at %s.',
1588
+
),
1589
+
),
1590
+
1583
1591
);
1584
1592
}
1585
1593