Mercurial > public > sg101
diff gpp/templates/base.html @ 500:886cc99e8406
For #240, add an "ajaxy" login via a jQuery UI pop-up dialog to streamline the login process.
| author | Brian Neal <bgneal@gmail.com> |
|---|---|
| date | Sat, 03 Dec 2011 02:48:18 +0000 |
| parents | 61b81b97f02f |
| children | 8631d32e6b16 |
line wrap: on
line diff
--- a/gpp/templates/base.html Wed Nov 30 02:41:18 2011 +0000 +++ b/gpp/templates/base.html Sat Dec 03 02:48:18 2011 +0000 @@ -9,7 +9,6 @@ {% load shoutbox_tags %} {% load irc_tags %} {% load potd_tags %} -{% load messages_tags %} {% load script_tags %} {% load poll_tags %} {% load core_tags %} @@ -35,6 +34,10 @@ <script type="text/javascript" src="{{ STATIC_URL }}js/jquery.cycle.all.min.js"></script> <script type="text/javascript" src="{{ STATIC_URL }}js/shoutbox.js"></script> <link rel="shortcut icon" type="image/vnd.microsoft.com" href="{{ STATIC_URL }}favicon.ico" /> +{% if not user.is_authenticated %} +{% script_tags "jquery-ui" %} +<script type="text/javascript" src="{{ STATIC_URL }}js/ajax_login.js"></script> +{% endif %} </head> <body>{% block begin_body %}{% endblock %} <div id="page" class="container"> @@ -42,18 +45,7 @@ <p><a href="/" title="SG101 Home"><img src="{{ STATIC_URL }}themes/kds/sgLogo.png" alt="SurfGuitar101.com Logo" width="446" height="103" /></a></p> </div> <div id="header-nav" class="span-24"> - <ul> - {% if user.is_authenticated %} - <li>Welcome, <a href="{% url 'bio-me' %}">{{ user.username }}</a></li> - <li><a href="{% url 'forums-index' %}">Forums</a></li> - <li>{% unread_messages user %}</li> - <li><a href="{% url 'haystack_search' %}">Search</a></li> - <li><a href="{% url 'accounts-logout' %}">Logout</a></li> - {% else %} - <li><a href="{% url 'accounts-login' %}">Login</a></li> - <li><a href="{% url 'accounts-register' %}">Register</a></li> - {% endif %} - </ul> + {% include "navbar.html" %} </div> <div id="content-secondary" class="span-4 append-1"> @@ -120,6 +112,10 @@ music alive.</p> </div> -</div>{% block end_body %}{% endblock %} +</div> +{% if not user.is_authenticated %} + {% include "accounts/ajax_login_form.html" %} +{% endif %} +{% block end_body %}{% endblock %} </body> </html>