Page MenuHomePhabricator
Files F14843993

D20863.id49737.diff
No OneTemporary
Actions

D20863.id49737.diff
View Options

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' => '88366522',
+ 'core.pkg.css' => '686ae87c',
'core.pkg.js' => '6e5c894f',
'differential.pkg.css' => '607c84be',
'differential.pkg.js' => 'a0212a0b',
@@ -36,7 +36,7 @@
'rsrc/css/aphront/typeahead-browse.css' => 'b7ed02d2',
'rsrc/css/aphront/typeahead.css' => '8779483d',
'rsrc/css/application/almanac/almanac.css' => '2e050f4f',
- 'rsrc/css/application/auth/auth.css' => 'add92fd8',
+ 'rsrc/css/application/auth/auth.css' => 'c2f23d74',
'rsrc/css/application/base/main-menu-view.css' => '17b71bbc',
'rsrc/css/application/base/notification-menu.css' => '4df1ee30',
'rsrc/css/application/base/phui-theme.css' => '35883b37',
@@ -540,7 +540,7 @@
'aphront-tooltip-css' => 'e3f2412f',
'aphront-typeahead-control-css' => '8779483d',
'application-search-view-css' => '0f7c06d8',
- 'auth-css' => 'add92fd8',
+ 'auth-css' => 'c2f23d74',
'bulk-job-css' => '73af99f5',
'conduit-api-css' => 'ce2cfc41',
'config-options-css' => '16c920ae',
diff --git a/src/applications/auth/controller/PhabricatorAuthController.php b/src/applications/auth/controller/PhabricatorAuthController.php
--- a/src/applications/auth/controller/PhabricatorAuthController.php
+++ b/src/applications/auth/controller/PhabricatorAuthController.php
@@ -286,4 +286,26 @@
->appendChild($invite_list);
}
+
+ final protected function newCustomStartMessage() {
+ $viewer = $this->getViewer();
+
+ $text = PhabricatorAuthMessage::loadMessageText(
+ $viewer,
+ PhabricatorAuthLoginMessageType::MESSAGEKEY);
+
+ if (!strlen($text)) {
+ return null;
+ }
+
+ $remarkup_view = new PHUIRemarkupView($viewer, $text);
+
+ return phutil_tag(
+ 'div',
+ array(
+ 'class' => 'auth-custom-message',
+ ),
+ $remarkup_view);
+ }
+
}
diff --git a/src/applications/auth/controller/PhabricatorAuthLoginController.php b/src/applications/auth/controller/PhabricatorAuthLoginController.php
--- a/src/applications/auth/controller/PhabricatorAuthLoginController.php
+++ b/src/applications/auth/controller/PhabricatorAuthLoginController.php
@@ -238,18 +238,24 @@
$content) {
$crumbs = $this->buildApplicationCrumbs();
+ $viewer = $this->getViewer();
- if ($this->getRequest()->getUser()->isLoggedIn()) {
+ if ($viewer->isLoggedIn()) {
$crumbs->addTextCrumb(pht('Link Account'), $provider->getSettingsURI());
} else {
- $crumbs->addTextCrumb(pht('Log In'), $this->getApplicationURI('start/'));
+ $crumbs->addTextCrumb(pht('Login'), $this->getApplicationURI('start/'));
+
+ $content = array(
+ $this->newCustomStartMessage(),
+ $content,
+ );
}
$crumbs->addTextCrumb($provider->getProviderName());
$crumbs->setBorder(true);
return $this->newPage()
- ->setTitle(pht('Log In'))
+ ->setTitle(pht('Login'))
->setCrumbs($crumbs)
->appendChild($content);
}
diff --git a/src/applications/auth/controller/PhabricatorAuthStartController.php b/src/applications/auth/controller/PhabricatorAuthStartController.php
--- a/src/applications/auth/controller/PhabricatorAuthStartController.php
+++ b/src/applications/auth/controller/PhabricatorAuthStartController.php
@@ -298,27 +298,6 @@
->setURI($auto_uri);
}
- private function newCustomStartMessage() {
- $viewer = $this->getViewer();
-
- $text = PhabricatorAuthMessage::loadMessageText(
- $viewer,
- PhabricatorAuthLoginMessageType::MESSAGEKEY);
-
- if (!strlen($text)) {
- return null;
- }
-
- $remarkup_view = new PHUIRemarkupView($viewer, $text);
-
- return phutil_tag(
- 'div',
- array(
- 'class' => 'auth-custom-message',
- ),
- $remarkup_view);
- }
-
private function newEmailLoginView(array $configs) {
assert_instances_of($configs, 'PhabricatorAuthProviderConfig');
diff --git a/webroot/rsrc/css/application/auth/auth.css b/webroot/rsrc/css/application/auth/auth.css
--- a/webroot/rsrc/css/application/auth/auth.css
+++ b/webroot/rsrc/css/application/auth/auth.css
@@ -57,7 +57,7 @@
}
.auth-custom-message {
- margin: 32px auto 64px;
+ margin: 32px auto 48px;
max-width: 548px;
background: #fff;
padding: 16px;

File Metadata

Mime Type
text/plain
Expires
Mon, Feb 3, 11:57 AM (5 h, 2 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7086885
Default Alt Text
D20863.id49737.diff (4 KB)

Event Timeline

Phabricator · Built by Phacility