From ccd2292458aab921c40ab0fad6c025a033f09f6e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 9 Jul 2013 14:39:28 +0200
Subject: [PATCH] Link to both the Persona and legacy sign in

---
 src/root/layout.tt |  2 +-
 src/root/login.tt  |  5 -----
 src/root/topbar.tt | 14 +++++++++++---
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/root/layout.tt b/src/root/layout.tt
index ed255e05..0229c229 100644
--- a/src/root/layout.tt
+++ b/src/root/layout.tt
@@ -136,7 +136,7 @@
         });
 
         $("#persona-signin").click(function() {
-          navigator.id.request();
+          navigator.id.request({ siteName: 'Hydra' });
         });
 
         $("#persona-signout").click(function() {
diff --git a/src/root/login.tt b/src/root/login.tt
index d26cb4d6..c2806600 100644
--- a/src/root/login.tt
+++ b/src/root/login.tt
@@ -7,11 +7,6 @@ You are already signed in as <tt>[% HTML.escape(c.user.username) %]</tt>.
 </p>
 [% ELSE %]
 
-<!--
-<p>Don't have an account yet? Please <a href="[%
-c.uri_for('/register') %]">register</a> first.</p>
--->
-
 <form class="form-horizontal" method="post" action="[% c.uri_for('/login') %]">
 
   <fieldset>
diff --git a/src/root/topbar.tt b/src/root/topbar.tt
index 609fa3c1..153b0b1a 100644
--- a/src/root/topbar.tt
+++ b/src/root/topbar.tt
@@ -202,9 +202,17 @@
       <a href="#" id="persona-signout">Sign out</a>
     </li>
   [% ELSE %]
-    <li>
-      <a href="#" id="persona-signin">Sign in</a>
-    </li>
+    [% WRAPPER makeSubMenu title="Sign in" %]
+      <li>
+        <a href="#" id="persona-signin">
+          <img src="https://developer.mozilla.org/files/3963/persona_sign_in_blue.png" alt="Sign in with Persona" />
+        </a>
+      </li>
+      <li class="divider"></li>
+      <li>
+        <a href="[% c.uri_for('/login') %]">Sign in with a Hydra user name</a>
+      </li>
+    [% END %]
   [% END %]
 
 </ul>