username/password registration now available

2012-12-04 15:18:59 -08:00
parent 7f8ae420aa
commit 07a614259f
3 changed files with 19 additions and 4 deletions
@@ -13,7 +13,20 @@
  <div id="head">
    <div class='pull-right'>
      {#unless _loggedIn}
-        <a href="/auth/facebook"><img src='/img/facebook-login-register.jpeg' alt="Login / Register With Facebook"/></a>
+        <a class="btn btn-small btn-info" href="#login-modal" data-toggle="modal">Login / Register</a>
+
+        <app:myModal modalId="login-modal" header="Login / Register">
+            <a href="/auth/facebook"><img src='/img/facebook-login-register.jpeg' alt="Login / Register With Facebook"/></a>
+            <h3>Or</h3>
+            <boot:tabs>
+                <boot:tab title="Login">
+                    <derby-auth:login />
+                </boot:tab>
+                <boot:tab title="Register">
+                    <derby-auth:register />
+                </boot:tab>
+            </boot:tabs>
+        </app:myModal>
      {else}
        <div class="btn-group">
            <button class="btn btn-small">{_loginName}</button>