From e34aa8add7f82cd91677ecce54425eec52cac8ab Mon Sep 17 00:00:00 2001 From: Anh Nhan Nguyen Date: Mon, 1 Apr 2013 08:33:14 -0700 Subject: [PATCH] Switched Main Directory Jump Panel to a Jump List Filter Summary: Sorry, I'm bad with puns {F38258} vs {F38259} It was a tough decision. We went with the latter. See chatlog today. Test Plan: See screens Reviewers: epriestley, chad, btrahan Reviewed By: epriestley CC: aran, Korvin Differential Revision: https://secure.phabricator.com/D5522 --- src/__celerity_resource_map__.php | 78 +++++++++---------- .../PhabricatorDirectoryMainController.php | 32 ++++---- .../directory/phabricator-jump-nav.css | 10 +++ 3 files changed, 68 insertions(+), 52 deletions(-) diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php index cd93faf4cb..a5b626d2de 100644 --- a/src/__celerity_resource_map__.php +++ b/src/__celerity_resource_map__.php @@ -2975,7 +2975,7 @@ celerity_register_resource_map(array( ), 'phabricator-jump-nav' => array( - 'uri' => '/res/a5927be8/rsrc/css/application/directory/phabricator-jump-nav.css', + 'uri' => '/res/b33dd475/rsrc/css/application/directory/phabricator-jump-nav.css', 'type' => 'css', 'requires' => array( @@ -3805,7 +3805,7 @@ celerity_register_resource_map(array( ), array( 'packages' => array( - '341e7351' => + '2cc08fc4' => array( 'name' => 'core.pkg.css', 'symbols' => @@ -3847,7 +3847,7 @@ celerity_register_resource_map(array( 34 => 'phabricator-object-item-list-view-css', 35 => 'global-drag-and-drop-css', ), - 'uri' => '/res/pkg/341e7351/core.pkg.css', + 'uri' => '/res/pkg/2cc08fc4/core.pkg.css', 'type' => 'css', ), 'def4c982' => @@ -4038,16 +4038,16 @@ celerity_register_resource_map(array( 'reverse' => array( 'aphront-attached-file-view-css' => '6b1fccc6', - 'aphront-dialog-view-css' => '341e7351', - 'aphront-error-view-css' => '341e7351', - 'aphront-form-view-css' => '341e7351', - 'aphront-list-filter-view-css' => '341e7351', - 'aphront-pager-view-css' => '341e7351', - 'aphront-panel-view-css' => '341e7351', - 'aphront-table-view-css' => '341e7351', - 'aphront-tokenizer-control-css' => '341e7351', - 'aphront-tooltip-css' => '341e7351', - 'aphront-typeahead-control-css' => '341e7351', + 'aphront-dialog-view-css' => '2cc08fc4', + 'aphront-error-view-css' => '2cc08fc4', + 'aphront-form-view-css' => '2cc08fc4', + 'aphront-list-filter-view-css' => '2cc08fc4', + 'aphront-pager-view-css' => '2cc08fc4', + 'aphront-panel-view-css' => '2cc08fc4', + 'aphront-table-view-css' => '2cc08fc4', + 'aphront-tokenizer-control-css' => '2cc08fc4', + 'aphront-tooltip-css' => '2cc08fc4', + 'aphront-typeahead-control-css' => '2cc08fc4', 'differential-changeset-view-css' => '8aaacd1b', 'differential-core-view-css' => '8aaacd1b', 'differential-inline-comment-editor' => '67ea27d0', @@ -4061,7 +4061,7 @@ celerity_register_resource_map(array( 'differential-table-of-contents-css' => '8aaacd1b', 'diffusion-commit-view-css' => 'c8ce2d88', 'diffusion-icons-css' => 'c8ce2d88', - 'global-drag-and-drop-css' => '341e7351', + 'global-drag-and-drop-css' => '2cc08fc4', 'inline-comment-summary-css' => '8aaacd1b', 'javelin-aphlict' => 'def4c982', 'javelin-behavior' => 'fe22443b', @@ -4133,48 +4133,48 @@ celerity_register_resource_map(array( 'javelin-util' => 'fe22443b', 'javelin-vector' => 'fe22443b', 'javelin-workflow' => 'fe22443b', - 'lightbox-attachment-css' => '341e7351', + 'lightbox-attachment-css' => '2cc08fc4', 'maniphest-task-summary-css' => '6b1fccc6', 'maniphest-transaction-detail-css' => '6b1fccc6', 'phabricator-busy' => 'def4c982', 'phabricator-content-source-view-css' => '8aaacd1b', - 'phabricator-core-buttons-css' => '341e7351', - 'phabricator-core-css' => '341e7351', - 'phabricator-crumbs-view-css' => '341e7351', - 'phabricator-directory-css' => '341e7351', + 'phabricator-core-buttons-css' => '2cc08fc4', + 'phabricator-core-css' => '2cc08fc4', + 'phabricator-crumbs-view-css' => '2cc08fc4', + 'phabricator-directory-css' => '2cc08fc4', 'phabricator-drag-and-drop-file-upload' => '67ea27d0', 'phabricator-dropdown-menu' => 'def4c982', 'phabricator-file-upload' => 'def4c982', - 'phabricator-filetree-view-css' => '341e7351', - 'phabricator-flag-css' => '341e7351', - 'phabricator-form-view-css' => '341e7351', - 'phabricator-header-view-css' => '341e7351', - 'phabricator-jump-nav' => '341e7351', + 'phabricator-filetree-view-css' => '2cc08fc4', + 'phabricator-flag-css' => '2cc08fc4', + 'phabricator-form-view-css' => '2cc08fc4', + 'phabricator-header-view-css' => '2cc08fc4', + 'phabricator-jump-nav' => '2cc08fc4', 'phabricator-keyboard-shortcut' => 'def4c982', 'phabricator-keyboard-shortcut-manager' => 'def4c982', - 'phabricator-main-menu-view' => '341e7351', + 'phabricator-main-menu-view' => '2cc08fc4', 'phabricator-menu-item' => 'def4c982', - 'phabricator-nav-view-css' => '341e7351', + 'phabricator-nav-view-css' => '2cc08fc4', 'phabricator-notification' => 'def4c982', - 'phabricator-notification-css' => '341e7351', - 'phabricator-notification-menu-css' => '341e7351', - 'phabricator-object-item-list-view-css' => '341e7351', + 'phabricator-notification-css' => '2cc08fc4', + 'phabricator-notification-menu-css' => '2cc08fc4', + 'phabricator-object-item-list-view-css' => '2cc08fc4', 'phabricator-object-selector-css' => '8aaacd1b', 'phabricator-paste-file-upload' => 'def4c982', 'phabricator-prefab' => 'def4c982', 'phabricator-project-tag-css' => '6b1fccc6', - 'phabricator-remarkup-css' => '341e7351', + 'phabricator-remarkup-css' => '2cc08fc4', 'phabricator-shaped-request' => '67ea27d0', - 'phabricator-side-menu-view-css' => '341e7351', - 'phabricator-standard-page-view' => '341e7351', + 'phabricator-side-menu-view-css' => '2cc08fc4', + 'phabricator-standard-page-view' => '2cc08fc4', 'phabricator-textareautils' => 'def4c982', 'phabricator-tooltip' => 'def4c982', - 'phabricator-transaction-view-css' => '341e7351', - 'phabricator-zindex-css' => '341e7351', - 'sprite-apps-large-css' => '341e7351', - 'sprite-gradient-css' => '341e7351', - 'sprite-icon-css' => '341e7351', - 'sprite-menu-css' => '341e7351', - 'syntax-highlighting-css' => '341e7351', + 'phabricator-transaction-view-css' => '2cc08fc4', + 'phabricator-zindex-css' => '2cc08fc4', + 'sprite-apps-large-css' => '2cc08fc4', + 'sprite-gradient-css' => '2cc08fc4', + 'sprite-icon-css' => '2cc08fc4', + 'sprite-menu-css' => '2cc08fc4', + 'syntax-highlighting-css' => '2cc08fc4', ), )); diff --git a/src/applications/directory/controller/PhabricatorDirectoryMainController.php b/src/applications/directory/controller/PhabricatorDirectoryMainController.php index 52c347f56c..c219b70f04 100644 --- a/src/applications/directory/controller/PhabricatorDirectoryMainController.php +++ b/src/applications/directory/controller/PhabricatorDirectoryMainController.php @@ -338,22 +338,28 @@ final class PhabricatorDirectoryMainController 'it. See %s or type help.', $doc_link)); + $form = phabricator_form( + $user, + array( + 'action' => '/jump/', + 'method' => 'POST', + 'class' => 'phabricator-jump-nav-form', + ), + array( + $jump_input, + $jump_caption, + )); + $panel = new AphrontPanelView(); $panel->setHeader('Jump Nav'); - $panel->appendChild( - phabricator_form( - $user, - array( - 'action' => '/jump/', - 'method' => 'POST', - 'class' => 'phabricator-jump-nav-form', - ), - array( - $jump_input, - $jump_caption, - ))); + $panel->setNoBackground(); + // $panel->appendChild(); - return $panel; + $list_filter = new AphrontListFilterView(); + $list_filter->appendChild(phutil_tag('h1', array(), 'Jump Nav')); + $list_filter->appendChild($form); + + return $list_filter; } private function renderMiniPanel($title, $body) { diff --git a/webroot/rsrc/css/application/directory/phabricator-jump-nav.css b/webroot/rsrc/css/application/directory/phabricator-jump-nav.css index 44379b7f79..383aa28c0d 100644 --- a/webroot/rsrc/css/application/directory/phabricator-jump-nav.css +++ b/webroot/rsrc/css/application/directory/phabricator-jump-nav.css @@ -24,3 +24,13 @@ color: #666666; text-align: left; } + +.aphront-list-filter-view-controls { + padding: 20px; +} + +.aphront-list-filter-view-controls h1 { + color: #555; + padding-top: 4px; + margin-bottom: 0.67em; +}