@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
Touch up notification/messages panels
Summary: Fixes T5575. Moves "All" links into title/header. Mark all read floats left, and connection status sits in footer. Also added hints to enable notifications (it's a cool feature).
Test Plan:
Tested locally both menus.
{F190630}
Reviewers: epriestley
Reviewed By: epriestley
Subscribers: epriestley, Korvin
Maniphest Tasks: T5575
Differential Revision: https://secure.phabricator.com/D10269
+39
-30
+3
-3
resources/celerity/map.php
+3
-3
resources/celerity/map.php
···
7
7
*/
8
8
return array(
9
9
'names' => array(
10
-
'core.pkg.css' => 'f8054294',
10
+
'core.pkg.css' => '383d0947',
11
11
'core.pkg.js' => '7c8455ef',
12
12
'darkconsole.pkg.js' => 'df001cab',
13
13
'differential.pkg.css' => '4a93db37',
···
37
37
'rsrc/css/aphront/typeahead.css' => 'a989b5b3',
38
38
'rsrc/css/application/auth/auth.css' => '1e655982',
39
39
'rsrc/css/application/base/main-menu-view.css' => 'aceca0e9',
40
-
'rsrc/css/application/base/notification-menu.css' => '5e3b5c86',
40
+
'rsrc/css/application/base/notification-menu.css' => '6aa0a74b',
41
41
'rsrc/css/application/base/phabricator-application-launch-view.css' => '8b7e271d',
42
42
'rsrc/css/application/base/standard-page-view.css' => '517cdfb1',
43
43
'rsrc/css/application/chatlog/chatlog.css' => '852140ff',
···
730
730
'phabricator-nav-view-css' => '9283c2df',
731
731
'phabricator-notification' => '0c6946e7',
732
732
'phabricator-notification-css' => 'ef2c9b34',
733
-
'phabricator-notification-menu-css' => '5e3b5c86',
733
+
'phabricator-notification-menu-css' => '6aa0a74b',
734
734
'phabricator-object-selector-css' => '029a133d',
735
735
'phabricator-phtize' => 'd254d646',
736
736
'phabricator-prefab' => 'bbae734c',
+2
-9
src/applications/conpherence/controller/ConpherenceNotificationPanelController.php
+2
-9
src/applications/conpherence/controller/ConpherenceNotificationPanelController.php
···
75
75
76
76
$content = hsprintf(
77
77
'<div class="phabricator-notification-header">%s</div>'.
78
-
'%s'.
79
-
'<div class="phabricator-notification-view-all">%s</div>',
78
+
'%s',
80
79
phutil_tag(
81
80
'a',
82
81
array(
83
82
'href' => '/conpherence/',
84
83
),
85
84
pht('Messages')),
86
-
$content,
87
-
phutil_tag(
88
-
'a',
89
-
array(
90
-
'href' => '/conpherence/',
91
-
),
92
-
'View All Conpherences'));
85
+
$content);
93
86
94
87
$unread = id(new ConpherenceParticipantCountQuery())
95
88
->withParticipantPHIDs(array($user->getPHID()))
+20
-13
src/applications/notification/controller/PhabricatorNotificationPanelController.php
+20
-13
src/applications/notification/controller/PhabricatorNotificationPanelController.php
···
46
46
),
47
47
pht('Notifications'));
48
48
49
-
$connection_status = new PhabricatorNotificationStatusView();
49
+
if (PhabricatorEnv::getEnvConfig('notification.enabled')) {
50
+
$connection_status = new PhabricatorNotificationStatusView();
51
+
} else {
52
+
$connection_status = phutil_tag(
53
+
'a',
54
+
array(
55
+
'href' => PhabricatorEnv::getDoclink(
56
+
'Notifications User Guide: Setup and Configuration'),
57
+
),
58
+
pht('Notification Server not enabled.'));
59
+
}
60
+
$connection_ui = phutil_tag(
61
+
'div',
62
+
array(
63
+
'class' => 'phabricator-notification-footer'
64
+
),
65
+
$connection_status);
50
66
51
67
$header = phutil_tag(
52
68
'div',
···
54
70
'class' => 'phabricator-notification-header',
55
71
),
56
72
array(
57
-
$connection_status,
58
73
$notifications_link,
74
+
$clear_ui,
59
75
));
60
76
61
77
$content = hsprintf(
62
-
'%s'.
63
-
'%s'.
64
-
'<div class="phabricator-notification-view-all">%s %s %s</div>',
78
+
'%s%s%s',
65
79
$header,
66
80
$content,
67
-
$clear_ui,
68
-
" \xC2\xB7 ",
69
-
phutil_tag(
70
-
'a',
71
-
array(
72
-
'href' => '/notification/',
73
-
),
74
-
pht('View All Notifications')));
81
+
$connection_ui);
75
82
76
83
$unread_count = id(new PhabricatorFeedStoryNotification())
77
84
->countUnread($user);