diff --git a/resources/celerity/map.php b/resources/celerity/map.php --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -122,7 +122,7 @@ 'rsrc/css/phui/calendar/phui-calendar.css' => '8675968e', 'rsrc/css/phui/phui-action-header-view.css' => '89c497e7', 'rsrc/css/phui/phui-action-list.css' => '9ee9910a', - 'rsrc/css/phui/phui-action-panel.css' => '43989d50', + 'rsrc/css/phui/phui-action-panel.css' => '7822da1a', 'rsrc/css/phui/phui-box.css' => '7b3a2eed', 'rsrc/css/phui/phui-button.css' => '008ba5e2', 'rsrc/css/phui/phui-crumbs-view.css' => '594d719e', @@ -766,7 +766,7 @@ 'phrequent-css' => 'ffc185ad', 'phriction-document-css' => '7d7f0071', 'phui-action-header-view-css' => '89c497e7', - 'phui-action-panel-css' => '43989d50', + 'phui-action-panel-css' => '7822da1a', 'phui-box-css' => '7b3a2eed', 'phui-button-css' => '008ba5e2', 'phui-calendar-css' => '8675968e', diff --git a/src/applications/almanac/controller/AlmanacConsoleController.php b/src/applications/almanac/controller/AlmanacConsoleController.php --- a/src/applications/almanac/controller/AlmanacConsoleController.php +++ b/src/applications/almanac/controller/AlmanacConsoleController.php @@ -9,48 +9,46 @@ public function handleRequest(AphrontRequest $request) { $viewer = $request->getViewer(); - $menu = id(new PHUIObjectItemListView()) - ->setUser($viewer) - ->setStackable(true); - - $menu->addItem( - id(new PHUIObjectItemView()) - ->setHeader(pht('Services')) - ->setHref($this->getApplicationURI('service/')) - ->setFontIcon('fa-plug') - ->addAttribute( - pht( - 'Manage Almanac services.'))); - - $menu->addItem( - id(new PHUIObjectItemView()) - ->setHeader(pht('Devices')) - ->setHref($this->getApplicationURI('device/')) - ->setFontIcon('fa-server') - ->addAttribute( - pht( - 'Manage Almanac devices.'))); - - $menu->addItem( - id(new PHUIObjectItemView()) - ->setHeader(pht('Networks')) - ->setHref($this->getApplicationURI('network/')) - ->setFontIcon('fa-globe') - ->addAttribute( - pht( - 'Manage Almanac networks.'))); + $view = id(new AphrontMultiColumnView()) + ->setFluidLayout(true) + ->setBorder(true); + + $panel1 = id(new PHUIActionPanelView()) + ->setFontIcon('fa-plug') + ->setHeader(pht('Services')) + ->setHref($this->getApplicationURI('service/')) + ->setSubHeader(pht('Manage Almanac Services.')); + $view->addColumn($panel1); + + $panel2 = id(new PHUIActionPanelView()) + ->setFontIcon('fa-server') + ->setHeader(pht('Devices')) + ->setHref($this->getApplicationURI('device/')) + ->setSubHeader(pht('Manage Almanac devices.')); + $view->addColumn($panel2); + + $panel3 = id(new PHUIActionPanelView()) + ->setFontIcon('fa-globe') + ->setHeader(pht('Networks')) + ->setHref($this->getApplicationURI('network/')) + ->setSubHeader(pht('Manage Almanac networks.')); + $view->addColumn($panel3); + + $panel4 = id(new PHUIActionPanelView()) + ->setFontIcon('fa-book') + ->setHeader(pht('Documentation')) + ->setHref(PhabricatorEnv::getDoclink('Almanac User Guide')) + ->setSubHeader(pht('Learn more about administrating Almanac')); + $view->addColumn($panel4); + $view = phutil_tag_div('mlr mll mlb', $view); $crumbs = $this->buildApplicationCrumbs(); $crumbs->addTextCrumb(pht('Console')); - $box = id(new PHUIObjectBoxView()) - ->setHeaderText('Console') - ->appendChild($menu); - return $this->buildApplicationPage( array( $crumbs, - $box, + $view, ), array( 'title' => pht('Almanac Console'), diff --git a/src/view/phui/PHUIActionPanelView.php b/src/view/phui/PHUIActionPanelView.php --- a/src/view/phui/PHUIActionPanelView.php +++ b/src/view/phui/PHUIActionPanelView.php @@ -73,6 +73,7 @@ $classes = array(); $classes[] = 'phui-action-panel'; if ($this->state) { + $classes[] = 'phui-action-panel-has-state'; $classes[] = $this->state; } diff --git a/webroot/rsrc/css/phui/phui-action-panel.css b/webroot/rsrc/css/phui/phui-action-panel.css --- a/webroot/rsrc/css/phui/phui-action-panel.css +++ b/webroot/rsrc/css/phui/phui-action-panel.css @@ -4,6 +4,9 @@ .phui-action-panel { position: relative; +} + +.phui-action-panel.phui-action-panel-has-state { padding-bottom: 44px; }