From 88cd2f86751621d73574ac56a9d6c4bedcbdd3d5 Mon Sep 17 00:00:00 2001
From: Arnaud Bos <arnaud.tlse@gmail.com>
Date: Sun, 11 Sep 2011 05:25:42 +0200
Subject: Fix #24 on Authentication and New project forms usability.

- Do not display anymore the identifier field in home.

- Let the user enter the id if the slug generated from project name already exists as a project id.

- Moved get_billform_for from 'utils' to 'forms', to avoid issue (was 'from forms import ...' into utils,
  and 'from utils import ...' into forms, which causeed an error).
---
 budget/templates/forms.html | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'budget/templates')

diff --git a/budget/templates/forms.html b/budget/templates/forms.html
index b027763..ba915e8 100644
--- a/budget/templates/forms.html
+++ b/budget/templates/forms.html
@@ -17,8 +17,11 @@
       </div> <!-- /clearfix -->
 {% endmacro %}
 
-{% macro submit(field, cancel=False) -%}
+{% macro submit(field, cancel=False, home=False) -%}
     <div class="actions">
+        {% if home %}
+            <a href="{{ url_for(".home") }}" class="btn">Back Home</a>
+        {% endif %}
         <button type="submit" class="btn primary">{{ field.name }}</button>
         {% if cancel %}
             <button id="cancel-form" type="reset" class="btn">Cancel</button>
@@ -42,12 +45,14 @@
 
     {% include "display_errors.html" %}
     {{ form.hidden_tag() }}
-    {{ input(form.name) }}
+    {% if not home %}
     {{ input(form.id) }}
+    {% endif %}
+    {{ input(form.name) }}
     {{ input(form.password) }}
     {{ input(form.contact_email) }}
     {% if not home %}
-    {{ submit(form.submit) }}
+    {{ submit(form.submit, home=True) }}
     {% endif %}
 
 {% endmacro %}
-- 
cgit v1.1