diff --git a/resources/celerity/map.php b/resources/celerity/map.php index a3361d05f3..d80181cdbb 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -7,7 +7,7 @@ */ return array( 'names' => array( - 'core.pkg.css' => 'f1eab25d', + 'core.pkg.css' => 'e09f7a8c', 'core.pkg.js' => '65e04767', 'darkconsole.pkg.js' => '8ab24e01', 'differential.pkg.css' => '8af45893', @@ -137,7 +137,7 @@ return array( 'rsrc/css/phui/phui-info-panel.css' => '27ea50a1', 'rsrc/css/phui/phui-list.css' => '53deb25c', 'rsrc/css/phui/phui-object-box.css' => 'b8b7fd78', - 'rsrc/css/phui/phui-object-item-list-view.css' => '2670a4a9', + 'rsrc/css/phui/phui-object-item-list-view.css' => '97d117e1', 'rsrc/css/phui/phui-pinboard-view.css' => '3dd4a269', 'rsrc/css/phui/phui-property-list-view.css' => '51480060', 'rsrc/css/phui/phui-remarkup-preview.css' => '19ad512b', @@ -785,7 +785,7 @@ return array( 'phui-info-panel-css' => '27ea50a1', 'phui-list-view-css' => '53deb25c', 'phui-object-box-css' => 'b8b7fd78', - 'phui-object-item-list-view-css' => '2670a4a9', + 'phui-object-item-list-view-css' => '97d117e1', 'phui-pinboard-view-css' => '3dd4a269', 'phui-property-list-view-css' => '51480060', 'phui-remarkup-preview-css' => '19ad512b', diff --git a/src/applications/auth/controller/config/PhabricatorAuthListController.php b/src/applications/auth/controller/config/PhabricatorAuthListController.php index fcf8ec3556..6f3bc06832 100644 --- a/src/applications/auth/controller/config/PhabricatorAuthListController.php +++ b/src/applications/auth/controller/config/PhabricatorAuthListController.php @@ -12,6 +12,7 @@ final class PhabricatorAuthListController ->execute(); $list = new PHUIObjectItemListView(); + foreach ($configs as $config) { $item = new PHUIObjectItemView(); @@ -28,8 +29,7 @@ final class PhabricatorAuthListController $name = $config->getProviderType().' ('.$config->getProviderClass().')'; } - $item - ->setHeader($name); + $item->setHeader($name); if ($provider) { $item->setHref($edit_uri); @@ -52,7 +52,7 @@ final class PhabricatorAuthListController $can_manage = $this->hasApplicationCapability( AuthManageProvidersCapability::CAPABILITY); if ($config->getIsEnabled()) { - $item->setBarColor('green'); + $item->setState(PHUIObjectItemView::STATE_SUCCESS); $item->addAction( id(new PHUIListItemView()) ->setIcon('fa-times') @@ -60,7 +60,7 @@ final class PhabricatorAuthListController ->setDisabled(!$can_manage) ->addSigil('workflow')); } else { - $item->setBarColor('grey'); + $item->setState(PHUIObjectItemView::STATE_FAIL); $item->addIcon('fa-times grey', pht('Disabled')); $item->addAction( id(new PHUIListItemView()) @@ -90,7 +90,6 @@ final class PhabricatorAuthListController pht('Add Authentication Provider')))); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->setBorder(true); $crumbs->addTextCrumb(pht('Auth Providers')); $config_name = 'auth.email-domains'; @@ -108,7 +107,6 @@ final class PhabricatorAuthListController $email_domains = PhabricatorEnv::getEnvConfig($config_name); if ($email_domains) { $warning->setSeverity(PHUIErrorView::SEVERITY_NOTICE); - $warning->setTitle(pht('Registration is Restricted')); $warning->appendChild( pht( 'Only users with a verified email address at one of the %s domains '. @@ -117,7 +115,6 @@ final class PhabricatorAuthListController phutil_tag('strong', array(), implode(', ', $email_domains)))); } else { $warning->setSeverity(PHUIErrorView::SEVERITY_WARNING); - $warning->setTitle(pht('Anyone Can Register an Account')); $warning->appendChild( pht( 'Anyone who can browse to this Phabricator install will be able to '. @@ -126,10 +123,28 @@ final class PhabricatorAuthListController $config_link)); } + $image = id(new PHUIIconView()) + ->setIconFont('fa-plus'); + $button = id(new PHUIButtonView()) + ->setTag('a') + ->setColor(PHUIButtonView::SIMPLE) + ->setHref($this->getApplicationURI('config/new/')) + ->setIcon($image) + ->setText(pht('Add Provider')); + + $header = id(new PHUIHeaderView()) + ->setHeader(pht('Authentication Providers')) + ->addActionLink($button); + + $list->setFlush(true); + $list = id(new PHUIObjectBoxView()) + ->setHeader($header) + ->setErrorView($warning) + ->appendChild($list); + return $this->buildApplicationPage( array( $crumbs, - $warning, $list, ), array( diff --git a/src/applications/auth/controller/config/PhabricatorAuthProviderConfigController.php b/src/applications/auth/controller/config/PhabricatorAuthProviderConfigController.php index 848d99cf76..db9ec06799 100644 --- a/src/applications/auth/controller/config/PhabricatorAuthProviderConfigController.php +++ b/src/applications/auth/controller/config/PhabricatorAuthProviderConfigController.php @@ -25,12 +25,6 @@ abstract class PhabricatorAuthProviderConfigController $can_create = $this->hasApplicationCapability( AuthManageProvidersCapability::CAPABILITY); - $crumbs->addAction( - id(new PHUIListItemView()) - ->setName(pht('Add Authentication Provider')) - ->setHref($this->getApplicationURI('/config/new/')) - ->setDisabled(!$can_create) - ->setIcon('fa-plus-square')); return $crumbs; } 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 13a312fb4d..705e9f9caf 100644 --- a/webroot/rsrc/css/phui/phui-object-item-list-view.css +++ b/webroot/rsrc/css/phui/phui-object-item-list-view.css @@ -19,6 +19,10 @@ ul.phui-object-item-list-view { padding: 0; } +.phui-object-box .phui-object-list-flush .phui-object-item { + margin: 0; +} + .device-phone .phui-object-box .phui-object-item-list-view.phui-object-list-flush { padding: 4px;