From bcdef099c24391d15e6ceebe7be469786b98ace7 Mon Sep 17 00:00:00 2001
From: Bob Trahan <btrahan@phacility.com>
Date: Tue, 29 Apr 2014 10:43:38 -0700
Subject: [PATCH] Notifications - add a "Clear All Notifications" link to
 dropdown

Summary: Fixes T2576. Also hyperlinks "Notifications" and "Messages" for easier quick navigation to those areas. Maybe we could get rid of the "See All X" UI at the bottom and use these links?

Test Plan: cleared all notifications from new UI - it worked! observed new linked "Notifications" and "Messages" headers

Reviewers: chad, epriestley

Reviewed By: epriestley

Subscribers: epriestley, Korvin

Maniphest Tasks: T2576

Differential Revision: https://secure.phabricator.com/D8894
---
 resources/celerity/map.php                      | 10 +++++-----
 .../ConpherenceNotificationPanelController.php  |  7 ++++++-
 .../PhabricatorNotificationPanelController.php  | 17 +++++++++++++++--
 .../css/application/base/notification-menu.css  |  9 +++++++++
 4 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 66e90a87a0..14bde7b596 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -7,7 +7,7 @@
 return array(
   'names' =>
   array(
-    'core.pkg.css' => 'a762d94d',
+    'core.pkg.css' => 'b7ba02ba',
     'core.pkg.js' => '417722ff',
     'darkconsole.pkg.js' => 'ca8671ce',
     'differential.pkg.css' => '8a064eb7',
@@ -38,7 +38,7 @@ return array(
     'rsrc/css/aphront/typeahead.css' => '271456a1',
     'rsrc/css/application/auth/auth.css' => '1e655982',
     'rsrc/css/application/base/main-menu-view.css' => '0a599177',
-    'rsrc/css/application/base/notification-menu.css' => 'fc9a363c',
+    'rsrc/css/application/base/notification-menu.css' => '99ffef72',
     'rsrc/css/application/base/phabricator-application-launch-view.css' => 'd290ba21',
     'rsrc/css/application/base/standard-page-view.css' => '517cdfb1',
     'rsrc/css/application/chatlog/chatlog.css' => '852140ff',
@@ -87,7 +87,7 @@ return array(
     'rsrc/css/application/phrequent/phrequent.css' => 'ffc185ad',
     'rsrc/css/application/phriction/phriction-document-css.css' => '7d7f0071',
     'rsrc/css/application/policy/policy-edit.css' => '05cca26a',
-    'rsrc/css/application/policy/policy-transaction-detail.css' => '21b7daba',
+    'rsrc/css/application/policy/policy-transaction-detail.css' => '82100a43',
     'rsrc/css/application/policy/policy.css' => '957ea14c',
     'rsrc/css/application/ponder/comments.css' => '6cdccea7',
     'rsrc/css/application/ponder/feed.css' => 'e62615b6',
@@ -705,7 +705,7 @@ return array(
     'phabricator-nav-view-css' => '80e60fc1',
     'phabricator-notification' => '0c6946e7',
     'phabricator-notification-css' => 'ef2c9b34',
-    'phabricator-notification-menu-css' => 'fc9a363c',
+    'phabricator-notification-menu-css' => '99ffef72',
     'phabricator-object-selector-css' => '029a133d',
     'phabricator-phtize' => 'd254d646',
     'phabricator-prefab' => '0326e5d0',
@@ -772,7 +772,7 @@ return array(
     'phui-workpanel-view-css' => '97b69459',
     'policy-css' => '957ea14c',
     'policy-edit-css' => '05cca26a',
-    'policy-transaction-detail-css' => '21b7daba',
+    'policy-transaction-detail-css' => '82100a43',
     'ponder-comment-table-css' => '6cdccea7',
     'ponder-feed-view-css' => 'e62615b6',
     'ponder-post-css' => 'ebab8a70',
diff --git a/src/applications/conpherence/controller/ConpherenceNotificationPanelController.php b/src/applications/conpherence/controller/ConpherenceNotificationPanelController.php
index 1da1521bd2..50ea0359e5 100644
--- a/src/applications/conpherence/controller/ConpherenceNotificationPanelController.php
+++ b/src/applications/conpherence/controller/ConpherenceNotificationPanelController.php
@@ -81,7 +81,12 @@ final class ConpherenceNotificationPanelController
       '<div class="phabricator-notification-header">%s</div>'.
       '%s'.
       '<div class="phabricator-notification-view-all">%s</div>',
-      pht('Messages'),
+      phutil_tag(
+        'a',
+        array(
+          'href' => '/conpherence/',
+        ),
+        pht('Messages')),
       $content,
       phutil_tag(
         'a',
diff --git a/src/applications/notification/controller/PhabricatorNotificationPanelController.php b/src/applications/notification/controller/PhabricatorNotificationPanelController.php
index 98328bc791..c0129429d3 100644
--- a/src/applications/notification/controller/PhabricatorNotificationPanelController.php
+++ b/src/applications/notification/controller/PhabricatorNotificationPanelController.php
@@ -26,10 +26,23 @@ final class PhabricatorNotificationPanelController
     }
 
     $content = hsprintf(
-      '<div class="phabricator-notification-header">%s</div>'.
+      '<div class="phabricator-notification-header">%s %s</div>'.
       '%s'.
       '<div class="phabricator-notification-view-all">%s</div>',
-      pht('Notifications'),
+      phutil_tag(
+        'a',
+        array(
+          'href' => '/notification/',
+        ),
+        pht('Notifications')),
+      javelin_tag(
+        'a',
+        array(
+          'sigil' => 'workflow',
+          'href' => '/notification/clear/',
+          'class' => 'phabricator-notification-clear-all'
+        ),
+        pht('Clear All Notifications')),
       $content,
       phutil_tag(
         'a',
diff --git a/webroot/rsrc/css/application/base/notification-menu.css b/webroot/rsrc/css/application/base/notification-menu.css
index fe3f77ad62..ffe636186d 100644
--- a/webroot/rsrc/css/application/base/notification-menu.css
+++ b/webroot/rsrc/css/application/base/notification-menu.css
@@ -74,6 +74,15 @@
   border-bottom: 1px solid #e9e9e9;
 }
 
+.phabricator-notification-header a {
+  color: {$darkgreytext};
+}
+
+.phabricator-notification-header .phabricator-notification-clear-all {
+  color: #18559D;
+  float: right;
+}
+
 .phabricator-notification-view-all {
   text-align: center;
   font-weight: bold;