From ba34aa535a1a4e5da5abc9fc99ca981e978a6fe9 Mon Sep 17 00:00:00 2001
From: Sergey Sharybin <sergey.vfx@gmail.com>
Date: Mon, 21 Oct 2013 23:27:04 +0200
Subject: [PATCH] Move custom login form text to an html file

Also committing all the template files needed for
making phabricator closer to how our gforge looks.
---
 .../auth/provider/PhabricatorAuthProviderPassword.php | 11 ++++-------
 webroot/rsrc/custom/static/login.html                 |  2 ++
 webroot/rsrc/custom/static/welcome.html               |  7 +++++++
 3 files changed, 13 insertions(+), 7 deletions(-)
 create mode 100644 webroot/rsrc/custom/static/login.html
 create mode 100644 webroot/rsrc/custom/static/welcome.html

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 @@
+<p style="margin: 12pt 0;">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.</p>
+<p style="margin: 12pt 0;">TODO: add a way to show the right account name if the wrong one is entered.'</p>
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 @@
+<div class="aphront-mini-panel-view">
+  <h1><a href="maniphest/">Blender 2.6 Bug tracker</a></h1>
+  <div style="padding-left: 16pt">
+    <a href="maniphest/task/create/">submit</a> Blender 2.6x bugs<br>
+    <a href="maniphest/">browse</a> Blender 2.6x bugs
+  </div>
+</div>