diff templates/base.djhtml @ 107:2bca07be6e51

Add login popup box So you can log in and immediately be redirected to the same page. Sort of like what reddit has. If Javascript is disabled, the user is simply taken to the standard login page.
author dellsystem <ilostwaldo@gmail.com>
date Tue, 11 Sep 2012 20:23:51 -0400
parents f872c643b056
children 12dd104b1227
line wrap: on
line diff
--- a/templates/base.djhtml	Tue Sep 11 18:06:01 2012 -0400
+++ b/templates/base.djhtml	Tue Sep 11 20:23:51 2012 -0400
@@ -54,6 +54,7 @@
       {% block navbar %}
       <div id="breadcrumbs">
         <div class="right-float">
+          {% block login_breadcrumbs %}
           {% if user.is_authenticated %}
             <a href="{% url auth_logout %}">Logout</a>
             ::
@@ -61,10 +62,11 @@
             ::
             <a href="{% url show_profile user %}">View your profile ({{ user }})</a>
           {% else %}
-            <a href="{% url auth_login %}?next={{ request.path }}">Login</a>
-            ::
-            <a href="{% url registration_register %}">Register</a>
+            <a href="{% url login %}?next={{ request.path }}" class="login-link">
+                Login or register
+            </a>
           {% endif %}
+          {% endblock %}
         </div>
         <div>
           {% block breadcrumbs %}
@@ -92,7 +94,15 @@
     </p>
   </div>
   <!-- END #footer -->
+  {% block login_form %}
+  <div id="login-popup" class="hidden">
+      <div id="login-form">
+          {% include "login_form.djhtml" %}
+      </div>
+  </div>
+  {% endblock %}
     <script src="/static/js/jquery.min.js"></script>
+    <script src="/static/js/agora.js"></script>
     {% block script_footer %}
     {% endblock %}
   </body>