diff --git a/resources/celerity/map.php b/resources/celerity/map.php index 67e860351a..d1a1c93dea 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -7,7 +7,7 @@ return array( 'names' => array( - 'core.pkg.css' => '76a5c45b', + 'core.pkg.css' => '69c32d07', 'core.pkg.js' => 'c907bd96', 'darkconsole.pkg.js' => 'ca8671ce', 'differential.pkg.css' => '5a65a762', @@ -15,7 +15,7 @@ return array( 'diffusion.pkg.css' => '3783278d', 'diffusion.pkg.js' => '7b51e80a', 'javelin.pkg.js' => '4dda9183', - 'maniphest.pkg.css' => '1f0780dc', + 'maniphest.pkg.css' => '6944ad50', 'maniphest.pkg.js' => '1e8f11af', 'rsrc/css/aphront/aphront-bars.css' => '231ac33c', 'rsrc/css/aphront/aphront-notes.css' => '6acadd3f', @@ -29,7 +29,7 @@ return array( 'rsrc/css/aphront/multi-column.css' => '05bbd016', 'rsrc/css/aphront/notification.css' => '6901121e', 'rsrc/css/aphront/pager-view.css' => '2e3539af', - 'rsrc/css/aphront/panel-view.css' => '35c2458b', + 'rsrc/css/aphront/panel-view.css' => '5846dfa2', 'rsrc/css/aphront/phabricator-nav-view.css' => 'd0d4a509', 'rsrc/css/aphront/request-failure-view.css' => 'da14df31', 'rsrc/css/aphront/table-view.css' => '92a719ca', @@ -77,7 +77,7 @@ return array( 'rsrc/css/application/maniphest/batch-editor.css' => '78444bc1', 'rsrc/css/application/maniphest/report.css' => '6fc16517', 'rsrc/css/application/maniphest/task-edit.css' => '8e23031b', - 'rsrc/css/application/maniphest/task-summary.css' => 'adb7495a', + 'rsrc/css/application/maniphest/task-summary.css' => '0cabd9a6', 'rsrc/css/application/objectselector/object-selector.css' => '029a133d', 'rsrc/css/application/owners/owners-path-editor.css' => '2f00933b', 'rsrc/css/application/paste/paste.css' => 'aa1767d1', @@ -136,7 +136,7 @@ return array( 'rsrc/css/phui/phui-info-panel.css' => '27ea50a1', 'rsrc/css/phui/phui-list.css' => '2edb76cf', 'rsrc/css/phui/phui-object-box.css' => '4f916b80', - 'rsrc/css/phui/phui-object-item-list-view.css' => 'e8192ada', + 'rsrc/css/phui/phui-object-item-list-view.css' => 'c177f587', 'rsrc/css/phui/phui-pinboard-view.css' => '53c5fca0', 'rsrc/css/phui/phui-property-list-view.css' => 'dbf53b12', 'rsrc/css/phui/phui-remarkup-preview.css' => '19ad512b', @@ -482,7 +482,7 @@ return array( 'aphront-multi-column-view-css' => '05bbd016', 'aphront-notes' => '6acadd3f', 'aphront-pager-view-css' => '2e3539af', - 'aphront-panel-view-css' => '35c2458b', + 'aphront-panel-view-css' => '5846dfa2', 'aphront-request-failure-view-css' => 'da14df31', 'aphront-table-view-css' => '92a719ca', 'aphront-tokenizer-control-css' => 'd888465e', @@ -659,7 +659,7 @@ return array( 'maniphest-batch-editor' => '78444bc1', 'maniphest-report-css' => '6fc16517', 'maniphest-task-edit-css' => '8e23031b', - 'maniphest-task-summary-css' => 'adb7495a', + 'maniphest-task-summary-css' => '0cabd9a6', 'multirow-row-manager' => 'e7076916', 'owners-path-editor' => '46efd18e', 'owners-path-editor-css' => '2f00933b', @@ -743,7 +743,7 @@ return array( 'phui-info-panel-css' => '27ea50a1', 'phui-list-view-css' => '2edb76cf', 'phui-object-box-css' => '4f916b80', - 'phui-object-item-list-view-css' => 'e8192ada', + 'phui-object-item-list-view-css' => 'c177f587', 'phui-pinboard-view-css' => '53c5fca0', 'phui-property-list-view-css' => 'dbf53b12', 'phui-remarkup-preview-css' => '19ad512b', diff --git a/src/applications/directory/controller/PhabricatorDirectoryMainController.php b/src/applications/directory/controller/PhabricatorDirectoryMainController.php index 672d6f0c41..8b59c6c928 100644 --- a/src/applications/directory/controller/PhabricatorDirectoryMainController.php +++ b/src/applications/directory/controller/PhabricatorDirectoryMainController.php @@ -128,18 +128,10 @@ final class PhabricatorDirectoryMainController 'Nothing appears to be critically broken right now.'); } + $href = '/maniphest/?statuses[]=0&priorities[]='.$unbreak_now.'#R'; + $title = pht('Unbreak Now!'); $panel = new AphrontPanelView(); - $panel->setHeader('Unbreak Now!'); - $panel->setCaption('Open tasks with "Unbreak Now!" priority.'); - $panel->addButton( - phutil_tag( - 'a', - array( - 'href' => '/maniphest/?statuses[]=0&priorities[]='.$unbreak_now.'#R', - 'class' => 'grey button', - ), - "View All Unbreak Now \xC2\xBB")); - + $panel->setHeader($this->renderSectionHeader($title, $href)); $panel->appendChild($this->buildTaskListView($tasks)); $panel->setNoBackground(); @@ -180,21 +172,11 @@ final class PhabricatorDirectoryMainController 'need triage.')); } + $title = pht('Needs Triage'); + $href = '/maniphest/?statuses[]=0&priorities[]='.$needs_triage. + '&userProjects[]='.$user->getPHID().'#R'; $panel = new AphrontPanelView(); - $panel->setHeader('Needs Triage'); - $panel->setCaption(hsprintf( - 'Open tasks with "Needs Triage" priority in '. - 'projects you are a member of.')); - - $panel->addButton( - phutil_tag( - 'a', - array( - 'href' => '/maniphest/?statuses[]=0&priorities[]='.$needs_triage. - '&userProjects[]='.$user->getPHID().'#R', - 'class' => 'grey button', - ), - "View All Triage \xC2\xBB")); + $panel->setHeader($this->renderSectionHeader($title, $href)); $panel->appendChild($this->buildTaskListView($tasks)); $panel->setNoBackground(); @@ -223,18 +205,10 @@ final class PhabricatorDirectoryMainController 'No revisions are waiting on you.'); } + $title = pht('Revisions Waiting on You'); + $href = '/differential'; $panel = new AphrontPanelView(); - $panel->setHeader('Revisions Waiting on You'); - $panel->setCaption('Revisions waiting for you for review or commit.'); - - $panel->addButton( - phutil_tag( - 'a', - array( - 'href' => '/differential/', - 'class' => 'button grey', - ), - "View Active Revisions \xC2\xBB")); + $panel->setHeader($this->renderSectionHeader($title, $href)); $revision_view = id(new DifferentialRevisionListView()) ->setHighlightAge(true) @@ -288,17 +262,10 @@ final class PhabricatorDirectoryMainController 'You have no assigned tasks.'); } + $title = pht('Assigned Tasks'); + $href = '/maniphest'; $panel = new AphrontPanelView(); - $panel->setHeader('Assigned Tasks'); - - $panel->addButton( - phutil_tag( - 'a', - array( - 'href' => '/maniphest/', - 'class' => 'button grey', - ), - "View Active Tasks \xC2\xBB")); + $panel->setHeader($this->renderSectionHeader($title, $href)); $panel->appendChild($this->buildTaskListView($tasks)); $panel->setNoBackground(); @@ -390,6 +357,16 @@ final class PhabricatorDirectoryMainController return $container; } + private function renderSectionHeader($title, $href) { + $header = phutil_tag( + 'a', + array( + 'href' => $href, + ), + $title); + return $header; + } + private function renderMiniPanel($title, $body) { $panel = new AphrontMiniPanelView(); $panel->appendChild( @@ -435,18 +412,11 @@ final class PhabricatorDirectoryMainController $handles = $this->loadViewerHandles($phids); $view->setHandles($handles); + $title = pht('Audits'); + $href = '/audit/'; $panel = new AphrontPanelView(); - $panel->setHeader('Audits'); - $panel->setCaption('Commits awaiting your audit.'); + $panel->setHeader($this->renderSectionHeader($title, $href)); $panel->appendChild($view); - $panel->addButton( - phutil_tag( - 'a', - array( - 'href' => '/audit/', - 'class' => 'button grey', - ), - "View Active Audits \xC2\xBB")); $panel->setNoBackground(); return $panel; @@ -480,18 +450,11 @@ final class PhabricatorDirectoryMainController $handles = $this->loadViewerHandles($phids); $view->setHandles($handles); + $title = pht('Problem Commits'); + $href = '/audit/'; $panel = new AphrontPanelView(); - $panel->setHeader('Problem Commits'); - $panel->setCaption('Commits which auditors have raised concerns about.'); + $panel->setHeader($this->renderSectionHeader($title, $href)); $panel->appendChild($view); - $panel->addButton( - phutil_tag( - 'a', - array( - 'href' => '/audit/', - 'class' => 'button grey', - ), - "View Problem Commits \xC2\xBB")); $panel->setNoBackground(); return $panel; diff --git a/webroot/rsrc/css/aphront/panel-view.css b/webroot/rsrc/css/aphront/panel-view.css index 76b2e23512..987751fbd7 100644 --- a/webroot/rsrc/css/aphront/panel-view.css +++ b/webroot/rsrc/css/aphront/panel-view.css @@ -8,7 +8,7 @@ border: 1px solid #c0c0c0; border-width: 1px 0 0; padding: 8px 16px; - margin: 20px 16px 40px 16px; + margin: 20px 16px 32px 16px; } .device-phone .aphront-panel-view { @@ -32,20 +32,29 @@ .aphront-panel-view h1 { font-size: 16px; font-weight: bold; - color: {$darkgreytext}; + color: {$darkbluetext}; text-shadow: 0 1px 1px #fff; padding: 4px 0 0 0; } +.aphront-panel-view h1 a { + color: {$darkbluetext}; + text-decoration: none; +} + +.aphront-panel-view h1 a:hover { + text-decoration: underline; +} + .aphront-panel-plain h1 { - padding: 0 0 4px 0; + padding: 0; } .aphront-panel-view-caption { font-size: 11px; color: {$greytext}; - margin-top: -0.1em; - margin-bottom: 0.75em; + margin-top: 4px; + margin-bottom: 4px; } .aphront-panel-view-buttons { @@ -113,7 +122,7 @@ .aphront-mini-panel-view { background: #fff; padding: 10px; - margin: 5px 20px; + margin: 4px 16px; border: 1px solid {$lightgreyborder}; border-bottom: 1px solid {$greyborder}; } diff --git a/webroot/rsrc/css/application/maniphest/task-summary.css b/webroot/rsrc/css/application/maniphest/task-summary.css index 5f984cae26..8b6b57942b 100644 --- a/webroot/rsrc/css/application/maniphest/task-summary.css +++ b/webroot/rsrc/css/application/maniphest/task-summary.css @@ -3,7 +3,7 @@ */ .maniphest-task-group { - padding-bottom: 30px; + padding-bottom: 24px; } .maniphest-batch-selected td { @@ -75,9 +75,9 @@ } .maniphest-list-container { - padding: 20px; + padding: 16px; } .device-phone .maniphest-list-container { - padding: 20px 5px; + padding: 20px 4px; } diff --git a/webroot/rsrc/css/phui/phui-object-item-list-view.css b/webroot/rsrc/css/phui/phui-object-item-list-view.css index 9f35c024fc..ec85acd8b8 100644 --- a/webroot/rsrc/css/phui/phui-object-item-list-view.css +++ b/webroot/rsrc/css/phui/phui-object-item-list-view.css @@ -7,7 +7,7 @@ } .device-desktop .phui-object-item-list-view { - padding: 20px; + padding: 16px; } .phui-object-item-list-view + .phui-object-item-list-view {