From be32a2550ec3b40d393620c301bbaa5bb59d1bc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Sureau?=
Date: Thu, 5 Apr 2012 15:40:09 +0200
Subject: Update to Boostrap v2.
Remove unused libs (QTip, JQueryUI) and add bootstrap-datepicker which is much lighter.
---
budget/templates/add_bill.html | 2 +-
budget/templates/add_member.html | 2 +-
budget/templates/authenticate.html | 2 +-
budget/templates/create_archive.html | 2 +-
budget/templates/create_project.html | 2 +-
budget/templates/edit_project.html | 2 +-
budget/templates/forms.html | 43 ++++++-------
budget/templates/home.html | 87 ++++++++++++--------------
budget/templates/layout.html | 106 +++++++++++++-------------------
budget/templates/list_bills.html | 66 ++++++++------------
budget/templates/password_reminder.html | 2 +-
budget/templates/send_invites.html | 2 +-
12 files changed, 138 insertions(+), 180 deletions(-)
(limited to 'budget/templates')
diff --git a/budget/templates/add_bill.html b/budget/templates/add_bill.html
index 34b89cc..71bb6f0 100644
--- a/budget/templates/add_bill.html
+++ b/budget/templates/add_bill.html
@@ -20,7 +20,7 @@
{% block content %}
-
{% endblock %}
diff --git a/budget/templates/add_member.html b/budget/templates/add_member.html
index 91ca226..8ddfd52 100644
--- a/budget/templates/add_member.html
+++ b/budget/templates/add_member.html
@@ -3,7 +3,7 @@
auto_hide_default_text('#name');
{% endblock %}
{% block content %}
-
{% endblock %}
diff --git a/budget/templates/authenticate.html b/budget/templates/authenticate.html
index 7af2440..dc62a70 100644
--- a/budget/templates/authenticate.html
+++ b/budget/templates/authenticate.html
@@ -7,7 +7,7 @@
to") }} {{ _("create it") }}{{ _("?") }}
{% endif %}
-
-
- {% if field.type != "SubmitField" %}
- {{ field.label }}
+
+ {% if field.type != "SubmitField" %}
+ {{ field.label(class="control-label") }}
+ {% endif %}
+
+ {% if multiple == True %}
+ {{ field(multiple=True, class=class) }}
+ {% else %}
+ {{ field(class=class) | safe }}
+ {% endif %}
+ {% if field.description %}
+
{{ field.description }}
{% endif %}
-
- {% if multiple == True %}
- {{ field(multiple=True, class=class) }}
- {% else %}
- {{ field(class=class) | safe }}
- {% endif %}
- {% if field.description %}
- {{ field.description }}
- {% endif %}
-
+
{% endmacro %}
{% macro submit(field, cancel=False, home=False) -%}
{% endmacro %}
@@ -66,7 +65,7 @@
{{ input(form.password) }}
{{ input(form.contact_email) }}
@@ -85,24 +84,22 @@
{{ input(form.payed_for) }}
- {{ form.submit(class="btn primary") }}
+ {{ form.submit(class="btn btn-primary") }}
{% if not edit %} {{ form.submit2(class="btn") }}{% endif %}
{% endmacro %}
{% macro add_member(form) %}
- {{ form.hidden_tag() }}
- {{ form.name(class="menu-input") }}
-
-
+{{ form.hidden_tag() }}
+{{ form.name(placeholder=_("Type user name here")) }}
{% endmacro %}
{% macro invites(form) %}
{{ form.hidden_tag() }}
{{ input(form.emails) }}
{% endmacro %}
diff --git a/budget/templates/home.html b/budget/templates/home.html
index d21d0ec..b9a2b46 100644
--- a/budget/templates/home.html
+++ b/budget/templates/home.html
@@ -1,63 +1,56 @@
{% extends "layout.html" %}
-{% block sidebar_wrapper %}{% endblock %}
-
{% block header %}
-