diff --git a/resources/celerity/map.php b/resources/celerity/map.php --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -9,7 +9,7 @@ 'names' => array( 'conpherence.pkg.css' => '3c8a0668', 'conpherence.pkg.js' => '020aebcf', - 'core.pkg.css' => 'ad8fc332', + 'core.pkg.css' => '6d9a0ba6', 'core.pkg.js' => '705aec2c', 'differential.pkg.css' => '607c84be', 'differential.pkg.js' => '1b97518d', @@ -176,7 +176,7 @@ 'rsrc/css/phui/phui-status.css' => 'e5ff8be0', 'rsrc/css/phui/phui-tag-view.css' => '8519160a', 'rsrc/css/phui/phui-timeline-view.css' => '1e348e4b', - 'rsrc/css/phui/phui-two-column-view.css' => '0a876b9e', + 'rsrc/css/phui/phui-two-column-view.css' => 'f96d319f', 'rsrc/css/phui/workboards/phui-workboard-color.css' => 'e86de308', 'rsrc/css/phui/workboards/phui-workboard.css' => '74fc9d98', 'rsrc/css/phui/workboards/phui-workcard.css' => '913441b6', @@ -873,7 +873,7 @@ 'phui-tag-view-css' => '8519160a', 'phui-theme-css' => '35883b37', 'phui-timeline-view-css' => '1e348e4b', - 'phui-two-column-view-css' => '0a876b9e', + 'phui-two-column-view-css' => 'f96d319f', 'phui-workboard-color-css' => 'e86de308', 'phui-workboard-view-css' => '74fc9d98', 'phui-workcard-view-css' => '913441b6', diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php --- a/src/__phutil_library_map__.php +++ b/src/__phutil_library_map__.php @@ -2037,6 +2037,7 @@ 'PHUIInfoView' => 'view/phui/PHUIInfoView.php', 'PHUIInvisibleCharacterTestCase' => 'view/phui/__tests__/PHUIInvisibleCharacterTestCase.php', 'PHUIInvisibleCharacterView' => 'view/phui/PHUIInvisibleCharacterView.php', + 'PHUILauncherView' => 'view/phui/PHUILauncherView.php', 'PHUILeftRightExample' => 'applications/uiexample/examples/PHUILeftRightExample.php', 'PHUILeftRightView' => 'view/phui/PHUILeftRightView.php', 'PHUIListExample' => 'applications/uiexample/examples/PHUIListExample.php', @@ -8236,6 +8237,7 @@ 'PHUIInfoView' => 'AphrontTagView', 'PHUIInvisibleCharacterTestCase' => 'PhabricatorTestCase', 'PHUIInvisibleCharacterView' => 'AphrontView', + 'PHUILauncherView' => 'AphrontTagView', 'PHUILeftRightExample' => 'PhabricatorUIExample', 'PHUILeftRightView' => 'AphrontTagView', 'PHUIListExample' => 'PhabricatorUIExample', 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 @@ -10,13 +10,15 @@ $viewer = $request->getViewer(); $menu = id(new PHUIObjectItemListView()) - ->setUser($viewer); + ->setUser($viewer) + ->setBig(true); $menu->addItem( id(new PHUIObjectItemView()) ->setHeader(pht('Devices')) ->setHref($this->getApplicationURI('device/')) ->setImageIcon('fa-server') + ->setClickable(true) ->addAttribute( pht( 'Create an inventory of physical and virtual hosts and '. @@ -27,6 +29,7 @@ ->setHeader(pht('Services')) ->setHref($this->getApplicationURI('service/')) ->setImageIcon('fa-plug') + ->setClickable(true) ->addAttribute( pht( 'Create and update services, and map them to interfaces on '. @@ -37,6 +40,7 @@ ->setHeader(pht('Networks')) ->setHref($this->getApplicationURI('network/')) ->setImageIcon('fa-globe') + ->setClickable(true) ->addAttribute( pht( 'Manage public and private networks.'))); @@ -46,6 +50,7 @@ ->setHeader(pht('Namespaces')) ->setHref($this->getApplicationURI('namespace/')) ->setImageIcon('fa-asterisk') + ->setClickable(true) ->addAttribute( pht('Control who can create new named services and devices.'))); @@ -57,6 +62,7 @@ ->setHeader(pht('Documentation')) ->setHref($docs_uri) ->setImageIcon('fa-book') + ->setClickable(true) ->addAttribute(pht('Browse documentation for Almanac.'))); $crumbs = $this->buildApplicationCrumbs(); @@ -64,17 +70,15 @@ $crumbs->setBorder(true); $box = id(new PHUIObjectBoxView()) + ->setHeaderText(pht('Almanac Console')) + ->setBackground(PHUIObjectBoxView::WHITE_CONFIG) ->setObjectList($menu); - $header = id(new PHUIHeaderView()) - ->setHeader(pht('Almanac Console')) - ->setHeaderIcon('fa-server'); + $launcher_view = id(new PHUILauncherView()) + ->appendChild($box); $view = id(new PHUITwoColumnView()) - ->setHeader($header) - ->setFooter(array( - $box, - )); + ->setFooter($launcher_view); return $this->newPage() ->setTitle(pht('Almanac Console')) diff --git a/src/applications/dashboard/controller/PhabricatorDashboardConsoleController.php b/src/applications/dashboard/controller/PhabricatorDashboardConsoleController.php --- a/src/applications/dashboard/controller/PhabricatorDashboardConsoleController.php +++ b/src/applications/dashboard/controller/PhabricatorDashboardConsoleController.php @@ -59,9 +59,11 @@ ->setBackground(PHUIObjectBoxView::WHITE_CONFIG) ->setObjectList($menu); + $launch_view = id(new PHUILauncherView()) + ->appendChild($box); + $view = id(new PHUITwoColumnView()) - ->setFixed(true) - ->setFooter($box); + ->setFooter($launch_view); return $this->newPage() ->setTitle($title) diff --git a/src/applications/diffusion/controller/DiffusionRepositoryEditController.php b/src/applications/diffusion/controller/DiffusionRepositoryEditController.php --- a/src/applications/diffusion/controller/DiffusionRepositoryEditController.php +++ b/src/applications/diffusion/controller/DiffusionRepositoryEditController.php @@ -78,14 +78,16 @@ ->addClass('diffusion-create-repo') ->appendChild($layout); - $view = id(new PHUITwoColumnView()) - ->setFixed(true) - ->setFooter( + $launcher_view = id(new PHUILauncherView()) + ->appendChild( array( $layout, $hints, )); + $view = id(new PHUITwoColumnView()) + ->setFooter($launcher_view); + return $this->newPage() ->setTitle($title) ->setCrumbs($crumbs) diff --git a/src/applications/drydock/controller/DrydockConsoleController.php b/src/applications/drydock/controller/DrydockConsoleController.php --- a/src/applications/drydock/controller/DrydockConsoleController.php +++ b/src/applications/drydock/controller/DrydockConsoleController.php @@ -76,9 +76,11 @@ ->setBackground(PHUIObjectBoxView::WHITE_CONFIG) ->setObjectList($menu); + $launcher_view = id(new PHUILauncherView()) + ->appendChild($box); + $view = id(new PHUITwoColumnView()) - ->setFixed(true) - ->setFooter($box); + ->setFooter($launcher_view); return $this->newPage() ->setTitle($title) diff --git a/src/view/phui/PHUILauncherView.php b/src/view/phui/PHUILauncherView.php new file mode 100644 --- /dev/null +++ b/src/view/phui/PHUILauncherView.php @@ -0,0 +1,20 @@ + implode(' ', $classes), + ); + } + +} diff --git a/webroot/rsrc/css/phui/phui-two-column-view.css b/webroot/rsrc/css/phui/phui-two-column-view.css --- a/webroot/rsrc/css/phui/phui-two-column-view.css +++ b/webroot/rsrc/css/phui/phui-two-column-view.css @@ -2,6 +2,11 @@ * @provides phui-two-column-view-css */ +.phui-launcher-view { + max-width: 1140px; + margin: 0 auto; +} + .phui-two-column-fixed { max-width: 1140px; margin: 0 auto;