From b9b64b140609dd565ce6fde88794903e3cd9e0e2 Mon Sep 17 00:00:00 2001 From: Spencer Judd Date: Fri, 16 Sep 2011 09:45:17 -0400 Subject: [PATCH 1/3] fixed some template things that were bothering me.. >.> --- cyclonejet/templates/index.html | 2 +- cyclonejet/templates/login.html | 26 ++++++++++++-------------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/cyclonejet/templates/index.html b/cyclonejet/templates/index.html index bba78ec..bb4e25b 100644 --- a/cyclonejet/templates/index.html +++ b/cyclonejet/templates/index.html @@ -1,6 +1,6 @@ {% extends 'base.html' %} -{% block title %}}home{% endblock %} +{% block title %}home{% endblock %} {% block content %} diff --git a/cyclonejet/templates/login.html b/cyclonejet/templates/login.html index a77b174..30dd26d 100644 --- a/cyclonejet/templates/login.html +++ b/cyclonejet/templates/login.html @@ -5,21 +5,19 @@ {% block content %}
- {% for field in form %} + {% for field in form %} - {% if field.name == 'csrf' %} - {# do nothing i.e don't display this label #} - {% else %} - {{ field.label }} - {% endif %} - - {{ field }} - - {% if field.errors %} - - {% endif %} + {% if field.name != 'csrf' %} + {{ field.label }} + {% endif %} + + {{ field }} + + {% if field.errors %} + + {% endif %} {% endfor %} From b9f3f9a3a08fd992034cace2cd3e10aba6a4af74 Mon Sep 17 00:00:00 2001 From: Spencer Judd Date: Fri, 16 Sep 2011 10:16:23 -0400 Subject: [PATCH 2/3] added some login/logout links to the header --- cyclonejet/templates/base.html | 5 +++++ cyclonejet/views/frontend.py | 1 + 2 files changed, 6 insertions(+) diff --git a/cyclonejet/templates/base.html b/cyclonejet/templates/base.html index 619fe8f..1d4ff42 100644 --- a/cyclonejet/templates/base.html +++ b/cyclonejet/templates/base.html @@ -25,6 +25,11 @@
+ {% if session['logged_in'] %} +

Welcome {{ session['username'] }}! Logout?

+ {% else %} +

Login

+ {% endif %}