Link to both the Persona and legacy sign in

src/root/layout.tt

@@ -136,7 +136,7 @@
         });
 
         $("#persona-signin").click(function() {
-          navigator.id.request();
+          navigator.id.request({ siteName: 'Hydra' });
         });
 
         $("#persona-signout").click(function() {

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>

src/root/topbar.tt

@@ -202,9 +202,17 @@
       <a href="#" id="persona-signout">Sign out</a>
     </li>
   [% ELSE %]
+    [% WRAPPER makeSubMenu title="Sign in" %]
       <li>
-      <a href="#" id="persona-signin">Sign in</a>
+        <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>