diff --git a/src/applications/auth/provider/PhabricatorAuthProviderPassword.php b/src/applications/auth/provider/PhabricatorAuthProviderPassword.php index 8bafadba47..489e1cf0d5 100644 --- a/src/applications/auth/provider/PhabricatorAuthProviderPassword.php +++ b/src/applications/auth/provider/PhabricatorAuthProviderPassword.php @@ -77,13 +77,10 @@ final class PhabricatorAuthProviderPassword pht('Register New Account')); } - $dialog->addFooter(phutil_tag('br')); - $dialog->addFooter(pht('Welcome to the new Blender developer website! Accounts from projects.blender.org have been preserved, with one exception: if you had multiple accounts using the same e-mail address, they will now be merged into one account.')); - $dialog->addFooter(phutil_tag('br')); - $dialog->addFooter(phutil_tag('br')); - $dialog->addFooter(pht('TODO: add a way to show the right account name if the wrong one is entered.')); - $dialog->addFooter(phutil_tag('br')); - $dialog->addFooter(phutil_tag('br')); + $webroot = dirname(phutil_get_library_root('phabricator')).'/webroot/'; + $dialog->addFooter( + phutil_safe_html( + FileSystem::readFile($webroot .'rsrc/custom/static/login.html'))); $dialog->addFooter( phutil_tag( diff --git a/webroot/rsrc/custom/static/login.html b/webroot/rsrc/custom/static/login.html new file mode 100644 index 0000000000..96d41326cd --- /dev/null +++ b/webroot/rsrc/custom/static/login.html @@ -0,0 +1,2 @@ +

Welcome to the new Blender developer website! Accounts from projects.blender.org have been preserved, with one exception: if you had multiple accounts using the same e-mail address, they will now be merged into one account.

+

TODO: add a way to show the right account name if the wrong one is entered.'

diff --git a/webroot/rsrc/custom/static/welcome.html b/webroot/rsrc/custom/static/welcome.html new file mode 100644 index 0000000000..15072f9d33 --- /dev/null +++ b/webroot/rsrc/custom/static/welcome.html @@ -0,0 +1,7 @@ +
+

Blender 2.6 Bug tracker

+
+ submit Blender 2.6x bugs
+ browse Blender 2.6x bugs +
+